From dedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 20 Dec 2015 04:39:34 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

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

diff --git a/interface/web/admin/lib/lang/es_server.lng b/interface/web/admin/lib/lang/es_server.lng
index 69d4024..68a15b9 100644
--- a/interface/web/admin/lib/lang/es_server.lng
+++ b/interface/web/admin/lib/lang/es_server.lng
@@ -12,4 +12,6 @@
 $wb['active_txt'] = 'Habilitado';
 $wb['mirror_server_id_txt'] = 'Es el espejo del servidor';
 $wb['- None -'] = '- Ninguno -';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['firewall_server_txt'] = 'Cortafuegos';
 ?>

--
Gitblit v1.9.1