From b0f818efec0b74741d6fa53d0e86a95065d4e2d1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 12 Feb 2016 11:06:36 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/interface/web/mail/lib/lang/fr_mail_user_list.lng b/interface/web/mail/lib/lang/fr_mail_user_list.lng
index 01241d3..0d41529 100644
--- a/interface/web/mail/lib/lang/fr_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user_list.lng
@@ -1,8 +1,12 @@
-<?php
-$wb['list_head_txt'] = 'Boîte mail';
-$wb['email_txt'] = 'Email';
-$wb['autoresponder_txt'] = 'Autorépondeur';
-$wb['add_new_record_txt'] = 'Ajouter une nouvelle boîte email';
-$wb['name_txt'] = 'Nom véritable';
-?>
-
+<?php
+$wb['list_head_txt'] = 'Boîte mail';
+$wb['email_txt'] = 'E-mail';
+$wb['autoresponder_txt'] = 'Répondeur automatique';
+$wb['add_new_record_txt'] = 'Ajouter une nouvelle boîte e-mail';
+$wb['name_txt'] = 'Nom véritable';
+$wb['login_txt'] = 'Nom d’utilisateur';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
+?>

--
Gitblit v1.9.1