Add cs files

1 files changed, 11 insertions, 15 deletions

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">