Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

 interface/web/strengthmeter/lib/lang/de_strengthmeter.lng

@@ -4,5 +4,5 @@
$wb['password_strength_2_txt'] = 'Mittel';
$wb['password_strength_3_txt'] = 'Gut';
$wb['password_strength_4_txt'] = 'Stark';
$wb['password_strength_5_txt'] = 'sehr stark';
$wb['password_strength_5_txt'] = 'Sehr stark';
?>