From c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 03 Jun 2015 02:29:59 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/tools/lib/lang/es_usersettings.lng |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/web/tools/lib/lang/es_usersettings.lng b/interface/web/tools/lib/lang/es_usersettings.lng
index de2105c..50c482e 100644
--- a/interface/web/tools/lib/lang/es_usersettings.lng
+++ b/interface/web/tools/lib/lang/es_usersettings.lng
@@ -5,6 +5,8 @@
 $wb['password_mismatch'] = 'La contraseña indicada en el segundo campo no coincide con la del primero.';
 $wb['Form to edit the user password and language.'] = 'Formulario para editar el usuario y la contraseña.';
 $wb['Settings'] = 'Configuraciones';
-$wb['id_rsa_txt'] = 'De claves RSA';
-$wb['ssh_rsa_txt'] = 'Claves SSH RSA';
+$wb['generate_password_txt'] = 'Generar contraseña';
+$wb['repeat_password_txt'] = 'Repetir contraseña';
+$wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
+$wb['password_match_txt'] = 'Las contraseñas coinciden.';
 ?>

--
Gitblit v1.9.1