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/es_server.lng |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/interface/web/admin/lib/lang/es_server.lng b/interface/web/admin/lib/lang/es_server.lng
index 5d36466..c43cfbf 100644
--- a/interface/web/admin/lib/lang/es_server.lng
+++ b/interface/web/admin/lib/lang/es_server.lng
@@ -1,12 +1,15 @@
-<?php
-$wb['config_txt'] = 'configuración';
-$wb['server_name_txt'] = 'Nombre de servidor';
-$wb['mail_server_txt'] = 'Servidor de correo';
-$wb['web_server_txt'] = 'Servidor web';
-$wb['dns_server_txt'] = 'Servidor DNS';
-$wb['file_server_txt'] = 'Servidor de ficheros';
-$wb['db_server_txt'] = 'Servidor de bases de datos';
-$wb['vserver_server_txt'] = 'ServidorVirtual-Servidor';
-$wb['active_txt'] = 'Activar';
-?>
-
+<?php
+$wb['config_txt'] = 'configuración';
+$wb['server_name_txt'] = 'Nombre de servidor';
+$wb['mail_server_txt'] = 'Servidor de correo';
+$wb['web_server_txt'] = 'Servidor web';
+$wb['dns_server_txt'] = 'Servidor DNS';
+$wb['file_server_txt'] = 'Servidor de ficheros';
+$wb['db_server_txt'] = 'Servidor de bases de datos';
+$wb['vserver_server_txt'] = 'Servidor-Virtual';
+$wb['active_txt'] = 'Activar';
+$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