aboutsummaryrefslogtreecommitdiffstats
path: root/cs
diff options
context:
space:
mode:
Diffstat (limited to 'cs')
-rw-r--r--cs/Select-and-use-ISOs.html192
-rw-r--r--cs/addUser.html26
-rw-r--r--cs/doPartitionDisks.html3
-rw-r--r--cs/index.html17
-rw-r--r--cs/setupBootloader.html79
-rw-r--r--cs/uninstall-Mageia.html4
6 files changed, 207 insertions, 114 deletions
diff --git a/cs/Select-and-use-ISOs.html b/cs/Select-and-use-ISOs.html
index a78ea82..71a37b6 100644
--- a/cs/Select-and-use-ISOs.html
+++ b/cs/Select-and-use-ISOs.html
@@ -23,9 +23,7 @@
</div>
</div>
-
-
<div class="section" title="&Uacute;vod">
<div class="titlepage">
@@ -37,15 +35,12 @@
</div>
</div>
-
<p>Mageia je &#353;&iacute;&#345;ena cestou obraz&#367; ISO. Tato str&aacute;nka v&aacute;m pom&#367;&#382;e vybrat, kter&yacute;
obraz vyhovuje va&#353;im pot&#345;eb&aacute;m.
</p>
-
<p>Jsou tu dv&#283; rodiny nosi&#269;&#367;:</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -69,12 +64,10 @@
</li>
</ul>
</div>
-
<p>Podrobnosti jsou uvedeny v dal&#353;&iacute;ch &#269;&aacute;stech.</p>
</div>
-
<div class="section" title="M&eacute;dia">
<div class="titlepage">
@@ -86,7 +79,6 @@
</div>
</div>
-
<div class="section" title="Definice">
<div class="titlepage">
@@ -98,19 +90,16 @@
</div>
</div>
-
<p>Zde je m&eacute;diem (nosi&#269;em) obrazov&yacute; soubor ISO, kter&yacute; v&aacute;m umo&#382;&#328;uje instalovat
a/nebo aktualizovat Mageiu a p&#345;i roz&#353;&iacute;&#345;en&iacute; jakoukoli fyzickou podporu, na
kterou je soubor ISO zkop&iacute;rov&aacute;n.
</p>
-
<p>M&#367;&#382;ete je naj&iacute;t <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">zde</a>.
</p>
</div>
-
<div class="section" title="Klasick&eacute; instala&#269;n&iacute; nosi&#269;e">
<div class="titlepage">
@@ -122,7 +111,6 @@
</div>
</div>
-
<div class="section" title="B&#283;&#382;n&eacute; vlastnosti">
<div class="titlepage">
@@ -134,7 +122,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -148,29 +135,9 @@
<p>Dok&aacute;&#382;&iacute; ud&#283;lat &#269;istou instalaci nebo aktualizovat z p&#345;edchoz&iacute;ch vyd&aacute;n&iacute;.</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>Rozli&#269;n&eacute; nosi&#269;e pro 32 nebo 64 bitovou architekturu.</p>
+ <p>R&#367;zn&eacute; nosi&#269;e pro 32 nebo 64 bitov&eacute; architektury.</p>
</li>
<li class="listitem">
@@ -196,31 +163,36 @@
</div>
</div>
-
<div class="section" title="&#381;iv&eacute; nosi&#269;e">
<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>
</div>
-
<div class="section" title="B&#283;&#382;n&eacute; vlastnosti">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -233,7 +205,13 @@
</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">
@@ -257,19 +235,21 @@
</div>
</div>
-
<div class="section" title="&#381;iv&eacute; DVD Plasma">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -285,26 +265,32 @@
</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>
</div>
</div>
-
<div class="section" title="Live DVD GNOME">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -320,26 +306,28 @@
</li>
<li class="listitem">
- <p>R&#367;zn&eacute; nosi&#269;e pro 32 nebo 64 bitov&eacute; architektury.</p>
+ <p>Pouze 64 bitov&aacute; architektura</p>
</li>
</ul>
</div>
</div>
-
<div class="section" title="&#381;iv&eacute; DVD Xfce">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -355,7 +343,7 @@
</li>
<li class="listitem">
- <p>R&#367;zn&eacute; nosi&#269;e pro 32 nebo 64 bitov&eacute; architektury.</p>
+ <p>32 nebo 64 bitov&aacute; architektura.</p>
</li>
</ul>
@@ -364,31 +352,36 @@
</div>
</div>
-
<div class="section" title="Jen zav&aacute;d&#283;c&iacute; nosi&#269;e CD">
<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>
</div>
-
<div class="section" title="B&#283;&#382;n&eacute; vlastnosti">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -424,25 +417,27 @@
</div>
</div>
-
<div class="section" title="netinstall.iso">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Obsahuje jen svobodn&yacute; software, pro ty lidi, kte&#345;&iacute; odm&iacute;taj&iacute; pou&#382;&iacute;vat
+ <p>Obsahuje jen svobodn&yacute; software, pro ty lidi, kte&#345;&iacute; up&#345;ednost&#328;uj&iacute; nepou&#382;&iacute;vat
nesvobodn&yacute; software.
</p>
@@ -451,19 +446,21 @@
</div>
</div>
-
<div class="section" title="netinstall-nonfree.iso">
<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>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -482,131 +479,132 @@
</div>
</div>
-
<div class="section" title="Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e">
<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>
</div>
-
<div class="section" title="Sta&#382;en&iacute;">
<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>
</div>
-
<p>Pokud jste si u&#382; vybrali v&aacute;&#353; soubor ISO, m&#367;&#382;ete ho st&aacute;hnout bu&#271; pomoc&iacute; http
nebo BitTorrentu. V obou p&#345;&iacute;padech v&aacute;m okno pod&aacute;v&aacute; p&aacute;r informac&iacute;, jako jsou
- pou&#382;it&yacute; zrcadlov&yacute; server a mo&#382;nost zm&#283;ny, pokud je p&#345;enosov&aacute; rychlost p&#345;&iacute;li&#353;
- n&iacute;zk&aacute;. Pokud je vybr&aacute;no http, m&#367;&#382;ete uvid&#283;t i n&#283;co takov&eacute;ho
+ pou&#382;it&yacute; zrcadlov&yacute; server a p&#345;&iacute;le&#382;itost ke zm&#283;n&#283;, pokud je p&#345;enosov&aacute; rychlost
+ p&#345;&iacute;li&#353; n&iacute;zk&aacute;. Pokud je vybr&aacute;no http, m&#367;&#382;ete uvid&#283;t i n&#283;co takov&eacute;ho
</p>
-
-
<p>md5sum a sha1sum jsou n&aacute;stroje ke zkontrolov&aacute;n&iacute; neporu&#353;enosti souboru
ISO. Jeden z nich si ponechejte <a class="link" href="Select-and-use-ISOs.html#integrity">pro budouc&iacute;
- pou&#382;it&iacute;</a>. Potom se objev&iacute; toto okno:
+ pou&#382;it&iacute;</a>. Potom se objev&iacute; tomuto podobn&eacute; okno:
</p>
-
-
<p>Za&#353;krtn&#283;te p&#345;ep&iacute;nac&iacute; tla&#269;&iacute;tko Ulo&#382;it soubor.</p>
</div>
-
- <div class="section" title="Kontrolov&aacute;n&iacute; neporu&#353;enosti st&aacute;hnut&eacute;ho nosi&#269;e">
+ <div class="section" title="Ov&#283;&#345;ov&aacute;n&iacute; neporu&#353;enosti st&aacute;hnut&eacute;ho nosi&#269;e">
<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>
</div>
-
<p>Oba kontroln&iacute; sou&#269;ty jsou hexadecim&aacute;ln&iacute; &#269;&iacute;sla vypo&#269;&iacute;tan&aacute; algoritmem ze
souboru, kter&yacute; m&aacute; b&yacute;t st&aacute;hnut. Kdy&#382; tyto algoritmy po&#382;&aacute;d&aacute;te o p&#345;epo&#269;&iacute;t&aacute;n&iacute;
tohoto &#269;&iacute;sla z va&#353;eho st&aacute;hnut&eacute;ho souboru, bu&#271; dostanete stejn&eacute; &#269;&iacute;slo a v&aacute;&#353;
st&aacute;hnut&yacute; soubor je neporu&#353;en&yacute;, nebo se &#269;&iacute;slo odli&#353;uje a m&aacute;te po&#353;kozen&yacute;
- soubor. Po&#353;kozen&iacute; nab&aacute;d&aacute; k tomu, &#382;e byste se m&#283;li pokusit st&aacute;hnout ISO
- znovu.
+ soubor. Po&#353;kozen&iacute; nab&aacute;d&aacute; k tomu, &#382;e byste se m&#283;li pokusit st&aacute;hnout ISO znovu
+ nebo pokusit o opravu pomoc&iacute; BitTorrentu.
</p>
-
<p>Otev&#345;ete konzoli, net&#345;eba b&yacute;t superu&#382;ivatelem (root), a:</p>
-
<p>- pro pou&#382;it&iacute; md5sum, napi&#353;te: [sam@localhost]$ <strong class="userinput"><code>md5sum
cesta/k/obrazov&eacute;mu/souboru.iso</code></strong>.
</p>
-
<p>- pro pou&#382;it&iacute; sha1sum, napi&#353;te: [sam@localhost]$ <strong class="userinput"><code>sha1sum
cesta/k/obrazov&eacute;mu/souboru.iso</code></strong>.
</p>
-
<p>a porovnejte z&iacute;skan&eacute; &#269;&iacute;slo z va&#353;eho po&#269;&iacute;ta&#269;e (mo&#382;n&aacute; na n&#283; budete muset
chvilku po&#269;kat) s &#269;&iacute;slem dan&yacute;m Mageiou. Nap&#345;&iacute;klad:
</p>
-
-
<p></p>
</div>
</div>
-
<div class="section" title="Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO">
<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>
</div>
-
<p>Zkontrolovan&eacute; ISO m&#367;&#382;e b&yacute;t nyn&iacute; vyp&aacute;leno na CD nebo DVD anebo vepsan&eacute;
(zapsan&eacute;) na za&#345;&iacute;zen&iacute; USB. Tyto operace nejsou oby&#269;ejn&yacute;m kop&iacute;rov&aacute;n&iacute;m a c&iacute;l&iacute;
k vytvo&#345;en&iacute; zavediteln&eacute;ho nosi&#269;e.
</p>
-
<div class="section" title="Vyp&aacute;len&iacute; souboru ISO na CD/DVD">
<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>
</div>
-
<p>Pou&#382;ijte kter&yacute;koli vypalovac&iacute; program, kter&yacute; si p&#345;ejete, ale ujist&#283;te se, &#382;e
vypalovac&iacute; za&#345;&iacute;zen&iacute; je spr&aacute;vn&#283; nastaveno na <span class="bold"><strong>vyp&aacute;lit
@@ -616,24 +614,25 @@
</p>
</div>
-
<div class="section" title="Zapsat ISO na USB flash">
<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>
</div>
-
<p>V&#353;echny soubory ISO Mageii jsou hybridy, co&#382; znamen&aacute;, &#382;e je m&#367;&#382;ete 'vepsat'
(zapsat) na za&#345;&iacute;zen&iacute; USB, a potom je pou&#382;&iacute;t na zaveden&iacute; a instalaci syst&eacute;mu.
</p>
-
<div class="warning" title="Varov&aacute;n&iacute;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -653,67 +652,70 @@
</tr>
</table>
</div>
-
<p>Pro obnovu p&#367;vodn&iacute; kapacity, mus&iacute;te znovu p&#345;ed&#283;lat odd&iacute;l za&#345;&iacute;zen&iacute; USB a
naform&aacute;tovat ho.
</p>
-
<div class="section" title="Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje v Mageii">
<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>
</div>
-
<p>M&#367;&#382;ete pou&#382;&iacute;t grafick&yacute; n&aacute;stroj, jak&yacute;m 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="Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje ve Windows">
<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>
</div>
-
<p>M&#367;&#382;ete vyzkou&#353;et:</p>
-
<p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=sk_SK" target="_top">Rufus</a> pou&#382;it&iacute;m
volby "obraz ISO";
</p>
-
<p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32
Disk Imager</a></p>
</div>
-
<div class="section" title="Pou&#382;it&iacute;m p&#345;&iacute;kazov&eacute;ho &#345;&aacute;dku v syst&eacute;mu GNU/Linux">
<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>
</div>
-
<div class="warning" title="Varov&aacute;n&iacute;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -732,10 +734,8 @@
</tr>
</table>
</div>
-
<p>T&eacute;&#382; m&#367;&#382;ete pou&#382;&iacute;t n&aacute;stroj dd v konzoli:</p>
-
<div class="orderedlist">
<ol class="orderedlist" type="1">
@@ -749,7 +749,6 @@
<p>Sta&#328;te se superu&#382;ivatelem (rootem) pou&#382;it&iacute;m p&#345;&iacute;kazu <strong class="userinput"><code>su
-</code></strong> (nezapome&#328;te na koncovou poml&#269;ku '-')
</p>
-
</li>
@@ -764,15 +763,12 @@
<li class="listitem">
<p>Pou&#382;ijte p&#345;&iacute;kaz <strong class="userinput"><code>fdisk -l</code></strong></p>
-
-
<p>P&#345;&iacute;padn&#283; m&#367;&#382;ete z&iacute;skat n&aacute;zev za&#345;&iacute;zen&iacute; p&#345;&iacute;kazem <code class="code">dmesg</code>: na konci,
vid&iacute;te n&aacute;zev za&#345;&iacute;zen&iacute; za&#269;&iacute;naj&iacute;c&iacute; na <span class="emphasis"><em>sd</em></span>, a
<span class="emphasis"><em>sdd</em></span> v tomto p&#345;&iacute;pad&#283;:
</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
@@ -803,12 +799,10 @@
<p>Vlo&#382;te p&#345;&iacute;kaz: # <strong class="userinput"><code>dd if=cesta/k/ISO/souboru of=/dev/sdX
bs=1M</code></strong></p>
-
<p>kde X=n&aacute;zev va&#353;eho za&#345;&iacute;zen&iacute;, nap&#345;. /dev/sdc</p>
-
- <p>P&#345;&iacute;klad: # <strong class="userinput"><code>dd if=/home/u&#382;ivatel/Stahov&aacute;n&iacute;/Mageia-4-x86_64-DVD.iso
+ <p>P&#345;&iacute;klad: # <strong class="userinput"><code>dd if=/home/u&#382;ivatel/Stahov&aacute;n&iacute;/Mageia-6-x86_64-DVD.iso
of=/dev/sdb bs=1M</code></strong></p>
</li>
diff --git a/cs/addUser.html b/cs/addUser.html
index ca8d985..7d9f16b 100644
--- a/cs/addUser.html
+++ b/cs/addUser.html
@@ -23,11 +23,16 @@
</div>
</div>
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Nastaven&iacute; hesla spr&aacute;vce (u&#382;ivatele root):">
<div class="titlepage">
@@ -39,7 +44,6 @@
</div>
</div>
-
<p>Pro v&#353;echny instalace <span class="application">Mageii</span> se doporu&#269;uje
nastavit heslo superu&#382;ivatele anebo spr&aacute;vce, kter&eacute; se v Linuxu oby&#269;ejn&#283;
@@ -50,7 +54,6 @@
pol&iacute;&#269;kem prvn&iacute;ho hesla, p&#345;i&#269;em&#382; jejich porovnan&iacute;m se ov&#283;&#345;&iacute;, zda jste v
prvn&iacute;m pol&iacute;&#269;ku neud&#283;lali p&#345;eklep.
</p>
-
<div class="note" title="Pozn&aacute;mka" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -71,7 +74,6 @@
</div>
</div>
-
<div class="section" title="Zadejte u&#382;ivatele">
<div class="titlepage">
@@ -83,13 +85,11 @@
</div>
</div>
-
<p>Zde p&#345;idejte u&#382;ivatele. U&#382;ivatel m&aacute; m&eacute;n&#283; opr&aacute;vn&#283;n&iacute; ne&#382; superu&#382;ivatel (root),
ale dost na proch&aacute;zen&iacute; internetu, pou&#382;&iacute;v&aacute;n&iacute; kancel&aacute;&#345;skych aplikac&iacute; anebo
hran&iacute; her a pro cokoli jin&eacute;ho, co se sv&yacute;m po&#269;&iacute;ta&#269;em prov&aacute;d&iacute; b&#283;&#382;n&yacute; u&#382;ivatel.
</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -102,8 +102,8 @@
</li>
<li class="listitem">
- <p><span class="guilabel">Skute&#269;n&eacute; jm&eacute;no</span>: Vlo&#382;te u&#382;ivatel&#367;m do tohoto textov&eacute;ho
- pole skute&#269;n&eacute; jm&eacute;no.
+ <p><span class="guilabel">Skute&#269;n&eacute; jm&eacute;no</span>: Vlo&#382;te do tohoto textov&eacute;ho pole
+ skute&#269;n&eacute; jm&eacute;no u&#382;ivatele.
</p>
</li>
@@ -111,7 +111,7 @@
<p><span class="guilabel">P&#345;ihla&#353;ovac&iacute; jm&eacute;no</span>: Zde m&#367;&#382;ete zadat u&#382;ivatelsk&eacute;
p&#345;ihla&#353;ovac&iacute; jm&eacute;no, nebo nechat instala&#269;n&iacute; program pokusit se pou&#382;&iacute;t
- skute&#269;n&eacute; jm&eacute;no u&#382;ivatel&#367;. <span class="emphasis"><em>P&#345;ihla&#353;ovac&iacute; jm&eacute;no je citliv&eacute; na
+ skute&#269;n&eacute; jm&eacute;no u&#382;ivatele. <span class="emphasis"><em>P&#345;ihla&#353;ovac&iacute; jm&eacute;no je citliv&eacute; na
velikost p&iacute;smen.</em></span></p>
</li>
@@ -133,7 +133,6 @@
</li>
</ul>
</div>
-
<div class="note" title="Pozn&aacute;mka" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -147,13 +146,15 @@
<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
u&#382;ivatel&#367;</em></span>.
</p>
-
<p>P&#345;&iacute;stupov&aacute; opr&aacute;vn&#283;n&iacute; lze zm&#283;nit tak&eacute; po instalaci.</p>
@@ -163,7 +164,6 @@
</div>
</div>
-
<div class="section" title="Roz&#353;&iacute;&#345;en&aacute; spr&aacute;va u&#382;ivatel&#367;">
<div class="titlepage">
@@ -175,16 +175,13 @@
</div>
</div>
-
<p>Pokud klepnete na tla&#269;&iacute;tko <span class="guibutton">pokro&#269;il&eacute;</span>, bude v&aacute;m
nab&iacute;dnuta obrazovka, kter&aacute; v&aacute;m dovoluje upravovat nastaven&iacute; pro u&#382;ivatele,
kter&eacute;ho p&#345;id&aacute;v&aacute;te.
</p>
-
<p>Dodate&#269;n&#283; m&#367;&#382;ete zak&aacute;zat anebo povolit &uacute;&#269;et hosta.</p>
-
<div class="warning" title="Varov&aacute;n&iacute;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -204,7 +201,6 @@
</tr>
</table>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
diff --git a/cs/doPartitionDisks.html b/cs/doPartitionDisks.html
index 461b83d..6ca8380 100644
--- a/cs/doPartitionDisks.html
+++ b/cs/doPartitionDisks.html
@@ -238,8 +238,11 @@
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/cs/index.html b/cs/index.html
index 9117e24..65da737 100644
--- a/cs/index.html
+++ b/cs/index.html
@@ -28,8 +28,13 @@
<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>
@@ -75,11 +80,19 @@
<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>
@@ -113,7 +126,11 @@
<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 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>
diff --git a/cs/uninstall-Mageia.html b/cs/uninstall-Mageia.html
index 1700b68..e09c137 100644
--- a/cs/uninstall-Mageia.html
+++ b/cs/uninstall-Mageia.html
@@ -31,7 +31,11 @@
<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>