From 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 14 Jun 2016 04:18:29 -0400
Subject: [PATCH] Merge branch 'florian030/ispconfig3-master' into stable-3.1

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

diff --git a/interface/web/tools/lib/lang/it_usersettings.lng b/interface/web/tools/lib/lang/it_usersettings.lng
index 6e671a3..e75e8d2 100644
--- a/interface/web/tools/lib/lang/it_usersettings.lng
+++ b/interface/web/tools/lib/lang/it_usersettings.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['language_txt'] = 'Lingua';
 $wb['password_mismatch'] = 'Il secondo campo password non corrisponde con il primo.';
 $wb['Form to edit the user password and language.'] = 'Form per modificare la password e la lingua dellutente.';

--
Gitblit v1.9.1