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/fr_mail_alias_list.lng |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/interface/web/mail/lib/lang/fr_mail_alias_list.lng b/interface/web/mail/lib/lang/fr_mail_alias_list.lng
index 382c6c3..406d52a 100644
--- a/interface/web/mail/lib/lang/fr_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_alias_list.lng
@@ -1,12 +1,8 @@
-<?php
-// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
-// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
-
-$wb["list_head_txt"] = "Alias d'email";
-$wb["active_txt"] = "Actif";
-$wb["source_txt"] = "source";
-$wb["destination_txt"] = "Destination";
-$wb["email_txt"] = "Email";
-$wb["add_new_record_txt"] = "Ajouter un nouvel alias d'email";
-?>
-
+<?php
+$wb['list_head_txt'] = 'Alias d\'email';
+$wb['active_txt'] = 'Actif';
+$wb['source_txt'] = 'source';
+$wb['destination_txt'] = 'Destination';
+$wb['email_txt'] = 'Email';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel alias d\'email';
+?>

--
Gitblit v1.9.1