diff options
Diffstat (limited to 'ca/setupBootloader.html')
| -rw-r--r-- | ca/setupBootloader.html | 116 |
1 files changed, 13 insertions, 103 deletions
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> |