Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
7
8
<?php
$wb['password_strength_0_txt'] = 'Too short';
$wb['password_strength_1_txt'] = 'Weak';
$wb['password_strength_2_txt'] = 'Fair';
$wb['password_strength_3_txt'] = 'Good';
$wb['password_strength_4_txt'] = 'Strong';
$wb['password_strength_5_txt'] = 'Very strong';
?>