From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/mail/lib/lang/es_mail_user_list.lng |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/interface/web/mail/lib/lang/es_mail_user_list.lng b/interface/web/mail/lib/lang/es_mail_user_list.lng
index 698f3fb..e5ef5f6 100644
--- a/interface/web/mail/lib/lang/es_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/es_mail_user_list.lng
@@ -1,8 +1,12 @@
 <?php
 $wb['list_head_txt'] = 'Buzón';
-$wb['email_txt'] = 'Dirección de correo';
-$wb['autoresponder_txt'] = 'Autorespondedor';
-$wb['add_new_record_txt'] = 'Añadir nuevo buzón';
+$wb['postfix_txt'] = 'Recepción';
+$wb['disablesmtp_txt'] = 'SMTP (envío)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
+$wb['email_txt'] = 'Correo';
+$wb['autoresponder_txt'] = 'Auto-respondedor';
+$wb['add_new_record_txt'] = 'Añadir buzón';
 $wb['name_txt'] = 'Nombre';
-$wb['login_txt'] = 'Login';
+$wb['login_txt'] = 'Entrar';
 ?>

--
Gitblit v1.9.1