From b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 27 Nov 2014 02:31:46 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc/master' into new-layout-3.1

---
 interface/web/login/lib/lang/en.lng |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/web/login/lib/lang/en.lng b/interface/web/login/lib/lang/en.lng
index e540ef2..e7487da 100644
--- a/interface/web/login/lib/lang/en.lng
+++ b/interface/web/login/lib/lang/en.lng
@@ -24,4 +24,5 @@
 $wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
 $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
 $wb['stay_logged_in_txt'] = 'Keep me logged in';
-?>
\ No newline at end of file
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
+?>

--
Gitblit v1.9.1