From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/es_server.lng |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 6be17ba..8443578
--- a/interface/web/admin/lib/lang/es_server.lng
+++ b/interface/web/admin/lib/lang/es_server.lng
@@ -1,16 +1,16 @@
 <?php
+$wb['- None -'] = '- Ninguno -';
+$wb['active_txt'] = 'Habilitado';
 $wb['config_txt'] = 'configuración';
-$wb['server_name_txt'] = 'Nombre del servidor';
-$wb['mail_server_txt'] = 'Servidor de correo';
-$wb['web_server_txt'] = 'Servidor web';
+$wb['db_server_txt'] = 'Servidor de DB';
 $wb['dns_server_txt'] = 'Servidor DNS';
 $wb['file_server_txt'] = 'Servidor de archivos';
-$wb['db_server_txt'] = 'Servidor de DB';
-$wb['vserver_server_txt'] = 'Servidor VServer';
-$wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Cortafuegos';
-$wb['active_txt'] = 'Habilitado';
+$wb['mail_server_txt'] = 'Servidor de correo';
 $wb['mirror_server_id_txt'] = 'Es el espejo del servidor';
-$wb['- None -'] = '- Ninguno -';
-$wb['xmpp_server_txt'] = 'XMPP Server';
+$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';
 ?>

--
Gitblit v1.9.1