From b0f818efec0b74741d6fa53d0e86a95065d4e2d1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 12 Feb 2016 11:06:36 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index d411ce5..7351d65 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -30,5 +30,6 @@
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
 $wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
+$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
-

--
Gitblit v1.9.1