aboutsummaryrefslogtreecommitdiffstats
path: root/cs/setupBootloader.html
diff options
context:
space:
mode:
Diffstat (limited to 'cs/setupBootloader.html')
-rw-r--r--cs/setupBootloader.html79
1 files changed, 79 insertions, 0 deletions
diff --git a/cs/setupBootloader.html b/cs/setupBootloader.html
index 06910a8..0ab69c5 100644
--- a/cs/setupBootloader.html
+++ b/cs/setupBootloader.html
@@ -33,7 +33,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e882"></a>Rozhran&iacute; zavad&#283;&#269;e
+=======
<h3 class="title"><a name="d5e899"></a>Rozhran&iacute; zavad&#283;&#269;e
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -81,7 +85,11 @@
<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>
@@ -89,8 +97,11 @@
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Neupravujte "Zav&aacute;d&#283;c&iacute; za&#345;&iacute;zen&iacute;", pokud s jistotou nev&iacute;te, co d&#283;l&aacute;te.</p>
@@ -102,7 +113,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h4 class="title"><a name="d5e898"></a>Grub2-efi na UEFI syst&eacute;mech
+=======
<h4 class="title"><a name="d5e918"></a>Grub2-efi na UEFI syst&eacute;mech
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -117,6 +132,18 @@
+<<<<<<< HEAD
+ <p>Pokud je Mageia jedin&yacute;m syst&eacute;mem nainstalovan&yacute;m na v&aacute;&#353; po&#269;&iacute;ta&#269;, instal&aacute;tor
+ vytvo&#345;il ESP (syst&eacute;mov&yacute; odd&iacute;l EFI) pro zaps&aacute;n&iacute; zavad&#283;&#269;e (Grub2-efi). Pokud
+ ve va&#353;em po&#269;&iacute;ta&#269;i byly u&#382; p&#345;edt&iacute;m nainstalov&aacute;ny opera&#269;n&iacute; syst&eacute;my UEFI
+ (nap&#345;&iacute;klad Windows 8), instal&aacute;tor Mageii zjistil st&aacute;vaj&iacute;c&iacute; ESP vytvo&#345;en&yacute;
+ opera&#269;n&iacute;m syst&eacute;mem Windows a p&#345;idal grub2-efi. A&#269;koli je mo&#382;no m&iacute;t v&iacute;ce
+ odd&iacute;l&#367; ESP, rad&iacute; se m&iacute;t a sta&#269;&iacute; jen jeden, bez ohledu na po&#269;et opera&#269;n&iacute;ch
+ syst&eacute;m&#367;, kter&eacute; m&aacute;te v po&#269;&iacute;ta&#269;i.
+ </p>
+
+
+=======
<p>Pokud je Mageia prvn&iacute;m syst&eacute;mem nainstalovan&yacute;m na v&aacute;&#353; po&#269;&iacute;ta&#269;, instal&aacute;tor
@@ -129,6 +156,7 @@
</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Neupravujte "Zav&aacute;d&#283;c&iacute; za&#345;&iacute;zen&iacute;", pokud s jistotou nev&iacute;te, co d&#283;l&aacute;te.</p>
</div>
@@ -140,7 +168,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e906"></a>Pou&#382;it&iacute; zavad&#283;&#269;e Mageii
+=======
<h3 class="title"><a name="d5e929"></a>Pou&#382;it&iacute; zavad&#283;&#269;e Mageii
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -175,8 +207,11 @@
<span class="guilabel">Probe Foreign OS</span></p>
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -185,7 +220,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e920"></a>Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;e
+=======
<h3 class="title"><a name="d5e946"></a>Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;e
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -203,11 +242,19 @@
</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>
@@ -215,7 +262,11 @@
+<<<<<<< HEAD
+ <p>If you don't want a bootable Mageia, but to chain load it from another OS,
+=======
<p>If you don't want a bootable Mageia, but chain load it from another OS,
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
click on <span class="guibutton">Next</span>, then on
<span class="guibutton">Advanced</span> and Check the box <span class="guilabel">Do not touch ESP
or MBR</span>.
@@ -224,10 +275,15 @@
+<<<<<<< HEAD
+ <p>You will get a warning that the bootloader is missing, ignore it by clicking
+ <span class="guibutton">OK</span>.
+=======
<p>You will get a warning that the bootloader will lack, ignore it by a click
on <span class="guibutton">OK</span>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -239,7 +295,11 @@
<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>
@@ -251,7 +311,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h4 class="title"><a name="d5e939"></a>Prvn&iacute; strana
+=======
<h4 class="title"><a name="d5e968"></a>Prvn&iacute; strana
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -302,10 +366,17 @@
<p><span class="guilabel">Enable ACPI:</span> ACPI (Advanced Configuration and Power
Interface) is a standard for the power management. It can save energy by
+<<<<<<< HEAD
+ stopping unused devices, this was the method used before APM. Unchecking it
+ could be useful if, for example, your computer does not support ACPI or if
+ you think the ACPI implementation might cause some problems (for instance
+ random reboots or system lockups).
+=======
stopping unused devices, this was the method used before APM. Uncheck it be
useful, for example, if your computer does not support ACPI or if you think
the ACPI implementation might cause some problems (for instance random
reboots or system lockups).
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -328,7 +399,11 @@
<li class="listitem">
<p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
+<<<<<<< HEAD
+ manages all external interrupts for a specific processor in an SMP system.
+=======
manage all external interrupts for some specific processor in an SMP system.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -346,7 +421,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h4 class="title"><a name="d5e971"></a>Dal&#353;&iacute; strana
+=======
<h4 class="title"><a name="d5e1000"></a>Dal&#353;&iacute; strana
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>