From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index db91358..7351d65 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -7,7 +7,7 @@
 $wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
 $wb['modules_txt'] = 'Άρθρωμα';
 $wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
-$wb['app_theme_txt'] = 'Design';
+$wb['app_theme_txt'] = 'Θεματική Παραλλαγή';
 $wb['typ_txt'] = 'Τύπος';
 $wb['active_txt'] = 'Ενεργός';
 $wb['language_txt'] = 'Γλώσσα';
@@ -25,4 +25,11 @@
 $wb['groups_txt'] = 'Ομάδες';
 $wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα';
 $wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$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