Merge branch 'florian030/ispconfig3-master' into stable-3.1

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

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

@@ -1,5 +1,5 @@
<?php
$wb['passwort_txt'] = 'Passwort';
$wb['password_txt'] = 'Passwort';
$wb['language_txt'] = 'Sprache';
$wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_strength_txt'] = 'Passwortkomplexität';