aboutsummaryrefslogtreecommitdiffstats
path: root/cs
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /cs
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'cs')
-rw-r--r--cs/Select-and-use-ISOs.html80
-rw-r--r--cs/addUser.html12
-rw-r--r--cs/doPartitionDisks.html9
-rw-r--r--cs/index.html17
-rw-r--r--cs/setupBootloader.html87
-rw-r--r--cs/uninstall-Mageia.html4
6 files changed, 0 insertions, 209 deletions
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>&#381;iv&eacute; nosi&#269;e
-=======
- <h4 class="title"><a name="d5e56"></a>&#381;iv&eacute; nosi&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -183,11 +179,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>B&#283;&#382;n&eacute; vlastnosti
-=======
- <h5 class="title"><a name="d5e58"></a>B&#283;&#382;n&eacute; vlastnosti
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -205,13 +197,9 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Ka&#382;d&eacute; ISO obsahuje pouze jedno grafick&eacute; prost&#345;ed&iacute; (KDE - Plasma, GNOME nebo
Xfce)
</p>
-=======
- <p>Ka&#382;d&eacute; ISO obsahuje pouze jedno grafick&eacute; prost&#345;ed&iacute; (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>&#381;iv&eacute; DVD Plasma
-=======
- <h5 class="title"><a name="d5e72"></a>&#381;iv&eacute; DVD Plasma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -265,11 +249,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Pouze 64 bitov&aacute; architektura.</p>
-=======
- <p>R&#367;zn&eacute; nosi&#269;e pro 32 nebo 64 bitov&eacute; 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>&#381;iv&eacute; DVD Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>&#381;iv&eacute; 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&aacute;d&#283;c&iacute; nosi&#269;e CD
-=======
- <h4 class="title"><a name="d5e99"></a>Jen zav&aacute;d&#283;c&iacute; nosi&#269;e CD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -372,11 +340,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>B&#283;&#382;n&eacute; vlastnosti
-=======
- <h5 class="title"><a name="d5e101"></a>B&#283;&#382;n&eacute; 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&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e
-=======
- <h3 class="title"><a name="d5e122"></a>Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -499,11 +451,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>Sta&#382;en&iacute;
-=======
- <h4 class="title"><a name="d5e124"></a>Sta&#382;en&iacute;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -531,11 +479,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>Ov&#283;&#345;ov&aacute;n&iacute; neporu&#353;enosti st&aacute;hnut&eacute;ho nosi&#269;e
-=======
- <h4 class="title"><a name="d5e136"></a>Kontrolov&aacute;n&iacute; neporu&#353;enosti st&aacute;hnut&eacute;ho nosi&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -575,11 +519,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO
-=======
- <h3 class="title"><a name="d5e149"></a>Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -595,11 +535,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>Vyp&aacute;len&iacute; souboru ISO na CD/DVD
-=======
- <h4 class="title"><a name="d5e152"></a>Vyp&aacute;len&iacute; 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&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje v Mageii
-=======
- <h5 class="title"><a name="d5e163"></a>Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;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&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje ve Windows
-=======
- <h5 class="title"><a name="d5e167"></a>Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;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&#382;it&iacute;m p&#345;&iacute;kazov&eacute;ho &#345;&aacute;dku v syst&eacute;mu GNU/Linux
-=======
- <h5 class="title"><a name="d5e174"></a>Pou&#382;it&iacute;m p&#345;&iacute;kazov&eacute;ho &#345;&aacute;dku v syst&eacute;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&iacute; hesla spr&aacute;vce (u&#382;ivatele root):">
<div class="titlepage">
@@ -146,10 +138,6 @@
<p>Jak&yacute;koliv u&#382;ivatel p&#345;idan&yacute; v pr&#367;b&#283;hu instalace Mageii bude m&iacute;t chr&aacute;n&#283;n
domovsk&yacute; adres&aacute;&#345; proti &#269;ten&iacute; a z&aacute;pisu (umask=0027)
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>M&#367;&#382;ete p&#345;idat v&#353;echny dal&#353;&iacute; pot&#345;ebn&eacute; u&#382;ivatele v kroku <span class="emphasis"><em>Nastaven&iacute; -
Souhrn</em></span> b&#283;hem instalace. Vyberte si <span class="emphasis"><em>Spr&aacute;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">&Uacute;vod</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">M&eacute;dia</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, instal&aacute;tor Mageii</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Z&aacute;kladn&iacute; nastaven&iacute; zav&aacute;d&#283;c&iacute;ho programu</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e882">Rozhran&iacute; zavad&#283;&#269;e</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e906">Pou&#382;it&iacute; zavad&#283;&#269;e Mageii</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e920">Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;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&iacute; zavad&#283;&#269;e</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e929">Pou&#382;it&iacute; zavad&#283;&#269;e Mageii</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e946">Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;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&#345;idan&iacute; nebo zm&#283;na polo&#382;ky v nab&iacute;dce zavad&#283;&#269;e</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Odinstalov&aacute;n&iacute; 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&iacute; zavad&#283;&#269;e
-=======
- <h3 class="title"><a name="d5e899"></a>Rozhran&iacute; zavad&#283;&#269;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&aacute;d&#283;c&iacute; za&#345;&iacute;zen&iacute;", pokud s jistotou nev&iacute;te, co d&#283;l&aacute;te.</p>
@@ -113,11 +100,7 @@
<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>
@@ -132,7 +115,6 @@
-<<<<<<< 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
@@ -143,20 +125,6 @@
</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
- 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>
-
-
->>>>>>> 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>
@@ -168,11 +136,7 @@
<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>
@@ -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&#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>
@@ -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&iacute; strana
-=======
- <h4 class="title"><a name="d5e968"></a>Prvn&iacute; 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&#353;&iacute; strana
-=======
- <h4 class="title"><a name="d5e1000"></a>Dal&#353;&iacute; 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>
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-02 06:22:26 +0000