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 | |
| 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
126 files changed, 1206 insertions, 5420 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 ó 64 bits.</p> @@ -189,7 +171,7 @@ <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e56"></a>Mitjà autònom + <h4 class="title"><a name="d5e53"></a>Mitjà autònom </h4> </div> </div> @@ -200,7 +182,7 @@ <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e58"></a>Característiques comunes + <h5 class="title"><a name="d5e55"></a>Caracterí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 ó 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ònom de GNOME + <h5 class="title"><a name="d5e78"></a>DVD autònom de GNOME </h5> </div> </div> @@ -302,7 +284,7 @@ </li> <li class="listitem"> - <p>Suports diferents per a arquitectura de 32 ó 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 ó 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és d'arrencada + <h4 class="title"><a name="d5e96"></a>Suport CD només d'arrencada </h4> </div> </div> @@ -360,7 +342,7 @@ <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e101"></a>Característiques comunes + <h5 class="title"><a name="d5e98"></a>Caracterí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és conté programari lliure, per a qui rebutja la utilització 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ó del mitjà + <h3 class="title"><a name="d5e119"></a>Baixada i comprovació del mitjà </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ó 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ó 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òria USB + <h4 class="title"><a name="d5e154"></a>Bolcat de l'ISO a un llapis de memò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ò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és també es poden modificar després de la instal·lació.</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·lació amb DrakX"> <link rel="up" href="index.html" title="Instal·lació 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ó del disc dur que es formatarà"><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·lació amb DrakX"> <link rel="up" href="index.html" title="Instal·lació 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·lació amb DrakX"> <link rel="up" href="index.html" title="Instal·lació 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·lar + propostes de l'auxiliar de particions de DrakX sobre on instal·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ó d'arrencada, boot, si no existeix. És + una partició d'1 MB sense punt de muntatge. Trieu l'opció de "Particions + personalitzades de disc" per poder crear-la amb l'instal·lador com qualsevol + altra partició, només cal seleccionar "partició 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ògics de 4096 bytes, en lloc dels sectors lògics de 512 bytes, estàndards fins ara. A causa de la manca de - maquinari disponible, l'eina de particionament utilitzada per l'instal·lador - no s'ha pogut provar amb un dispositiu d'aquestes característiques. A més, + maquinari disponible, l'eina de particions utilitzada per l'instal·lador no + s'ha pogut provar amb un dispositiu d'aquestes característiques. A més, alguns discs SSD fan servir actualment un bloc d'esborrament de mé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ó següent: + MB. Si teniu algun d'aquests dispositius, us recomanem de fer les particions + del disc prèviament, utilitzant alguna eina de particions alternativa, com + ara gparted, i feu servir la configuració segü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·lació amb DrakX"> <link rel="up" href="index.html" title="Instal·lació 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ó dels suports (configura suports d'instal·lació 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ó</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ó del mitjà</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ó del mitjà</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·lador de Mageia</a></span></dt> @@ -50,10 +50,10 @@ <dt><span class="section"><a href="setupSCSI.html">Configuració SCSI</a></span></dt> <dt><span class="section"><a href="selectInstallClass.html">Instal·lació o actualització</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ó del disc dur que es formatarà</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ó</a></span></dt> <dt><span class="section"><a href="add_supplemental_media.html">Selecció dels suports (configura suports d'instal·lació suplementaris)</a></span></dt> <dt><span class="section"><a href="media_selection.html">Selecció del suport (Nonfree)</a></span></dt> @@ -75,19 +75,11 @@ <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 + <dt><span class="section"><a href="setupBootloader.html#d5e883">Bootloader interface</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e907">Ús del gestor d'arrencada de Mageia</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e921">Ú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ó o modificació d'una entrada al menú d'arrencada</a></span></dt> @@ -121,11 +113,7 @@ <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 + <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·lació amb DrakX"> <link rel="up" href="index.html" title="Instal·lació amb DrakX"> <link rel="prev" href="selectInstallClass.html" title="Instal·lació o actualització"> - <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ús gràfics de Mageia só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>Ús del gestor d'arrencada de Mageia -======= - <h3 class="title"><a name="d5e930"></a>Ús del gestor d'arrencada de Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 + <h3 class="title"><a name="d5e907"></a>Ú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>Ús d'un gestor d'arrencada existent -======= - <h3 class="title"><a name="d5e947"></a>Ús d'un gestor d'arrencada existent ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 + <h3 class="title"><a name="d5e921"></a>Ú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·lació amb DrakX"> <link rel="up" href="index.html" title="Instal·lació 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> diff --git a/cs/Select-and-use-ISOs.html b/cs/Select-and-use-ISOs.html index 71a37b6..6ebb876 100644 --- a/cs/Select-and-use-ISOs.html +++ b/cs/Select-and-use-ISOs.html @@ -168,11 +168,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Živé nosiče -======= - <h4 class="title"><a name="d5e56"></a>Živé nosiče ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -183,11 +179,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>Běžné vlastnosti -======= - <h5 class="title"><a name="d5e58"></a>Běžné vlastnosti ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -205,13 +197,9 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Každé ISO obsahuje pouze jedno grafické prostředí (KDE - Plasma, GNOME nebo Xfce) </p> -======= - <p>Každé ISO obsahuje pouze jedno grafické prostředí (KDE, GNOME nebo Xfce)</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -240,11 +228,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e69"></a>Živé DVD Plasma -======= - <h5 class="title"><a name="d5e72"></a>Živé DVD Plasma ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -265,11 +249,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Pouze 64 bitová architektura.</p> -======= - <p>Různé nosiče pro 32 nebo 64 bitové architektury.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -281,11 +261,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>Live DVD GNOME -======= - <h5 class="title"><a name="d5e81"></a>Live DVD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -318,11 +294,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e87"></a>Živé DVD Xfce -======= - <h5 class="title"><a name="d5e90"></a>Živé DVD Xfce ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -357,11 +329,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>Jen zaváděcí nosiče CD -======= - <h4 class="title"><a name="d5e99"></a>Jen zaváděcí nosiče CD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -372,11 +340,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>Běžné vlastnosti -======= - <h5 class="title"><a name="d5e101"></a>Běžné vlastnosti ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -422,11 +386,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -451,11 +411,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -484,11 +440,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>Stahování a zkontrolování nosiče -======= - <h3 class="title"><a name="d5e122"></a>Stahování a zkontrolování nosiče ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -499,11 +451,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>Stažení -======= - <h4 class="title"><a name="d5e124"></a>Stažení ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -531,11 +479,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>Ověřování neporušenosti stáhnutého nosiče -======= - <h4 class="title"><a name="d5e136"></a>Kontrolování neporušenosti stáhnutého nosiče ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -575,11 +519,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>Vypálení nebo vepsání souboru ISO -======= - <h3 class="title"><a name="d5e149"></a>Vypálení nebo vepsání souboru ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -595,11 +535,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>Vypálení souboru ISO na CD/DVD -======= - <h4 class="title"><a name="d5e152"></a>Vypálení souboru ISO na CD/DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -619,11 +555,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>Zapsat ISO na USB flash -======= - <h4 class="title"><a name="d5e157"></a>Zapsat ISO na USB flash ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -661,11 +593,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Použitím grafického nástroje v Mageii -======= - <h5 class="title"><a name="d5e163"></a>Použitím grafického nástroje v Mageii ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -680,11 +608,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Použitím grafického nástroje ve Windows -======= - <h5 class="title"><a name="d5e167"></a>Použitím grafického nástroje ve Windows ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -706,11 +630,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>Použitím příkazového řádku v systému GNU/Linux -======= - <h5 class="title"><a name="d5e174"></a>Použitím příkazového řádku v systému GNU/Linux ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/cs/addUser.html b/cs/addUser.html index 7d9f16b..297b530 100644 --- a/cs/addUser.html +++ b/cs/addUser.html @@ -23,16 +23,8 @@ </div> </div> -<<<<<<< HEAD -======= - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Nastavení hesla správce (uživatele root):"> <div class="titlepage"> @@ -146,10 +138,6 @@ <p>Jakýkoliv uživatel přidaný v průběhu instalace Mageii bude mít chráněn domovský adresář proti čtení a zápisu (umask=0027) </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Můžete přidat všechny další potřebné uživatele v kroku <span class="emphasis"><em>Nastavení - Souhrn</em></span> během instalace. Vyberte si <span class="emphasis"><em>Správa diff --git a/cs/doPartitionDisks.html b/cs/doPartitionDisks.html index 6ca8380..bf192b4 100644 --- a/cs/doPartitionDisks.html +++ b/cs/doPartitionDisks.html @@ -42,8 +42,6 @@ - - <p><a name="doPartitionDisks-pa3"></a></p> <div class="itemizedlist"> <ul class="itemizedlist"> @@ -101,8 +99,6 @@ </p> - - </li> </ul> @@ -238,11 +234,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> diff --git a/cs/index.html b/cs/index.html index 65da737..9f2e345 100644 --- a/cs/index.html +++ b/cs/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Úvod</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Média</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Stahování a zkontrolování nosiče</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Vypálení nebo vepsání souboru ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Stahování a zkontrolování nosiče</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Vypálení nebo vepsání souboru ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, instalátor Mageii</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Základní nastavení zaváděcího programu</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e882">Rozhraní zavaděče</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e906">Použití zavaděče Mageii</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e920">Použití už existujícího zavaděče</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e923">Using chain loading</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e937">Volby</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e899">Rozhraní zavaděče</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e929">Použití zavaděče Mageii</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e946">Použití už existujícího zavaděče</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e949">Using the chain loading</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e966">Volby</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Přidaní nebo změna položky v nabídce zavaděče</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Odinstalování Mageii</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Jak na to</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1273">Jak na to</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/cs/setupBootloader.html b/cs/setupBootloader.html index 0ab69c5..5d6bcc6 100644 --- a/cs/setupBootloader.html +++ b/cs/setupBootloader.html @@ -33,11 +33,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e882"></a>Rozhraní zavaděče -======= - <h3 class="title"><a name="d5e899"></a>Rozhraní zavaděče ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -85,11 +81,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e892"></a>Grub2 on Legacy/MBR and Legacy/GPT systems -======= - <h4 class="title"><a name="d5e909"></a>Grub2 on Legacy/MBR and Legacy/GPT systems ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -97,11 +89,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Neupravujte "Zaváděcí zařízení", pokud s jistotou nevíte, co děláte.</p> @@ -113,11 +100,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e898"></a>Grub2-efi na UEFI systémech -======= - <h4 class="title"><a name="d5e918"></a>Grub2-efi na UEFI systémech ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -132,7 +115,6 @@ -<<<<<<< HEAD <p>Pokud je Mageia jediným systémem nainstalovaným na váš počítač, instalátor vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud ve vašem počítači byly už předtím nainstalovány operační systémy UEFI @@ -143,20 +125,6 @@ </p> -======= - - - <p>Pokud je Mageia prvním systémem nainstalovaným na váš počítač, instalátor - vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud - ve vašem počítači byly už předtím nainstalovány operační systémy UEFI - (například Windows 8), instalátor Mageii zjistil stávající ESP vytvořený - operačním systémem Windows a přidal grub2-efi. Ačkoli je možno mít více - oddílů ESP, radí se mít a stačí jen jeden, bez ohledu na počet operačních - systémů, které máte v počítači. - </p> - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Neupravujte "Zaváděcí zařízení", pokud s jistotou nevíte, co děláte.</p> </div> @@ -168,11 +136,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e906"></a>Použití zavaděče Mageii -======= - <h3 class="title"><a name="d5e929"></a>Použití zavaděče Mageii ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -207,11 +171,6 @@ <span class="guilabel">Probe Foreign OS</span></p> -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -220,11 +179,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e920"></a>Použití už existujícího zavaděče -======= - <h3 class="title"><a name="d5e946"></a>Použití už existujícího zavaděče ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -242,19 +197,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Using chain loading"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e923"></a>Using chain loading -======= - <div class="section" title="Using the chain loading"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e949"></a>Using the chain loading ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -262,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>. @@ -275,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> @@ -295,11 +231,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e937"></a>Volby -======= - <h3 class="title"><a name="d5e966"></a>Volby ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -311,11 +243,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e939"></a>První strana -======= - <h4 class="title"><a name="d5e968"></a>První strana ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -366,17 +294,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> @@ -399,11 +320,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> @@ -421,11 +338,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e971"></a>Další strana -======= - <h4 class="title"><a name="d5e1000"></a>Další strana ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> diff --git a/cs/uninstall-Mageia.html b/cs/uninstall-Mageia.html index e09c137..4d14827 100644 --- a/cs/uninstall-Mageia.html +++ b/cs/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1244"></a>Jak na to -======= - <h3 class="title"><a name="d5e1273"></a>Jak na to ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/de/Select-and-use-ISOs.html b/de/Select-and-use-ISOs.html index f77a91d..01beeb6 100644 --- a/de/Select-and-use-ISOs.html +++ b/de/Select-and-use-ISOs.html @@ -173,11 +173,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Live Medien -======= - <h4 class="title"><a name="d5e56"></a>Live Medien ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -188,11 +184,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>Grundsätzliche Eigenschaften -======= - <h5 class="title"><a name="d5e58"></a>Grundsätzliche Eigenschaften ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -211,11 +203,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Jede ISO enthält nur eine Desktop-Umgebung (Plasma, GNOME oder Xfce).</p> -======= - <p>Jede ISO enthält nur eine Desktop-Umgebung (KDE, GNOME oder Xfce).</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -244,11 +232,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e69"></a>Live-DVD Plasma -======= - <h5 class="title"><a name="d5e72"></a>Live-DVD Plasma ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -269,11 +253,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Nur 64-Bit-Architektur.</p> -======= - <p>Verschiedene Medien für 32- oder 64-Bit-Architekturen.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -285,11 +265,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>Live-DVD GNOME -======= - <h5 class="title"><a name="d5e81"></a>Live-DVD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -322,11 +298,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e87"></a>Live-DVD Xfce -======= - <h5 class="title"><a name="d5e90"></a>Live-DVD Xfce ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -361,11 +333,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>Boot-only CD Medien -======= - <h4 class="title"><a name="d5e99"></a>Boot-only CD Medien ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -376,11 +344,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>Grundsätzliche Eigenschaften -======= - <h5 class="title"><a name="d5e101"></a>Grundsätzliche Eigenschaften ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -426,11 +390,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -455,11 +415,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -488,11 +444,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>Medien herunterladen und überprüfen -======= - <h3 class="title"><a name="d5e122"></a>Medien herunterladen und überprüfen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -503,11 +455,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>Herunterladen -======= - <h4 class="title"><a name="d5e124"></a>Herunterladen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -537,11 +485,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>Überprüfen der integrität der heruntergeladenen Datei -======= - <h4 class="title"><a name="d5e136"></a>Überprüfen der integrietät der heruntergeladenen Datei ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -584,11 +528,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>Brennen oder übertragen der ISO -======= - <h3 class="title"><a name="d5e149"></a>Brennen oder übertragen der ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -604,11 +544,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>ISO auf eine CD/DVD brennen -======= - <h4 class="title"><a name="d5e152"></a>ISO auf eine CD/DVD brennen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -628,11 +564,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>ISO auf einen USB-Stick übertragen -======= - <h4 class="title"><a name="d5e157"></a>ISO auf einen USB-Stick übertragen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -670,11 +602,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Verwenden eines grafischen Werkzeugs in Mageia -======= - <h5 class="title"><a name="d5e163"></a>Verwenden eines grafischen Werkzeugs in Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -689,11 +617,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Verwenden eines grafischen Werkzeugs in Windows -======= - <h5 class="title"><a name="d5e167"></a>Verwenden eines grafischen Werkzeugs in Windows ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -715,11 +639,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>Verwenden der Befehlszeile in einem GNU/Linux System -======= - <h5 class="title"><a name="d5e174"></a>Verwenden der Befehlzeile in einem GNU/Linux System ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/de/addUser.html b/de/addUser.html index 20ee737..a99f8ec 100644 --- a/de/addUser.html +++ b/de/addUser.html @@ -23,16 +23,8 @@ </div> </div> -<<<<<<< HEAD -======= - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Setzen des Administrator (root) Passworts:"> <div class="titlepage"> @@ -151,20 +143,12 @@ <p>Jeder Nutzer, der bei der Installation von Mageia hinzugefügt wird, erhält ein lese- und schreibgeschütztes home Verzeichnis (umask=0027). </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Sie können zusätzliche Zugänge für weitere Benutzer im <span class="emphasis"><em>Konfiguration - Zusammenfassung</em></span> Bildschirm, während der Installation, hinzufügen. Wähle hierfür die <span class="emphasis"><em>Benutzerverwaltung</em></span> aus. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Die Zugriffsrechte können auch nach der Installation abgeändert werden.</p> diff --git a/de/choosePackageGroups.html b/de/choosePackageGroups.html index a7962f0..97f0ac0 100644 --- a/de/choosePackageGroups.html +++ b/de/choosePackageGroups.html @@ -51,22 +51,13 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Grafische Umgebung</p> -======= - <p>Grafische Umgebung.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>Individuelle Paketauswahl: Um händisch Pakete hinzuzufügen oder entfernen zu können, wählen Sie bitte diese Option. -======= - <p>Individuelle Paketauswahl (Um händisch Pakete hinzuzufügen oder entfernen zu - können, wählen Sie bitte diese Option.) ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> diff --git a/de/doPartitionDisks.html b/de/doPartitionDisks.html index 4ba5338..b1bae49 100644 --- a/de/doPartitionDisks.html +++ b/de/doPartitionDisks.html @@ -42,8 +42,6 @@ - - <p><a name="doPartitionDisks-pa3"></a></p> <div class="itemizedlist"> <ul class="itemizedlist"> @@ -107,8 +105,6 @@ </p> - - </li> </ul> @@ -243,30 +239,17 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem GPT-Laufwerk verwenden, müssen Sie eine BIOS Bootpartition erstellen, falls noch keine vorhanden ist. Es ist eine ungefähr 1 MiB große Partition ohne einen Einhängepunkt. Wähle die "Benutzerdefinierte Partitionierung" um diese über das Installationsprogramm zu erstellen, wie dies auch bei den anderen -======= - <p>Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem GPT - Laufwerk verwenden, müssen Sie eine BIOS Bootpartition erstellen, falls noch - keine vorhanden ist. Es ist eine ungefähr 1 MiB große Partition ohne einen - Einhängepunkt. Wähle die "Benutzerdefinierte Partitionierung" um diese über - das Installationsprogramm zu erstellen, wie dies auch bei den anderen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 Partitionen geschieht. Wähle als Dateisystem "BIOS boot partition" aus. </p> -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> diff --git a/de/index.html b/de/index.html index bfa490e..ad9b410 100644 --- a/de/index.html +++ b/de/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Einleitung</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medien</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Medien herunterladen und überprüfen</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Brennen oder übertragen der ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Medien herunterladen und überprüfen</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Brennen oder übertragen der ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, das Mageia Installationsprogramm</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Hauptoptionen des Bootloaders</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e902">Bootloader Oberfläche</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e926">Verwenden des Mageia Bootloaders</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e940">Verwenden eines bestehenden Bootloaders</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e943">Verwenden des Chain-Loader</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e957">Optionen</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e919">Bootloader interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e949">Verwenden des Mageia Bootloaders</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e966">Verwenden eines bestehenden Bootloaders</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e969">Verwenden des Chain-Loader</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e986">Optionen</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Hinzufügen oder ändern eines Boot Menü Eintrags</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia deinstallieren</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1264">Kurzanleitung</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1293">Kurzanleitung</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/de/misc-params.html b/de/misc-params.html index 5b95a67..cf134e8 100644 --- a/de/misc-params.html +++ b/de/misc-params.html @@ -199,14 +199,9 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Wenn Sie feststellen, dass ein falsches Tastaturlayout verwendet wird und Sie dieses ändern möchten, beachten Sie, das sich Ihr Passwort hierdurch auch ändert. -======= - <p>If you notice a wrong keyboard layout and want to change it, keep in mind - that your passwords are going to change too. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </td> diff --git a/de/selectCountry.html b/de/selectCountry.html index 64be86c..4ea6e2f 100644 --- a/de/selectCountry.html +++ b/de/selectCountry.html @@ -32,11 +32,7 @@ <p><a name="selectCountry-pa1"></a>Wählen Sie Ihr Land oder Ihre Region. Dies ist für alle Einstellungen nötig, wie für die Währung und die für dieses Land gültigen Einstellungen des Funknetzes. Wählen Sie das falsche Land aus, kann dies zu einer Fehlfunktion -<<<<<<< HEAD des WLAN führen. -======= - des WLANs führen. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -79,7 +75,6 @@ -<<<<<<< HEAD <p><a name="selectCountry-pa4"></a>Im <span class="guilabel">Andere Länder</span> Bildschirm können Sie weitere Eingabemethoden auswählen (am unteren Ende der Liste). Eingabemethoden erlauben es den Benutzern, multilinguale Zeichen (Chinesisch, Japanisch, @@ -88,15 +83,6 @@ Eingabemethoden (SCIM, GIN, HIME, usw.) bieten ähnliche Funktionen an und können installiert werden, wenn Sie die HTTP/FTP Medien hinzugefügt haben, bevor Sie diese Pakete auswählen. -======= - <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an - input method (at the bottom of the list). Input methods allow users to input - multilingual characters (Chinese, Japanese, Korean, etc). IBus is the - default input method, so users should not need to configure it - manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar - functions and can be installed if you added HTTP/FTP media before package - selection. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> diff --git a/de/setupBootloader.html b/de/setupBootloader.html index d9600bd..47b927c 100644 --- a/de/setupBootloader.html +++ b/de/setupBootloader.html @@ -29,19 +29,11 @@ -<<<<<<< HEAD <div class="section" title="Bootloader Oberfläche"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e902"></a>Bootloader Oberfläche -======= - <div class="section" title="Bootloader interface"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e919"></a>Bootloader interface ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -49,11 +41,7 @@ -<<<<<<< HEAD <p>Standardmäßig verwendet Mageia ausschließlich:</p> -======= - <p>By default, Mageia uses exclusively:</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> @@ -95,11 +83,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e912"></a>Grub2 auf Legacy/MBR und Legacy/GPT Systeme -======= - <h4 class="title"><a name="d5e929"></a>Grub2 auf Legacy/MBR und Legacy/GPT Systeme ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -107,17 +91,9 @@ -<<<<<<< HEAD <p>Ändern Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun.</p> -======= - - - - - <p>Änderen Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -126,11 +102,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e918"></a>Grub2-efi auf UEFI Systeme -======= - <h4 class="title"><a name="d5e938"></a>Grub2-efi auf UEFI Systeme ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -145,7 +117,6 @@ -<<<<<<< HEAD <p>Wenn Mageia das einzige Betriebssystem ist, welches auf Ihrem Computer installiert ist, dann hat das Installationsprogramm eine ESP (EFI-Systempartition) erstellt, um dort den Bootloader (Grub2-efi) zu @@ -159,22 +130,6 @@ <p>Ändern Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun.</p> -======= - - - <p>Wenn Mageia das erste System, welches auf Ihrem Computer installiert ist, - dann hat das Installationsprogramm eine ESP (EFI System Partition) erstellt - um dort den Bootloader (Grub2-efi) zu speichern. Falls bereits ein UEFI - Betriebssystem auf Ihrem Computer vorhanden war (z.B. Windows 8), erkennt - das Mageia Installationsprogramm die bestehende ESP, welche von Windows - erstellt wurde, und fügt grub2-efi hinzu. Es ist auch möglich mehrere ESPs - zu haben, jedoch wird generell nur eine benötigt und diese ist auch - ausreichend, egal wie viele Betriebssysteme Sie verwenden. - </p> - - - <p>Änderen Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -185,11 +140,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e926"></a>Verwenden des Mageia Bootloaders -======= - <h3 class="title"><a name="d5e949"></a>Verwenden des Mageia Bootloaders ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -224,11 +175,6 @@ <span class="guilabel">Fremdes OS testen</span></p> -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -237,11 +183,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e940"></a>Verwenden eines bestehenden Bootloaders -======= - <h3 class="title"><a name="d5e966"></a>Verwenden eines bestehenden Bootloaders ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -264,11 +206,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e943"></a>Verwenden des Chain-Loader -======= - <h3 class="title"><a name="d5e969"></a>Verwenden des Chain-Loader ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -276,32 +214,18 @@ -<<<<<<< HEAD <p>Falls Sie kein bootbares Mageia haben möchten, dieses jedoch über den Chainloader eines anderen Betriebssystem starten möchten, klicke auf <span class="guibutton">Weiter</span>, anschließend auf <span class="guilabel">Fortgeschritten</span> und wähle die Box <span class="guilabel">Verändere nichts an der ESP oder dem MBR</span> aus. -======= - <p>If you don't want a bootable Mageia, but chain load it from another OS, - 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>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>Sie werden eine Warnmeldung erhalten, dass der Bootloader fehlt. Ignorieren Sie diese Meldung indem Sie auf <span class="guibutton">OK</span> drücken. -======= - - - <p>You will get a warning that the bootloader will lack, ignore it by a click - on <span class="guibutton">OK</span>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -313,11 +237,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e957"></a>Optionen -======= - <h3 class="title"><a name="d5e986"></a>Optionen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -329,11 +249,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e959"></a>Erste Seite -======= - <h4 class="title"><a name="d5e988"></a>Erste Seite ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -353,17 +269,11 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Sicherheit</span>: Dies erlaubt Ihnen ein Passwort für den Bootloader festzulegen. Dies bedeutet, dass der Benutzername und das Passwort beim Startvorgang abfragt wird, wenn ein Booteintrag ausgewählt wird oder Einstellungen geändert werden. Der Benutzername ist "root" und das Passwort ist welches, dass Sie in diesem Abschnitt festlegen können. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -390,7 +300,6 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">ACPI aktivieren:</span> ACPI (Advanced Configuration and Power Interface) ist ein Standard für die Energieverwaltung. Es kann durch das Abschalten von ungenutzten Geräten Strom sparen, was eine Methode ist, @@ -398,55 +307,30 @@ nützlich sein wenn, zum Beispiel, Ihr Computer ACPI nicht unterstützt oder falls Sie finden, dass die ACPI Implementierung einige Probleme verursacht (als Beispiel wären zufällige Neustarts oder Systemhänger). -======= - <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 - 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> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">SMP aktivieren</span>: Diese Auswahl aktiviert / deaktiviert das symmetrische Multiprocessing für Multiprozessorsysteme. -======= - <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric - multiprocessing for multi core processors. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">APIC aktivieren</span>: Aktivieren oder deaktivierten dieser Option erlaubt dem Betriebssystem Zugriff auf den Advanced Programmable Interrupt Controller. APIC Geräte erlauben ein weitaus komplexeres Prioritätenmodell und erweiterte IRC (Interrupt Request) Verwaltung. -======= - <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the - operating system access to the Advanced Programmable Interrupt - Controller. APIC devices permit more complex priority models, and Advanced - IRQ (Interrupt Request) management. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Lokales APIC aktivieren</span>: Hier können Sie das lokale APIC auswählen, welches alle externen Interrupts (Unterbrechungen) für einen bestimmten Prozessor in einem SMP System verwaltet. -======= - <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which - manage all external interrupts for some specific processor in an SMP system. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -464,11 +348,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e991"></a>Nächste Seite -======= - <h4 class="title"><a name="d5e1020"></a>Nächste Seite ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -480,25 +360,16 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Standard:</span> Das Betriebssystem das als Standardsystem voreingestellt werden soll -======= - <p><span class="guilabel">Default:</span> Operating system started up by default ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Hinzufügen/Erweitern:</span> Mit dieser Option können Sie Kernel-Einstellungen einrichten oder dem Kernel die Anweisung geben, mehr Informationen beim Booten zu geben. -======= - <p><span class="guilabel">Append:</span> This option lets you pass the kernel - information or tell the kernel to give you more information as it boots. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -514,27 +385,17 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Video-Modus:</span> Diese legt die Bildschirmauflösung und Farbtiefe des Bootmenüs fest. Wenn Sie auf das nach unten zeigende Dreieck klicken werden Ihnen weitere Auflösungen und Farbtiefen angezeigt. -======= - <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth - the boot menu will use. If you click the down triangle you will be offered - other size and colour depth options. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="bold"><strong>Verändere nichts an der ESP oder dem MBR</strong></span>: siehe oben, <a class="link" href="setupBootloader.html#setupChainLoading">Verwenden des Chain-Loader</a></p> -======= - <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> diff --git a/de/uninstall-Mageia.html b/de/uninstall-Mageia.html index 14aed30..e623d0c 100644 --- a/de/uninstall-Mageia.html +++ b/de/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1264"></a>Kurzanleitung -======= - <h3 class="title"><a name="d5e1293"></a>Kurzanleitung ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/es/Select-and-use-ISOs.html b/es/Select-and-use-ISOs.html index 2e318b0..13c3742 100644 --- a/es/Select-and-use-ISOs.html +++ b/es/Select-and-use-ISOs.html @@ -136,27 +136,6 @@ </p> </li> -<<<<<<< HEAD -======= - </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"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <li class="listitem"> <p>Medios diferentes para arquitecturas de 32 o 64 bits.</p> @@ -192,11 +171,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Medio Live -======= - <h4 class="title"><a name="d5e56"></a>Medio Live ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -207,11 +182,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>Caracterśticas comunes. -======= - <h5 class="title"><a name="d5e58"></a>Caracterśticas comunes. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -230,11 +201,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Cada ISO contiene sólo un entorno de escritorio (Plasma, GNOME o Xfce).</p> -======= - <p>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -259,19 +226,11 @@ </div> -<<<<<<< HEAD <div class="section" title="DVD Live Plasma"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e69"></a>DVD Live Plasma -======= - <div class="section" title="Live DVD Plasma"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e72"></a>Live DVD Plasma ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -282,11 +241,7 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Solo entorno de escritorio Plasma</p> -======= - <p>Plasma desktop environment only.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -296,11 +251,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Arquitectura de 64 bits solamente.</p> -======= - <p>Medios diferentes para arquitecturas de 32 o 64 bits.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -312,11 +263,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>Live DVD GNOME -======= - <h5 class="title"><a name="d5e81"></a>Live DVD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -345,19 +292,11 @@ </div> -<<<<<<< HEAD <div class="section" title="DVD Live Xfce"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e87"></a>DVD Live Xfce -======= - <div class="section" title="Live DVD Xfce"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e90"></a>Live DVD Xfce ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -368,11 +307,7 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Solo entorno de escritorio Xfce</p> -======= - <p>Xfce desktop environment only.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -396,11 +331,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>Medio CD sólo de arranque -======= - <h4 class="title"><a name="d5e99"></a>Medio CD sólo de arranque ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -411,11 +342,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>Caracterśticas comunes. -======= - <h5 class="title"><a name="d5e101"></a>Caracterśticas comunes. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -461,11 +388,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -490,11 +413,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -523,11 +442,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>Descargando y verificando medios. -======= - <h3 class="title"><a name="d5e122"></a>Descargando y verificando medios. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -538,11 +453,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>Descargando -======= - <h4 class="title"><a name="d5e124"></a>Descargando ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -556,15 +467,9 @@ </p> -<<<<<<< HEAD <p>Md5sum y sha1sum son herramientas para comprobar la integridad ISO. Utilice sólo una de ellas. Mantenga una de ellas <a class="link" href="Select-and-use-ISOs.html#integrity">para uso posterior</a>. A continuación, aparece una ventana similar a ésta: -======= - <p>md5sum y sha1sum son herramientas para comprobar la integridad de las - ISO. Use solo una de ellas. Guarde una de ellas <a class="link" href="Select-and-use-ISOs.html#integrity">para uso posterior</a>. Entonces aparece esta - ventana: ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -576,32 +481,19 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>Comprobando la integridad de los medios descargados -======= - <h4 class="title"><a name="d5e136"></a>Verificar integridad del medio descargado ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD <p>Ambas sumas de comprobación son números hexadecimales calculados mediante un algoritmo del archivo que se va a descargar. Cuando solicita que estos algoritmos recalculen este número desde su archivo descargado, tiene el mismo número y el archivo descargado es correcto o el número es diferente y tiene un error. Un error indica que debe volver a intentar la descarga o intentar una reparación utilizando BitTorrent. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>Abra una consola, no es necesario ser root, y:</p> @@ -627,11 +519,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>Grabar o volcar el ISO -======= - <h3 class="title"><a name="d5e149"></a>Grabar o volcar el ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -647,11 +535,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>Grabar el ISO en un CD/DVD -======= - <h4 class="title"><a name="d5e152"></a>Grabar el ISO en un CD/DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -671,11 +555,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>Volvar el ISO en un USB -======= - <h4 class="title"><a name="d5e157"></a>Volvar el ISO en un USB ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -713,11 +593,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Usando una herramienta gráfica dentro de Mageia -======= - <h5 class="title"><a name="d5e163"></a>Usando una herramienta gráfica dentro de Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -732,11 +608,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Usando una herramienta gráfica dentro de Windows -======= - <h5 class="title"><a name="d5e167"></a>Usando una herramienta gráfica dentro de Windows ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -758,11 +630,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>Usando la Línea de comandos dentro de un sistema GNU/Linux -======= - <h5 class="title"><a name="d5e174"></a>Usando la Línea de comandos dentro de un sistema GNU/Linux ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/es/addUser.html b/es/addUser.html index 173743d..a68cfbf 100644 --- a/es/addUser.html +++ b/es/addUser.html @@ -141,15 +141,9 @@ de inicio protegido tanto de lectura como de escritura (umask=0027). </p> -<<<<<<< HEAD <p>Puede agregar todos los usuarios adicionales necesarios en el paso <span class="emphasis"><em>Configuración - Resumen</em></span> durante la instalación. Elija <span class="emphasis"><em>Gestión de usuarios</em></span>. -======= - <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>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>Los permisos de acceso se pueden cambiar también tras la instalación.</p> diff --git a/es/choosePackageGroups.html b/es/choosePackageGroups.html index 1bd1a5a..9be94fd 100644 --- a/es/choosePackageGroups.html +++ b/es/choosePackageGroups.html @@ -64,13 +64,8 @@ </div> -<<<<<<< HEAD <p>Lea <a class="xref" href="minimal-install.html" title="Instalación mínima.">“Instalación mínima.”</a> para obtener instrucciones sobre cómo realizar una instalación mínima (sin o con X & IceWM). -======= - <p>Read <a class="xref" href="minimal-install.html" title="Instalación mínima.">“Instalación mínima.”</a> for instructions on how to do a - minimal install (without or with X & IceWM). ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </div> diff --git a/es/diskdrake.html b/es/diskdrake.html index f77fc58..e89be2e 100644 --- a/es/diskdrake.html +++ b/es/diskdrake.html @@ -89,14 +89,9 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Si está instalando Mageia en un ordenador con UEFI, compruebe que existe una partición ESP (EFI System Partition) correctamente montada en /boot/EFI (ver más abajo) -======= - <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI - System Partition) is present and correctly mounted on /boot/EFI (see below) ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -117,13 +112,8 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Si está instalando Mageia en un sistema Legacy/GPT, compruebe que existe una partición BIOS de arranque de tipo correcto -======= - <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot - partition is present with a correct type ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> diff --git a/es/doPartitionDisks.html b/es/doPartitionDisks.html index 79bc48a..dfea4f3 100644 --- a/es/doPartitionDisks.html +++ b/es/doPartitionDisks.html @@ -232,20 +232,12 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Si está usando un sistema Legacy (conocido como CSM o BIOS) con un disco GPT, necesita creat una partición de arranque BIOS, en caso de que no exista. Es una partición de alrededor de 1 MiB sin punto de montaje. Escoja la opción "Particionado personalizado del disco" para poder crearla con el instalador como cualquier otra partición. Simplemente seleccione partición de arranque BIOS como sistema de archivos. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> diff --git a/es/index.html b/es/index.html index 47ec11f..0a893c8 100644 --- a/es/index.html +++ b/es/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducción</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medio</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Descargando y verificando medios.</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Grabar o volcar el ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Descargando y verificando medios.</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Grabar o volcar el ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, el instalador de Mageia</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Opciones principales del cargador de arranque</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e877">Interfaz del cargador de arranque</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e901">Usando el cargador de arranque de Mageia</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e915">Usando un cargador de arranque existente</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e918">Carga en uso</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e932">Opciones</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e880">Bootloader interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e904">Usando el cargador de arranque de Mageia</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e918">Usando un cargador de arranque existente</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e921">Using chain loading</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e935">Opciones</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Agregando o modificando una entrada en el menú de arranque</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Desinstalando Mageia</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1238">Guias</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1241">Guias</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/es/misc-params.html b/es/misc-params.html index 3a91ccc..dbab1fa 100644 --- a/es/misc-params.html +++ b/es/misc-params.html @@ -44,41 +44,24 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Como regla general, se recomienda la configuración por defecto, que se puede manterner salvo 3 excepciones: -======= - <p>As a general rule, default settings are recommended and you can keep them - with 3 exceptions: ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>se conocen algunos problemas en la configuración por defecto</p> -======= - <p>there are known issues with a default setting</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>la configuración por defecto se ha probado ya y falla</p> -======= - <p>the default setting has already been tried and it fails</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>se da más información en las secciones siguientes</p> -======= - <p>something else is said in the detailed sections below</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -133,11 +116,7 @@ </p> -<<<<<<< HEAD <p><a name="misc-params-system-pa4b"></a>No cambie nada, a menos que sepa como configurar Grub2 -======= - <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -215,13 +194,8 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Si nota una configuración errónea de teclado y quiere cambiarla, tenga en cuenta que las contraseñas cambiarán también. -======= - <p>If you notice a wrong keyboard layout and want to change it, keep in mind - that your passwords are going to change too. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </td> @@ -386,15 +360,9 @@ </p> -<<<<<<< HEAD <p><a name="misc-params-security-pa2b"></a>Seleccione los servicios que desea tener acceso a su sistema. Sus selecciones dependerán de lo que utilice su computadora. Para obtener más información, consulte <a class="xref" href="">???</a>. -======= - <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your - selections will depend on what you use your computer for. For more - information, see <a class="xref" href="">???</a>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> diff --git a/es/selectCountry.html b/es/selectCountry.html index 039c750..df8d7dc 100644 --- a/es/selectCountry.html +++ b/es/selectCountry.html @@ -29,15 +29,9 @@ -<<<<<<< HEAD <p><a name="selectCountry-pa1"></a>Elija su país o región. Esto es importante para todo tipo de configuraciones, como la moneda o la red wifi. Elegir el país incorrecto puede hacer que no pueda usar una red inalámbrica. -======= - <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, - like the currency and wireless regulatory domain. Setting the wrong country - can lead to not being able to use a Wireless network. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -79,7 +73,6 @@ -<<<<<<< HEAD <p><a name="selectCountry-pa4"></a>En la pantalla <span class="guilabel">Otros países</span> también puede seleccionar un método de entrada (en la parte inferior de la lista). Los métodos de entrada permiten a los usuarios introducir caracteres multilingües (chino, @@ -87,15 +80,6 @@ que los usuarios no deben configurarlo manualmente. Otros métodos de entrada (SCIM, GCIN, HIME, etc) también proporcionan funciones similares y se pueden instalar si agregó medios HTTP / FTP antes de la selección de paquetes. -======= - <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an - input method (at the bottom of the list). Input methods allow users to input - multilingual characters (Chinese, Japanese, Korean, etc). IBus is the - default input method, so users should not need to configure it - manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar - functions and can be installed if you added HTTP/FTP media before package - selection. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -108,15 +92,9 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p><a name="selectCountry-pa5"></a>Si se perdió la configuración del método de entrada durante la instalación, puede acceder a ella después de arrancar el sistema instalado a través de "Configurar su computadora" -> "Sistema" o ejecutando localedrake como root. -======= - <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it - after you boot your installed system via "Configure your Computer" -> - "System", or by running localedrake as root. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </td> diff --git a/es/setupBootloader.html b/es/setupBootloader.html index 5ed2a4b..5bc9cb8 100644 --- a/es/setupBootloader.html +++ b/es/setupBootloader.html @@ -29,19 +29,11 @@ -<<<<<<< HEAD <div class="section" title="Interfaz del cargador de arranque"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e877"></a>Interfaz del cargador de arranque -======= - <div class="section" title="Bootloader interface"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e880"></a>Bootloader interface ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -49,31 +41,19 @@ -<<<<<<< HEAD <p>Por defecto, Mageia usa exclusivamente:</p> -======= - <p>By default, Mageia uses exclusively:</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Grub2 (con o sin menú gráfico) para sistemas Legacy/MBR o Legacy/GPT</p> -======= - <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>Grub2-efi para un sistema UEFI.</p> -======= - <p>Grub2-efi for a UEFI system.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -97,19 +77,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Grub2 en sistemas Legacy/MBR y Legacy/GPT"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e887"></a>Grub2 en sistemas Legacy/MBR y Legacy/GPT -======= - <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e890"></a>Grub2 on Legacy/MBR and Legacy/GPT systems ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -126,19 +98,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Grub2-efi en sistemas UEFI"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e893"></a>Grub2-efi en sistemas UEFI -======= - <div class="section" title="Grub2-efi on UEFI systems"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e896"></a>Grub2-efi on UEFI systems ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -146,19 +110,13 @@ -<<<<<<< HEAD <p>Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya que no se puede elegir entre con o sin menú gráfico -======= - <p>With an UEFI system, the user interface is slightly different as you cannot - choose between with or without graphical menu ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>Si Mageia es el único sistema instalado en su computadora, el instalador creará una ESP (EFI System Partition) para instalar el gestor de arranque (Grub2-efi). Si ya hay sistemas operativos UEFI instalados en su computadora @@ -166,15 +124,6 @@ creado por Windows y agrega grub2-efi. Aunque es posible tener varios ESP, solo uno es aconsejable y suficiente sea cual sea el número de sistemas operativos que tenga. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -191,11 +140,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e901"></a>Usando el cargador de arranque de Mageia -======= - <h3 class="title"><a name="d5e904"></a>Usando el cargador de arranque de Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -203,52 +148,32 @@ -<<<<<<< HEAD <p>Por defecto, según su sistema, Mageia escribe un nuevo:</p> -======= - <p>By default, according to your system, Mageia writes a new:</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>GRUB2 en el MBR (Master Boot Record) de su primer disco duro o en la partición de arranque del BIOS. -======= - <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard - drive or in the BIOS boot partition. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p>Cargador de arranque Grub2-efi en el ESP</p> -======= - <p>Grub2-efi bootloader into the ESP</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> </div> -<<<<<<< HEAD <p>Si ya tiene instalados otros sistemas operativos, Mageia intentará agregarlos al nuevo menú de inicio de Mageia. Si no desea este comportamiento, haga clic en <span class="guibutton">Siguiente</span> y, a continuación, desmarque la casilla <span class="guilabel">Sondear otros sistemas operativos</span></p> -======= - <p>If you already have other operating systems installed, Mageia attempts to - add them to your new Mageia boot menu. If you don't want this behaviour, - click on <span class="guibutton">Next</span> and then uncheck the box - <span class="guilabel">Probe Foreign OS</span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 @@ -259,11 +184,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e915"></a>Usando un cargador de arranque existente -======= - <h3 class="title"><a name="d5e918"></a>Usando un cargador de arranque existente ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -281,19 +202,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Carga en uso"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e918"></a>Carga en uso -======= - <div class="section" title="Using chain loading"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e921"></a>Using chain loading ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -301,29 +214,17 @@ -<<<<<<< HEAD <p>Si no desea un arranque de Mageia, sino que inicie desde otro SO, haga clic en <span class="guibutton">Siguiente</span>, luego en <span class="guibutton">Avanzado</span> y marque la casilla <span class="guilabel">No toque ESP o MBR</span>. -======= - <p>If you don't want a bootable Mageia, but to chain load it from another OS, - 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>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>Obtendrá una advertencia de que falta el cargador de arranque, ignórelo haciendo clic en <span class="guibutton">Aceptar</span>. -======= - <p>You will get a warning that the bootloader is missing, ignore it by clicking - <span class="guibutton">OK</span>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -335,11 +236,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e932"></a>Opciones -======= - <h3 class="title"><a name="d5e935"></a>Opciones ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -347,19 +244,11 @@ -<<<<<<< HEAD <div class="section" title="Primera página"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e934"></a>Primera página -======= - <div class="section" title="First page"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e937"></a>First page ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -371,72 +260,45 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Retardo antes de arrancar la imagen predeterminada</span>: Este cuadro de texto le permite establecer un retraso en segundos antes de que se inicie el sistema operativo predeterminado. -======= - <p><span class="guilabel">Delay before booting the default image</span>: This text box - lets you set a delay in seconds before the default operating system is - started up. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Seguridad</span>: Permite establecer una contraseña para el gestor de arranque. Esto significa que se le pedirá un nombre de usuario y una contraseña durante el arranque para seleccionar una entrada de inicio o cambiar la configuración. El nombre de usuario es "root" y la contraseña es la elegida aquí después. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Contraseña</span>: este cuadro de texto es donde se pone la contraseña -======= - <p><span class="guilabel">Password</span>: This text box is where you actually put the - password ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Contraseña (de nuevo)</span>: vuelva a escribir la contraseña y Drakx comprobará que coincide con la que se ha definido anteriormente. -======= - <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will - check that it matches with the one set above. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Avanzado</span></p> -======= - <p><span class="guilabel">Advanced</span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Habilitar ACPI:</span> ACPI (Advanced Configuration and Power Interface) es un estándar para la administración de energía. Se puede ahorrar energía al detener los dispositivos no utilizados, este fue el @@ -444,55 +306,30 @@ su equipo no admite ACPI o si cree que la implementación de ACPI podría causar algunos problemas (por ejemplo, reinicios aleatorios o bloqueos del sistema). -======= - <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 - 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). ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Habilitar SMP</span>: esta opción habilita / deshabilita el multiprocesamiento simétrico para procesadores multi-núcleo. -======= - <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric - multiprocessing for multi core processors. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Habilitar APIC</span>: Activar o desactivar esta opción le permite al sistema operativo acceder al Controlador de interrupción programable avanzado. Los dispositivos APIC permiten modelos de prioridad más complejos y la gestión avanzada de IRQ (Solicitud de interrupción). -======= - <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the - operating system access to the Advanced Programmable Interrupt - Controller. APIC devices permit more complex priority models, and Advanced - IRQ (Interrupt Request) management. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Habilitar APIC local</span>: Aquí puede establecer APIC local, que administra todas las interrupciones externas para un procesador específico en un sistema SMP. -======= - <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which - manages all external interrupts for a specific processor in an SMP system. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -506,19 +343,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Página siguiente"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e966"></a>Página siguiente -======= - <div class="section" title="Next page"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e969"></a>Next page ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -530,70 +359,43 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Predeterminado:</span> Sistema operativo iniciado de forma predeterminada -======= - <p><span class="guilabel">Default:</span> Operating system started up by default ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Añadir:</span> Esta opción le permite pasar la información del kernel o decirle al núcleo que le proporcione más información a medida que arranca. -======= - <p><span class="guilabel">Append:</span> This option lets you pass the kernel - information or tell the kernel to give you more information as it boots. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Detección de otros sistemas operativos</span>: ver arriba <a class="link" href="setupBootloader.html#setupMageiaBootloader"> Utilizar un gestor de arranque Mageia </a></p> -======= - <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Avanzado</span></p> -======= - <p><span class="guilabel">Advanced</span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Modo de video:</span> Define el tamaño de la pantalla y la profundidad de color que utilizará el menú de arranque. Si hace clic en el triángulo hacia abajo, se le ofrecerán otras opciones de tamaño y profundidad de color. -======= - <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth - the boot menu will use. If you click the down triangle you will be offered - other size and colour depth options. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="bold"><strong>No toque ESP o MBR</strong></span>: ver arriba <a class="link" href="setupBootloader.html#setupChainLoading">Uso de la cadena de arranque</a></p> -======= - <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> diff --git a/es/setupBootloaderAddEntry.html b/es/setupBootloaderAddEntry.html index 2431cb2..c5b847d 100644 --- a/es/setupBootloaderAddEntry.html +++ b/es/setupBootloaderAddEntry.html @@ -27,13 +27,8 @@ -<<<<<<< HEAD <p>Para ello, necesita editar manualmente /boot/grub2/custom.cfg o usar el software grub-customizer (Disponible en los repositorios Mageia). -======= - <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the - software grub-customizer instead (Available in the Mageia repositories). ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -46,11 +41,7 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Para más información, vea nuestro wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p> -======= - <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> diff --git a/es/uninstall-Mageia.html b/es/uninstall-Mageia.html index 33c5cc0..49a43f9 100644 --- a/es/uninstall-Mageia.html +++ b/es/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1238"></a>Guias -======= - <h3 class="title"><a name="d5e1241"></a>Guias ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/et/Select-and-use-ISOs.html b/et/Select-and-use-ISOs.html index b07d86d..97df409 100644 --- a/et/Select-and-use-ISOs.html +++ b/et/Select-and-use-ISOs.html @@ -41,10 +41,6 @@ </p> <p>Andmekandjaid on kaht tüüpi:</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -493,11 +489,7 @@ leida allalaaditud faili põhjal, saab tulemuseks kas sama arvu, mis tähendab, et allalaaditud fail on korras, või siis mõne muu arvu, mis tähendab, et see ei ole korras. Viimasel juhul tuleks fail uuesti alla -<<<<<<< HEAD laadida või püüda see BitTorrenti abil parandada. -======= - laadida. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>Avage konsool (selleks ei pea olema administraator) ja kirjutage:</p> @@ -597,11 +589,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Graafilise tööriista kasutamine Mageias -======= - <h5 class="title"><a name="d5e183"></a>Graafilise tööriista kasutamine Mageias ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -617,11 +605,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Graafilise tööriista kasutamine Windowsis -======= - <h5 class="title"><a name="d5e187"></a>Graafilise tööriista kasutamine Windowsis ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -643,11 +627,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>Käsurea kasutamine GNU/Linuxi süsteemis -======= - <h5 class="title"><a name="d5e194"></a>Käsurea kasutamine GNU/Linuxi süsteemis ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/et/addUser.html b/et/addUser.html index 6954a32..e7e282f 100644 --- a/et/addUser.html +++ b/et/addUser.html @@ -139,24 +139,7 @@ lugemis- kui ka kirjutuskaitstud (umask=0027). </p> -<<<<<<< HEAD <p>Kõik vajalikud kasutajad saab lisada juba paigaldamise ajal -======= - <p>Kui aga uue paigalduse järel lisada kasutaja tööriistaga <span class="emphasis"><em>Mageia - juhtimiskeskus - Süsteem - Kasutajate haldamine</em></span>, on nende - kasutajate kodukataloog kaitstud nii kirjutamise kui ka lugemise eest. - </p> - - - <p>Kui te ei soovi, et kodukataloog oleks kellelegi näha ehk loetav, on - soovitatav praegu lisada ainult ajutine kasutaja ja tegelikud kasutajad - alles pärast taaskäivitamist. - </p> - - - <p>Kui aga teil pole midagi selle vastu, et kodukataloogid on kõigile näha, - võite lisada kõik vajalikud kasutajad juba paigaldamise ajal ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <span class="emphasis"><em>kokkuvõtte</em></span> etapil. Valige seal <span class="emphasis"><em>Kasutajate haldamine</em></span>. </p> @@ -186,10 +169,6 @@ </p> <p> Samuti saab siin lubada või keelata külaliskonto.</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Hoiatus" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> diff --git a/et/index.html b/et/index.html index 984548c..7875724 100644 --- a/et/index.html +++ b/et/index.html @@ -75,7 +75,6 @@ <dt><span class="section"><a href="setupBootloader.html">Alglaaduri põhiseadistused</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e904">Alglaaduri liides</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e932">Mageia alglaaduri kasutamine</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e948">Olemasoleva alglaaduri kasutamine</a></span></dt> @@ -84,19 +83,6 @@ </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismenüü kirje lisamine või muutmine</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e910">BIOS-e süsteemiga</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e947">UEFI süsteemiga</a></span></dt> - </dl> - </dd> - <dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismenüü kirje lisamine või muutmine</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e962">BIOS-e süsteemiga</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e979">UEFI süsteemiga</a></span></dt> - </dl> - </dd> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dt><span class="section"><a href="misc-params.html">Seadistuste kokkuvõte</a></span></dt> <dd> <dl> diff --git a/et/setupBootloader.html b/et/setupBootloader.html index 93673fa..1b5ee32 100644 --- a/et/setupBootloader.html +++ b/et/setupBootloader.html @@ -29,21 +29,11 @@ -<<<<<<< HEAD <div class="section" title="Alglaaduri liides"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e904"></a>Alglaaduri liides -======= - - - <div class="section" title="BIOS-e süsteemiga"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e910"></a>BIOS-e süsteemiga ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -101,46 +91,11 @@ -<<<<<<< HEAD -======= - <p><a name="setupBootloader-pa4"></a>Vaikimisi kirjutab Mageia uue GRUBi alglaaduri teie esimese kõvaketta MBR - (Master Boot Record) sektsiooni. Kui teil on juba paigaldatud teisi - operatsioonisüsteeme, üritab Mageia lisada need uude Mageia - alglaadimismenüüsse. - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Ärge muutke "Alglaadimisseadet", kui te pole täiesti kindel, et teate, mida teete. </p> -<<<<<<< HEAD -======= - - - <div class="warning" title="Hoiatus" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Hoiatus]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa6"></a>Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei toeta - ega tunne neid ära, kui kasutada vaikimisi GRUBi alglaadurit. - </p> - - - <p>Sel juhul on parim lahendus kasutada GRUB2 alglaadurit, mille saab valida - paigaldamise ajal kokkuvõtteleheküljel. - </p> - - </td> - </tr> - </table> - </div> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -162,13 +117,6 @@ </p> -<<<<<<< HEAD -======= - <p><a name="setupBootloader-pa47"></a>Ärge valige seadet, nt "sda", sest nii kirjutate üle olemasoleva MBR - sektsiooni. Peate valima juurpartitsiooni, mille valisite varasemal - partitsioneerimisetapil, nt sda7. - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Kui Mageia on ainuke süsteem, mis on teie arvutisse paigaldatud, loob @@ -255,19 +203,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Ahellaadimise kasutamine"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e951"></a>Ahellaadimise kasutamine -======= - <div class="section" title="UEFI süsteemiga"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e947"></a>UEFI süsteemiga ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -275,21 +215,15 @@ -<<<<<<< HEAD <p>Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest teisest operatsioonisüsteemist, siis klõpsake <span class="guibutton">Järgmine</span>, seejärel <span class="guibutton">Muu</span> ja märkige ära kastike <span class="guilabel">ESP-i ega MBR-i ei puudutata</span>. -======= - <p>UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa - valida alglaadurit, kuna saadaval on ainult Grub2-efi. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>Näete hoiatust, et alglaadur puudub. Eirake seda ja klõpsake <span class="guibutton">Olgu</span>. </p> @@ -471,21 +405,6 @@ </div> </div> -======= - <p>Kui Mageia on esimene süsteem, mis teie arvutisse paigaldatakse, loob - paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi) - tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonisüsteeme - (näiteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP - ja lisab sellele Grub2-efi. ESP-sid võib küll põhimõtteliselt olla ka mitu, - aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui - palju on arvutis operatsioonisüsteeme. - </p> - - - <p>Ärge muutke "Alglaadimisseadet", kui te pole täiesti kindel, et teate, mida - teete. - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> diff --git a/et/setupBootloaderAddEntry.html b/et/setupBootloaderAddEntry.html index 1a9a069..2318aeb 100644 --- a/et/setupBootloaderAddEntry.html +++ b/et/setupBootloaderAddEntry.html @@ -32,7 +32,6 @@ </p> -<<<<<<< HEAD <div class="note" title="Märkus" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -47,110 +46,6 @@ </td> </tr> </table> -======= - <div class="section" title="BIOS-e süsteemiga"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e962"></a>BIOS-e süsteemiga - </h3> - </div> - </div> - </div> - - - - <p>Kirje saab lisada või valitut muuta, kui klõpsata <span class="emphasis"><em>alglaaduri - seadistamise</em></span> ekraanil vajalikule nupule ja sooritada muutused - selle kohale ilmuvas ekraanis. - </p> - - - <div class="note" title="Märkus" 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="[Märkus]" src="note.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Kui olete valinud alglaaduriks <code class="code">Grub 2</code>, ei saa te selle - tööriistaga sel sammul kirjeid muuta, nii et klõpsake 'Edasi'. Teil tuleb - käsitsi muuta faili <code class="code">/boot/grub2/custom.cfg</code> või kasutada - tööriista <code class="code">grub-customizer</code>. - </p> - - </td> - </tr> - </table> - </div> - - - - - <p>Mõningaid asju võib muuta vähese riskiga, näiteks kirje nimi ja märge - kastikeses, millega see muudetakse vaikimisi kirjeks. - </p> - - - <p>Kirje nimele võib lisada versiooninumbri, aga nime võib ka täielikult muuta.</p> - - - <p>Vaikimisi kirje on see, mille süsteem laadib, kui jätate alglaadimise ajal - kasutamata võimaluse midagi valida. - </p> - - - <div class="warning" title="Hoiatus" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Hoiatus]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Teiste parameetrite muutmine võib kaasa tuua süsteemi, mida enam ei saagi - laadida. Sestap ärge muutke siin midagi, mille muutmise vajalikkuses te - täiesti kindel ei ole. - </p> - - </td> - </tr> - </table> - </div> - - </div> - - - <div class="section" title="UEFI süsteemiga"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e979"></a>UEFI süsteemiga - </h3> - </div> - </div> - </div> - - - - <p>Sel juhul on alglaaduriks valitud Grub2-efi ning te ei saa selle tööriistaga - sel sammul kirjeid muuta. Teil tuleb käsitsi muuta faili - <code class="code">/boot/grub2/custom.cfg</code> või kasutada tööriista - <code class="code">grub-customizer</code>. Ainuke asi, mida siin teha saab, on valida - rippmenüüst vaikimisi kirje. - </p> - - - <p>Klõpsu järel nupule <span class="guibutton">Edasi</span> laseb järgmine rippmenüü - valida Grub2 ekraanilahutuse (kuna see on graafiline alglaadur). - </p> - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </div> 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 diff --git a/eu/addUser.html b/eu/addUser.html index 3722fb9..ec037f3 100644 --- a/eu/addUser.html +++ b/eu/addUser.html @@ -144,23 +144,6 @@ Summary</em></span> step during the install. Choose <span class="emphasis"><em>User management</em></span>. </p> -<<<<<<< HEAD -======= - - - <p>Ez baduzu nahi home direktorioa edonork irakurgarri izan dezan, aldi - baterako erabiltzaile bat soilik gehitu orain eta berrabiarazi ondoren - benetako(ak) gehitzea komeni da. - </p> - - - <p>Mundu guztiak irakur ditzakeen direktorioak nahigao badituzu, instalazioan - zehar <span class="emphasis"><em>Ezarpen - Laburpen</em></span> beharrezko erabiltzaile - guztiak gehi ditzakezu. Aukeratu <span class="emphasis"><em>Erabiltzaileak - kudeatu</em></span>. - </p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Sarbide baimena instalatu ondoren ere aldatu egin daiteke.</p> @@ -188,10 +171,6 @@ </p> <p>Gainera, baliogabetu edo gaitu ahal izango duzu gonbidatu kontu bat.</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Abisua" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> diff --git a/eu/index.html b/eu/index.html index 2640a79..69bb5c7 100644 --- a/eu/index.html +++ b/eu/index.html @@ -75,8 +75,7 @@ <dt><span class="section"><a href="setupBootloader.html">Abio kargatzailearen aukera nagusiak</a></span></dt> <dd> <dl> -<<<<<<< HEAD - <dt><span class="section"><a href="setupBootloader.html#d5e901">Bootloader interface</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e901">Abioko kargatzailearen interfazea</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e929">Mageia abio kargatzailea erabiliz</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e945">Existitzen den abio kargatzaile bat erabiliz</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e948">Using chain loading</a></span></dt> @@ -84,19 +83,6 @@ </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Gegitu edo Aldatu Abio Menuko Sarrera</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e909">Bios sistemarekin</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e946">UEFI sistemarekin</a></span></dt> - </dl> - </dd> - <dt><span class="section"><a href="setupBootloaderAddEntry.html">Gegitu edo Aldatu Abio Menuko Sarrera</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e965">Bios sistemarekin</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e982">UEFI sistemarekin</a></span></dt> - </dl> - </dd> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dt><span class="section"><a href="misc-params.html">Hainbat parametroen laburpena</a></span></dt> <dd> <dl> @@ -127,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia desinstalatzen</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1271">Jarraibideak</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1221">Jarraibideak</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/eu/setupBootloader.html b/eu/setupBootloader.html index decf724..d52b09c 100644 --- a/eu/setupBootloader.html +++ b/eu/setupBootloader.html @@ -29,21 +29,11 @@ -<<<<<<< HEAD - <div class="section" title="Bootloader interface"> + <div class="section" title="Abioko kargatzailearen interfazea"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e901"></a>Bootloader interface -======= - - - <div class="section" title="Bios sistemarekin"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e909"></a>Bios sistemarekin ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 + <h3 class="title"><a name="d5e901"></a>Abioko kargatzailearen interfazea </h3> </div> </div> @@ -63,7 +53,7 @@ </li> <li class="listitem"> - <p>Grub2-efi for a UEFI system.</p> + <p>Grub2-efi UEFI sistementzat.</p> </li> </ul> @@ -79,7 +69,7 @@ <tr> <td align="left" valign="top"> - <p>The mageia grafiko menu politak ditu:</p> + <p>The mageia menuak grafikoa politak ditu :)</p> </td> </tr> @@ -99,55 +89,18 @@ -<<<<<<< HEAD <p>Ez aldatu "Abio Gailua" zer egiten duzun benetan jakin gabe.</p> -======= - <p><a name="setupBootloader-pa4"></a>Berez, Mageia GRUB (Ondare) kargatzaile berria zure disko gogorreko MBR - (Master Boot Record)-an idazten du lehenengoz. Sistema eragile bat baino - gehiago baduzu, Mageia saiatuko da abio menu berrira gehitzen. - </p> - - - <p>Mageia gaur egun GRUB2 eskaintzen du GRUB ondarea eta Lilo gain aukerako - abioko kargatzailea gisa. - </p> - - - <div class="warning" title="Abisua" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Abisua]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa6"></a>Linux sistemek Grub2 abioko kargatzailea erabiltzerakoan ez daude onartuta - GRUB (ondarea)gaitik eta ez du aitortzen lehenetsitako GRUB kargatzailea - erabiltzen badu. - </p> - - - <p>Instalazioan orrialdean zehar laburpena eskuragarri duen GRUB2 abio - kargatzailea hemen erabiltzea da konponbiderik onena. - </p> - - </td> - </tr> - </table> - </div> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> - <div class="section" title="Grub2-efi on UEFI systems"> + <div class="section" title="Grub2-efi UEFI sistemetan"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e919"></a>Grub2-efi on UEFI systems + <h4 class="title"><a name="d5e919"></a>Grub2-efi UEFI sistemetan </h4> </div> </div> @@ -160,13 +113,6 @@ </p> -<<<<<<< HEAD -======= - <p><a name="setupBootloader-pa47"></a>Ez ezazu aukeratu "sda" bezalako gailu bat, edo MBR existentea gainidatziko - du. Partizio fasean zehar aukeratutako root partizioa aukeratu behar duzu, - adibidez sda7 bezala. - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>If Mageia is the only system installed on your computer, the installer @@ -250,19 +196,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Using chain loading"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e948"></a>Using chain loading -======= - <div class="section" title="UEFI sistemarekin"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e946"></a>UEFI sistemarekin ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -270,21 +208,15 @@ -<<<<<<< HEAD <p>If you don't want a bootable Mageia, but to chain load it from another OS, 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>. -======= - <p>UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak dira, - ezin duzu abiarazlea aukeratu Grub2-efi soilik dagoelako eskuragarri ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>You will get a warning that the bootloader is missing, ignore it by clicking <span class="guibutton">OK</span>. </p> @@ -306,11 +238,11 @@ - <div class="section" title="First page"> + <div class="section" title="Lehen orria"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e966"></a>First page + <h4 class="title"><a name="d5e966"></a>Lehen orria </h4> </div> </div> @@ -331,8 +263,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> @@ -352,7 +285,7 @@ </li> <li class="listitem"> - <p><span class="guilabel">Advanced</span></p> + <p><span class="guilabel">Aurreratu</span></p> <div class="itemizedlist"> @@ -435,7 +368,7 @@ </li> <li class="listitem"> - <p><span class="guilabel">Advanced</span></p> + <p><span class="guilabel">Aurreratu</span></p> <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> @@ -459,19 +392,6 @@ </div> </div> -======= - <p>Mageia zure ordenagailuan instalatutako lehen sistema bada, instalatzaileai - ESP (EFI sistema partizioa) sortuko du (Grub2-EFI) kargatzaileak - jasotzeko. Zure ordenagailuan UEFI sistema eragile bat bazegoen aldez - aurretik (Windows 8 adibidez), Mageia instalatzaileak detektatuko ditu - dauden Windows sortutako ESP eta grub2-EFI-ra gehituko ditu. Hainbat ESP - izatea posiblea izan arren, soilik bat izatea aholkatzen da eta aski dituzun - sistema eragileetako kopurua edozein izanik ere. - </p> - - - <p>Ez aldatu "Abio Gailua" zer egiten duzun benetan jakin gabe.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> diff --git a/eu/setupBootloaderAddEntry.html b/eu/setupBootloaderAddEntry.html index adf28da..e24fad0 100644 --- a/eu/setupBootloaderAddEntry.html +++ b/eu/setupBootloaderAddEntry.html @@ -32,7 +32,6 @@ </p> -<<<<<<< HEAD <div class="note" title="Oharra" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -47,110 +46,6 @@ </td> </tr> </table> -======= - <div class="section" title="Bios sistemarekin"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e965"></a>Bios sistemarekin - </h3> - </div> - </div> - </div> - - - - <p>Sarrera lehen aukera gehitu edo alda dezakezu, beharrezko botoia sakatuz - <span class="emphasis"><em>Abioko Ezarpen</em></span>etan eta goian agertzen den leihoan - aukerak aldatzen. - </p> - - - <div class="note" title="Oharra" 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="[Oharra]" src="note.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><code class="code">Grub 2</code> zure abioko kargatzaile bezala aukeratu baduzu, tresna - hau ezin duzu erabili sarrerak aldatzeko urrats honetan, sakatu - 'Hurrengoa'. <code class="code">/boot/grub2/custom.cfg</code> eskuz editatu edo ordez - <code class="code">grub-customizer</code> erabili behar duzu. - </p> - - </td> - </tr> - </table> - </div> - - - - - <p>Segurtasunez egin daitezkeen gauza batzuk sarrera bati etiketa aldatzea eta - lehenetsi gisa markatzea. - </p> - - - <p>Bertsio zenbaki egokia, edo izenez erabat sarrerari gehitu diezaiokezu.</p> - - - <p>Lehenetsitako sarrera da sistemak zuk abioan zehar ez baduzu aukera egiten - kargatzen duena. - </p> - - - <div class="warning" title="Abisua" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Abisua]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Beste gauza batzuk aldatzeak zure sistema ez abiaraztea egin dezake. Mesedez - ez egin ezer ere ez, zertan ari zaren jakin gabe. - </p> - - </td> - </tr> - </table> - </div> - - </div> - - - <div class="section" title="UEFI sistemarekin"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e982"></a>UEFI sistemarekin - </h3> - </div> - </div> - </div> - - - - <p>Kasu honetan Grub2-EFI erabiltzen ari zara, eta ezin duzu tresna hau erabili - sarrerak aldatu egiteko urrats honetan. Horretarako eskuz editatu - <code class="code">/boot/grub2/custom.cfg</code> edo erabili <code class="code">grub-customizer</code> - ordez. Hemen egin dezakezun guztia, goitibeherako zerrendako sarrera - lehenetsia aukeratzea da. - </p> - - - <p> <span class="guibutton">Hurrengoa</span> botoia klikatu ondoren, beste - goitibeherako zerrendan bideoaren bereizmena hautatzea uzten du - Grub2-rentzat zein abio kudeatzaike grafiko bat da. - </p> - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </div> diff --git a/eu/uninstall-Mageia.html b/eu/uninstall-Mageia.html index 58f294d..3377050 100644 --- a/eu/uninstall-Mageia.html +++ b/eu/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1271"></a>Jarraibideak -======= - <h3 class="title"><a name="d5e1221"></a>Jarraibideak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/fr/index.html b/fr/index.html index 3391861..c4306b3 100644 --- a/fr/index.html +++ b/fr/index.html @@ -75,7 +75,6 @@ <dt><span class="section"><a href="setupBootloader.html">Principales options du chargeur de démarrage</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e911">Interface du programme d'amorçage</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e939">Utiliser un chargeur de démarrage Mageia</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e955">Utiliser un chargeur de démarrage existant. </a></span></dt> @@ -84,19 +83,6 @@ </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entrée de Menu de Démarrage</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e918">Avec un système BIOS</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e955">Avec un système UEFI</a></span></dt> - </dl> - </dd> - <dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entrée de Menu de Démarrage</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e974">Avec un système BIOS</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e991">Avec un système UEFI</a></span></dt> - </dl> - </dd> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dt><span class="section"><a href="misc-params.html">Résumé des différents paramètres</a></span></dt> <dd> <dl> @@ -127,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Désinstaller Mageia</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1281">Guide</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1230">Guide</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/fr/setupBootloader.html b/fr/setupBootloader.html index 152cb26..5b7b48d 100644 --- a/fr/setupBootloader.html +++ b/fr/setupBootloader.html @@ -33,11 +33,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e911"></a>Interface du programme d'amorçage -======= - <h3 class="title"><a name="d5e918"></a>Avec un système BIOS ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -211,11 +207,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e958"></a>Utilisation du chargement en chaîne -======= - <h3 class="title"><a name="d5e955"></a>Avec un système UEFI ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/fr/setupBootloaderAddEntry.html b/fr/setupBootloaderAddEntry.html index 0b2001f..ffe3ef2 100644 --- a/fr/setupBootloaderAddEntry.html +++ b/fr/setupBootloaderAddEntry.html @@ -32,7 +32,6 @@ </p> -<<<<<<< HEAD <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -47,116 +46,6 @@ </td> </tr> </table> -======= - <div class="section" title="Avec un système BIOS"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e974"></a>Avec un système BIOS - </h3> - </div> - </div> - </div> - - - - <p>Vous pouvez ajouter une entrée ou en modifier une après l'avoir - sélectionnée, en pressant le bouton correspondant dans l'écran de - <span class="emphasis"><em>Configuration du démarrage</em></span> et en éditant les entrées de - la fenêtre qui s'ouvre à ce moment. - </p> - - - <div class="note" title="Note" 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="[Note]" src="note.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Si vous avez choisi <code class="code">Grub 2</code> comme chargeur de démarrage, vous ne - pouvez pas utliser cet outil pour modifier les entrées à cette étape, - appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier - <code class="code">/boot/grub2/custom.cfg</code> ou utiliser <code class="code">grub-customizer</code> - à la place. - </p> - - </td> - </tr> - </table> - </div> - - - - - <p>Le changement du nom d'une entrée et l'activation de la case à cocher pour - définir l'entrée par défaut sont des actions qui ne comportent pas de - risques. - </p> - - - <p>Vous pouvez ajouter votre propre version du numéro d'une entrée ou la - renommer complètement. - </p> - - - <p>L'entrée par défaut est celle qui est choisie lorsque aucun choix n'est fait - pendant la phase de démarrage du système. - </p> - - - <div class="warning" title="Avertissement" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Avertissement]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Modifier d'autres choses peut vous laisser avec un système - non-démarrable. N'essayez pas quoi que ce soit sans savoir ce que vous - faites. - </p> - - </td> - </tr> - </table> - </div> - - </div> - - - <div class="section" title="Avec un système UEFI"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e991"></a>Avec un système UEFI - </h3> - </div> - </div> - </div> - - - - <p>Dans ce cas, vous utilisez Grub2-efi et vous ne pouvez pas utiliser cet - outil pour modifier les entrées à cette étape. Pour faire cela, vous devez - modifier manuellement <code class="code">/boot/grub2/custom.cfg</code> ou utiliser - <code class="code">grub-customizer</code> à la place. Tout ce que vous pouvez faire ici, - c'est choisir l'entrée par défaut dans la liste déroulante. - </p> - - - <p>Après avoir cliqué sur le bouton <span class="guibutton">Suivant</span>, une autre - liste déroulante permet de choisir la résolution vidéo pour Grub2, qui est - le chargeur de démarrage graphique. - </p> - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </div> diff --git a/fr/uninstall-Mageia.html b/fr/uninstall-Mageia.html index 62f2f37..21a3879 100644 --- a/fr/uninstall-Mageia.html +++ b/fr/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1281"></a>Guide -======= - <h3 class="title"><a name="d5e1230"></a>Guide ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/hu/Select-and-use-ISOs.html b/hu/Select-and-use-ISOs.html index 9773f33..85f66a8 100644 --- a/hu/Select-and-use-ISOs.html +++ b/hu/Select-and-use-ISOs.html @@ -23,13 +23,7 @@ </div> </div> -<<<<<<< HEAD -======= - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Bevezetés"> <div class="titlepage"> @@ -41,23 +35,12 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Mageia is distributed via ISO images. This page will help you to choose which image match your needs. </p> -<<<<<<< HEAD - - <p>There is two families of media:</p> -======= - <p>There is two families of media:</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -80,18 +63,10 @@ </li> </ul> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Details are given in the next sections.</p> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Media"> <div class="titlepage"> @@ -103,10 +78,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Definition"> <div class="titlepage"> @@ -118,28 +89,16 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>You can find them <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">here</a>. </p> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Classical installation media"> <div class="titlepage"> @@ -151,10 +110,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Common features"> <div class="titlepage"> @@ -166,10 +121,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -187,10 +138,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="DVD"> <div class="titlepage"> @@ -202,20 +149,12 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Different media for 32 or 64 bit architectures.</p> -======= - <p>Different media for architecture 32 or 64 bits.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -239,96 +178,30 @@ </div> </div> -<<<<<<< HEAD - - </div> -======= - - - <div class="section" title="DVD dual arch"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e56"></a>DVD dual arch - </h5> - </div> - </div> - </div> - - - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <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>Uses Xfce desktop only.</p> - - </li> - <li class="listitem"> - - <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> - <li class="listitem"> - - <p>It contains non free software.</p> - - </li> - </ul> - </div> - - </div> </div> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Live media"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e56"></a>Live media -======= - <h4 class="title"><a name="d5e67"></a>Live media ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Common features"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e58"></a>Common features -======= - <h5 class="title"><a name="d5e69"></a>Common features ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -341,11 +214,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</p> -======= - <p>Each ISO contains only one desktop environment (KDE or GNOME).</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -369,90 +238,50 @@ </div> </div> -<<<<<<< HEAD <div class="section" title="Live DVD Plasma"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e72"></a>Live DVD Plasma -======= - - - <div class="section" title="Live CD KDE"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e83"></a>Live CD KDE ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Plasma desktop environment only.</p> -======= - <p>KDE desktop environment only.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>All languages are present.</p> -======= - <p>English language only.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>Different media for 32 or 64 bit architectures.</p> -======= - <p>32 bit only.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> </div> </div> -<<<<<<< HEAD <div class="section" title="Live DVD GNOME"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e81"></a>Live DVD GNOME -======= - - - <div class="section" title="Live CD GNOME"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e92"></a>Live CD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -463,44 +292,6 @@ </li> <li class="listitem"> -<<<<<<< HEAD -======= - <p>English language only.</p> - - </li> - <li class="listitem"> - - <p>32 bit only.</p> - - </li> - </ul> - </div> - - </div> - - - <div class="section" title="Live DVD KDE"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e101"></a>Live DVD KDE - </h5> - </div> - </div> - </div> - - - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <p>KDE desktop environment only.</p> - - </li> - <li class="listitem"> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>All languages are present.</p> </li> @@ -513,41 +304,23 @@ </div> </div> -<<<<<<< HEAD <div class="section" title="Live DVD Xfce"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e90"></a>Live DVD Xfce -======= - - - <div class="section" title="Live DVD GNOME"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e110"></a>Live DVD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Xfce desktop environment only.</p> -======= - <p>GNOME desktop environment only.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -566,48 +339,28 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Boot-only CD media"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e99"></a>Boot-only CD media -======= - <h4 class="title"><a name="d5e119"></a>Boot-only CD media ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Common features"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e101"></a>Common features -======= - <h5 class="title"><a name="d5e121"></a>Common features ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -643,31 +396,17 @@ </div> </div> -<<<<<<< HEAD <div class="section" title="netinstall.iso"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e112"></a>netinstall.iso -======= - - - <div class="section" title="boot.iso"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e132"></a>boot.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -682,31 +421,17 @@ </div> </div> -<<<<<<< HEAD <div class="section" title="netinstall-nonfree.iso"> <div class="titlepage"> <div> <div> <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso -======= - - - <div class="section" title="boot-nonfree.iso"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e137"></a>boot-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -725,205 +450,112 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Downloading and Checking Media"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e122"></a>Downloading and Checking Media -======= - <h3 class="title"><a name="d5e142"></a>Downloading and Checking Media ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Downloading"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e124"></a>Downloading -======= - <h4 class="title"><a name="d5e144"></a>Downloading ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD - -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD -======= - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Check the radio button Save File.</p> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Checking the downloaded media integrity"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e136"></a>Checking the downloaded media integrity -======= - <h4 class="title"><a name="d5e156"></a>Checking the downloaded media integrity ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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 -<<<<<<< HEAD failure. A failure infers that you should retry the download or attempt a repair using BitTorrent. </p> <p>Open a console, no need to be root, and:</p> -======= - failure. A failure infers that you should retry the download. - </p> - - - <p>Open a console, no need to be root, and:</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>- To use md5sum, type: [sam@localhost]$ <strong class="userinput"><code>md5sum path/to/the/image/file.iso</code></strong>. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>- To use sha1sum, type: [sam@localhost]$ <strong class="userinput"><code>sha1sum path/to/the/image/file.iso</code></strong>. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD -======= - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p></p> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Burn or dump the ISO"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e149"></a>Burn or dump the ISO -======= - <h3 class="title"><a name="d5e169"></a>Burn or dump the ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> </div> -<<<<<<< HEAD <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 bootable medium. </p> -======= - - - <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> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Burning the ISO to a CD/DVD"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e152"></a>Burning the ISO to a CD/DVD -======= - <h4 class="title"><a name="d5e172"></a>Burning the ISO to a CD/DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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 @@ -932,37 +564,21 @@ </p> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Dump the ISO to a USB stick"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e157"></a>Dump the ISO to a USB stick -======= - <h4 class="title"><a name="d5e177"></a>Dump the ISO to a USB stick ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -973,11 +589,7 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <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 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 the device; any other data will be lost and the partition capacity will be reduced to the image size. </p> @@ -986,105 +598,58 @@ </tr> </table> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>To recover the original capacity, you must redo partitioning and re-format the USB stick. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Using a graphical tool within Mageia"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e163"></a>Using a graphical tool within Mageia -======= - <h5 class="title"><a name="d5e183"></a>Using a graphical tool within Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Using a graphical tool within Windows"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e167"></a>Using a graphical tool within Windows -======= - <h5 class="title"><a name="d5e187"></a>Using a graphical tool within Windows ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD - - <p>You could try:</p> -======= - <p>You could try:</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> using the "ISO image" option; </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32 Disk Imager</a></p> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Using Command line within a GNU/Linux system"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e174"></a>Using Command line within a GNU/Linux system -======= - <h5 class="title"><a name="d5e194"></a>Using Command line within a GNU/Linux system ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -1103,15 +668,8 @@ </tr> </table> </div> -<<<<<<< HEAD <p>You can also use the dd tool in a console:</p> -======= - - - <p>You can also use the dd tool in a console:</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="orderedlist"> <ol class="orderedlist" type="1"> @@ -1125,20 +683,12 @@ <p>Become root with the command <strong class="userinput"><code>su -</code></strong> (don't forget the final '-' ) </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>Plug in your USB stick (do not mount it, this also means do not open any -======= - <p>Plug your USB stick (do not mount it, this also means do not open any ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 application or file manager that could access or read it) </p> @@ -1146,22 +696,12 @@ <li class="listitem"> <p>Enter the command <strong class="userinput"><code>fdisk -l</code></strong></p> -<<<<<<< HEAD - -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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 @@ -1192,15 +732,8 @@ <p>Enter the command: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX bs=1M</code></strong></p> -<<<<<<< HEAD <p>Where X=your device name eg: /dev/sdc</p> -======= - - - <p>Where X=your device name eg: /dev/sdc</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> diff --git a/hu/acceptLicense.html b/hu/acceptLicense.html index e8cb012..542c121 100644 --- a/hu/acceptLicense.html +++ b/hu/acceptLicense.html @@ -2,11 +2,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<<<<<<< HEAD <title>Licenc és Kiadási megjegyzések</title> -======= - <title>Licensz és Kiadási megjegyzések</title> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> <link rel="home" href="index.html" title="Installation with DrakX"> <link rel="up" href="index.html" title="Installation with DrakX"> @@ -17,19 +13,11 @@ table { font-family: sans-serif; font-size: 13px } --></style></head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<<<<<<< HEAD <div lang="hu" class="section" title="Licenc és Kiadási megjegyzések"> <div class="titlepage"> <div> <div> <h2 class="title"><a name="acceptLicense"></a>Licenc és Kiadási megjegyzések -======= - <div lang="hu" class="section" title="Licensz és Kiadási megjegyzések"> - <div class="titlepage"> - <div> - <div> - <h2 class="title"><a name="acceptLicense"></a>Licensz és Kiadási megjegyzések ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h2> </div> </div> diff --git a/hu/addUser.html b/hu/addUser.html index a889dc2..c6890cc 100644 --- a/hu/addUser.html +++ b/hu/addUser.html @@ -23,30 +23,8 @@ </div> </div> -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="A rendszergazdai (root) jelszó beállítása"> <div class="titlepage"> @@ -58,10 +36,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>It is advisable for all <span class="application">Mageia</span> installations to set a superuser or administrator's password, usually called the @@ -72,10 +46,6 @@ just below the first password box, this checks that you have not mistyped the first password by comparing them. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -96,10 +66,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Adjon meg egy felhasználót"> <div class="titlepage"> @@ -111,21 +77,11 @@ </div> </div> -<<<<<<< HEAD <p>Add a user here. A user has fewer rights than the superuser (root), but enough to use the internet, office applications or play games and anything else the average user does with his computer </p> -======= - - - <p>Add a user here. A user has fewer rights than the superuser (root), but - enough to surf the internet, use office applications or play games and - anything else the average user does with his computer - </p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -145,13 +101,8 @@ <li class="listitem"> <p><span class="guilabel">Login Name</span>: Here you enter the user login name or let -<<<<<<< HEAD drakx use a version of the user's real name. <span class="emphasis"><em>The login name is case sensitive.</em></span></p> -======= - drakx use a version of the users real name. <span class="emphasis"><em>The login name is case - sensitive.</em></span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -172,10 +123,6 @@ </li> </ul> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -186,7 +133,6 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Any user you add while installing Mageia, will have a both read and write protected home directory (umask=0027). </p> @@ -195,29 +141,6 @@ Summary</em></span> step during the install. Choose <span class="emphasis"><em>User management</em></span>. </p> -======= - <p>Any user you add while installing Mageia, will have a world readable (but - write protected) home directory. - </p> - - - <p>However, while using your new install, any user you add in <span class="emphasis"><em>MCC - - System - Manage users on system</em></span> will have a home directory that - is both read and write protected. - </p> - - - <p>If you don't want a world readable home directory for anyone, it is advised - to only add a temporary user now and to add the real one(s) after reboot. - </p> - - - <p>If you prefer world readable home directories, you might want to 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> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>The access permissions can also be changed after the install.</p> @@ -227,10 +150,6 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Speciális Felhasználókezelés"> <div class="titlepage"> @@ -242,23 +161,12 @@ </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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> -<<<<<<< HEAD - - <p>Additionally, you can disable or enable a guest account.</p> -======= - <p>Additionally, you can disable or enable a guest account.</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -278,10 +186,6 @@ </tr> </table> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> diff --git a/hu/chooseDesktop.html b/hu/chooseDesktop.html index 289b098..f5e9430 100644 --- a/hu/chooseDesktop.html +++ b/hu/chooseDesktop.html @@ -22,49 +22,25 @@ </div> </div> </div> -<<<<<<< HEAD -======= - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Depending on your selection here, you may be offered further screens to fine tune your choice. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>After the selection step(s), you will see a slide show during package installation. The slide show can be disabled by pressing the <span class="guilabel">Details</span> button </p> -<<<<<<< HEAD -======= - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Choose whether you prefer to use the <span class="application">KDE</span> or <span class="application">Gnome</span> desktop environment. Both come with a full set of useful applications and tools. Tick <span class="guilabel">Custom</span> if @@ -73,11 +49,7 @@ <span class="application">LXDE</span> desktop is lighter than the previous two, sporting less eye candy and fewer packages installed by default. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> diff --git a/hu/choosePackageGroups.html b/hu/choosePackageGroups.html index a046ba9..fa7131c 100644 --- a/hu/choosePackageGroups.html +++ b/hu/choosePackageGroups.html @@ -22,7 +22,6 @@ </div> </div> </div> -<<<<<<< HEAD @@ -30,23 +29,12 @@ -======= - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Packages have been sorted into groups, to make choosing what you need on your system a lot easier. The groups are fairly self explanatory, however more information about the content of each is available in tool-tips which become visible as the mouse is hovered over them. </p> -<<<<<<< HEAD <div class="itemizedlist"> <ul class="itemizedlist"> @@ -80,40 +68,6 @@ minimal install (without or with X & IceWM). </p> -======= - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <p>Munkaállomás.</p> - - </li> - <li class="listitem"> - - <p>Kiszolgáló.</p> - - </li> - <li class="listitem"> - - <p>Grafikus környezet</p> - - </li> - <li class="listitem"> - - <p>Individual Package Selection: You can use this option to manually add or - remove packages. - </p> - - </li> - </ul> - </div> - - <p>Read <a class="xref" href="minimal-install.html" title="Minimal Install">„Minimal Install”</a> for instructions on how to do a - minimal install (without or with X & IceWM). - </p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> diff --git a/hu/diskdrake.html b/hu/diskdrake.html index 159d44c..7094539 100644 --- a/hu/diskdrake.html +++ b/hu/diskdrake.html @@ -29,21 +29,6 @@ -<<<<<<< HEAD -======= - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> @@ -104,11 +89,7 @@ <td align="left" valign="top"> <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI -<<<<<<< HEAD System Partition) is present and correctly mounted on /boot/EFI (see below) -======= - System Partition) is present and correctly mounted on /boot/EFI (see above) ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -119,7 +100,6 @@ </table> </div> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -141,8 +121,6 @@ </table> </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> diff --git a/hu/doPartitionDisks.html b/hu/doPartitionDisks.html index 811400f..10950ca 100644 --- a/hu/doPartitionDisks.html +++ b/hu/doPartitionDisks.html @@ -221,7 +221,6 @@ </div> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -248,8 +247,6 @@ </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> diff --git a/hu/exitInstall.html b/hu/exitInstall.html index 390af31..bca3d7d 100644 --- a/hu/exitInstall.html +++ b/hu/exitInstall.html @@ -22,24 +22,11 @@ </div> </div> </div> -<<<<<<< HEAD -======= - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="exitInstall-pa1"></a>You have finished installing and configuring @@ -54,7 +41,6 @@ <p><a name="exitInstall-pa3"></a>If you didn't adjust the settings for the bootloader, your Mageia install -<<<<<<< HEAD will be automatically selected and started. </p> @@ -66,21 +52,6 @@ <p><a name="exitInstall-pa5"></a>Visit www.mageia.org if you have any questions or want to contribute to Mageia </p> -======= - will be automatically selected and started. - </p> - - - <p><a name="exitInstall-pa4"></a>Enjoy! - </p> - - - <p><a name="exitInstall-pa5"></a>Visit www.mageia.org if you have any questions or want to contribute to - Mageia - </p> - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> diff --git a/hu/index.html b/hu/index.html index e1ca433..d1b4f0c 100644 --- a/hu/index.html +++ b/hu/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Bevezetés</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Downloading and Checking Media</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Burn or dump the ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Downloading and Checking Media</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Burn or dump the ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, the Mageia Installer</a></span></dt> @@ -45,11 +40,7 @@ </dl> </dd> <dt><span class="section"><a href="selectLanguage.html">Válasszon nyelvet</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="acceptLicense.html">Licenc és Kiadási megjegyzések</a></span></dt> -======= - <dt><span class="section"><a href="acceptLicense.html">Licensz és Kiadási megjegyzések</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dd> <dl> <dt><span class="section"><a href="acceptLicense.html#license">Licencegyezmény</a></span></dt> @@ -84,7 +75,6 @@ <dt><span class="section"><a href="setupBootloader.html">Rendszerindítási beállítások</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">Using a Mageia bootloader</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e924">Using an existing bootloader</a></span></dt> @@ -93,19 +83,6 @@ </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e899">With a Bios system</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e936">With an UEFI system</a></span></dt> - </dl> - </dd> - <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e951">With a Bios system</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e968">With an UEFI system</a></span></dt> - </dl> - </dd> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dt><span class="section"><a href="misc-params.html">Summary of miscellaneous parameters</a></span></dt> <dd> <dl> @@ -136,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Uninstalling 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#d5e1206">Howto</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/hu/misc-params.html b/hu/misc-params.html index 1aa2164..cba9c59 100644 --- a/hu/misc-params.html +++ b/hu/misc-params.html @@ -29,31 +29,6 @@ -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="misc-params-pa1"></a>DrakX made smart choices for the configuration of your system depending on the choices you made and on the hardware DrakX detected. You can check the settings here and change them if you want after pressing @@ -61,7 +36,6 @@ </p> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -100,8 +74,6 @@ </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="System parameters"> <div class="titlepage"> <div> @@ -143,11 +115,7 @@ </p> -<<<<<<< HEAD <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2 -======= - <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub and/or Lilo ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -212,7 +180,6 @@ <p><a name="misc-params-hardware-pa1a"></a>This is where you setup or change your keyboard layout which will depend on your location, language or type of keyboard. </p> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> @@ -232,8 +199,6 @@ </tr> </table> </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -252,11 +217,7 @@ <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Sound card</span>: </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="misc-params-hardware-pa3a"></a>The installer uses the default driver, if there is a default one. The option to select a different driver is only given when there is more than one driver for your card, but none of them is the default one. @@ -395,12 +356,8 @@ <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your -<<<<<<< HEAD selections will depend on what you use your computer for. For more information, see <a class="xref" href="">???</a>. -======= - selections will depend on what you use your computer for. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> diff --git a/hu/selectCountry.html b/hu/selectCountry.html index 0ad230f..f8dc0b5 100644 --- a/hu/selectCountry.html +++ b/hu/selectCountry.html @@ -22,7 +22,6 @@ </div> </div> </div> -<<<<<<< HEAD @@ -31,39 +30,16 @@ <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, -======= - - - - - - - - - - - - - <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 like the currency and wireless regulatory domain. Setting the wrong country can lead to not being able to use a Wireless network. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="selectCountry-pa2"></a>If your country isn't in the list, click the <span class="guilabel">Other Countries</span> button and choose your country / region there. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -72,31 +48,19 @@ </tr> <tr> <td align="left" valign="top"> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="selectCountry-pa3"></a>If your country is only in the <span class="guilabel">Other Countries</span> list, after clicking <span class="guibutton">OK</span> it may seem a country from the first list was chosen. Please ignore this, DrakX will follow your real choice. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> </table> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Input method"> <div class="titlepage"> <div> @@ -106,7 +70,6 @@ </div> </div> </div> -<<<<<<< HEAD @@ -120,23 +83,6 @@ </p> -======= - - - - - <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an - input method (at the bottom of the list). Input methods allow users to input - multilingual characters (Chinese, Japanese, Korean, etc). IBus is the - default input method in Mageia DVDs, Africa/India and Asia/no-India - Live-CDs. For Asian and African locales, IBus will be set as default input - method so users should not need to configure it manually. Other input - methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be - installed if you added HTTP/FTP media before package selection. - </p> - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -145,33 +91,19 @@ </tr> <tr> <td align="left" valign="top"> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it after you boot your installed system via "Configure your Computer" -> "System", or by running localedrake as root. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> </table> </div> -<<<<<<< HEAD </div> -======= - - </div> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> diff --git a/hu/selectLanguage.html b/hu/selectLanguage.html index b0b4332..841a3d1 100644 --- a/hu/selectLanguage.html +++ b/hu/selectLanguage.html @@ -7,11 +7,7 @@ <link rel="home" href="index.html" title="Installation with DrakX"> <link rel="up" href="index.html" title="Installation with DrakX"> <link rel="prev" href="installer.html" title="DrakX, the Mageia Installer"> -<<<<<<< HEAD <link rel="next" href="acceptLicense.html" title="Licenc és Kiadási megjegyzések"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css"> -======= - <link rel="next" href="acceptLicense.html" title="Licensz és Kiadási megjegyzések"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <!-- body { font-family: sans-serif; font-size: 13px } table { font-family: sans-serif; font-size: 13px } diff --git a/hu/setupBootloader.html b/hu/setupBootloader.html index c27bf13..f320489 100644 --- a/hu/setupBootloader.html +++ b/hu/setupBootloader.html @@ -29,21 +29,11 @@ -<<<<<<< HEAD <div class="section" title="Bootloader interface"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e886"></a>Bootloader interface -======= - - - <div class="section" title="With a Bios system"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e899"></a>With a Bios system ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -51,7 +41,6 @@ -<<<<<<< HEAD <p>By default, Mageia uses exclusively:</p> @@ -69,17 +58,6 @@ </li> </ul> </div> -======= - <p><a name="setupBootloader-pa1"></a>If you prefer different bootloader settings to those chosen automatically by - the installer, you can change them here. - </p> - - - <p><a name="setupBootloader-pa2"></a>You may already have another operating system on your machine, in which case - you need to decide whether to add Mageia to your existing bootloader, or - allow Mageia to create a new one. - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;"> @@ -99,19 +77,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems -======= - <div class="section" title="Using a Mageia bootloader"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="usingMageiaBootloader"></a>Using a Mageia bootloader ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -119,64 +89,18 @@ -<<<<<<< HEAD <p>Don't modify the "Boot Device" unless you really know what you are doing.</p> -======= - <p><a name="setupBootloader-pa4"></a>By default, Mageia writes a new GRUB (legacy) bootloader into the MBR - (Master Boot Record) of your first hard drive. If you already have other - operating systems installed, Mageia attempts to add them to your new Mageia - boot menu. - </p> - - - <p>Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB - legacy and Lilo. - </p> - - - <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Figyelem]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa6"></a>Linux systems which use the GRUB2 bootloader are not currently supported by - GRUB (legacy) and will not be recognized if the default GRUB bootloader is - used. - </p> - - - <p>The best solution here is to use the GRUB2 bootloader which is available at - the Summary page during installation. - </p> - - </td> - </tr> - </table> - </div> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> -<<<<<<< HEAD <div class="section" title="Grub2-efi on UEFI systems"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems -======= - <div class="section" title="Using an existing bootloader"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="usingExistingBootloader"></a>Using an existing bootloader ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -184,7 +108,6 @@ -<<<<<<< HEAD <p>With an UEFI system, the user interface is slightly different as you cannot choose between with or without graphical menu </p> @@ -270,91 +193,15 @@ add it automatically. See the documentation for the operating system in question. </p> -======= - <p><a name="setupBootloader-pa46"></a>If you decide to use an existing bootloader then you will need to remember - to STOP at the summary page during the installation and click the Bootloader - <span class="guibutton">Configure</span> button, which will allow you to change the - bootloader install location. - </p> - - - <p><a name="setupBootloader-pa47"></a>Do not select a device e.g."sda", or you will overwrite your existing - MBR. You must select the root partition that you chose during the - partitioning phase earlier, e.g. sda7. - </p> - - - <p><a name="setupBootloader-pa48"></a>To be clear, sda is a device, sda7 is a partition on that device. - </p> - - - <div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Tip"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tipp]" src="tip.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa48a"></a>Go to tty2 with Ctrl+Alt+F2 and type <code class="literal">df</code> to check where - your <code class="literal">/</code> (root) partition is. Ctrl+Alt+F7 takes you back to - the installer screen. - </p> - - </td> - </tr> - </table> - </div> - - - <p><a name="setupBootloader-pa49"></a>The exact procedure for adding your Mageia system to an existing bootloader - is beyond the scope of this help, however in most cases it will involve - running the relevant bootloader installation program which should detect and - add it automatically. See the documentation for the operating system in - question. - </p> - - </div> - - - <div class="section" title="Bootloader advanced option"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="advancedOptionBootloader"></a>Bootloader advanced option - </h4> - </div> - </div> - </div> - - - - <p><a name="setupBootloader-pa52"></a>If you have very limited disk space for the <code class="literal">/</code> partition - that contains <code class="literal">/tmp</code>, click on - <span class="guibutton">Advanced</span> and check the box for <span class="guilabel">Clean /tmp - at each boot</span>. This helps to maintain some free space. - </p> - - </div> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </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="With an UEFI system"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e936"></a>With an UEFI system ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -362,21 +209,15 @@ -<<<<<<< HEAD <p>If you don't want a bootable Mageia, but to chain load it from another OS, 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>. -======= - <p>With an UEFI system, the user interface is slightly different as you cannot - choose the boot loader since only Grub2-efi is available. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>You will get a warning that the bootloader is missing, ignore it by clicking <span class="guibutton">OK</span>. </p> @@ -551,19 +392,6 @@ </div> </div> -======= - <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 added 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> diff --git a/hu/setupBootloaderAddEntry.html b/hu/setupBootloaderAddEntry.html index 3b0efab..9b5f6a5 100644 --- a/hu/setupBootloaderAddEntry.html +++ b/hu/setupBootloaderAddEntry.html @@ -27,7 +27,6 @@ -<<<<<<< HEAD <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the software grub-customizer instead (Available in the Mageia repositories). </p> @@ -47,112 +46,6 @@ </td> </tr> </table> -======= - - - <div class="section" title="With a Bios system"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e951"></a>With a Bios system - </h3> - </div> - </div> - </div> - - - - <p>You can add an entry or modify the one you select first, by pressing the - relevant button in the <span class="emphasis"><em>Bootloader Configuration</em></span> screen - and editing the screen that pops up on top of it. - </p> - - - <div class="note" title="Megjegyzés" 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="[Megjegyzés]" 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>Some things that can be done without any risk, are changing the label of an - entry and ticking the box to make an entry the default one. - </p> - - - <p>You can add the proper version number of an entry, or rename it completely.</p> - - - <p>The default entry is the one the systems boots into if you don't make a - choice while booting up. - </p> - - - <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Figyelem]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Editing other things can leave you with an unbootable system. Please don't - just try something without knowing what you are doing. - </p> - - </td> - </tr> - </table> - </div> - - </div> - - - <div class="section" title="With an UEFI system"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e968"></a>With an UEFI system - </h3> - </div> - </div> - </div> - - - - <p>In this case you are using Grub2-efi and you cannot use this tool to edit - entries at this step. To do that you need to manually edit - <code class="code">/boot/grub2/custom.cfg</code> or use <code class="code">grub-customizer</code> - instead. All you can do here, is to choose the default entry in the drop - down list. - </p> - - - <p>After a click on the <span class="guibutton">Next</span> button, another drop down - list allows to choose the video resolution for Grub2 which is a graphical - boot loader. - </p> - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </div> diff --git a/hu/setupSCSI.html b/hu/setupSCSI.html index 1f8cd1c..23c8054 100644 --- a/hu/setupSCSI.html +++ b/hu/setupSCSI.html @@ -6,11 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> <link rel="home" href="index.html" title="Installation with DrakX"> <link rel="up" href="index.html" title="Installation with DrakX"> -<<<<<<< HEAD <link rel="prev" href="acceptLicense.html" title="Licenc és Kiadási megjegyzések"> -======= - <link rel="prev" href="acceptLicense.html" title="Licensz és Kiadási megjegyzések"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <link rel="next" href="selectInstallClass.html" title="Install or Upgrade"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css"> <!-- body { font-family: sans-serif; font-size: 13px } diff --git a/hu/soundConfig.html b/hu/soundConfig.html index c2ae706..518b063 100644 --- a/hu/soundConfig.html +++ b/hu/soundConfig.html @@ -22,10 +22,6 @@ </div> </div> </div> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 @@ -36,35 +32,21 @@ <p>In this screen the name of the driver that the installer chose for your sound card is given, which will be the default driver if we have a default one. -<<<<<<< HEAD </p> -======= - - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>The default driver should work without problems. However, if after install you do encounter problems, then run <span class="command"><strong>draksound</strong></span> or start this tool via MCC (Mageia Control Center), by choosing the <span class="guilabel">Hardware</span> tab and clicking on <span class="guilabel">Sound Configuration</span> at the top right of the screen. -<<<<<<< HEAD </p> -======= - - </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>Then, in the draksound or "Sound Configuration" tool screen, click on <span class="guibutton">Advanced</span> and then on <span class="guibutton">Troubleshooting</span> to find very useful advice about how to solve the problem. -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -83,22 +65,12 @@ <p>Clicking <span class="guibutton">Advanced</span> in this screen, during install, is useful if there is no default driver and there are several drivers available, but you think the installer selected the wrong one. -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>In that case you can select a different driver after clicking on <span class="guibutton">Let me pick any driver</span>. -<<<<<<< HEAD </p> -======= - - </p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> diff --git a/hu/uninstall-Mageia.html b/hu/uninstall-Mageia.html index cc6c70a..d486a27 100644 --- a/hu/uninstall-Mageia.html +++ b/hu/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="d5e1206"></a>Howto ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/nl/Select-and-use-ISOs.html b/nl/Select-and-use-ISOs.html index 491e132..c41334b 100644 --- a/nl/Select-and-use-ISOs.html +++ b/nl/Select-and-use-ISOs.html @@ -139,27 +139,6 @@ </p> </li> -<<<<<<< HEAD -======= - </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"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <li class="listitem"> <p>Vershillende media voor 32- en 64-bits architectuur.</p> @@ -195,11 +174,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Live media -======= - <h4 class="title"><a name="d5e56"></a>Live media ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -210,11 +185,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>Algemene eigenschappen -======= - <h5 class="title"><a name="d5e58"></a>Algemene eigenschappen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -232,11 +203,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Elke ISO bevat slechts één werkomgeving (Plasma, GNOME of Xfce).</p> -======= - <p>Elke ISO bevat slechts één werkomgeving (KDE, GNOME of Xfce).</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -265,11 +232,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e69"></a>PLASMA Live DVD -======= - <h5 class="title"><a name="d5e72"></a>PLASMA Live DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -290,11 +253,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Alleen 64-bits architectuur.</p> -======= - <p>Vershillende media voor 32- en 64-bits architectuur.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -306,11 +265,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>GNOME Live DVD -======= - <h5 class="title"><a name="d5e81"></a>GNOME Live DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -343,11 +298,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e87"></a>Xfce Live DVD -======= - <h5 class="title"><a name="d5e90"></a>Xfce Live DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -382,11 +333,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>Enkel-opstart CD-media -======= - <h4 class="title"><a name="d5e99"></a>Enkel-opstart CD-media ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -397,11 +344,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>Algemene eigenschappen -======= - <h5 class="title"><a name="d5e101"></a>Algemene eigenschappen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -447,11 +390,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -476,11 +415,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -509,11 +444,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>Een medium downloaden en checken -======= - <h3 class="title"><a name="d5e122"></a>Een medium downloaden en checken ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -524,11 +455,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>Downloaden -======= - <h4 class="title"><a name="d5e124"></a>Downloaden ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -543,13 +470,8 @@ <p>md5sum en sha1sum zijn hulpmiddelen om de integriteit van de ISO te -<<<<<<< HEAD controleren. Gebruik er maar één van. Bewaar één van hen <a class="link" href="Select-and-use-ISOs.html#integrity">voor verder gebruik</a>. Er verschijnt dan een venster dat lijkt op deze: -======= - controleren. Gebruik er maar één van. Bewaar één van hen <a class="link" href="Select-and-use-ISOs.html#integrity">voor verder gebruik</a>. Dan verschijnt er dit - venster: ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -561,31 +483,18 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>De integriteit van het gedownloade medium controleren -======= - <h4 class="title"><a name="d5e136"></a>De integriteit van het gedownloade ISO controleren ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD <p>Beide checksums zijn hexadecimale getallen die door een algoritme voor het te downloaden bestand berekend zijn. Als u deze checksums opnieuw laat berekenen voor het gedownloade bestand en de uitkomst is gelijk, dan is het bestand in orde. Als de uitkomst niet overeenkomt, kunt u de download beter overdoen of een reparatie proberen met behulp van BitTorrent. . -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>Open een terminal (niet als root), en:</p> @@ -613,11 +522,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>Brand of dump het ISO -======= - <h3 class="title"><a name="d5e149"></a>Brand of dump het ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -633,11 +538,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>De ISO op een CD/DVD branden -======= - <h4 class="title"><a name="d5e152"></a>De ISO op een CD/DVD branden ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -656,11 +557,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>Dump de ISO op een USB-stick -======= - <h4 class="title"><a name="d5e157"></a>Dump de ISO op een USB-stick ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -698,11 +595,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Gebruik een grafisch hulpmiddel binnen Mageia -======= - <h5 class="title"><a name="d5e163"></a>Gebruik een grafisch hulpmiddel binnen Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -717,11 +610,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Gebruik een grafisch hulpmiddel binnen Windows -======= - <h5 class="title"><a name="d5e167"></a>Gebruik een grafisch hulpmiddel binnen Windows ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -743,11 +632,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>Gebruik de commandoregel binnen een GNU/Linux-systeem -======= - <h5 class="title"><a name="d5e174"></a>Gebruik de commandoregel binnen een GNU/Linux-systeem ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/nl/index.html b/nl/index.html index 4488cff..8c73f7e 100644 --- a/nl/index.html +++ b/nl/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introductie</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Een medium downloaden en checken</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Brand of dump het ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Een medium downloaden en checken</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Brand of dump het ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, het Mageia-installatieprogramma</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Algemene opties voor de opstartlader</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e882">Opstartlader Interface</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e906">De Mageia-opstartlader gebruiken</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e920">Een bestaande opstartlader gebruiken</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e923">Met behulp van opeenvolgend laden</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e937">Opties</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e885">Opstartlader Interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e909">De Mageia-opstartlader gebruiken</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e923">Een bestaande opstartlader gebruiken</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e926">Met behulp van opeenvolgend laden</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e940">Opties</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Wijzig een opstartmenu-ingang of voeg er een toe</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia deïnstalleren</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Howto</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1246">Howto</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/nl/setupBootloader.html b/nl/setupBootloader.html index d2ac750..a38f84c 100644 --- a/nl/setupBootloader.html +++ b/nl/setupBootloader.html @@ -33,11 +33,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e882"></a>Opstartlader Interface -======= - <h3 class="title"><a name="d5e885"></a>Opstartlader Interface ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -75,11 +71,7 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>De Mageia grafische menu's zijn mooi :)</p> -======= - <p>De Mageia grafische menu's zijn mooi :</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> @@ -91,11 +83,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e892"></a>Grub2 op Legacy/MBR en Legacy/GPT systemen -======= - <h4 class="title"><a name="d5e895"></a>Grub2 op Legacy/MBR en Legacy/GPT systemen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -114,11 +102,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e898"></a>Grub2-efi op UEFI systemen -======= - <h4 class="title"><a name="d5e901"></a>Grub2-efi op UEFI systemen ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -133,7 +117,6 @@ -<<<<<<< HEAD <p>Als uw computer naast Mageia geen ander besturingssysteem had, dan heeft het Mageia-installatieprogramma een ESP (EFI-SysteemPartitie) voor de opstartlader (Grub2-efi) gemaakt. Stond er echter al eerder een @@ -142,15 +125,6 @@ grub2-efi-opstartlader daaraan toevoegd. Alhoewel het mogelijk is verscheidene ESP's te hebben, wordt aanbevolen het bij één te laten. Één is genoeg, ongeacht het aantal besturingssystemen dat u heeft. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -165,11 +139,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e906"></a>De Mageia-opstartlader gebruiken -======= - <h3 class="title"><a name="d5e909"></a>De Mageia-opstartlader gebruiken ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -212,11 +182,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e920"></a>Een bestaande opstartlader gebruiken -======= - <h3 class="title"><a name="d5e923"></a>Een bestaande opstartlader gebruiken ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -238,11 +204,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e923"></a>Met behulp van opeenvolgend laden -======= - <h3 class="title"><a name="d5e926"></a>Met behulp van opeenvolgend laden ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -272,11 +234,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e937"></a>Opties -======= - <h3 class="title"><a name="d5e940"></a>Opties ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -288,11 +246,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e939"></a>Eerste pagina -======= - <h4 class="title"><a name="d5e942"></a>Eerste pagina ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -312,18 +266,11 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Beveiliging</span>: Hiermee kunt u een wachtwoord instellen voor de opstartlader. Dit betekent dat een gebruikersnaam en wachtwoord tijdens de opstarttijd zal worden gevraagd waarna u een opstartinvoer kunt selecteren of instellingen kan wijzigen. De gebruikersnaam is 'root' en hierna wordt het wachtwoord gekozen. -======= - <p><span class="guilabel">Veiligheid</span>: Hiermee kunt u een wachtwoord voor de - opstartlader instellen. Dit betekent dat andere mensen niet de enkele - gebruiker modus kunnen gebruiken. Daarnaast kunnen zij ook geen instellingen - wijzigen tijdens het opstarten. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -351,7 +298,6 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">ACPI Inschakelen:</span> ACPI (Advanced Configuration and Power Interface) is een standaard voor energiebeheer. Het kan energie besparen door ongebruikte apparaten uit te schakelen. Dit was de methode die @@ -359,14 +305,6 @@ bijvoorbeeld als uw computer niet ACPI ondersteunt of als u denkt dat de ACPI-implementatie kan leiden tot een aantal problemen (bijvoorbeeld dat het systeem willekeurige opnieuw opstart of vastloopt). -======= - <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 - 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). ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -409,11 +347,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e971"></a>Volgende pagina -======= - <h4 class="title"><a name="d5e974"></a>Volgende pagina ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> diff --git a/nl/uninstall-Mageia.html b/nl/uninstall-Mageia.html index b92a679..20f0b47 100644 --- a/nl/uninstall-Mageia.html +++ b/nl/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1243"></a>Howto -======= - <h3 class="title"><a name="d5e1246"></a>Howto ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/ro/Select-and-use-ISOs.html b/ro/Select-and-use-ISOs.html index c37237e..b30889f 100644 --- a/ro/Select-and-use-ISOs.html +++ b/ro/Select-and-use-ISOs.html @@ -23,9 +23,7 @@ </div> </div> - - <div class="section" title="Introducere"> <div class="titlepage"> @@ -37,15 +35,12 @@ </div> </div> - <p>Mageia este distribuită prin imagini ISO. Această pagină vă va ajuta să alegeți imaginea care se potrivește nevoilor voastre. </p> - <p>Există două familii de medii:</p> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -71,12 +66,10 @@ </li> </ul> </div> - <p>Detaliile sînt oferite în secțiunile următoare.</p> </div> - <div class="section" title="Medii"> <div class="titlepage"> @@ -88,7 +81,6 @@ </div> </div> - <div class="section" title="Definiție"> <div class="titlepage"> @@ -100,19 +92,16 @@ </div> </div> - <p>Aici, un mediu (plural: medii) este o imagine ISO ce permite instalarea și/sau actualizarea distribuției Mageia și prin extensie orice suport fizic pe care poate fi copiat fișierul ISO. </p> - <p>Le puteți găsi <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">aici</a>. </p> </div> - <div class="section" title="Mediile de instalare clasice"> <div class="titlepage"> @@ -124,7 +113,6 @@ </div> </div> - <div class="section" title="Caracteristici comune"> <div class="titlepage"> @@ -136,7 +124,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -152,26 +139,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>Diferitele medii pentru arhitectură pe 32 sau 64 de biți.</p> @@ -200,77 +167,30 @@ </div> </div> - - - <div class="section" title="DVD arhitectură duală"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e56"></a>DVD arhitectură duală - </h5> - </div> - </div> - </div> - - - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <p>Ambele arhitecturi sînt prezente pe același mediu, alegerea este făcută - automat în funcție de tipul procesorului detectat. - </p> - - </li> - <li class="listitem"> - - <p>Utilizează doar mediul de birou Xfce.</p> - - </li> - <li class="listitem"> - - <p>Nu sînt disponibile toate limbile. (be, bg, ca, de, en, es, fr, it, mk, pl, - pt, ru, sv, uk) DE VERIFICAT! - </p> - - </li> - <li class="listitem"> - - <p>Conține aplicații proprietare.</p> - - </li> - </ul> - </div> - - </div> </div> - <div class="section" title="Mediile Live"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e67"></a>Mediile Live + <h4 class="title"><a name="d5e53"></a>Mediile Live </h4> </div> </div> </div> - <div class="section" title="Caracteristici comune"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e69"></a>Caracteristici comune + <h5 class="title"><a name="d5e55"></a>Caracteristici comune </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -283,7 +203,7 @@ </li> <li class="listitem"> - <p>Fiecare imagine ISO conține numai un mediu de birou (KDE sau GNOME).</p> + <p>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</p> </li> <li class="listitem"> @@ -307,54 +227,50 @@ </div> </div> - - <div class="section" title="LiveCD KDE"> + <div class="section" title="Live DVD Plasma"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e83"></a>LiveCD KDE + <h5 class="title"><a name="d5e69"></a>Live DVD Plasma </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p>Doar mediul de birou KDE.</p> + <p>Plasma desktop environment only.</p> </li> <li class="listitem"> - <p>Doar limba engleză.</p> + <p>Toate limbile sînt prezente.</p> </li> <li class="listitem"> - <p>Doar 32 de biți.</p> + <p>64 bit architecture only.</p> </li> </ul> </div> </div> - - <div class="section" title="LiveCD GNOME"> + <div class="section" title="LiveDVD GNOME"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e92"></a>LiveCD GNOME + <h5 class="title"><a name="d5e78"></a>LiveDVD GNOME </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -365,72 +281,35 @@ </li> <li class="listitem"> - <p>Doar limba engleză.</p> - - </li> - <li class="listitem"> - - <p>Doar 32 de biți.</p> - - </li> - </ul> - </div> - - </div> - - - <div class="section" title="LiveDVD KDE"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e101"></a>LiveDVD KDE - </h5> - </div> - </div> - </div> - - - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <p>Doar mediul de birou KDE.</p> - - </li> - <li class="listitem"> - <p>Toate limbile sînt prezente.</p> </li> <li class="listitem"> - <p>Diferitele medii pentru arhitectură pe 32 sau 64 de biți.</p> + <p>64 bit architecture only</p> </li> </ul> </div> </div> - - <div class="section" title="LiveDVD GNOME"> + <div class="section" title="Live DVD Xfce"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e110"></a>LiveDVD GNOME + <h5 class="title"><a name="d5e87"></a>Live DVD Xfce </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p>Doar mediul de birou GNOME.</p> + <p>Xfce desktop environment only.</p> </li> <li class="listitem"> @@ -440,7 +319,7 @@ </li> <li class="listitem"> - <p>Diferitele medii pentru arhitectură pe 32 sau 64 de biți.</p> + <p>32 or 64 bit architectures.</p> </li> </ul> @@ -449,31 +328,28 @@ </div> </div> - <div class="section" title="CD-uri doar pentru demarat"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e119"></a>CD-uri doar pentru demarat + <h4 class="title"><a name="d5e96"></a>CD-uri doar pentru demarat </h4> </div> </div> </div> - <div class="section" title="Caracteristici comune"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e121"></a>Caracteristici comune + <h5 class="title"><a name="d5e98"></a>Caracteristici comune </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -510,26 +386,24 @@ </div> </div> - - <div class="section" title="boot.iso"> + <div class="section" title="netinstall.iso"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e132"></a>boot.iso + <h5 class="title"><a name="d5e109"></a>netinstall.iso </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p>Conține numai aplicații libere, pentru persoanele care refuză aplicațiile - proprietare. + <p>Contains only free software, for those people who prefer not to use non-free + software. </p> </li> @@ -537,19 +411,17 @@ </div> </div> - - <div class="section" title="boot-nonfree.iso"> + <div class="section" title="netinstall-nonfree.iso"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e137"></a>boot-nonfree.iso + <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -568,130 +440,112 @@ </div> </div> - <div class="section" title="Descărcarea și verificarea mediilor"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e142"></a>Descărcarea și verificarea mediilor + <h3 class="title"><a name="d5e119"></a>Descărcarea și verificarea mediilor </h3> </div> </div> </div> - <div class="section" title="Descărcare"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e144"></a>Descărcare + <h4 class="title"><a name="d5e121"></a>Descărcare </h4> </div> </div> </div> - - <p>Odată ce ați ales fișierul ISO, îl puteți descărca utilizînd HTTP sau - BitTorrent. În ambele cazuri o fereastră vă va oferi anumite informații, - precum oglinda de descărcare utilizată și posibilitatea de a o schimba dacă - este prea lentă. Dacă alegeți HTTP, puteți vedea și ceva de genul + <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 an opportunity to change if the bandwidth is to low. If + http is chosen, you may also see something like </p> - - - <p>md5sum și sha1sum sînt unelte pentru verificarea integrității imaginilor - ISO. Utilizați doar una din ele. Păstrați una din ele <a class="link" href="Select-and-use-ISOs.html#integrity">pentru a o utiliza și mai tîrziu</a>. Apoi vă va - apărea această fereastră: + <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> - - <p>Bifați butonul radio „Salvează fișierul”.</p> </div> - - <div class="section" title="Se verifică integritatea mediului descărcat"> + <div class="section" title="Checking the integrity of the downloaded media"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e156"></a>Se verifică integritatea mediului descărcat + <h4 class="title"><a name="d5e133"></a>Checking the integrity of the downloaded media </h4> </div> </div> </div> - - <p>Ambele sume de control sînt numere hexazecimale calculate de un algoritm cu - fișierul ce va fi descărcat. Cînd îi cereți algoritmului să recalculeze - acest număr din fișierul pe care l-ați descărcat, ori obțineți același număr - și descărcarea s-a efectuat corect, ori numărul este diferit și ați întîlnit - un eșec. În caz de eșec trebuie să încercați să-l mai descărcați o dată. + <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> - <p>Deschideți o consolă, trebuie să fiți root, și:</p> - <p>- Pentru a utiliza md5sum, tastați: [sam@localhost]$ <strong class="userinput"><code>md5sum path/to/the/image/file.iso</code></strong>. </p> - <p>- Pentru a utiliza sha1sum, tastați: [sam@localhost]$ <strong class="userinput"><code>sha1sum path/to/the/image/file.iso</code></strong>. </p> - <p>și comparați numărul obținut pe calculator (va trebui să așteptați un pic) cu numărul dat de Mageia. Exemplu: </p> - - <p></p> </div> </div> - <div class="section" title="Inscripționați sau copiați imaginea ISO"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e169"></a>Inscripționați sau copiați imaginea ISO + <h3 class="title"><a name="d5e146"></a>Inscripționați sau copiați imaginea ISO </h3> </div> </div> </div> - <p>Imaginea ISO verificată poate fi acum inscripționată pe un CD/DVD sau pusă pe o cheie USB. Aceste operații nu sînt simple copieri și au ca scop să producă medie de pe care se poate demara. </p> - <div class="section" title="Inscripționarea imaginii ISO pe un CD/DVD"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e172"></a>Inscripționarea imaginii ISO pe un CD/DVD + <h4 class="title"><a name="d5e149"></a>Inscripționarea imaginii ISO pe un CD/DVD </h4> </div> </div> </div> - <p>Puteți utiliza orice aplicație de inscripționat doriți, însă asigurați-vă că este configurată corect pe <span class="bold"><strong>inscripționat o @@ -701,24 +555,21 @@ </p> </div> - <div class="section" title="Puneți imaginea ISO pe o cheie USB"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e177"></a>Puneți imaginea ISO pe o cheie USB + <h4 class="title"><a name="d5e154"></a>Puneți imaginea ISO pe o cheie USB </h4> </div> </div> </div> - <p>Toate imaginile ISO Mageia sînt hibride, asta înseamnă că pot fi „puse” pe o cheie USB pentru a demara și instala sistemul. </p> - <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -738,67 +589,58 @@ </tr> </table> </div> - <p>Pentru a recupera capacitatea inițială va trebui să repartiționați și să reformatați cheia USB. </p> - <div class="section" title="Utilizînd o unealtă grafică din Mageia"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e183"></a>Utilizînd o unealtă grafică din Mageia + <h5 class="title"><a name="d5e160"></a>Utilizînd o unealtă grafică din Mageia </h5> </div> </div> </div> - <p>Puteți utiliza un utilitar grafic precum <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="Utilizînd o unealtă grafică din Windows"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e187"></a>Utilizînd o unealtă grafică din Windows + <h5 class="title"><a name="d5e164"></a>Utilizînd o unealtă grafică din Windows </h5> </div> </div> </div> - <p>Puteți încerca:</p> - <p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> utilizînd opțiunea „ISO image"; </p> - <p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32 Disk Imager</a></p> </div> - <div class="section" title="Utilizînd linia de comandă dintr-un sistem GNU/Linux"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e194"></a>Utilizînd linia de comandă dintr-un sistem GNU/Linux + <h5 class="title"><a name="d5e171"></a>Utilizînd linia de comandă dintr-un sistem GNU/Linux </h5> </div> </div> </div> - <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -817,10 +659,8 @@ </tr> </table> </div> - <p>Puteți utiliza utilitarul dd într-o consolă:</p> - <div class="orderedlist"> <ol class="orderedlist" type="1"> @@ -834,7 +674,6 @@ <p>Deveniți root cu comanda <strong class="userinput"><code>su -</code></strong> (nu uitați liniuța de la final '-' ) </p> - </li> @@ -848,15 +687,12 @@ <li class="listitem"> <p>Introduceți comanda <strong class="userinput"><code>fdisk -l</code></strong></p> - - <p>Alternativ, puteți obține numele dispozitivului cu comanda <code class="code">dmesg</code>, la sfîrșit veți vedea numele dispozitivului începînd cu <span class="emphasis"><em>sd</em></span>, sau <span class="emphasis"><em>sdd</em></span> în acest caz: </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 @@ -887,12 +723,10 @@ <p>Introduceți comanda: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX bs=1M</code></strong></p> - <p>Unde X=numele dispozitivului, ex: /dev/sdc</p> - - <p>Exemplu: # <strong class="userinput"><code>dd if=/home/user/Downloads/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/ro/addUser.html b/ro/addUser.html index 277108d..9c38a84 100644 --- a/ro/addUser.html +++ b/ro/addUser.html @@ -23,25 +23,8 @@ </div> </div> - - - - - - - - - - - - - - - - - <div class="section" title="Definiți parola administratorului (root):"> <div class="titlepage"> @@ -53,7 +36,6 @@ </div> </div> - <p>Pentru toate instalările de <span class="application">Mageia</span> se recomandă să definiți o parolă de superutilizator sau administrator, cunoscută și ca @@ -63,7 +45,6 @@ trebui să retastați parola în căsuța de dedesubt, astfel se vor compara cele două parole pentru a vă asigura că nu ați tastat greșit. </p> - <div class="note" title="Notă" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -85,7 +66,6 @@ </div> </div> - <div class="section" title="Introduceți un utilizator"> <div class="titlepage"> @@ -97,14 +77,12 @@ </div> </div> - <p>Adăugați un utilizator la această etapă. Un utilizator dispune de mai puține drepturi ca un administrator (root), însă suficiente pentru a putea naviga pe Internet, utiliza aplicațiile de birotică, juca jocuri sau orice altceva ce un utilizator obișnuit poate face cu calculatorul său. </p> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -147,7 +125,6 @@ </li> </ul> </div> - <div class="note" title="Notă" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -158,30 +135,14 @@ <tr> <td align="left" valign="top"> - <p>Toți utilizatorii adăugați în cursul instalării distribuției Magaiea vor - avea un director personal ce poate fi consultat de toată lumea (însă - protejat la scriere). + <p>Any user you add while installing Mageia, will have a both read and write + protected home directory (umask=0027). </p> - - <p>Totuși, după instalare, orice utilizator adăugat cu <span class="emphasis"><em>MCC - Sistem - - Gestionați utilizatorii din sistem</em></span> vor avea un director personal - protejat atît la citire cît și la scriere. + <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> - - - <p>Dacă nu doriți un director personal accesibil în citire de toată lumea, este - recomandat să adăugați acum doar un utilizator temporar și să-i adăugați pe - cei adevărați după repornire. - </p> - - - <p>Dacă preferați directoare personale accesibile în citire pentru toată lumea, - va trebui să adăugați toți utilizatorii doriți în etapa - <span class="emphasis"><em>Configurație - rezumat</em></span> alegînd <span class="emphasis"><em>Gestionare - utilizatori</em></span>. - </p> - <p>Drepturile de acces pot fi modificate și după instalare.</p> @@ -191,7 +152,6 @@ </div> </div> - <div class="section" title="Gestionare avansată utilizatori"> <div class="titlepage"> @@ -203,16 +163,13 @@ </div> </div> - <p>Dacă apăsați butonul <span class="guibutton">Avansat</span> vi se va prezenta un ecran în care veți putea edita parametrii conturilor utilizatorilor pe care îi adăugați. </p> - <p>Adițional, puteți dezactiva sau activa un cont invitat.</p> - <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -233,7 +190,6 @@ </tr> </table> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> diff --git a/ro/chooseDesktop.html b/ro/chooseDesktop.html index 5f9a58d..7325b40 100644 --- a/ro/chooseDesktop.html +++ b/ro/chooseDesktop.html @@ -22,30 +22,25 @@ </div> </div> </div> + - - - - - + - + <p>În funcție de alegerea de aici vi se vor prezenta ecrane suplimentare pentru a vă afina alegerea. </p> - + <p>După etapa de selecție, veți vedea o diaporamă pe parcursul instalării pachetelor. Diaporama se poate dezactiva apăsînd pe butonul <span class="guilabel">Detalii</span>. </p> + - - - - + <p>Alegeți dacă preferați să utilizați mediul de birou <span class="application">KDE</span> sau <span class="application">Gnome</span>. Ambele vin cu o colecție de aplicații și unelte folositoare. Apăsați pe @@ -55,7 +50,7 @@ este mai lejer decît celelalte două, poate nu atît de plăcut ochiului și cu mai puține pachete instalate implicit. </p> - + </div> </body> </html> diff --git a/ro/choosePackageGroups.html b/ro/choosePackageGroups.html index 6e6c78a..966d7b2 100644 --- a/ro/choosePackageGroups.html +++ b/ro/choosePackageGroups.html @@ -22,52 +22,52 @@ </div> </div> </div> + - - - - + + - + <p>Pachetele au fost sortate în grupuri pentru a vă facilita alegerea a ceea ce este necesar pentru acest sistem. Conținutul grupurilor este evident, totuși, informații suplimentare despre conținutul fiecărui pachet sînt disponibile în infobule cînd le survolați cu mausul. </p> - + <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - - <p>Stație de lucru.</p> + <p>Stație de lucru.</p> + </li> <li class="listitem"> - - <p>Server.</p> + <p>Server.</p> + </li> <li class="listitem"> - - <p>Mediu grafic de lucru</p> + <p>Mediu grafic de lucru</p> + </li> <li class="listitem"> - + <p>Selectare individuală a pachetelor: puteți utiliza această opțiune pentru a adăuga sau înlătura manual pachetele. </p> - + </li> </ul> </div> - - <p>Pentru intrucțiuni despre cum să faceți o instalare minimalistă (cu sau - fără X & IceWM), citiți <a class="xref" href="minimal-install.html" title="Instalare minimală">„Instalare minimală”</a>. - </p> + + <p>Read <a class="xref" href="minimal-install.html" title="Instalare minimală">„Instalare minimală”</a> for instructions on how to do a + minimal install (without or with X & IceWM). + </p> + </div> </body> </html> diff --git a/ro/diskdrake.html b/ro/diskdrake.html index 2176d94..3bfab41 100644 --- a/ro/diskdrake.html +++ b/ro/diskdrake.html @@ -29,18 +29,6 @@ - - - - - - - - - - - - <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> @@ -101,8 +89,8 @@ <tr> <td align="left" valign="top"> - <p>Dacă instalați Mageia pe un sistem UEFI, verificați că o partiție de sistem - EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus) + <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI + System Partition) is present and correctly mounted on /boot/EFI (see below) </p> @@ -113,6 +101,27 @@ </table> </div> + + <div class="note" title="Notă" 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="[Notă]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot + partition is present with a correct type + </p> + + + + </td> + </tr> + </table> + </div> + </div> </body> </html> diff --git a/ro/doPartitionDisks.html b/ro/doPartitionDisks.html index 207aa40..e2ca2fd 100644 --- a/ro/doPartitionDisks.html +++ b/ro/doPartitionDisks.html @@ -223,6 +223,32 @@ </div> + <div class="note" title="Notă" 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="[Notă]" src="note.png"></td> + <th align="left"></th> + </tr> + <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> + + + + + + </td> + </tr> + </table> + </div> + + <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> diff --git a/ro/exitInstall.html b/ro/exitInstall.html index 031d37a..467efcb 100644 --- a/ro/exitInstall.html +++ b/ro/exitInstall.html @@ -22,16 +22,11 @@ </div> </div> </div> - - - - - - + + - <p><a name="exitInstall-pa1"></a>Ați terminat de instalat și configurat distribuția @@ -47,19 +42,17 @@ <p><a name="exitInstall-pa3"></a>Dacă nu ajustați parametrii încărcătorului de sistem, distribuția Mageia va - fi selectată și pornită automat. + fi selectată și pornită automat. </p> - + <p><a name="exitInstall-pa4"></a>Profitați! </p> - + <p><a name="exitInstall-pa5"></a>Vizitați www.mageia.org dacă aveți întrebări sau dacă doriți să contribuiți - la Mageia + la Mageia </p> - - </div> </body> diff --git a/ro/index.html b/ro/index.html index 0ac8526..93ed37f 100644 --- a/ro/index.html +++ b/ro/index.html @@ -28,8 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducere</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medii</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Descărcarea și verificarea mediilor</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Inscripționați sau copiați imaginea ISO</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Descărcarea și verificarea mediilor</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Inscripționați sau copiați imaginea ISO</a></span></dt> </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, instalatorul Mageia</a></span></dt> @@ -75,17 +75,14 @@ <dt><span class="section"><a href="setupBootloader.html">Opțiunile principale ale încărcătorului de sistem</a></span></dt> <dd> <dl> - <dt><span class="section"><a href="setupBootloader.html#d5e903">Cu un sistem BIOS</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e940">Cu un sistem UEFI</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e887">Bootloader interface</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e911">Se utilizează un încărcător de sistem Mageia</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e925">Se utilizează încărcătorul de sistem existent</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e928">Using chain loading</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e942">Options</a></span></dt> </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Adăugați sau modificați o intrare din meniul de demaraj</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e955">Cu un sistem BIOS</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e972">Cu un sistem UEFI</a></span></dt> - </dl> - </dd> <dt><span class="section"><a href="misc-params.html">Rezumatul parametrilor diverși</a></span></dt> <dd> <dl> @@ -116,7 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Dezinstalare Mageia</a></span></dt> <dd> <dl> - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1210">Îndrumar</a></span></dt> + <dt><span class="section"><a href="uninstall-Mageia.html#d5e1248">Îndrumar</a></span></dt> </dl> </dd> </dl> diff --git a/ro/misc-params.html b/ro/misc-params.html index 533ebc7..8ffc6d5 100644 --- a/ro/misc-params.html +++ b/ro/misc-params.html @@ -29,28 +29,6 @@ - - - - - - - - - - - - - - - - - - - - - - <p><a name="misc-params-pa1"></a>DrakX a făcut alegeri inteligente pentru configurația sistemului în funcție de opțiunile pe care le-ați ales și de componentele materiale detectate. Puteți verifica parametrii aici, iar dacă doriți îi puteți @@ -58,6 +36,44 @@ </p> + <div class="note" title="Notă" 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="[Notă]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>As a general rule, default settings are recommended and you can keep them + with 3 exceptions: + </p> + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p>there are known issues with a default setting</p> + + </li> + <li class="listitem"> + + <p>the default setting has already been tried and it fails</p> + + </li> + <li class="listitem"> + + <p>something else is said in the detailed sections below</p> + + </li> + </ul> + </div> + + </td> + </tr> + </table> + </div> + + <div class="section" title="Parametri sistem"> <div class="titlepage"> <div> @@ -99,7 +115,7 @@ </p> - <p><a name="misc-params-system-pa4b"></a>Nu schimbați nimic dacă nu știți cum să configurați Grub și/sau Lilo + <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2 </p> @@ -165,6 +181,25 @@ <p><a name="misc-params-hardware-pa1a"></a>Aici puteți configura sau schimba dispunerea tastaturii, care va depinde de locația voastră, de limbă și de tipul tastaturii. </p> + + + <div class="note" title="Notă" 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="[Notă]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>If you notice a wrong keyboard layout and want to change it, keep in mind + that your passwords are going to change too. + </p> + + </td> + </tr> + </table> + </div> </li> <li class="listitem"> @@ -183,7 +218,7 @@ <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Placă de sunet</span>: </p> - + <p><a name="misc-params-hardware-pa3a"></a>Instalatorul utilizează pilotul implicit, dacă există. Opțiunea pentru a selecționa un alt pilot este propusă numai cînd există mai mulți piloți pentru acestă placă, însă nici unul dintre ei nu este cel implicit. @@ -322,8 +357,9 @@ </p> - <p><a name="misc-params-security-pa2b"></a>Selectați serviciile care doriți să aibă acces la sistem. Selecțiile vor - depinde de modul în care utilizați calculatorul. + <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your + selections will depend on what you use your computer for. For more + information, see <a class="xref" href="">???</a>. </p> diff --git a/ro/selectCountry.html b/ro/selectCountry.html index 0a1055e..5f24095 100644 --- a/ro/selectCountry.html +++ b/ro/selectCountry.html @@ -22,30 +22,24 @@ </div> </div> </div> + + + - - - - - - - - - - <p><a name="selectCountry-pa1"></a>Selectați țara sau regiunea. Acest lucru este important pentru multe tipuri - de parametri, precum moneda locală și domeniul de reglementare - radio. Alegerea greșită a țării poate conduce la incapacitatea de a utiliza - rețelele fără fir. + + <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, + like the currency and wireless regulatory domain. Setting the wrong country + can lead to not being able to use a Wireless network. </p> - + <p><a name="selectCountry-pa2"></a>Dacă țara dorită nu este în listă, faceți clic pe butonul <span class="guilabel">Alte țări</span> și alegeți de acolo țara / regiunea. </p> - + <div class="note" title="Notă" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -54,19 +48,19 @@ </tr> <tr> <td align="left" valign="top"> - + <p><a name="selectCountry-pa3"></a>Dacă țara dorită se află doar în lista <span class="guilabel">Alte țări</span>, după ce faceți clic pe <span class="guibutton">OK</span> poate apărea că o țară din prima listă a fost aleasă. Ignorați acest lucru, DrakX va continua cu alegerea pe care ați făcut-o. </p> - + </td> </tr> </table> </div> - + <div class="section" title="Metodă de intrare"> <div class="titlepage"> <div> @@ -76,22 +70,19 @@ </div> </div> </div> + - - - - <p><a name="selectCountry-pa4"></a>În ecranul <span class="guilabel">Alte țări</span> puteți selecta și metoda de - intrare (la baza listei). Metodele de intrare permit utilizatorilor să scrie - cu caractere multilingve (chineză, japoneză, coreeană, etc.). IBus este - metoda de intrare implicită pe DVD-urile Mageia și pe Live CD-urile - Africa/India și Asia/no-India. Pentru localele asiatice și africane, IBus va - fi definit drept metoda de intrare implicită, așa că utilizatorii nu vor mai - trebui s-o configureze manual. Celelalte metode de intrare (SCIM, GCIN, - HIME, etc.) care oferă funcții similare pot fi instalate dacă ați adăugat - mediile HTTP/FTP înainte de selecția pachetelor. + + <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an + input method (at the bottom of the list). Input methods allow users to input + multilingual characters (Chinese, Japanese, Korean, etc). IBus is the + default input method, so users should not need to configure it + manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar + functions and can be installed if you added HTTP/FTP media before package + selection. </p> - + <div class="note" title="Notă" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -100,19 +91,19 @@ </tr> <tr> <td align="left" valign="top"> - - <p><a name="selectCountry-pa5"></a>Dacă ați omis configurarea metodei de intrare în timpul instalării, o puteți - accesa după redemararea sistemului instalat via „Configurați calculatorul” - -> „Sistem” sau executînd localedrake ca root. - </p> + <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it + after you boot your installed system via "Configure your Computer" -> + "System", or by running localedrake as root. + </p> + </td> </tr> </table> </div> - + </div> - + </div> </body> </html> diff --git a/ro/setupBootloader.html b/ro/setupBootloader.html index 10ac7fb..cc23506 100644 --- a/ro/setupBootloader.html +++ b/ro/setupBootloader.html @@ -29,13 +29,11 @@ - - - <div class="section" title="Cu un sistem BIOS"> + <div class="section" title="Bootloader interface"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e903"></a>Cu un sistem BIOS + <h3 class="title"><a name="d5e887"></a>Bootloader interface </h3> </div> </div> @@ -43,15 +41,23 @@ - <p><a name="setupBootloader-pa1"></a>Dacă preferați alți parametri pentru încărcătorul de sistem în locul celor - aleși automatic de instalator, în acest caz îi puteți schimba aici. - </p> + <p>By default, Mageia uses exclusively:</p> - <p><a name="setupBootloader-pa2"></a>Dacă aveți deja instalat un alt sistem de operare pe calculator, în acest - caz trebuie să vă decideți ori să adăugați Mageia la încărcătorul de sistem - existent, ori să lăsați Mageia să creeze unul nou. - </p> + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p> + + </li> + <li class="listitem"> + + <p>Grub2-efi for a UEFI system.</p> + + </li> + </ul> + </div> <div class="tip" title="Indicație" style="margin-left: 0.5in; margin-right: 0.5in;"> @@ -63,7 +69,7 @@ <tr> <td align="left" valign="top"> - <p>Meniurile grafice Mageia sînt frumoase:</p> + <p>The Mageia graphical menus are nice :)</p> </td> </tr> @@ -71,11 +77,11 @@ </div> - <div class="section" title="Se utilizează un încărcător de sistem Mageia"> + <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="usingMageiaBootloader"></a>Se utilizează un încărcător de sistem Mageia + <h4 class="title"><a name="d5e897"></a>Grub2 on Legacy/MBR and Legacy/GPT systems </h4> </div> </div> @@ -83,50 +89,18 @@ - <p><a name="setupBootloader-pa4"></a>Implicit Mageia scrie un nou încărcător de sistem GRUB (învechit) pe MBR - („Master Boot Record”, sectorul principal de demaraj) de pe primul disc - dur. Dacă aveți deja instalate și alte sisteme de operare, Mageia va încerca - să le adauge în noul meniu de demaraj. - </p> - - - <p>De asemenea, Mageia propune GRUB2 ca încărcător de sistem opțional în plus - de GRUB (învechit) și Lilo. - </p> - <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Avertisment]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa6"></a>Sistemele Linux care utilizează GRUB2 ca încărcător de sistem nu sînt - suportate în momentul de față de GRUB (învechit) și nu vor fi recunoscute - dacă este utilizat încărcătorul de sistem GRUB implicit. - </p> - - - <p>Cea mai bună soluție aici este să utilizați încărcătorul de sistem GRUB2 - care este disponibil în pagina rezumat din cursul instalării. - </p> - - </td> - </tr> - </table> - </div> + <p>Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți.</p> </div> - <div class="section" title="Se utilizează încărcătorul de sistem existent"> + <div class="section" title="Grub2-efi on UEFI systems"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="usingExistingBootloader"></a>Se utilizează încărcătorul de sistem existent + <h4 class="title"><a name="d5e903"></a>Grub2-efi on UEFI systems </h4> </div> </div> @@ -134,85 +108,100 @@ - <p><a name="setupBootloader-pa46"></a>Dacă ați decis să utilizați un încărcător de sistem existent, atunci va - trebui să nu uitați să VĂ OPRIȚI la pagina rezumat din cursul instalării și - să faceți clic pe butonul <span class="guibutton">Configurează</span> de lîngă - încărcătorul de sistem pentru a schimba locația de instalare a - încărcătorului de sistem. + <p>With an UEFI system, the user interface is slightly different as you cannot + choose between with or without graphical menu </p> - <p><a name="setupBootloader-pa47"></a>Nu selectați dispozitivul intitulat spre exemplu „sda”, că veți suprascrie - sectorul principal de demaraj (MBR) existent. Trebuie să selectați partiția - rădăcină (/) pe care ați ales-o în etapa de partiționare precedentă (de - exemplu: sda7). - </p> - <p><a name="setupBootloader-pa48"></a>Ca să fie clar: sda este un dispozitiv, iar sda7 este o partiție de pe acel - dispozitiv. + <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> - <div class="tip" title="Indicație" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Tip"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Indicație]" src="tip.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa48a"></a>Treceți în terminalul tty2 cu Ctrl+Alt+F2 și tastați <code class="literal">df</code> - ca să verificați unde se află partiția <code class="literal">/</code> - (rădăcină). Ctrl+Alt+F7 vă readuce în ecranul instalatorului. - </p> - - </td> - </tr> - </table> - </div> - - - <p><a name="setupBootloader-pa49"></a>Procedura exactă pentru adăugarea sistemului Mageia la un încărcător de - sistem existent depășește scopul acestui ajutor. Totuși, în majoritatea - cazurilor, acest lucru implică lansarea programului de instalare al acelui - încărcător de sistem, care ar trebui să detecteze și să adauge automat noul - sistem Mageia. Consultați documentația sistemului de operare în chestiune. - </p> + <p>Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți.</p> </div> + + </div> + + + <div class="section" title="Se utilizează un încărcător de sistem Mageia"> + <div class="titlepage"> + <div> + <div> + <h3 class="title"><a name="d5e911"></a>Se utilizează un încărcător de sistem Mageia + </h3> + </div> + </div> + </div> + - <div class="section" title="Opțiunile avansate ale încărcătorului de sistem"> - <div class="titlepage"> + <p>By default, according to your system, Mageia writes a new:</p> + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard + drive or in the BIOS boot partition. + </p> + + </li> + <li class="listitem"> + + <p>Grub2-efi bootloader into the ESP</p> + + </li> + </ul> + </div> + + + <p>If you already have other operating systems installed, Mageia attempts to + add them to your new Mageia boot menu. If you don't want this behaviour, + click on <span class="guibutton">Next</span> and then uncheck the box + <span class="guilabel">Probe Foreign OS</span></p> + + + + </div> + + + <div class="section" title="Se utilizează încărcătorul de sistem existent"> + <div class="titlepage"> + <div> <div> - <div> - <h4 class="title"><a name="advancedOptionBootloader"></a>Opțiunile avansate ale încărcătorului de sistem - </h4> - </div> + <h3 class="title"><a name="d5e925"></a>Se utilizează încărcătorul de sistem existent + </h3> </div> </div> - - - - <p><a name="setupBootloader-pa52"></a>Dacă dispuneți de un spațiu limitat pe partiția <code class="literal">/</code>, iar - aceasta conține <code class="literal">/tmp</code>, faceți clic pe - <span class="guibutton">Avansat</span> și bifați căsuța <span class="guilabel">Curăță /tmp la - fiecare pornire</span>. Acest lucru vă ajută să mențineți ceva spațiu - liber. - </p> - </div> + + + + <p>Procedura exactă pentru adăugarea sistemului Mageia la un încărcător de + sistem existent depășește scopul acestui ajutor. Totuși, în majoritatea + cazurilor, acest lucru implică lansarea programului de instalare al acelui + încărcător de sistem, care ar trebui să detecteze și să adauge automat noul + sistem Mageia. Consultați documentația sistemului de operare în chestiune. + </p> </div> - <div class="section" title="Cu un sistem UEFI"> + <div class="section" title="Using chain loading"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e940"></a>Cu un sistem UEFI + <h3 class="title"><a name="d5e928"></a>Using chain loading </h3> </div> </div> @@ -220,25 +209,190 @@ - <p>Pe un sistem UEFI interfața utilizator este un pic diferită deoarece nu - puteți alege încărcătorul de sistem din moment ce numai Grub2-efi este - disponibil. + <p>If you don't want a bootable Mageia, but to chain load it from another OS, + 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>. </p> - <p>Dacă Mageia este primul sistem instalat pe calculator, instalatorul a creat - o ESP (Partiție de Sistem EFI) pentru a găzdui încărcătorul de sistem - (Grub2-efi). Dacă se afla dinainte și un alt sistem de operare UEFI instalat - pe calculator (Windows 8 de exemplu), instalatorul Mageia a detectat - partiția ESP creată de Windows și a adăugat Grub2-efi. Este totuși posibil - să aveți mai multe partiții ESP, însă una este suficientă indiferent de cît - de multe sisteme de operare aveți instalate pe calculator. + <p>You will get a warning that the bootloader is missing, ignore it by clicking + <span class="guibutton">OK</span>. </p> - <p>Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți.</p> + + </div> + + + <div class="section" title="Options"> + <div class="titlepage"> + <div> + <div> + <h3 class="title"><a name="d5e942"></a>Options + </h3> + </div> + </div> + </div> + + + + <div class="section" title="First page"> + <div class="titlepage"> + <div> + <div> + <h4 class="title"><a name="d5e944"></a>First page + </h4> + </div> + </div> + </div> + + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p><span class="guilabel">Delay before booting the default image</span>: This text box + lets you set a delay in seconds before the default operating system is + started up. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Security</span>: This allows you to set a password for the + 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> + <li class="listitem"> + + <p><span class="guilabel">Password</span>: This text box is where you actually put the + password + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will + check that it matches with the one set above. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Advanced</span></p> + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <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 + 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). + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric + multiprocessing for multi core processors. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the + operating system access to the Advanced Programmable Interrupt + Controller. APIC devices permit more complex priority models, and Advanced + IRQ (Interrupt Request) management. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which + manages all external interrupts for a specific processor in an SMP system. + </p> + + </li> + </ul> + </div> + + </li> + </ul> + </div> + + </div> + + + <div class="section" title="Next page"> + <div class="titlepage"> + <div> + <div> + <h4 class="title"><a name="d5e976"></a>Next page + </h4> + </div> + </div> + </div> + + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p><span class="guilabel">Default:</span> Operating system started up by default + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Append:</span> This option lets you pass the kernel + information or tell the kernel to give you more information as it boots. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Advanced</span></p> + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth + the boot menu will use. If you click the down triangle you will be offered + other size and colour depth options. + </p> + + </li> + <li class="listitem"> + + <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p> + + </li> + </ul> + </div> + + </li> + </ul> + </div> + + </div> </div> diff --git a/ro/setupBootloaderAddEntry.html b/ro/setupBootloaderAddEntry.html index 4fdafb3..a65c389 100644 --- a/ro/setupBootloaderAddEntry.html +++ b/ro/setupBootloaderAddEntry.html @@ -27,113 +27,25 @@ + <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the + software grub-customizer instead (Available in the Mageia repositories). + </p> - <div class="section" title="Cu un sistem BIOS"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e955"></a>Cu un sistem BIOS - </h3> - </div> - </div> - </div> - - - - <p>Puteți adăuga o intrare sau modifica una după ce ați selectat-o, apăsînd pe - butonul corespunzător din ecranul <span class="emphasis"><em>Configurare încărcător de - sistem</em></span> și editînd intrările din fereastra care se afișează în - acel moment. - </p> - - - <div class="note" title="Notă" 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="[Notă]" src="note.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Dacă ați ales <code class="code">Grub 2</code> ca încărcător de sistem nu puteți utiliza - această unealtă pentru a edita intrările în această etapă, apăsați - „Înainte”. Va trebui să editați manual <code class="code">/boot/grub2/custom.cfg</code> - sau să utilizați <code class="code">grub-customizer</code>. - </p> - - </td> - </tr> - </table> - </div> - - - - - <p>Schimbarea numelui unei intrări și bifarea căsuței pentru a o defini ca - intrare implicită sînt acțiuni care nu comportă nici un risc. - </p> - - - <p>Puteți adăuga propriul vostru număr de versiune pentru o intrare, sau o - puteți redenumi în întregime. - </p> - - - <p>Intrarea implicită este cea pe care sistemul o va demara dacă nu faceți nici - o alegere la pornire. - </p> - - - <div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Avertisment]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Editarea altor lucruri vă poate conduce la un sistem nedemarabil. Nu - încercați să testați ceva dacă nu știți ce faceți. - </p> - - </td> - </tr> - </table> - </div> - - </div> - - - <div class="section" title="Cu un sistem UEFI"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e972"></a>Cu un sistem UEFI - </h3> - </div> - </div> - </div> - - - - <p>În acest caz utilizați Grub2-efi și nu puteți utiliza această unealtă pentru - a edita intrările în această etapă. Pentru a face acest lucru va trebui să - editați manual <code class="code">/boot/grub2/custom.cfg</code> sau mai bine utilizați - <code class="code">grub-customizer</code>. Tot ce puteți face aici este să alegeți - intrarea implicită din lista derulantă. - </p> - - - <p>După ce apăsați pe butonul <span class="guibutton">Înainte</span> o altă listă - derulantă vă permite să alegeți rezoluția video pentru Grub2 care este un - încărcător grafic de sistem. - </p> - - - + <div class="note" title="Notă" 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="[Notă]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p> + + </td> + </tr> + </table> </div> </div> diff --git a/ro/soundConfig.html b/ro/soundConfig.html index 0874099..75b522d 100644 --- a/ro/soundConfig.html +++ b/ro/soundConfig.html @@ -22,7 +22,6 @@ </div> </div> </div> - @@ -32,8 +31,8 @@ <p>Acest ecran afișează numele pilotului pe care instalatorul l-a ales pentru placa de sunet, care va fi cel implicit dacă există unul. - </p> + <p>Pilotul implicit ar trebui să funcționeze fără probleme. Totuși, dacă întîlniți probleme după instalare, atunci executați @@ -41,13 +40,12 @@ Control Center), alegînd categoria <span class="guilabel">Componente materiale</span> și faceți clic pe <span class="guilabel">Configurare sunet</span> în partea din dreapta sus a ecranului. - </p> + <p>Apoi, în draksound sau ecranul uneltei de „Configurarea sunetului”, apăsați pe <span class="guibutton">Avansat</span> și apoi pe <span class="guibutton">Depanare</span> pentru a găsi sfaturi utile despre cum să rezolvați problema. - </p> @@ -66,15 +64,12 @@ <p>Apăsarea pe <span class="guibutton">Avansat</span> în acest ecran, în cursul instalării, este utilă dacă nu există un pilot implicit dar sînt cîțiva disponibili și credeți că instalatorul l-a selecționat pe cel greșit. - </p> <p>În acel caz puteți selecta un pilot diferit după ce faceți clic pe <span class="guibutton">Alegerea unui pilot</span>. - </p> - </div> diff --git a/ro/uninstall-Mageia.html b/ro/uninstall-Mageia.html index 0801449..63456ee 100644 --- a/ro/uninstall-Mageia.html +++ b/ro/uninstall-Mageia.html @@ -31,7 +31,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e1210"></a>Îndrumar + <h3 class="title"><a name="d5e1248"></a>Îndrumar </h3> </div> </div> diff --git a/sl/Select-and-use-ISOs.html b/sl/Select-and-use-ISOs.html index ce19d2e..742e2c7 100644 --- a/sl/Select-and-use-ISOs.html +++ b/sl/Select-and-use-ISOs.html @@ -23,9 +23,7 @@ </div> </div> - - <div class="section" title="Predstavitev"> <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="Vir"> <div class="titlepage"> @@ -85,7 +78,6 @@ </div> </div> - <div class="section" title="Definicija"> <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>Najdete jih <a class="ulink" href="http://www.mageia.org/sl/downloads/" target="_top">tukaj</a>. </p> </div> - <div class="section" title="Mediji za klasično namestitev"> <div class="titlepage"> @@ -121,7 +110,6 @@ </div> </div> - <div class="section" title="Skupne značilnosti"> <div class="titlepage"> @@ -133,7 +121,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -151,7 +138,6 @@ </div> </div> - <div class="section" title="DVD"> <div class="titlepage"> @@ -163,13 +149,12 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <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"> @@ -195,7 +180,6 @@ </div> </div> - <div class="section" title="Live media"> <div class="titlepage"> @@ -207,7 +191,6 @@ </div> </div> - <div class="section" title="Skupne značilnosti"> <div class="titlepage"> @@ -219,7 +202,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -256,7 +238,6 @@ </div> </div> - <div class="section" title="Live DVD Plasma"> <div class="titlepage"> @@ -268,7 +249,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -291,7 +271,6 @@ </div> </div> - <div class="section" title="Live DVD GNOME"> <div class="titlepage"> @@ -303,7 +282,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -326,7 +304,6 @@ </div> </div> - <div class="section" title="Live DVD Xfce"> <div class="titlepage"> @@ -338,7 +315,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -363,7 +339,6 @@ </div> </div> - <div class="section" title="Boot-only CD media"> <div class="titlepage"> @@ -375,7 +350,6 @@ </div> </div> - <div class="section" title="Skupne značilnosti"> <div class="titlepage"> @@ -387,7 +361,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -423,7 +396,6 @@ </div> </div> - <div class="section" title="netinstall.iso"> <div class="titlepage"> @@ -435,7 +407,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -450,7 +421,6 @@ </div> </div> - <div class="section" title="netinstall-nonfree.iso"> <div class="titlepage"> @@ -462,7 +432,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -481,7 +450,6 @@ </div> </div> - <div class="section" title="Downloading and Checking Media"> <div class="titlepage"> @@ -493,7 +461,6 @@ </div> </div> - <div class="section" title="Prejemanje"> <div class="titlepage"> @@ -505,29 +472,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="Checking the downloaded media integrity"> <div class="titlepage"> @@ -539,42 +500,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>Open a console, no need to be root, and:</p> - <p>- To use md5sum, type: [sam@localhost]$ <strong class="userinput"><code>md5sum path/to/the/image/file.iso</code></strong>. </p> - <p>- To use sha1sum, type: [sam@localhost]$ <strong class="userinput"><code>sha1sum path/to/the/image/file.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="Burn or dump the ISO"> <div class="titlepage"> @@ -586,13 +540,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="Burning the ISO to a CD/DVD"> <div class="titlepage"> @@ -604,7 +556,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 @@ -613,7 +564,6 @@ </p> </div> - <div class="section" title="Odlaganje odtisa nosilca za namestitev na ključek USB"> <div class="titlepage"> @@ -625,12 +575,10 @@ </div> </div> - <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> - <div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -650,12 +598,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"> @@ -667,12 +613,10 @@ </div> </div> - <p>Uporabite lahko orodje z grafičnim vmesnikom kot je <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"> @@ -684,21 +628,17 @@ </div> </div> - <p>Lahko poskusite:</p> - <p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=sl" target="_top">Rufus</a> z uporabo možnosti "ISO image" "ISO slika" ; </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"> @@ -710,7 +650,6 @@ </div> </div> - <div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -729,10 +668,8 @@ </tr> </table> </div> - <p>You can also use the dd tool in a console:</p> - <div class="orderedlist"> <ol class="orderedlist" type="1"> @@ -746,13 +683,12 @@ <p>Become root with the command <strong class="userinput"><code>su -</code></strong> (don't forget the 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> @@ -760,15 +696,12 @@ <li class="listitem"> <p>Enter the command <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 @@ -799,10 +732,8 @@ <p>Enter the command: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX 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> diff --git a/sl/acceptLicense.html b/sl/acceptLicense.html index 1adaadf..eba7072 100644 --- a/sl/acceptLicense.html +++ b/sl/acceptLicense.html @@ -99,9 +99,9 @@ - <p>Important information are given about this release of - <span class="application">Mageia</span> and are accessible clicking on the - <span class="guibutton">Release Notes</span> button. + <p>Za to izdajo distribucije <span class="application">Mageia</span> so na voljo + pomembne informacije, dosegljive s klikom na gumb <span class="guibutton">Opombe ob + izdaji</span>. </p> </div> diff --git a/sl/addUser.html b/sl/addUser.html index 3f07c73..8abcb79 100644 --- a/sl/addUser.html +++ b/sl/addUser.html @@ -23,11 +23,8 @@ </div> </div> - - - <div class="section" title="Nastavite geslo skrbnika (uporabnika root):"> <div class="titlepage"> @@ -39,18 +36,14 @@ </div> </div> - - <p>It is advisable for all <span class="application">Mageia</span> installations to - set a superuser or administrator's password, usually called the - <span class="emphasis"><em>root password</em></span> in Linux. As you type a password into the - top box the colour of its shield will change from red to yellow to green - depending on the strength of the password. A green shield shows you are - using a strong password. You need to repeat the same password in the box - just below the first password box, this checks that you have not mistyped - the first password by comparing them. + <p>V vseh namestitvah <span class="application">Mageje</span> je priporočljivo + nastaviti geslo skrbnika, v Linux-u znan kot <span class="emphasis"><em>geslo root + uporabnika</em></span>. Med tipkanjem gesla v polje se bo barva ščita + spremenila glede na moč gesla od rdeče do rumene in pri močnem geslu + zelene. Zaradi preverjanja pravilnosti vnosa morate geslo ponoviti v polju + niže. </p> - <div class="note" title="Opomba" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -61,8 +54,8 @@ <tr> <td align="left" valign="top"> - <p>All passwords are case sensitive, it is best to use a mixture of letters - (upper and lower case), numbers and other characters in a password. + <p>Vsa gesla so občutljiva na velikost črk. Najbolje je v njem uporabiti + mešanico velikih ter malih črk, številk in posebnih znakov. </p> </td> @@ -71,7 +64,6 @@ </div> </div> - <div class="section" title="Dodajte uporabnika"> <div class="titlepage"> @@ -83,56 +75,51 @@ </div> </div> - - <p>Add a user here. A user has fewer rights than the superuser (root), but - enough to surf the internet, use office applications or play games and - anything else the average user does with his computer + <p>Tukaj dodajte uporabnika. Imel bo manj pravic kot skrbnik (root), a dovolj + za uporabo spleta, pisarniških programov, igranje iger in vse ostalo kar + običajni uporabnik počne z računalnikom. </p> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p><span class="guibutton">Icon</span>: if you click on this button it will change the - users icon. + <p><span class="guibutton">Ikona</span>: s klikom na ta gumb je možno spremeniti ikono + oz. sliko uporabnika. </p> </li> <li class="listitem"> - <p><span class="guilabel">Real Name</span>: Insert the users real name into this text - box. + <p><span class="guilabel">Pravo ime</span>: tukaj vnesite pravo ime uporabnika. </p> </li> <li class="listitem"> - <p><span class="guilabel">Login Name</span>: Here you enter the user login name or let - drakx use a version of the users real name. <span class="emphasis"><em>The login name is case - sensitive.</em></span></p> + <p><span class="guilabel">Prijavno ime</span>: Tukaj vnesete prijavno ime uporabnika ali + pustite programu drakx uporabiti verzijo pravega imena + uporabnika. <span class="emphasis"><em>Prijavno ime razlikuje med velikostjo črk.</em></span></p> </li> <li class="listitem"> - <p><span class="guilabel">Password</span>: In this text box you should type in the user - password. There is a shield at the end of the text box that indicates the - strength of the password. (See also <a class="xref" href="addUser.html#givePassword" title="Opomba">Opomba</a>) + <p><span class="guilabel">Geslo</span>: Tukaj vnesite uporabniško geslo. Med tipkanjem + gesla v polje se bo barva ščita desno spremenila glede na moč gesla od rdeče + do rumene in pri močnem geslu zelene. (Glejte tudi <a class="xref" href="addUser.html#givePassword" title="Opomba">Opomba</a>) </p> </li> <li class="listitem"> - <p><span class="guilabel">Password (again)</span>: Retype the user password into this - text box and drakx will check you have the same password in each of the user - password text boxes. + <p><span class="guilabel">Geslo (ponovno)</span>: Program drakx preverja pravilnost + vnosa, zato morate vnos gesla ponoviti. </p> </li> </ul> </div> - <div class="note" title="Opomba" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -143,16 +130,14 @@ <tr> <td align="left" valign="top"> - <p>Any user you add while installing Mageia, will have a both read and write - protected home directory (umask=0027). + <p>Vsak uporabnik, dodan med namestitvijo Mageje, bo imel domačo mapo zaščiteno + tako pred branjem kot tudi pisanjem (umask=0027) </p> - - <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>Več uporabnikov je med namestitvijo možno dodati v koraku + <span class="emphasis"><em>Nastavitve - povzetek</em></span>. Izberite <span class="emphasis"><em>Upravljanje + uporabnikov</em></span>. </p> - <p>Dovoljenje dostopa lahko spremenite tudi po namestitvi</p> @@ -162,7 +147,6 @@ </div> </div> - <div class="section" title="Napredno upravljanje z uporabniki"> <div class="titlepage"> @@ -174,15 +158,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>S klikom na gumb <span class="guibutton">Napredno</span> lahko urejate nastavitev za + tega dodanega uporabnika. </p> - <p>Dodatno lahko onemogočite ali omogočite prijavo gosta.</p> - <div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -202,7 +183,6 @@ </tr> </table> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> diff --git a/sl/add_supplemental_media.html b/sl/add_supplemental_media.html index 5cc9102..d6c2728 100644 --- a/sl/add_supplemental_media.html +++ b/sl/add_supplemental_media.html @@ -31,30 +31,29 @@ - <p>This screen gives you the list of already recognized repositories. You can - add other sources for packages, like an optical disc or a remote source. The - source selection determines which packages will be available for selection - during the next steps. + <p>Ta zaslon ponuja seznam že prepoznanih odlagališč paketov. Lahko dodate še + kak drug vir, recimo DVD ali kak oddaljen vir. Ta izbor bo določil kateri + paketi bodo na voljo v naslednjih korakih. </p> - <p>For a network source, there are two steps to follow:</p> + <p>Za omrežni vir je potrebno slediti dvema korakoma:</p> <div class="orderedlist"> <ol class="orderedlist" type="1"> <li class="listitem"> - <p>Choosing and activation of the network, if not already up. </p> + <p>Izbor in po potrebi aktiviranje omrežja. </p> </li> <li class="listitem"> - <p>Selecting a mirror or specifying a URL (very first entry). By selecting a - mirror, you have access to the selection of all repositories managed by - Mageia, like the Nonfree , the Tainted repositories and the Updates. With - the URL, you can designate a specific repository or your own NFS - installation. + <p>Izbor zrcala ali določanje URL-ja (čisto prvi vnos). Z izborom zrcala + pridobite dostop do vseh skladišč, ki jih upravlja skupnost Mageia, Npr. z + lastniško programsko opremo (Nonfree) ali Patentno zaščiteni (Tainted) in + seveda posodobitve. Z določanjem URL-ja lahko določite specifično skladišče + ali vašo lastno namestitev NFS. </p> </li> @@ -71,12 +70,11 @@ <tr> <td align="left" valign="top"> - <p>If you are updating a 64 bit installation which may contain some 32 bit - packages, it is advised to use this screen to add an online mirror by - ticking one of the Network protocols here. The 64 bit DVD iso only contains - 64 bit and noarch packages, it will not be able to update the 32 bit - packages. However, after adding an online mirror, installer will find the - needed 32 bit packages there. + <p>Za posodobitev 64-bitne namestitve, ki lahko vsebuje nekaj 32-bitnih paketov + je priporočljivo tukaj dodati aktivno zrcalo z označenjem enega od omrežnih + protokolov. To je potrebno, ker 64-bitna slika odtisa diska ne vsebuje + 32-bitnih paketov, zato jih brez aktivnega zrcala namestitev ne more + posodobiti. </p> </td> diff --git a/sl/doPartitionDisks.html b/sl/doPartitionDisks.html index bb2fb28..03b2daf 100644 --- a/sl/doPartitionDisks.html +++ b/sl/doPartitionDisks.html @@ -42,8 +42,6 @@ - - <p><a name="doPartitionDisks-pa3"></a></p> <div class="itemizedlist"> <ul class="itemizedlist"> @@ -102,8 +100,6 @@ </p> - - </li> </ul> @@ -243,8 +239,6 @@ - - </td> </tr> diff --git a/sl/index.html b/sl/index.html index a71e513..64411ff 100644 --- a/sl/index.html +++ b/sl/index.html @@ -75,11 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Glavne možnosti zagonskega nalagalnika</a></span></dt> <dd> <dl> - <dt><span class="section"><a href="setupBootloader.html#d5e900">Bootloader interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e930">Using a Mageia bootloader</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e947">Using an existing bootloader</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">Možnosti</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e910">Using a Mageia bootloader</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e924">Using an existing bootloader</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">Možnosti</a></span></dt> </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt> @@ -113,7 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Odstrani Magejo</a></span></dt> <dd> <dl> - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1273">Howto</a></span></dt> + <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Howto</a></span></dt> </dl> </dd> </dl> diff --git a/sl/setupBootloader.html b/sl/setupBootloader.html index e37442d..0c074a6 100644 --- a/sl/setupBootloader.html +++ b/sl/setupBootloader.html @@ -33,7 +33,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e900"></a>Bootloader interface + <h3 class="title"><a name="d5e886"></a>Bootloader interface </h3> </div> </div> @@ -81,7 +81,7 @@ <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e910"></a>Grub2 on Legacy/MBR and Legacy/GPT systems + <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems </h4> </div> </div> @@ -91,9 +91,7 @@ - - - <p>Don't modify the "Boot Device" unless really knowing what you do.</p> + <p>Don't modify the "Boot Device" unless you really know what you are doing.</p> </div> @@ -102,7 +100,7 @@ <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e919"></a>Grub2-efi on UEFI systems + <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems </h4> </div> </div> @@ -117,19 +115,17 @@ - - - <p>If Mageia is the first system installed on your computer, the installer + <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 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. + (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 really knowing what you do.</p> + <p>Don't modify the "Boot Device" unless you really know what you are doing.</p> </div> @@ -140,7 +136,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e930"></a>Using a Mageia bootloader + <h3 class="title"><a name="d5e910"></a>Using a Mageia bootloader </h3> </div> </div> @@ -175,8 +171,6 @@ <span class="guilabel">Probe Foreign OS</span></p> - - </div> @@ -185,7 +179,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e947"></a>Using an existing bootloader + <h3 class="title"><a name="d5e924"></a>Using an existing bootloader </h3> </div> </div> @@ -203,11 +197,11 @@ </div> - <div class="section" title="Using the chain loading"> + <div class="section" title="Using chain loading"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e950"></a>Using the chain loading + <h3 class="title"><a name="d5e927"></a>Using chain loading </h3> </div> </div> @@ -215,7 +209,7 @@ - <p>If you don't want a bootable Mageia, but chain load it from another OS, + <p>If you don't want a bootable Mageia, but to chain load it from another OS, 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 +218,8 @@ - - - <p>You will get a warning that the bootloader will lack, ignore it by a click - on <span class="guibutton">OK</span>. + <p>You will get a warning that the bootloader is missing, ignore it by clicking + <span class="guibutton">OK</span>. </p> @@ -239,7 +231,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e967"></a>Možnosti + <h3 class="title"><a name="d5e941"></a>Možnosti </h3> </div> </div> @@ -251,7 +243,7 @@ <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e969"></a>First page + <h4 class="title"><a name="d5e943"></a>First page </h4> </div> </div> @@ -302,10 +294,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 - 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). + 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). </p> </li> @@ -328,7 +320,7 @@ <li class="listitem"> <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which - manage all external interrupts for some specific processor in an SMP system. + manages all external interrupts for a specific processor in an SMP system. </p> </li> @@ -346,7 +338,7 @@ <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e1001"></a>Next page + <h4 class="title"><a name="d5e975"></a>Next page </h4> </div> </div> diff --git a/sl/uninstall-Mageia.html b/sl/uninstall-Mageia.html index ad26c14..21abc94 100644 --- a/sl/uninstall-Mageia.html +++ b/sl/uninstall-Mageia.html @@ -31,7 +31,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e1273"></a>Howto + <h3 class="title"><a name="d5e1247"></a>Howto </h3> </div> </div> diff --git a/sq/Select-and-use-ISOs.html b/sq/Select-and-use-ISOs.html index 84ff89f..5cfda8d 100644 --- a/sq/Select-and-use-ISOs.html +++ b/sq/Select-and-use-ISOs.html @@ -23,9 +23,7 @@ </div> </div> - - <div class="section" title="Paraqitje"> <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="Media"> <div class="titlepage"> @@ -85,7 +78,6 @@ </div> </div> - <div class="section" title="Përcaktim"> <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>Ju mund ti gjeni <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">këtu</a>. </p> </div> - <div class="section" title="Classical installation media"> <div class="titlepage"> @@ -121,7 +110,6 @@ </div> </div> - <div class="section" title="Common features"> <div class="titlepage"> @@ -133,7 +121,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -149,29 +136,9 @@ </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>Different media for architecture 32 or 64 bits.</p> + <p>Different media for 32 or 64 bit architectures.</p> </li> <li class="listitem"> @@ -195,77 +162,30 @@ </div> </div> - - - <div class="section" title="DVD dual arch"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e56"></a>DVD dual arch - </h5> - </div> - </div> - </div> - - - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <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>Uses Xfce desktop only.</p> - - </li> - <li class="listitem"> - - <p>Jo të gjitha gjuhët janë në dispozicion. (be, bg, ca, de, en, es, fr, it, - mk, pl, pt, ru, sv, uk) TË KONTROLLOHEN! - </p> - - </li> - <li class="listitem"> - - <p>përmban programe jo të lirë.</p> - - </li> - </ul> - </div> - - </div> </div> - <div class="section" title="Live media"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e67"></a>Live media + <h4 class="title"><a name="d5e53"></a>Live media </h4> </div> </div> </div> - <div class="section" title="Common features"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e69"></a>Common features + <h5 class="title"><a name="d5e55"></a>Common features </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -278,7 +198,7 @@ </li> <li class="listitem"> - <p>Each ISO contains only one desktop environment (KDE or GNOME).</p> + <p>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</p> </li> <li class="listitem"> @@ -302,54 +222,50 @@ </div> </div> - - <div class="section" title="Live CD KDE"> + <div class="section" title="Live DVD Plasma"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e83"></a>Live CD KDE + <h5 class="title"><a name="d5e69"></a>Live DVD Plasma </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p>KDE desktop environment only.</p> + <p>Plasma desktop environment only.</p> </li> <li class="listitem"> - <p>Vetëm gjuha angleze.</p> + <p>Të gjitha gjuhët janë të pranishëme.</p> </li> <li class="listitem"> - <p>32 bit vetëm.</p> + <p>64 bit architecture only.</p> </li> </ul> </div> </div> - - <div class="section" title="Live CD GNOME"> + <div class="section" title="Live DVD GNOME"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e92"></a>Live CD GNOME + <h5 class="title"><a name="d5e78"></a>Live DVD GNOME </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -360,72 +276,35 @@ </li> <li class="listitem"> - <p>Vetëm gjuha angleze.</p> - - </li> - <li class="listitem"> - - <p>32 bit vetëm.</p> - - </li> - </ul> - </div> - - </div> - - - <div class="section" title="Live DVD KDE"> - <div class="titlepage"> - <div> - <div> - <h5 class="title"><a name="d5e101"></a>Live DVD KDE - </h5> - </div> - </div> - </div> - - - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <p>KDE desktop environment only.</p> - - </li> - <li class="listitem"> - <p>Të gjitha gjuhët janë të pranishëme.</p> </li> <li class="listitem"> - <p>Different media for 32 or 64 bit architectures.</p> + <p>64 bit architecture only</p> </li> </ul> </div> </div> - - <div class="section" title="Live DVD GNOME"> + <div class="section" title="Live DVD Xfce"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e110"></a>Live DVD GNOME + <h5 class="title"><a name="d5e87"></a>Live DVD Xfce </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p>GNOME desktop environment only.</p> + <p>Xfce desktop environment only.</p> </li> <li class="listitem"> @@ -435,7 +314,7 @@ </li> <li class="listitem"> - <p>Different media for 32 or 64 bit architectures.</p> + <p>32 or 64 bit architectures.</p> </li> </ul> @@ -444,31 +323,28 @@ </div> </div> - <div class="section" title="Boot-only CD media"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e119"></a>Boot-only CD media + <h4 class="title"><a name="d5e96"></a>Boot-only CD media </h4> </div> </div> </div> - <div class="section" title="Common features"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e121"></a>Common features + <h5 class="title"><a name="d5e98"></a>Common features </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -504,25 +380,23 @@ </div> </div> - - <div class="section" title="boot.iso"> + <div class="section" title="netinstall.iso"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e132"></a>boot.iso + <h5 class="title"><a name="d5e109"></a>netinstall.iso </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - <p>Contains only free software, for those people who refuse to use non-free + <p>Contains only free software, for those people who prefer not to use non-free software. </p> @@ -531,19 +405,17 @@ </div> </div> - - <div class="section" title="boot-nonfree.iso"> + <div class="section" title="netinstall-nonfree.iso"> <div class="titlepage"> <div> <div> - <h5 class="title"><a name="d5e137"></a>boot-nonfree.iso + <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso </h5> </div> </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -562,131 +434,112 @@ </div> </div> - <div class="section" title="Downloading and Checking Media"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e142"></a>Downloading and Checking Media + <h3 class="title"><a name="d5e119"></a>Downloading and Checking Media </h3> </div> </div> </div> - <div class="section" title="Shkarkim"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e144"></a>Shkarkim + <h4 class="title"><a name="d5e121"></a>Shkarkim </h4> </div> </div> </div> - - <p>Pasi të keni zgjedhur dosjen tuaj ISO, ju mund ta shkarkoni atë duke - përdorur ose http ose BitTorrent. Në të dyja rastet, një dritare ju jep disa - informacione, të tilla si pasqyrë në përdorim dhe mundësinë për të ndryshuar - nëse Shpejtësia është i ulët. Nëse http është zgjedhur, ju gjithashtu mund - të shihni diçka si + <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 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> - - <p>Check the radio button Save File.</p> </div> - - <div class="section" title="Checking the downloaded media integrity"> + <div class="section" title="Checking the integrity of the downloaded media"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e156"></a>Checking the downloaded media integrity + <h4 class="title"><a name="d5e133"></a>Checking the integrity of the downloaded media </h4> </div> </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>Open a console, no need to be root, and:</p> - <p>- To use md5sum, type: [sam@localhost]$ <strong class="userinput"><code>md5sum path/to/the/image/file.iso</code></strong>. </p> - <p>- To use sha1sum, type: [sam@localhost]$ <strong class="userinput"><code>sha1sum path/to/the/image/file.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="Burn or dump the ISO"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e169"></a>Burn or dump the ISO + <h3 class="title"><a name="d5e146"></a>Burn or dump the ISO </h3> </div> </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="Burning the ISO to a CD/DVD"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e172"></a>Burning the ISO to a CD/DVD + <h4 class="title"><a name="d5e149"></a>Burning the ISO to a CD/DVD </h4> </div> </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 @@ -695,24 +548,21 @@ </p> </div> - <div class="section" title="Dump the ISO to a USB stick"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="d5e177"></a>Dump the ISO to a USB stick + <h4 class="title"><a name="d5e154"></a>Dump the ISO to a USB stick </h4> </div> </div> </div> - <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> - <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -723,7 +573,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> @@ -732,67 +582,58 @@ </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"> <div> <div> - <h5 class="title"><a name="d5e183"></a>Using a graphical tool within Mageia + <h5 class="title"><a name="d5e160"></a>Using a graphical tool within Mageia </h5> </div> </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"> <div> <div> - <h5 class="title"><a name="d5e187"></a>Using a graphical tool within Windows + <h5 class="title"><a name="d5e164"></a>Using a graphical tool within Windows </h5> </div> </div> </div> - <p>Ju mund të provoni:</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"> <div> <div> - <h5 class="title"><a name="d5e194"></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> </div> - <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -811,10 +652,8 @@ </tr> </table> </div> - <p>You can also use the dd tool in a console:</p> - <div class="orderedlist"> <ol class="orderedlist" type="1"> @@ -828,13 +667,12 @@ <p>Bëhuni root me komandën <strong class="userinput"><code>su -</code></strong> (mos harroni '-' në fund ) </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> @@ -842,15 +680,12 @@ <li class="listitem"> <p>Shkruani komandën <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 @@ -881,12 +716,10 @@ <p>Shkruani komandën: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX bs=1M</code></strong></p> - <p>Where X=your device name eg: /dev/sdc</p> - - <p>Shembull: # <strong class="userinput"><code>dd if=/home/user/Downloads/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/sq/addUser.html b/sq/addUser.html index 03a5f48..4a14616 100644 --- a/sq/addUser.html +++ b/sq/addUser.html @@ -23,25 +23,8 @@ </div> </div> - - - - - - - - - - - - - - - - - <div class="section" title="Vendos Fjalëkalim administratori (root):"> <div class="titlepage"> @@ -53,7 +36,6 @@ </div> </div> - <p>Është e këshillueshme për të gjithë instalimet <span class="application">Mageia</span> për të vendosur një superpërdorues apo @@ -65,7 +47,6 @@ fjalëkalim në kutinë vetëm nën kutinë e parë fjalëkalimi, kjo kontrollon se ju nuk e keni shtypur keq pyetjen fjalëkalimin e parë duke i krahasuar ato. </p> - <div class="note" title="Shënim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -87,7 +68,6 @@ </div> </div> - <div class="section" title="Fut një përdorues"> <div class="titlepage"> @@ -99,14 +79,12 @@ </div> </div> - <p>Shto një përdorues këtu. Një përdorues ka më pak të drejta se super-përdoruesit (root), por të mjaftueshme për të shfletuar në internet, përdorimi aplikacioneve të zyrës ose luajnë lojëra dhe çdo gjë tjetër përdoruesi mesatar bën me kompjuterin e tij </p> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -149,7 +127,6 @@ </li> </ul> </div> - <div class="note" title="Shënim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -160,29 +137,14 @@ <tr> <td align="left" valign="top"> - <p>Çdo përdorues ju shtoni gjatë instalimit Mageia, do të ketë një botë të - lexueshëm (por shkrim i mbrojtur) skedari shtëpi. + <p>Any user you add while installing Mageia, will have a both read and write + protected home directory (umask=0027). </p> - - <p>Megjithatë, duke përdorur instalmin tuaj të ri, çdo përdorues që të shtoni - në <span class="emphasis"><em>MCC - System - Menaxho përdoruesit në sistem</em></span> do të - ketë një skedarë shtëpi që është me mbrojtje lexo dhe shkruaj. + <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> - - - <p>Nëse ju nuk doni një skedarë të përgjithshëm të lexueshëm shtëpi për të - gjithë, është këshilluar për të shtuar vetëm një përdorues të përkohshme - tani dhe për të shtuar një të vërtetë pa(s) rinisjes. - </p> - - - <p>Nëse ju preferoni skedarë të lexueshëm dokumente në shtëpi, ju mund të - dëshironi të shtoni të gjithë përdoruesit shtesë të nevojshme në - <span class="emphasis"><em>Konfiguracion - Përmbledhje</em></span> hap gjatë - instalimit. Zgjidh <span class="emphasis"><em>Menaxhimi Përdoruesit</em></span>. - </p> - <p>Lejet hyrëse gjithashtu mund të ndryshohet pas instalimit.</p> @@ -192,7 +154,6 @@ </div> </div> - <div class="section" title="Menaxhim Përdoruesi Avancuar"> <div class="titlepage"> @@ -204,16 +165,13 @@ </div> </div> - <p>Nëse butoni <span class="guibutton">avancimi</span> klikohet ju do ju ofrohet një ekran që ju lejon të modifikoni cilësimet për përdoruesin që ju jeni duke shtuar. </p> - <p>Përveç kësaj, ju mund të çaktivizoni ose aktivizo një llogari mysafir.</p> - <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -234,7 +192,6 @@ </tr> </table> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> diff --git a/sq/chooseDesktop.html b/sq/chooseDesktop.html index 184ba68..8713f53 100644 --- a/sq/chooseDesktop.html +++ b/sq/chooseDesktop.html @@ -22,29 +22,24 @@ </div> </div> </div> + - - - - - + - + <p>Në varësi të zgjedhjes tuaj këtu, ju mund të ju ofrohet ekran i mëtejshme për të akorduar gjobë zgjedhjes tuaj. </p> - + <p>Pas përzgjedhjes hapave(s), ju do të shihni një shfaqje gjatë instalimit të paketës. Shfaqje mund të ç'aktiviohet duke shtypur butonin <span class="guilabel">Detajet</span></p> + - - - - + <p>Zgjidhni nëse ju preferoni të përdorni <span class="application">KDE</span> ose <span class="application">Gnome</span> mjedisin desktop. Të dy vijnë me një seri të plotë të aplikacioneve të dobishme dhe mjetet. Shenjë @@ -54,7 +49,7 @@ desktop është më e lehtë se dy të mëparshmit, mbështet karamele sy më pak dhe më pak paketa instaluese nga parazgjedhja. </p> - + </div> </body> </html> diff --git a/sq/choosePackageGroups.html b/sq/choosePackageGroups.html index d5da924..64f2bec 100644 --- a/sq/choosePackageGroups.html +++ b/sq/choosePackageGroups.html @@ -22,14 +22,13 @@ </div> </div> </div> + - - - - + + - + <p>Paketat janë të renditura në grupe, për të bërë zgjedhjen atyre që ju duhet në sistemin tuaj shumë më e lehtë. Grupet janë mjaft të vetë shpjegueshëm, megjithatë më shumë informacion në lidhje me përmbajtjen e secilit është në @@ -37,38 +36,39 @@ ta. </p> - + <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> - - <p>Stacion-pune.</p> + <p>Stacion-pune.</p> + </li> <li class="listitem"> - - <p>Server.</p> + <p>Server.</p> + </li> <li class="listitem"> - - <p>Mjedis Grafike.</p> + <p>Mjedis Grafike.</p> + </li> <li class="listitem"> - + <p>Zgjedhja Individuale Paketave: Ju mund të përdorni këtë opsion për të shtuar manualisht ose hequr paketa. </p> - + </li> </ul> </div> - - <p>Lexo <a class="xref" href="minimal-install.html" title="Instalim Minimal">seksioni i quajtur “Instalim Minimal”</a> për instruksione si për të bërë - një instalim minimal (pa ose me X & IceWM). - </p> + + <p>Read <a class="xref" href="minimal-install.html" title="Instalim Minimal">seksioni i quajtur “Instalim Minimal”</a> for instructions on how to do a + minimal install (without or with X & IceWM). + </p> + </div> </body> </html> diff --git a/sq/diskdrake.html b/sq/diskdrake.html index f043f43..22c8904 100644 --- a/sq/diskdrake.html +++ b/sq/diskdrake.html @@ -29,18 +29,6 @@ - - - - - - - - - - - - <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> @@ -103,7 +91,7 @@ <td align="left" valign="top"> <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI - System Partition) is present and correctly mounted on /boot/EFI (see above) + System Partition) is present and correctly mounted on /boot/EFI (see below) </p> @@ -114,6 +102,27 @@ </table> </div> + + <div class="note" title="Shënim" 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="[Shënim]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot + partition is present with a correct type + </p> + + + + </td> + </tr> + </table> + </div> + </div> </body> </html> diff --git a/sq/doPartitionDisks.html b/sq/doPartitionDisks.html index baaafd0..903cbbd 100644 --- a/sq/doPartitionDisks.html +++ b/sq/doPartitionDisks.html @@ -225,6 +225,32 @@ </div> + <div class="note" title="Shënim" 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="[Shënim]" src="note.png"></td> + <th align="left"></th> + </tr> + <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> + + + + + + </td> + </tr> + </table> + </div> + + <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> diff --git a/sq/exitInstall.html b/sq/exitInstall.html index 46e0389..eba9798 100644 --- a/sq/exitInstall.html +++ b/sq/exitInstall.html @@ -24,14 +24,9 @@ </div> - - - - - + - <p><a name="exitInstall-pa1"></a>Ju keni përfunduar instalimin dhe konfigurimin @@ -46,19 +41,17 @@ <p><a name="exitInstall-pa3"></a>Nëse ju nuk e keni të rregulluar parametrat për ngarkuesin-ndezës, instalimi - juaj Mageia do të përzgjidhet automatikisht dhe filloi. + juaj Mageia do të përzgjidhet automatikisht dhe filloi. </p> - + <p><a name="exitInstall-pa4"></a>Kënaquni! </p> - + <p><a name="exitInstall-pa5"></a>Vizito www.mageia.org nëse keni ndonjë pyetje ose dëshironi të kontribuoni - në Mageia + në Mageia </p> - - </div> </body> diff --git a/sq/index.html b/sq/index.html index 3487249..16c9bf6 100644 --- a/sq/index.html +++ b/sq/index.html @@ -28,8 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Paraqitje</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Downloading and Checking Media</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Burn or dump the ISO</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Downloading and Checking Media</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Burn or dump the ISO</a></span></dt> </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, instaluesi Mageia</a></span></dt> @@ -75,17 +75,14 @@ <dt><span class="section"><a href="setupBootloader.html">Opsionet kryesore të programit Bootloader</a></span></dt> <dd> <dl> - <dt><span class="section"><a href="setupBootloader.html#d5e899">With a Bios system</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e936">With an UEFI system</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e883">Bootloader interface</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e907">Using a Mageia bootloader</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e921">Using an existing bootloader</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">Options</a></span></dt> </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e951">With a Bios system</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e968">With an UEFI system</a></span></dt> - </dl> - </dd> <dt><span class="section"><a href="misc-params.html">Summary of miscellaneous parameters</a></span></dt> <dd> <dl> @@ -116,7 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Ç'instalim Mageia </a></span></dt> <dd> <dl> - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1206">Sitë</a></span></dt> + <dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Sitë</a></span></dt> </dl> </dd> </dl> diff --git a/sq/misc-params.html b/sq/misc-params.html index 89cb3cf..58839ff 100644 --- a/sq/misc-params.html +++ b/sq/misc-params.html @@ -29,28 +29,6 @@ - - - - - - - - - - - - - - - - - - - - - - <p><a name="misc-params-pa1"></a>DrakX made smart choices for the configuration of your system depending on the choices you made and on the hardware DrakX detected. You can check the settings here and change them if you want after pressing @@ -58,6 +36,44 @@ </p> + <div class="note" title="Shënim" 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="[Shënim]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>As a general rule, default settings are recommended and you can keep them + with 3 exceptions: + </p> + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p>there are known issues with a default setting</p> + + </li> + <li class="listitem"> + + <p>the default setting has already been tried and it fails</p> + + </li> + <li class="listitem"> + + <p>something else is said in the detailed sections below</p> + + </li> + </ul> + </div> + + </td> + </tr> + </table> + </div> + + <div class="section" title="Parametrat e Sistemit"> <div class="titlepage"> <div> @@ -99,8 +115,7 @@ </p> - <p><a name="misc-params-system-pa4b"></a>Mos ndrysho asgjë, nëse nuk keni njohuri se si të konfiguroni Grub dhe/ose - Lilo + <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2 </p> @@ -165,6 +180,25 @@ <p><a name="misc-params-hardware-pa1a"></a>Kjo është ajo ku ju vendosni ose ndryshoni paraqitjen e tastierës tuaj e cila do të varet nga vendndodhja juaj, gjuha ose lloji i tastierës. </p> + + + <div class="note" title="Shënim" 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="[Shënim]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>If you notice a wrong keyboard layout and want to change it, keep in mind + that your passwords are going to change too. + </p> + + </td> + </tr> + </table> + </div> </li> <li class="listitem"> @@ -183,7 +217,7 @@ <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Karta Zërit</span>: </p> - + <p><a name="misc-params-hardware-pa3a"></a>The installer uses the default driver, if there is a default one. The option to select a different driver is only given when there is more than one driver for your card, but none of them is the default one. @@ -322,7 +356,8 @@ <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your - selections will depend on what you use your computer for. + selections will depend on what you use your computer for. For more + information, see <a class="xref" href="">???</a>. </p> diff --git a/sq/selectCountry.html b/sq/selectCountry.html index 3fb9f5a..1d2c02d 100644 --- a/sq/selectCountry.html +++ b/sq/selectCountry.html @@ -22,30 +22,24 @@ </div> </div> </div> + + + - - - - - - - - - - <p><a name="selectCountry-pa1"></a>Zgjidhni vendin tuaj ose rajonin. Kjo është e rëndësishme për të gjitha - llojet e cilësimeve, si monedhe dhe domain pa tel rregullator. Vendosja në - vend të gabuar mund të çojë në mos qenë në gjendje për të përdorur një rrjet - Wireless. + + <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, + like the currency and wireless regulatory domain. Setting the wrong country + can lead to not being able to use a Wireless network. </p> - + <p><a name="selectCountry-pa2"></a>If your country isn't in the list, click the <span class="guilabel">Other Countries</span> button and choose your country / region there. </p> - + <div class="note" title="Shënim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -54,19 +48,19 @@ </tr> <tr> <td align="left" valign="top"> - + <p><a name="selectCountry-pa3"></a>If your country is only in the <span class="guilabel">Other Countries</span> list, after clicking <span class="guibutton">OK</span> it may seem a country from the first list was chosen. Please ignore this, DrakX will follow your real choice. </p> - + </td> </tr> </table> </div> - + <div class="section" title="Metodë hyrëse"> <div class="titlepage"> <div> @@ -76,21 +70,19 @@ </div> </div> </div> + - - - + <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an input method (at the bottom of the list). Input methods allow users to input multilingual characters (Chinese, Japanese, Korean, etc). IBus is the - default input method in Mageia DVDs, Africa/India and Asia/no-India - Live-CDs. For Asian and African locales, IBus will be set as default input - method so users should not need to configure it manually. Other input - methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be - installed if you added HTTP/FTP media before package selection. + default input method, so users should not need to configure it + manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar + functions and can be installed if you added HTTP/FTP media before package + selection. </p> - + <div class="note" title="Shënim" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -99,19 +91,19 @@ </tr> <tr> <td align="left" valign="top"> - + <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it after you boot your installed system via "Configure your Computer" -> "System", or by running localedrake as root. </p> - + </td> </tr> </table> </div> - + </div> - + </div> </body> </html> diff --git a/sq/setupBootloader.html b/sq/setupBootloader.html index 44672f5..f39fcbf 100644 --- a/sq/setupBootloader.html +++ b/sq/setupBootloader.html @@ -29,13 +29,11 @@ - - - <div class="section" title="With a Bios system"> + <div class="section" title="Bootloader interface"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e899"></a>With a Bios system + <h3 class="title"><a name="d5e883"></a>Bootloader interface </h3> </div> </div> @@ -43,15 +41,23 @@ - <p><a name="setupBootloader-pa1"></a>If you prefer different bootloader settings to those chosen automatically by - the installer, you can change them here. - </p> + <p>By default, Mageia uses exclusively:</p> - <p><a name="setupBootloader-pa2"></a>You may already have another operating system on your machine, in which case - you need to decide whether to add Mageia to your existing bootloader, or - allow Mageia to create a new one. - </p> + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p> + + </li> + <li class="listitem"> + + <p>Grub2-efi for a UEFI system.</p> + + </li> + </ul> + </div> <div class="tip" title="Propozim" style="margin-left: 0.5in; margin-right: 0.5in;"> @@ -63,7 +69,7 @@ <tr> <td align="left" valign="top"> - <p>The Mageia graphical menus are nice :</p> + <p>The Mageia graphical menus are nice :)</p> </td> </tr> @@ -71,11 +77,11 @@ </div> - <div class="section" title="Using a Mageia bootloader"> + <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="usingMageiaBootloader"></a>Using a Mageia bootloader + <h4 class="title"><a name="d5e893"></a>Grub2 on Legacy/MBR and Legacy/GPT systems </h4> </div> </div> @@ -83,50 +89,18 @@ - <p><a name="setupBootloader-pa4"></a>By default, Mageia writes a new GRUB (legacy) bootloader into the MBR - (Master Boot Record) of your first hard drive. If you already have other - operating systems installed, Mageia attempts to add them to your new Mageia - boot menu. - </p> - - - <p>Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB - legacy and Lilo. - </p> - <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Paralajmërim]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa6"></a>Linux systems which use the GRUB2 bootloader are not currently supported by - GRUB (legacy) and will not be recognized if the default GRUB bootloader is - used. - </p> - - - <p>The best solution here is to use the GRUB2 bootloader which is available at - the Summary page during installation. - </p> - - </td> - </tr> - </table> - </div> + <p>Don't modify the "Boot Device" unless you really know what you are doing.</p> </div> - <div class="section" title="Using an existing bootloader"> + <div class="section" title="Grub2-efi on UEFI systems"> <div class="titlepage"> <div> <div> - <h4 class="title"><a name="usingExistingBootloader"></a>Using an existing bootloader + <h4 class="title"><a name="d5e899"></a>Grub2-efi on UEFI systems </h4> </div> </div> @@ -134,81 +108,100 @@ - <p><a name="setupBootloader-pa46"></a>If you decide to use an existing bootloader then you will need to remember - to STOP at the summary page during the installation and click the Bootloader - <span class="guibutton">Configure</span> button, which will allow you to change the - bootloader install location. + <p>With an UEFI system, the user interface is slightly different as you cannot + choose between with or without graphical menu </p> - <p><a name="setupBootloader-pa47"></a>Do not select a device e.g."sda", or you will overwrite your existing - MBR. You must select the root partition that you chose during the - partitioning phase earlier, e.g. sda7. - </p> - <p><a name="setupBootloader-pa48"></a>To be clear, sda is a device, sda7 is a partition on that device. + <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> - <div class="tip" title="Propozim" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Tip"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Propozim]" src="tip.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p><a name="setupBootloader-pa48a"></a>Go to tty2 with Ctrl+Alt+F2 and type <code class="literal">df</code> to check where - your <code class="literal">/</code> (root) partition is. Ctrl+Alt+F7 takes you back to - the installer screen. - </p> - - </td> - </tr> - </table> - </div> - - - <p><a name="setupBootloader-pa49"></a>The exact procedure for adding your Mageia system to an existing bootloader - is beyond the scope of this help, however in most cases it will involve - running the relevant bootloader installation program which should detect and - add it automatically. See the documentation for the operating system in - question. - </p> + <p>Don't modify the "Boot Device" unless you really know what you are doing.</p> </div> + + </div> + + + <div class="section" title="Using a Mageia bootloader"> + <div class="titlepage"> + <div> + <div> + <h3 class="title"><a name="d5e907"></a>Using a Mageia bootloader + </h3> + </div> + </div> + </div> + - <div class="section" title="Bootloader advanced option"> - <div class="titlepage"> + <p>By default, according to your system, Mageia writes a new:</p> + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard + drive or in the BIOS boot partition. + </p> + + </li> + <li class="listitem"> + + <p>Grub2-efi bootloader into the ESP</p> + + </li> + </ul> + </div> + + + <p>If you already have other operating systems installed, Mageia attempts to + add them to your new Mageia boot menu. If you don't want this behaviour, + click on <span class="guibutton">Next</span> and then uncheck the box + <span class="guilabel">Probe Foreign OS</span></p> + + + + </div> + + + <div class="section" title="Using an existing bootloader"> + <div class="titlepage"> + <div> <div> - <div> - <h4 class="title"><a name="advancedOptionBootloader"></a>Bootloader advanced option - </h4> - </div> + <h3 class="title"><a name="d5e921"></a>Using an existing bootloader + </h3> </div> </div> - - - - <p><a name="setupBootloader-pa52"></a>If you have very limited disk space for the <code class="literal">/</code> partition - that contains <code class="literal">/tmp</code>, click on - <span class="guibutton">Advanced</span> and check the box for <span class="guilabel">Clean /tmp - at each boot</span>. This helps to maintain some free space. - </p> - </div> + + + + <p>The exact procedure for adding your Mageia system to an existing bootloader + is beyond the scope of this help, however in most cases it will involve + running the relevant bootloader installation program which should detect and + add it automatically. See the documentation for the operating system in + question. + </p> </div> - <div class="section" title="With an UEFI system"> + <div class="section" title="Using chain loading"> <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e936"></a>With an UEFI system + <h3 class="title"><a name="d5e924"></a>Using chain loading </h3> </div> </div> @@ -216,24 +209,190 @@ - <p>With an UEFI system, the user interface is slightly different as you cannot - choose the boot loader since only Grub2-efi is available. + <p>If you don't want a bootable Mageia, but to chain load it from another OS, + 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>. </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 added 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>You will get a warning that the bootloader is missing, ignore it by clicking + <span class="guibutton">OK</span>. </p> - <p>Don't modify the "Boot Device" unless really knowing what you do.</p> + + </div> + + + <div class="section" title="Options"> + <div class="titlepage"> + <div> + <div> + <h3 class="title"><a name="d5e938"></a>Options + </h3> + </div> + </div> + </div> + + + + <div class="section" title="First page"> + <div class="titlepage"> + <div> + <div> + <h4 class="title"><a name="d5e940"></a>First page + </h4> + </div> + </div> + </div> + + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p><span class="guilabel">Delay before booting the default image</span>: This text box + lets you set a delay in seconds before the default operating system is + started up. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Security</span>: This allows you to set a password for the + 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> + <li class="listitem"> + + <p><span class="guilabel">Password</span>: This text box is where you actually put the + password + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will + check that it matches with the one set above. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Advanced</span></p> + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <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 + 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). + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric + multiprocessing for multi core processors. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the + operating system access to the Advanced Programmable Interrupt + Controller. APIC devices permit more complex priority models, and Advanced + IRQ (Interrupt Request) management. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which + manages all external interrupts for a specific processor in an SMP system. + </p> + + </li> + </ul> + </div> + + </li> + </ul> + </div> + + </div> + + + <div class="section" title="Next page"> + <div class="titlepage"> + <div> + <div> + <h4 class="title"><a name="d5e972"></a>Next page + </h4> + </div> + </div> + </div> + + + + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p><span class="guilabel">Default:</span> Operating system started up by default + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Append:</span> This option lets you pass the kernel + information or tell the kernel to give you more information as it boots. + </p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p> + + </li> + <li class="listitem"> + + <p><span class="guilabel">Advanced</span></p> + <div class="itemizedlist"> + <ul class="itemizedlist"> + <li class="listitem"> + + <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth + the boot menu will use. If you click the down triangle you will be offered + other size and colour depth options. + </p> + + </li> + <li class="listitem"> + + <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p> + + </li> + </ul> + </div> + + </li> + </ul> + </div> + + </div> </div> diff --git a/sq/setupBootloaderAddEntry.html b/sq/setupBootloaderAddEntry.html index 0f57ecd..f3d4fa9 100644 --- a/sq/setupBootloaderAddEntry.html +++ b/sq/setupBootloaderAddEntry.html @@ -27,110 +27,25 @@ + <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the + software grub-customizer instead (Available in the Mageia repositories). + </p> - <div class="section" title="With a Bios system"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e951"></a>With a Bios system - </h3> - </div> - </div> - </div> - - - - <p>You can add an entry or modify the one you select first, by pressing the - relevant button in the <span class="emphasis"><em>Bootloader Configuration</em></span> screen - and editing the screen that pops up on top of it. - </p> - - - <div class="note" title="Shënim" 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="[Shënim]" 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>Some things that can be done without any risk, are changing the label of an - entry and ticking the box to make an entry the default one. - </p> - - - <p>You can add the proper version number of an entry, or rename it completely.</p> - - - <p>The default entry is the one the systems boots into if you don't make a - choice while booting up. - </p> - - - <div class="warning" title="Paralajmërim" style="margin-left: 0.5in; margin-right: 0.5in;"> - <table border="0" summary="Warning"> - <tr> - <td rowspan="2" align="center" valign="top" width="25"><img alt="[Paralajmërim]" src="warning.png"></td> - <th align="left"></th> - </tr> - <tr> - <td align="left" valign="top"> - - <p>Editing other things can leave you with an unbootable system. Please don't - just try something without knowing what you are doing. - </p> - - </td> - </tr> - </table> - </div> - - </div> - - - <div class="section" title="With an UEFI system"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e968"></a>With an UEFI system - </h3> - </div> - </div> - </div> - - - - <p>In this case you are using Grub2-efi and you cannot use this tool to edit - entries at this step. To do that you need to manually edit - <code class="code">/boot/grub2/custom.cfg</code> or use <code class="code">grub-customizer</code> - instead. All you can do here, is to choose the default entry in the drop - down list. - </p> - - - <p>After a click on the <span class="guibutton">Next</span> button, another drop down - list allows to choose the video resolution for Grub2 which is a graphical - boot loader. - </p> - - - + <div class="note" title="Shënim" 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="[Shënim]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p> + + </td> + </tr> + </table> </div> </div> diff --git a/sq/soundConfig.html b/sq/soundConfig.html index d8a09d0..9722aa2 100644 --- a/sq/soundConfig.html +++ b/sq/soundConfig.html @@ -22,7 +22,6 @@ </div> </div> </div> - @@ -33,22 +32,21 @@ <p>In this screen the name of the driver that the installer chose for your sound card is given, which will be the default driver if we have a default one. - </p> + <p>The default driver should work without problems. However, if after install you do encounter problems, then run <span class="command"><strong>draksound</strong></span> or start this tool via MCC (Mageia Control Center), by choosing the <span class="guilabel">Hardware</span> tab and clicking on <span class="guilabel">Sound Configuration</span> at the top right of the screen. - </p> + <p>Then, in the draksound or "Sound Configuration" tool screen, click on <span class="guibutton">Advanced</span> and then on <span class="guibutton">Troubleshooting</span> to find very useful advice about how to solve the problem. - </p> @@ -67,15 +65,12 @@ <p>Clicking <span class="guibutton">Advanced</span> in this screen, during install, is useful if there is no default driver and there are several drivers available, but you think the installer selected the wrong one. - </p> <p>In that case you can select a different driver after clicking on <span class="guibutton">Let me pick any driver</span>. - </p> - </div> diff --git a/sq/uninstall-Mageia.html b/sq/uninstall-Mageia.html index 1bd1bbb..fae4c46 100644 --- a/sq/uninstall-Mageia.html +++ b/sq/uninstall-Mageia.html @@ -31,7 +31,7 @@ <div class="titlepage"> <div> <div> - <h3 class="title"><a name="d5e1206"></a>Sitë + <h3 class="title"><a name="d5e1244"></a>Sitë </h3> </div> </div> diff --git a/tr/Select-and-use-ISOs.html b/tr/Select-and-use-ISOs.html index a516471..a02d22f 100644 --- a/tr/Select-and-use-ISOs.html +++ b/tr/Select-and-use-ISOs.html @@ -136,27 +136,6 @@ <p>Önceki sürümden yükseltme veya temiz bir kurulum yapabilirler.</p> </li> -<<<<<<< HEAD -======= - </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"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <li class="listitem"> <p>32 veya 64 bit mimari için farklı ortamlar.</p> @@ -192,11 +171,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Canlı Ortam -======= - <h4 class="title"><a name="d5e56"></a>Canlı Ortam ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -207,11 +182,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>Ortak özellikler -======= - <h5 class="title"><a name="d5e58"></a>Ortak özellikler ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -229,11 +200,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Her bir ISO yalnız bir masaüstü ortamı içerir (Plasma, Gnome veya Xfce).</p> -======= - <p>Her bir ISO yalnız bir masaüstü ortamı içerir (KDE, Gnome veya Xfce).</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -262,11 +229,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e69"></a>Canlı DVD Plasma -======= - <h5 class="title"><a name="d5e72"></a>Canlı DVD Plasma ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -287,11 +250,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Sadece 64 bit mimari.</p> -======= - <p>32 veya 64 bit mimari için farklı ortamlar.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -303,11 +262,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>Canlı DVD GNOME -======= - <h5 class="title"><a name="d5e81"></a>Canlı DVD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -340,11 +295,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e87"></a>Canlı DVD Xfce -======= - <h5 class="title"><a name="d5e90"></a>Canlı DVD Xfce ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -379,11 +330,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>Boot-only CD ortamı -======= - <h4 class="title"><a name="d5e99"></a>Boot-only CD ortamı ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -394,11 +341,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>Ortak özellikler -======= - <h5 class="title"><a name="d5e101"></a>Ortak özellikler ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -442,11 +385,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -471,11 +410,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -504,11 +439,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>Ortamları indirme ve kontrol etme -======= - <h3 class="title"><a name="d5e122"></a>Ortamları indirme ve kontrol etme ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -519,11 +450,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>İndirme -======= - <h4 class="title"><a name="d5e124"></a>İndirme ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -551,18 +478,13 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>İndirilen ortamın bütünlüğünü kontrol etme -======= - <h4 class="title"><a name="d5e136"></a>İndirilen ortamın bütünlüğünü kontrol etme ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD <p>Her sağlama toplamı, indirilecek dosyadan bir algoritma tarafından hesaplanan onaltılık sayılardan oluşur. Bu algoritmalara indirdiğiniz dosyadan bu sayıyı yeniden hesaplamasını istediğinizde ya aynı rakamı @@ -570,14 +492,6 @@ dosyanın bozuk olması nedeniyle farklı bir rakam bulacak ve hata verecektir. Bir hata, ya dosyayı yeniden indirmeniz gerektiği veya BitTorrent kullanarak onarmanız gerektiği anlamına gelmektedir. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>Konsolu açın -root olmanıza gerek yok- ve aşağıdaki komutlardan birini @@ -607,11 +521,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>ISO yakma veya atma -======= - <h3 class="title"><a name="d5e149"></a>ISO yakma veya atma ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -627,11 +537,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>Bir CD/DVD üzerine ISO yakma -======= - <h4 class="title"><a name="d5e152"></a>Bir CD/DVD üzerine ISO yakma ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -651,11 +557,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>Bir USB bellek üzerine ISO atmak -======= - <h4 class="title"><a name="d5e157"></a>Bir USB bellek üzerine ISO atmak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -693,11 +595,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Mageia üzerinde bir grafiksel araç kullanarak -======= - <h5 class="title"><a name="d5e163"></a>Mageia üzerinde bir grafiksel araç kullanarak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -714,11 +612,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Windows üzerinde bir grafiksel araç kullanarak -======= - <h5 class="title"><a name="d5e167"></a>Windows üzerinde bir grafiksel araç kullanarak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -740,11 +634,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>Bir GNU/Linux sistem üzerinde komut satırını kullanarak -======= - <h5 class="title"><a name="d5e174"></a>Bir GNU/Linux sistem üzerinde komut satırını kullanarak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/tr/index.html b/tr/index.html index 2268ca6..4d7a00a 100644 --- a/tr/index.html +++ b/tr/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Giriş</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Ortam</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Ortamları indirme ve kontrol etme</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">ISO yakma veya atma</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Ortamları indirme ve kontrol etme</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">ISO yakma veya atma</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, Mageia Kurulum Aracı</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Önyükleyici ana seçenekleri</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e883">Önyükleyici arayüzü</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e907">Bir Mageia önyükleyicisi kullanmak</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e921">Mevcut bir önyükleyiciyi kullanmak</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e924">Zincirleme yükleme kullanılıyor</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e938">Seçenekler</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e910">Bir Mageia önyükleyicisi kullanmak</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e924">Mevcut bir önyükleyiciyi kullanmak</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">Seçenekler</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Önyükleme Menü Girdisi Ekleme veya Değiştirme</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia' yı Kaldırma</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Nasıl</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Nasıl</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/tr/selectCountry.html b/tr/selectCountry.html index e2a35b0..7f54abb 100644 --- a/tr/selectCountry.html +++ b/tr/selectCountry.html @@ -29,15 +29,9 @@ -<<<<<<< HEAD <p><a name="selectCountry-pa1"></a>Bulunduğunuz ülke veya bölgeyi seçin. Bu işlem, para birimi ve kablosuz ağ dolaşım alanı gibi her tür ayar için önemlidir. Yanlış ülkeyi seçmek Kablosuz ağ kullanımınızı engelleyebilir. -======= - <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, - like the currency and wireless regulatory domain. Setting the wrong country - can lead to not being able to use a Wireless network. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -79,22 +73,12 @@ -<<<<<<< HEAD <p><a name="selectCountry-pa4"></a><span class="guilabel">Diğer Ülkeler</span> ekranında ayrıca bir girdi yöntemi (listenin sonunda) seçebilirsiniz. Girdi yöntemleri kullanıcıların birden çok alfabe karakterini (Çince, Japonca, Korece v.b.) kullanmalarını sağlar. IBus ön tanımlı girdi yöntemidir. Diğer girdi yöntemleri de (SCIM, GCIN, HIME vb.) benzer işlevler sunar ve paket seçiminden önce HTTP/FTP veri kaynağı ayarlanmışsa kurulabilirler. -======= - <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an - input method (at the bottom of the list). Input methods allow users to input - multilingual characters (Chinese, Japanese, Korean, etc). IBus is the - default input method, so users should not need to configure it - manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar - functions and can be installed if you added HTTP/FTP media before package - selection. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -107,16 +91,10 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p><a name="selectCountry-pa5"></a>Kurulum sırasında girdi yöntemi kurulumunu atlamışsanız; bu işleve, kurduğunuz sistemi başlattıktan sonra "Bilgisayarınızı Yapılandırın" -> "Sistem" yoluyla veya kök olarak localedrake aracını çalıştırarak erişebilirsiniz. -======= - <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it - after you boot your installed system via "Configure your Computer" -> - "System", or by running localedrake as root. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </td> diff --git a/tr/setupBootloader.html b/tr/setupBootloader.html index defb765..5cc2edd 100644 --- a/tr/setupBootloader.html +++ b/tr/setupBootloader.html @@ -29,19 +29,11 @@ -<<<<<<< HEAD <div class="section" title="Önyükleyici arayüzü"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e883"></a>Önyükleyici arayüzü -======= - <div class="section" title="Bootloader interface"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e886"></a>Bootloader interface ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -49,31 +41,19 @@ -<<<<<<< HEAD <p>Öntanımlı olarak Mageia sadece şunu kullanır:</p> -======= - <p>By default, Mageia uses exclusively:</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Eski/MBR veya Eski/GPT sistem için Grub2 (grafiksel menü ile/olmadan) </p> -======= - <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p>Bir UEFI sistem için Grub2-efi</p> -======= - <p>Grub2-efi for a UEFI system.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -97,19 +77,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Eski/MBR ve Eski/GPT sistemler üzerinde Grub2"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e893"></a>Eski/MBR ve Eski/GPT sistemler üzerinde Grub2 -======= - <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -126,19 +98,11 @@ </div> -<<<<<<< HEAD <div class="section" title="UEFI sistemler üzerinde Grub2-efi"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e899"></a>UEFI sistemler üzerinde Grub2-efi -======= - <div class="section" title="Grub2-efi on UEFI systems"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -146,19 +110,13 @@ -<<<<<<< HEAD <p>Bir UEFI sistemde kullanıcı arayüzü biraz farklıdır çünkü grafiksel menünün bulunması veya bulunmaması arasında tercihte bulunamazsınız -======= - <p>With an UEFI system, the user interface is slightly different as you cannot - choose between with or without graphical menu ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>Mageia bilgisayarınıza kurduğunuz tek sistemse, kurulum aracı önyükleyiciyi (Grub2-efi) taşımak üzere bir ESP (EFI Sistem Disk Bölümü) oluşturacaktır. Bilgisayarınızda önceden bir UEFI işletim sistemi (Mesela @@ -166,15 +124,6 @@ olan mevcut ESP alanını algılayarak grub2-efi'yi ekleyecektir. Birden fazla ESP' nin bir arada olması mümkün ise de sadece bir tane olması önerilir; çünkü kaç işletim sistemi kurulu olursa olsun biri yeterlidir. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -191,11 +140,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e907"></a>Bir Mageia önyükleyicisi kullanmak -======= - <h3 class="title"><a name="d5e910"></a>Bir Mageia önyükleyicisi kullanmak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -203,54 +148,34 @@ -<<<<<<< HEAD <p>Öntanımlı olarak, sisteminize uygun biçimde Mageia şunlardan birini yeni olarak yazar: </p> -======= - <p>By default, according to your system, Mageia writes a new:</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>Ya ilk sabit diskinizdeki MBR (Birincil Önyükleme Kaydı) içine veya BIOS disk bölümüne GRUB2 önyükleyicisi -======= - <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard - drive or in the BIOS boot partition. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p>ESP içine Grub2-efi önyükleyicisi</p> -======= - <p>Grub2-efi bootloader into the ESP</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> </div> -<<<<<<< HEAD <p>Zaten bir işletim sistemi kuruluysa, Mageia bunları yeni Mageia önyükleme menünüze eklemeyi dener. Bu davranışı istemiyorsanız <span class="guibutton">İleri</span> düğmesine tıklayıp <span class="guilabel">Yabancı İşletim Sistemini Sorgula</span> kutucuğundaki işareti kaldırın. </p> -======= - <p>If you already have other operating systems installed, Mageia attempts to - add them to your new Mageia boot menu. If you don't want this behaviour, - click on <span class="guibutton">Next</span> and then uncheck the box - <span class="guilabel">Probe Foreign OS</span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 @@ -261,11 +186,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e921"></a>Mevcut bir önyükleyiciyi kullanmak -======= - <h3 class="title"><a name="d5e924"></a>Mevcut bir önyükleyiciyi kullanmak ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -283,19 +204,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Zincirleme yükleme kullanılıyor"> <div class="titlepage"> <div> <div> <h3 class="title"><a name="d5e924"></a>Zincirleme yükleme kullanılıyor -======= - <div class="section" title="Using chain loading"> - <div class="titlepage"> - <div> - <div> - <h3 class="title"><a name="d5e927"></a>Using chain loading ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -303,29 +216,17 @@ -<<<<<<< HEAD <p>Önyüklenebilir bir Mageia istemiyor fakat bir başka işletim sisteminden zincirleme yüklenmesini istiyorsanız, <span class="guibutton">İleri</span> ve <span class="guibutton">Gelişmiş</span> düğmelerine tıklayarak <span class="guibutton">ESP veya MBR'ye dokunma</span> kutucuğunu işaretleyin. -======= - <p>If you don't want a bootable Mageia, but to chain load it from another OS, - 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>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> -<<<<<<< HEAD <p>Önyükleyicinin eksik olduğuna dair bir uyarı alacaksınız. Ancak bunu <span class="guibutton">Tamam</span> düğmesine tıklayarak atlayın. -======= - <p>You will get a warning that the bootloader is missing, ignore it by clicking - <span class="guibutton">OK</span>. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -337,11 +238,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e938"></a>Seçenekler -======= - <h3 class="title"><a name="d5e941"></a>Seçenekler ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -349,19 +246,11 @@ -<<<<<<< HEAD <div class="section" title="İlk sayfa"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e940"></a>İlk sayfa -======= - <div class="section" title="First page"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e943"></a>First page ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -373,71 +262,44 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Öntanımlı görüntünün yüklemesinden önceki gecikme</span>: Bu metin kutusu öntanımlı işletim sistemi başlatılmadan önceki gecikme süresini saniye cinsinden ayarlamanızı sağlar. -======= - <p><span class="guilabel">Delay before booting the default image</span>: This text box - lets you set a delay in seconds before the default operating system is - started up. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guibutton">Güvenlik</span>: Önyükleyici için bir parola ayarlamanızı sağlar. Böylece önyükleme sırasında önyükleme girdisini seçmek veya ayarları değiştirmek için bir kullanıcı adı ile parolası sorulur. Kullanıcı adı "root" ve parola da burada seçilendir. -======= - <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. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Parola</span>: Bu metin kutusu parolanızı oluşturacağınız kısımdır -======= - <p><span class="guilabel">Password</span>: This text box is where you actually put the - password ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Parola (tekrar)</span>: Parolanızı yeniden yazın. Böylece Drakx üstte yazılan parola ile uyuşup uyuşmadığını denetler. -======= - <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will - check that it matches with the one set above. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Gelişmiş</span></p> -======= - <p><span class="guilabel">Advanced</span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">ACPI özelliğini etkinleştir:</span> ACPI (Gelişmiş Yapılandırma ve Güç Arabirimi) bir güç yönetimi standardıdır. Kullanılmayan aygıtları durdurarak, ki bu APM öncesinde kullanılan yöntemdir, enerji @@ -445,55 +307,30 @@ çünkü bilgisayarınız ACPI' yi desteklemiyor olabilir veya ACPI uygulamasının bazı sorunlara (mesela rastgele yeniden başlatmalar veya sistem kilitlenmeleri) yol açtığını düşünüyor olabilirsiniz. -======= - <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 - 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). ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">SMP özelliğini etkinleştir</span>: Bu seçenek, çok çekirdekli işlemcilerde simetrik çoklu işlemeyi etkinleştirir veya devre dışı bırakır. -======= - <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric - multiprocessing for multi core processors. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">APIC özelliğini etkinleştir</span>: Bunu etkinleştirmek işletim sisteminin Gelişmiş Programlanabilir Kesme Denetleyicisi-APIC-ne erişimini sağlar. APIC aygıtları daha karmaşık öncelikleme modellerine ve Gelişmiş IRQ (Kesme Talebi) yönetimine izin verir. -======= - <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the - operating system access to the Advanced Programmable Interrupt - Controller. APIC devices permit more complex priority models, and Advanced - IRQ (Interrupt Request) management. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Yerel APIC özelliğini etkinleştir</span>: Burada, bir SMP sistemde belli bir işlemci için tüm dış kesmeleri yöneten yerel APIC özelliğini ayarlayabilirsiniz. -======= - <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which - manages all external interrupts for a specific processor in an SMP system. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -507,19 +344,11 @@ </div> -<<<<<<< HEAD <div class="section" title="Sonraki sayfa"> <div class="titlepage"> <div> <div> <h4 class="title"><a name="d5e972"></a>Sonraki sayfa -======= - <div class="section" title="Next page"> - <div class="titlepage"> - <div> - <div> - <h4 class="title"><a name="d5e975"></a>Next page ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -531,70 +360,43 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Öntanımlı:</span> Öntanımlı olarak başlatılacak işletim sistemi -======= - <p><span class="guilabel">Default:</span> Operating system started up by default ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Sonuna ekle:</span> Bu seçenek çekirdek bilgisini geçmenizi veya çekirdeğe önyükleme sırasında daha fazla bilgi vermesini söylemenizi sağlar. -======= - <p><span class="guilabel">Append:</span> This option lets you pass the kernel - information or tell the kernel to give you more information as it boots. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Yabancı İşletim Sistemini Sorgula</span>: yukarıya bakınız <a class="link" href="setupBootloader.html#setupMageiaBootloader">Bir Mageia önyükleyicisini kullanma</a></p> -======= - <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Gelişmiş</span></p> -======= - <p><span class="guilabel">Advanced</span></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">Ekran kipi:</span> Bu seçenek, önyükleme menüsünün kullanacağı ekran boyutunu ve renk derinliğini ayarlar. Aşağı yönlü üçgene tıkladığınızda daha fazla boyut ve renk derinliği seçenekleri önerilir. -======= - <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth - the boot menu will use. If you click the down triangle you will be offered - other size and colour depth options. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="bold"><strong>ESP veya MBR'ye dokunma </strong></span>: yukarıya bakınız <a class="link" href="setupBootloader.html#setupChainLoading">Zincirleme yüklemeyi kullanma</a></p> -======= - <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> diff --git a/tr/setupBootloaderAddEntry.html b/tr/setupBootloaderAddEntry.html index a2c27cf..e445e8d 100644 --- a/tr/setupBootloaderAddEntry.html +++ b/tr/setupBootloaderAddEntry.html @@ -27,14 +27,9 @@ -<<<<<<< HEAD <p>Bunu yapmak için /boot/grub2/custom.cfg dosyasını elle düzenlemeli veya Mageia veri kaynaklarında bulunan grub-customizer yazılımını kullanmalısınız. -======= - <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the - software grub-customizer instead (Available in the Mageia repositories). ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -47,11 +42,7 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Daha fazla bilgi için wiki sayfamızı okuyun: </p> -======= - <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> diff --git a/tr/uninstall-Mageia.html b/tr/uninstall-Mageia.html index c861b84..e96fe31 100644 --- a/tr/uninstall-Mageia.html +++ b/tr/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1243"></a>Nasıl -======= - <h3 class="title"><a name="d5e1247"></a>Nasıl ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/uk/Select-and-use-ISOs.html b/uk/Select-and-use-ISOs.html index 7591f6b..673e5c2 100644 --- a/uk/Select-and-use-ISOs.html +++ b/uk/Select-and-use-ISOs.html @@ -139,27 +139,6 @@ <p>Вони придатні для встановлення «з нуля» або оновлення попередніх випусків.</p> </li> -<<<<<<< HEAD -======= - </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"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <li class="listitem"> <p>Різні носії для 32-бітової та 64-бітової архітектур.</p> @@ -197,11 +176,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Портативний носій -======= - <h4 class="title"><a name="d5e56"></a>Портативний носій ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -212,11 +187,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>Типові можливості -======= - <h5 class="title"><a name="d5e58"></a>Типові можливості ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -235,11 +206,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Кожен ISO містить лише одне стільничне середовище (Плазму, GNOME або Xfce).</p> -======= - <p>Кожен ISO містить лише одне стільничне середовище (KDE, GNOME або Xfce).</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -268,11 +235,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e69"></a>Портативний DVD з Плазмою -======= - <h5 class="title"><a name="d5e72"></a>Портативний DVD з Плазмою ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -293,11 +256,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>Лише для 64-бітової архітектури.</p> -======= - <p>Різні носії для 32-бітової та 64-бітової архітектур.</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -309,11 +268,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>Портативний DVD із GNOME -======= - <h5 class="title"><a name="d5e81"></a>Портативний DVD із GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -346,11 +301,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e87"></a>Портативний DVD з Xfce -======= - <h5 class="title"><a name="d5e90"></a>Портативний DVD з Xfce ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -385,11 +336,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>Носії CD лише для завантаження -======= - <h4 class="title"><a name="d5e99"></a>Носії CD лише для завантаження ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -400,11 +347,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>Типові можливості -======= - <h5 class="title"><a name="d5e101"></a>Типові можливості ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -451,11 +394,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -480,11 +419,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -513,11 +448,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>Отримання та перевірка носіїв даних -======= - <h3 class="title"><a name="d5e122"></a>Отримання та перевірка носіїв даних ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -528,11 +459,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>Отримання -======= - <h4 class="title"><a name="d5e124"></a>Отримання ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -562,11 +489,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>Перевірка цілісності отриманих даних образу -======= - <h4 class="title"><a name="d5e136"></a>Перевірка цілісності отриманих даних ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -609,11 +532,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>Запис образу ISO -======= - <h3 class="title"><a name="d5e149"></a>Запис образу ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -629,11 +548,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>Запис образу ISO на компакт-диск або DVD -======= - <h4 class="title"><a name="d5e152"></a>Запис образу ISO на компакт-диск або DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -653,11 +568,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>Запис образу ISO на флешку USB -======= - <h4 class="title"><a name="d5e157"></a>Запис образу ISO на флешку USB ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -695,11 +606,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>Використання інструмента із графічним інтерфейсом у Mageia -======= - <h5 class="title"><a name="d5e163"></a>Використання інструмента із графічним інтерфейсом у Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -715,11 +622,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>Використання інструмента із графічним інтерфейсом у Windows -======= - <h5 class="title"><a name="d5e167"></a>Використання інструмента із графічним інтерфейсом у Windows ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -741,11 +644,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>За допомогою інструментів командного рядка у системі GNU/Linux -======= - <h5 class="title"><a name="d5e174"></a>За допомогою інструментів командного рядка у системі GNU/Linux ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> diff --git a/uk/index.html b/uk/index.html index aa0836b..768d446 100644 --- a/uk/index.html +++ b/uk/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Вступ</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Носій</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Отримання та перевірка носіїв даних</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Запис образу ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Отримання та перевірка носіїв даних</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Запис образу ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, програма для встановлення Mageia</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Основні параметри завантажувача</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e884">Інтерфейс завантажувача</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e908">Користування завантажувачем Mageia</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e922">Користування вже встановленим завантажувачем</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e925">Використання ланцюгового завантаження</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e939">Параметри</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e887">Інтерфейс завантажувача</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e911">Користування завантажувачем Mageia</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e925">Користування вже встановленим завантажувачем</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e928">Використання ланцюгового завантаження</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e942">Параметри</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Додавання пункту меню завантаження та внесення змін у такі пункти</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Вилучення Mageia</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Настанови</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Настанови</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/uk/setupBootloader.html b/uk/setupBootloader.html index c4c57ca..7f4d674 100644 --- a/uk/setupBootloader.html +++ b/uk/setupBootloader.html @@ -33,11 +33,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e884"></a>Інтерфейс завантажувача -======= - <h3 class="title"><a name="d5e887"></a>Інтерфейс завантажувача ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -85,11 +81,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e894"></a>Grub2 для застарілих систем із MBR та GPT -======= - <h4 class="title"><a name="d5e897"></a>Grub2 для застарілих систем із MBR та GPT ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -110,11 +102,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e900"></a>Grub2-efi у системах UEFI -======= - <h4 class="title"><a name="d5e903"></a>Grub2-efi у системах UEFI ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -154,11 +142,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e908"></a>Користування завантажувачем Mageia -======= - <h3 class="title"><a name="d5e911"></a>Користування завантажувачем Mageia ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -202,11 +186,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e922"></a>Користування вже встановленим завантажувачем -======= - <h3 class="title"><a name="d5e925"></a>Користування вже встановленим завантажувачем ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -229,11 +209,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e925"></a>Використання ланцюгового завантаження -======= - <h3 class="title"><a name="d5e928"></a>Використання ланцюгового завантаження ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -265,11 +241,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e939"></a>Параметри -======= - <h3 class="title"><a name="d5e942"></a>Параметри ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -281,11 +253,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e941"></a>Перша сторінка -======= - <h4 class="title"><a name="d5e944"></a>Перша сторінка ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -307,14 +275,9 @@ <p><span class="guilabel">Безпека</span>: за допомогою цього розділу ви можете встановити пароль для доступу до завантажувача. Використання пароля -<<<<<<< HEAD означатиме, що для вибору запису для завантаження або зміни параметрів доведеться вводити пароль. Іменем користувача буде «root», а пароль можна буде вибрати на наступному етапі. -======= - означатиме, що інші особи не зможуть увійти до режиму одного користувача або - змінити параметри під час завантаження. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -393,11 +356,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e973"></a>Наступна сторінка -======= - <h4 class="title"><a name="d5e976"></a>Наступна сторінка ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> diff --git a/uk/uninstall-Mageia.html b/uk/uninstall-Mageia.html index e5bb393..7df7f2f 100644 --- a/uk/uninstall-Mageia.html +++ b/uk/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1244"></a>Настанови -======= - <h3 class="title"><a name="d5e1247"></a>Настанови ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> diff --git a/update-help_files.sh b/update-help_files.sh index 65a5bf1..00851e1 100755 --- a/update-help_files.sh +++ b/update-help_files.sh @@ -17,7 +17,7 @@ set -e -LANGS="ca cs de el en eo es et eu fr hr hu id it nl pl pt pt_br ro ru sk sl sq sv tr uk zh_cn" +LANGS="ca cs de el en eo es et eu fr hr hu id it nl nb pl pt pt_br ro ru sk sl sq sv tr uk zh_cn" DLPATH="http://docteam.mageia.nl/zipped/drakx-installer-help/" diff --git a/zh_cn/Select-and-use-ISOs.html b/zh_cn/Select-and-use-ISOs.html index b1453c6..710a338 100644 --- a/zh_cn/Select-and-use-ISOs.html +++ b/zh_cn/Select-and-use-ISOs.html @@ -37,15 +37,8 @@ <p>Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。</p> -<<<<<<< HEAD <p>有两种类型的媒介：</p> -======= - - - <p>有两种类型的媒介：</p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="itemizedlist"> <ul class="itemizedlist"> @@ -89,10 +82,6 @@ <p>媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>您可以在<a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">这里</a>找到它们。 </p> @@ -133,29 +122,6 @@ <p>它们可以用于全新安装，或更新之前的版本。</p> </li> -<<<<<<< HEAD -======= - </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"> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <li class="listitem"> <p>媒介有 32 位和 64 位两种架构之分。</p> @@ -187,11 +153,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e53"></a>Live 媒介 -======= - <h4 class="title"><a name="d5e56"></a>Live 媒介 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -202,11 +164,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e55"></a>通用特性 -======= - <h5 class="title"><a name="d5e58"></a>通用特性 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -222,11 +180,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>每个 ISO 仅包含一种桌面环境（KDE Plasma、GNOME 或 Xfce）。</p> -======= - <p>每个 ISO 仅包含一种桌面环境（KDE、GNOME 或 Xfce）。</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> @@ -253,11 +207,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e69"></a>Live DVD KDE -======= - <h5 class="title"><a name="d5e72"></a>Live DVD KDE ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -278,11 +228,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>仅支持 64 位处理器。</p> -======= - <p>媒介有 32 位和 64 位两种架构之分。</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -294,11 +240,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e78"></a>Live DVD GNOME -======= - <h5 class="title"><a name="d5e81"></a>Live DVD GNOME ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -319,11 +261,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>仅支持 64 位处理器</p> -======= - <p>媒介有 32 位和 64 位两种架构之分。</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -335,11 +273,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e87"></a>Live DVD Xfce -======= - <h5 class="title"><a name="d5e90"></a>Live DVD Xfce ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -360,11 +294,7 @@ </li> <li class="listitem"> -<<<<<<< HEAD <p>同时支持 32 位和 64 位处理器。</p> -======= - <p>媒介有 32 位和 64 位两种架构之分。</p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -378,11 +308,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e96"></a>仅用于引导的 CD -======= - <h4 class="title"><a name="d5e99"></a>仅用于引导的 CD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -393,11 +319,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e98"></a>通用特性 -======= - <h5 class="title"><a name="d5e101"></a>通用特性 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -437,11 +359,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e109"></a>netinstall.iso -======= - <h5 class="title"><a name="d5e112"></a>netinstall.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -464,11 +382,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso -======= - <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -495,11 +409,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e119"></a>下载和检查媒介 -======= - <h3 class="title"><a name="d5e122"></a>下载和检查媒介 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -510,11 +420,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e121"></a>下载中 -======= - <h4 class="title"><a name="d5e124"></a>下载中 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -538,31 +444,18 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e133"></a>检查下载文件的完整性 -======= - <h4 class="title"><a name="d5e136"></a>检查下载文件的完整性 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> </div> -<<<<<<< HEAD <p>这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。当您使用这些算法来重新计算下载文件的校验值时，如果您得到的结果和 Mageia 提供的一致，说明您的文件没有问题；否则，说明下载失败，您可能需要重新下载，或改用 BitTorrent 下载。 -======= - <p>这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。若您重新计算得到的校验和与 Mageia - 提供的校验和一致，说明您下载的文件内容正确；否则，说明您下载失败（文件可能不完整或已损坏），您应当重新下载。 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <p>打开一个终端（无需以 root 身份操作），然后：</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>- 若使用 md5sum，请输入：[sam@localhost]$ <strong class="userinput"><code>md5sum path/to/the/image/file.iso</code></strong>。 @@ -573,10 +466,6 @@ </p> <p>然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如：</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p></p> @@ -589,11 +478,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e146"></a>刻录或转储 ISO -======= - <h3 class="title"><a name="d5e149"></a>刻录或转储 ISO ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -601,20 +486,12 @@ <p>经过检查后的 ISO 即可被刻录至 CD/DVD，或写入到 U 盘。这些操作不同于简单的复制，其目的是创建一个可引导的媒体。</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="将ISO文件刻录到CD或DVD"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e149"></a>将ISO文件刻录到CD或DVD -======= - <h4 class="title"><a name="d5e152"></a>将ISO文件刻录到CD或DVD ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -631,11 +508,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e154"></a>写入 ISO 到 U 盘 -======= - <h4 class="title"><a name="d5e157"></a>写入 ISO 到 U 盘 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -643,10 +516,6 @@ <p>所有的 Mageia ISO 均为混合类型 ISO，因此您可以将其“转储”到 U 盘中，然后使用 U 盘来引导和安装系统。</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="警告" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -665,20 +534,12 @@ </div> <p>若要恢复原始容量，您必须重新进行分区和格式化操作。</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="使用 Mageia 的图形化工具"> <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e160"></a>使用 Mageia 的图形化工具 -======= - <h5 class="title"><a name="d5e163"></a>使用 Mageia 的图形化工具 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -695,11 +556,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e164"></a>使用 Windows 下的图形化工具 -======= - <h5 class="title"><a name="d5e167"></a>使用 Windows 下的图形化工具 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -707,10 +564,6 @@ <p>您可以尝试：</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> 中的“ISO 镜像”选项； @@ -725,11 +578,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h5 class="title"><a name="d5e171"></a>使用 GNU/Linux 系统中的命令行程序 -======= - <h5 class="title"><a name="d5e174"></a>使用 GNU/Linux 系统中的命令行程序 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h5> </div> </div> @@ -753,10 +602,6 @@ </div> <p>您也可以在终端中使用 dd 工具：</p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="orderedlist"> <ol class="orderedlist" type="1"> @@ -780,18 +625,10 @@ <li class="listitem"> <p>输入命令 <strong class="userinput"><code>fdisk -l</code></strong></p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>或者，您也可以通过命令 <code class="code">dmesg</code> 来查看设备名：在输入末尾，您将看到以 <span class="emphasis"><em>sd</em></span> 开头的设备名，如 <span class="emphasis"><em>sdd</em></span></p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <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 @@ -820,19 +657,10 @@ <li class="listitem"> <p>输入命令：# <strong class="userinput"><code>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</code></strong></p> -<<<<<<< HEAD <p>其中，“X”是您的设备名（如：/dev/sdc）</p> <p>示例：# <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso -======= - - - <p>其中，“X”是您的设备名（如：/dev/sdc）</p> - - - <p>示例：# <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 of=/dev/sdb bs=1M</code></strong></p> </li> diff --git a/zh_cn/addUser.html b/zh_cn/addUser.html index 099ef6c..1c35ddc 100644 --- a/zh_cn/addUser.html +++ b/zh_cn/addUser.html @@ -118,17 +118,9 @@ <td align="left" valign="top"> <p>在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。</p> -<<<<<<< HEAD <p>你可以在<span class="emphasis"><em>配置 - 概要</em></span>一步中添加其他所需用户，只需选择<span class="emphasis"><em>用户管理</em></span>即可。 </p> -======= - - - <p>你可以在<span class="emphasis"><em>配置 - 概要</em></span>一步中添加其他所需用户，只需选择<span class="emphasis"><em>用户管理</em></span>即可。 - </p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>也可以在安装完成后改变访问权限。</p> diff --git a/zh_cn/doPartitionDisks.html b/zh_cn/doPartitionDisks.html index 950c010..2edc7aa 100644 --- a/zh_cn/doPartitionDisks.html +++ b/zh_cn/doPartitionDisks.html @@ -40,8 +40,6 @@ - - <p><a name="doPartitionDisks-pa3"></a></p> <div class="itemizedlist"> <ul class="itemizedlist"> @@ -89,8 +87,6 @@ </p> - - </li> </ul> @@ -213,11 +209,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> diff --git a/zh_cn/index.html b/zh_cn/index.html index b25a19b..bf1e7e7 100644 --- a/zh_cn/index.html +++ b/zh_cn/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">简介</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">介质</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">下载和检查媒介</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">刻录或转储 ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">下载和检查媒介</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">刻录或转储 ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX，Mageia 的安装器</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">引导程序的主要选项</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e874">引导器界面</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e898">使用 Mageia 提供的引导器</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e912">使用现存的引导器</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e915">使用链式加载（chain loading）</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e929">选项</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e891">引导器界面</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e921">使用 Mageia 提供的引导器</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e938">使用现存的引导器</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e941">使用链式加载（chain loading）</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e958">选项</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">添加或修改引导菜单项</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">卸载Mageia</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1232">如何做</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1262">如何做</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> diff --git a/zh_cn/setupBootloader.html b/zh_cn/setupBootloader.html index 5384894..08426af 100644 --- a/zh_cn/setupBootloader.html +++ b/zh_cn/setupBootloader.html @@ -33,11 +33,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e874"></a>引导器界面 -======= - <h3 class="title"><a name="d5e891"></a>引导器界面 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -85,11 +81,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e884"></a>GRUB2，当使用传统硬件 + MBR/GPT 格式分区时 -======= - <h4 class="title"><a name="d5e901"></a>GRUB2，当使用传统硬件 + MBR/GPT 格式分区时 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -97,11 +89,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>若您不确定如何操作，请不要修改“引导设备”。</p> @@ -113,11 +100,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e890"></a>GRUB2-efi，当使用 UEFI 硬件时 -======= - <h4 class="title"><a name="d5e910"></a>GRUB2-efi，当使用 UEFI 硬件时 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -130,23 +113,12 @@ -<<<<<<< HEAD - <p>如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 - UEFI 操作系统（例如 Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 - grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需求。 - </p> - - -======= - - <p>如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 UEFI 操作系统（例如 Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需求。 </p> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>若您不确定如何操作，请不要修改“引导设备”。</p> </div> @@ -158,11 +130,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e898"></a>使用 Mageia 提供的引导器 -======= - <h3 class="title"><a name="d5e921"></a>使用 Mageia 提供的引导器 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -193,11 +161,6 @@ 这么做，请点击<span class="guibutton">下一步</span>，然后取消勾选<span class="guilabel">检测其他操作系统</span></p> -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -206,11 +169,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e912"></a>使用现存的引导器 -======= - <h3 class="title"><a name="d5e938"></a>使用现存的引导器 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -229,11 +188,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e915"></a>使用链式加载（chain loading） -======= - <h3 class="title"><a name="d5e941"></a>使用链式加载（chain loading） ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -249,11 +204,6 @@ -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <p>安装程序将会提醒您缺少引导器，请忽略它并点击<span class="guibutton">确定</span>。 </p> @@ -266,11 +216,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e929"></a>选项 -======= - <h3 class="title"><a name="d5e958"></a>选项 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -282,11 +228,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e931"></a>第一页 -======= - <h4 class="title"><a name="d5e960"></a>第一页 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> @@ -329,53 +271,27 @@ <ul class="itemizedlist"> <li class="listitem"> -<<<<<<< HEAD <p>ACPI（高级配置与电源接口）是标准的电源管理协议。它可以关闭未使用的设备以节能，用于取代 APM。如果您的硬件不兼容 ACPI，或者您认为 ACPI 会造成某些问题（如偶尔会自动重启，或系统卡死），则可以取消勾选它。 -======= - <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 - 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> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">启用 SMP</span>：此选项启用或禁用多核处理器上的对称多处理器特性。 -======= - <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric - multiprocessing for multi core processors. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">启用 APIC</span>：启用或禁用高级可编程中断控制器。APIC 设备可以支持更复杂的优先级模型和高级 IRQ（中断请求）管理功能。 -======= - <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the - operating system access to the Advanced Programmable Interrupt - Controller. APIC devices permit more complex priority models, and Advanced - IRQ (Interrupt Request) management. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> <li class="listitem"> -<<<<<<< HEAD <p><span class="guilabel">启用本地 APIC</span>：您可以在这里设置本地 APIC，用于在 SMP 系统中管理某个特定处理器的所有外部中断。 -======= - <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which - manage all external interrupts for some specific processor in an SMP system. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </li> @@ -393,11 +309,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h4 class="title"><a name="d5e962"></a>下一页 -======= - <h4 class="title"><a name="d5e992"></a>下一页 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h4> </div> </div> diff --git a/zh_cn/uninstall-Mageia.html b/zh_cn/uninstall-Mageia.html index 4b716df..df91667 100644 --- a/zh_cn/uninstall-Mageia.html +++ b/zh_cn/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1232"></a>如何做 -======= - <h3 class="title"><a name="d5e1262"></a>如何做 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> |