From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

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

diff --git a/interface/web/admin/lib/lang/tr_users_list.lng b/interface/web/admin/lib/lang/tr_users_list.lng
index f666162..9c0b33d 100644
--- a/interface/web/admin/lib/lang/tr_users_list.lng
+++ b/interface/web/admin/lib/lang/tr_users_list.lng
@@ -1,10 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Kullanıcılar';
 $wb['username_txt'] = 'Kullanıcı adı';
-$wb['name_txt'] = 'İsim';
-$wb['vorname_txt'] = 'Takma ad';
-$wb['ort_txt'] = 'şehir';
+$wb['client_id_txt'] = 'Client ID';
+$wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Yeni Kullanıcı';
 $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!';
+$wb['groups_txt'] = 'Groups';
 ?>
-

--
Gitblit v1.9.1