Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2013-11-25 5b5f7c5ea79c0c9efcb4ecae4bdf1224e8486833

 interface/web/tools/lib/lang/en_usersettings.lng

@@ -5,4 +5,8 @@
$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.';
?>