From 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 17 Mar 2016 07:30:11 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

diff --git a/interface/web/tools/lib/lang/en_usersettings.lng b/interface/web/tools/lib/lang/en_usersettings.lng
index 1497848..efbe6c3 100644
--- a/interface/web/tools/lib/lang/en_usersettings.lng
+++ b/interface/web/tools/lib/lang/en_usersettings.lng
@@ -2,9 +2,11 @@
 $wb["passwort_txt"] = 'Password';
 $wb["password_strength_txt"] = 'Password strength';
 $wb["language_txt"] = 'Language';
-$wb["btn_save_txt"] = 'Save';
-$wb["btn_cancel_txt"] = 'Cancel';
 $wb["password_mismatch"] = 'The password in the second password field does not match the first password.';
 $wb["Form to edit the user password and language."] = 'Form to edit the user password and language.';
 $wb["Settings"] = 'Settings';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
 ?>

--
Gitblit v1.9.1