From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/admin/lib/lang/es_server.lng b/interface/web/admin/lib/lang/es_server.lng
old mode 100644
new mode 100755
index c43cfbf..c24901a
--- a/interface/web/admin/lib/lang/es_server.lng
+++ b/interface/web/admin/lib/lang/es_server.lng
@@ -1,15 +1,16 @@
 <?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['active_txt'] = 'Habilitado';
+$wb['config_txt'] = 'configuración';
+$wb['db_server_txt'] = 'Servidor de DB';
+$wb['dns_server_txt'] = 'Servidor DNS';
+$wb['file_server_txt'] = 'Servidor de archivos';
 $wb['firewall_server_txt'] = 'Cortafuegos';
-?>
+$wb['mail_server_txt'] = 'Servidor de correo';
+$wb['mirror_server_id_txt'] = 'Es el espejo del servidor';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['server_name_txt'] = 'Nombre del servidor';
+$wb['vserver_server_txt'] = 'Servidor VServer';
+$wb['web_server_txt'] = 'Servidor web';
+$wb['xmpp_server_txt'] = 'Servidor XMPP';
+?>
\ No newline at end of file

--
Gitblit v1.9.1