From d44c3fa38bb0e29718ad7d4009342faf9d2a32a7 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 28 Jun 2016 06:00:23 -0400
Subject: [PATCH] Merge branch 'patch-2' into 'stable-3.1'

---
 interface/web/tools/lib/lang/de_usersettings.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng
index 908bbf6..c643d38 100644
--- a/interface/web/tools/lib/lang/de_usersettings.lng
+++ b/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';

--
Gitblit v1.9.1