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_list.lng |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/interface/web/admin/lib/lang/es_server_list.lng b/interface/web/admin/lib/lang/es_server_list.lng
old mode 100644
new mode 100755
index 2c68cb8..d78ccd8
--- a/interface/web/admin/lib/lang/es_server_list.lng
+++ b/interface/web/admin/lib/lang/es_server_list.lng
@@ -1,13 +1,14 @@
 <?php
-$wb['list_head_txt'] = 'Servidor';
-$wb['server_name_txt'] = 'Nombre';
-$wb['mail_server_txt'] = 'Correo';
-$wb['web_server_txt'] = 'Web';
+$wb['add_new_record_txt'] = 'Añadir servidor';
+$wb['db_server_txt'] = 'DB';
 $wb['dns_server_txt'] = 'DNS';
-$wb['file_server_txt'] = 'FTP';
-$wb['db_server_txt'] = 'BD';
-$wb['vserver_server_txt'] = 'VServer';
-$wb['add_new_record_txt'] = 'Añadir nuevo servidor';
-$wb['proxy_server_txt'] = 'Proxy';
+$wb['file_server_txt'] = 'Archivo';
 $wb['firewall_server_txt'] = 'Cortafuegos';
+$wb['list_head_txt'] = 'Servidor';
+$wb['mail_server_txt'] = 'Correo';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['server_name_txt'] = 'Nombre';
+$wb['vserver_server_txt'] = 'VServer';
+$wb['web_server_txt'] = 'Web';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>

--
Gitblit v1.9.1