Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 b973ff1298fed20030a13d86e1233151a7e3189b

 interface/web/sites/lib/lang/fr_database_user.lng

@@ -10,7 +10,7 @@
$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
$wb['generate_password_txt'] = 'Générer un mot de passe';
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';