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_server_list.lng |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/interface/web/admin/lib/lang/ja_server_list.lng b/interface/web/admin/lib/lang/ja_server_list.lng
index c44136b..2c5a6d2 100644
--- a/interface/web/admin/lib/lang/ja_server_list.lng
+++ b/interface/web/admin/lib/lang/ja_server_list.lng
@@ -1,12 +1,14 @@
 <?php
-$wb["list_head_txt"] = 'サーバー';
-$wb["server_name_txt"] = 'サーバー名';
-$wb["mail_server_txt"] = 'メール';
-$wb["web_server_txt"] = 'ウェブ';
-$wb["dns_server_txt"] = 'DNS';
-$wb["file_server_txt"] = 'ファイルサーバー';
-$wb["db_server_txt"] = 'DB';
-$wb["vserver_server_txt"] = 'VServer';
-$wb["add_new_record_txt"] = 'サーバーを追加する';
+$wb['list_head_txt'] = 'サーバー';
+$wb['server_name_txt'] = 'サーバー名';
+$wb['mail_server_txt'] = 'メール';
+$wb['web_server_txt'] = 'ウェブ';
+$wb['dns_server_txt'] = 'DNS';
+$wb['file_server_txt'] = 'ファイルサーバー';
+$wb['db_server_txt'] = 'DB';
+$wb['vserver_server_txt'] = 'VServer';
+$wb['add_new_record_txt'] = 'サーバーを追加する';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
-

--
Gitblit v1.9.1