From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/tools/lib/lang/en_usersettings.lng b/interface/web/tools/lib/lang/en_usersettings.lng
index ca6ca60..e882321 100644
--- a/interface/web/tools/lib/lang/en_usersettings.lng
+++ b/interface/web/tools/lib/lang/en_usersettings.lng
@@ -1,7 +1,12 @@
 <?php
-$wb["passwort_txt"] = 'Password';
+$wb["password_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.';
-?>
\ No newline at end of file
+$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