Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5

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

@@ -5,5 +5,8 @@
$wb['password_mismatch'] = 'As senhas não coincidem';
$wb['Form to edit the user password and language.'] = 'Formulário para alterar idioma e senha';
$wb['Settings'] = 'Configurações';
$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.';
?>