From 39fab06dfae1e0218a1bb3aa48a381586dfaea6d Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Sat, 13 Dec 2014 16:18:41 -0500
Subject: [PATCH] Merge branch 'develop' into 'master'

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

diff --git a/interface/web/admin/lib/lang/en_users_list.lng b/interface/web/admin/lib/lang/en_users_list.lng
index 258abfe..9860ab4 100644
--- a/interface/web/admin/lib/lang/en_users_list.lng
+++ b/interface/web/admin/lib/lang/en_users_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb["list_head_txt"] = 'Users';
 $wb["username_txt"] = 'Username';
-$wb["name_txt"] = 'Name';
-$wb["vorname_txt"] = 'Forename';
-$wb["ort_txt"] = 'city';
+$wb["client_id_txt"] = 'User ID';
+$wb["active_txt"] = 'Active';
+$wb["groups_txt"] = 'Groups';
 $wb["add_new_record_txt"] = 'Add new user';
+$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1