aboutsummaryrefslogtreecommitdiffstats
path: root/es/addUser.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
commitb3d0edb99a4723879887064280c5b6a5761322b1 (patch)
treebf83bdc5f9b797a4bdac78d45aa6d36f1fe7279b /es/addUser.html
parent2e4709a8fe3e15cfceae673670a910aa68e115c1 (diff)
downloaddrakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.gz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.bz2
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.xz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.zip
Update Spanish files
Diffstat (limited to 'es/addUser.html')
-rw-r--r--es/addUser.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/es/addUser.html b/es/addUser.html
index c427555..173743d 100644
--- a/es/addUser.html
+++ b/es/addUser.html
@@ -141,9 +141,15 @@
de inicio protegido tanto de lectura como de escritura (umask=0027).
</p>
+<<<<<<< HEAD
+ <p>Puede agregar todos los usuarios adicionales necesarios en el paso
+ <span class="emphasis"><em>Configuraci&oacute;n - Resumen</em></span> durante la instalaci&oacute;n. Elija
+ <span class="emphasis"><em>Gesti&oacute;n de usuarios</em></span>.
+=======
<p>You can 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>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Los permisos de acceso se pueden cambiar tambi&eacute;n tras la instalaci&oacute;n.</p>