From f382f091aa97d10056b4c433aa55298fece010d4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:16:30 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

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

diff --git a/interface/web/admin/lib/lang/es_server.lng b/interface/web/admin/lib/lang/es_server.lng
index 2b96119..c43cfbf 100644
--- a/interface/web/admin/lib/lang/es_server.lng
+++ b/interface/web/admin/lib/lang/es_server.lng
@@ -10,6 +10,6 @@
 $wb['active_txt'] = 'Activar';
 $wb['mirror_server_id_txt'] = 'Es el espejo del Servidor';
 $wb['- None -'] = '- Ninguno -';
-$wb['proxy_server_txt'] = 'Servidor-Proxy';
-$wb['firewall_server_txt'] = 'Servidor-Cortafuegos';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['firewall_server_txt'] = 'Cortafuegos';
 ?>

--
Gitblit v1.9.1