From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/admin/lib/lang/en_server_list.lng |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/lib/lang/en_server_list.lng b/interface/web/admin/lib/lang/en_server_list.lng
index d15701e..164468e 100644
--- a/interface/web/admin/lib/lang/en_server_list.lng
+++ b/interface/web/admin/lib/lang/en_server_list.lng
@@ -7,5 +7,7 @@
 $wb["file_server_txt"] = 'File';
 $wb["db_server_txt"] = 'DB';
 $wb["vserver_server_txt"] = 'VServer';
+$wb["proxy_server_txt"] = 'Proxy';
+$wb["firewall_server_txt"] = 'Firewall';
 $wb["add_new_record_txt"] = 'Add new Server';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1