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

diff --git a/interface/web/admin/lib/lang/ja_server.lng b/interface/web/admin/lib/lang/ja_server.lng
index 8eb0ef7..6f1574a 100644
--- a/interface/web/admin/lib/lang/ja_server.lng
+++ b/interface/web/admin/lib/lang/ja_server.lng
@@ -10,4 +10,6 @@
 $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';
 ?>

--
Gitblit v1.9.1