From 984a084705f358bc9799d634eb81427e81982051 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Sun, 25 Jun 2017 18:38:09 +0200
Subject: Update translations

---
 hu/addUser.html | 96 ---------------------------------------------------------
 1 file changed, 96 deletions(-)

(limited to 'hu/addUser.html')

diff --git a/hu/addUser.html b/hu/addUser.html
index a889dc2..c6890cc 100644
--- a/hu/addUser.html
+++ b/hu/addUser.html
@@ -23,30 +23,8 @@
             </div>
          </div>
            
-<<<<<<< HEAD
            
            
-=======
-         
-           
-         
-           
-         
-           
-         
-           
-         
-           
-         
-           
-         
-           
-         
-           
-         
-           
-         
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="A rendszergazdai (root) jelsz&oacute; be&aacute;ll&iacute;t&aacute;sa">
             <div class="titlepage">
@@ -58,10 +36,6 @@
                </div>
             </div>
                 
-<<<<<<< HEAD
-=======
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <p>It is advisable for all <span class="application">Mageia</span> installations to
                set a superuser or administrator's password, usually called the
@@ -72,10 +46,6 @@
                just below the first password box, this checks that you have not mistyped
                the first password by comparing them.
             </p>
-<<<<<<< HEAD
-=======
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Note">
@@ -96,10 +66,6 @@
             </div>
               
          </div>
-<<<<<<< HEAD
-=======
-         
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Adjon meg egy felhaszn&aacute;l&oacute;t">
             <div class="titlepage">
@@ -111,21 +77,11 @@
                </div>
             </div>
                 
-<<<<<<< HEAD
                 
             <p>Add a user here. A user has fewer rights than the superuser (root), but
                enough to use the internet, office applications or play games and anything
                else the average user does with his computer
             </p>
-=======
-            
-                
-            <p>Add a user here. A user has fewer rights than the superuser (root), but
-               enough to surf the internet, use office applications or play games and
-               anything else the average user does with his computer
-            </p>
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
@@ -145,13 +101,8 @@
                   <li class="listitem">
                              
                      <p><span class="guilabel">Login Name</span>: Here you enter the user login name or let
-<<<<<<< HEAD
                         drakx use a version of the user's real name. <span class="emphasis"><em>The login name is
                               case sensitive.</em></span></p>
-=======
-                        drakx use a version of the users real name. <span class="emphasis"><em>The login name is case
-                              sensitive.</em></span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            
                   </li>
                   <li class="listitem">
@@ -172,10 +123,6 @@
                   </li>
                </ul>
             </div>
-<<<<<<< HEAD
-=======
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Note">
@@ -186,7 +133,6 @@
                   <tr>
                      <td align="left" valign="top">
                               
-<<<<<<< HEAD
                         <p>Any user you add while installing Mageia, will have a both read and write
                            protected home directory (umask=0027).
                         </p>
@@ -195,29 +141,6 @@
                                  Summary</em></span> step during the install. Choose <span class="emphasis"><em>User
                                  management</em></span>.
                         </p>
-=======
-                        <p>Any user you add while installing Mageia, will have a world readable (but
-                           write protected) home directory.
-                        </p>
-                        
-                              
-                        <p>However, while using your new install, any user you add in <span class="emphasis"><em>MCC -
-                                 System - Manage users on system</em></span> will have a home directory that
-                           is both read and write protected.
-                        </p>
-                        
-                              
-                        <p>If you don't want a world readable home directory for anyone, it is advised
-                           to only add a temporary user now and to add the real one(s)  after reboot.
-                        </p>
-                        
-                              
-                        <p>If you prefer world readable home directories, you might want to add all
-                           extra needed users in the <span class="emphasis"><em>Configuration - Summary</em></span> step
-                           during the install. Choose <span class="emphasis"><em>User management</em></span>.
-                        </p>
-                        
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                               
                         <p>The access permissions can also be changed after the install.</p>
                             
@@ -227,10 +150,6 @@
             </div>
               
          </div>
-<<<<<<< HEAD
-=======
-         
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Speci&aacute;lis Felhaszn&aacute;l&oacute;kezel&eacute;s">
             <div class="titlepage">
@@ -242,23 +161,12 @@
                </div>
             </div>
                 
-<<<<<<< HEAD
-=======
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <p>If the <span class="guibutton">advanced</span> button is clicked you are offered a
                screen that allows you to edit the settings for the user you are adding.
             </p>
-<<<<<<< HEAD
-                
-            <p>Additionally, you can disable or enable a guest account.</p>
-=======
-            
                 
             <p>Additionally, you can disable or enable a guest account.</p>
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Warning">
@@ -278,10 +186,6 @@
                   </tr>
                </table>
             </div>
-<<<<<<< HEAD
-=======
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
-- 
cgit v1.2.1