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/ja_users_list.lng |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/web/admin/lib/lang/ja_users_list.lng b/interface/web/admin/lib/lang/ja_users_list.lng
index a5fdfd9..6a3fac4 100644
--- a/interface/web/admin/lib/lang/ja_users_list.lng
+++ b/interface/web/admin/lib/lang/ja_users_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"] = 'ユーザー';
-$wb["username_txt"] = 'ユーザー名';
-$wb["name_txt"] = 'Name';
-$wb["vorname_txt"] = 'Forename';
-$wb["ort_txt"] = 'city';
-$wb["add_new_record_txt"] = 'ユーザーを追加する';
+$wb['list_head_txt'] = 'ユーザー';
+$wb['username_txt'] = 'ユーザー名';
+$wb['client_id_txt'] = 'Client ID';
+$wb['active_txt'] = 'Active';
+$wb['add_new_record_txt'] = 'ユーザーを追加する';
+$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