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

diff --git a/interface/web/admin/lib/lang/ja_server.lng b/interface/web/admin/lib/lang/ja_server.lng
index ea0763e..1450c38 100644
--- a/interface/web/admin/lib/lang/ja_server.lng
+++ b/interface/web/admin/lib/lang/ja_server.lng
@@ -1,12 +1,16 @@
-<?php
-$wb["config_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["active_txt"] = '有効';
-?>
-
+<?php
+$wb['config_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['active_txt'] = '有効';
+$wb['mirror_server_id_txt'] = 'Is mirror of Server';
+$wb['- None -'] = '- None -';
+$wb['proxy_server_txt'] = 'Proxy-Server';
+$wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+?>

--
Gitblit v1.9.1