From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.

---
 interface/web/admin/lib/lang/fr_server_list.lng |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server_list.lng b/interface/web/admin/lib/lang/fr_server_list.lng
index a3013ed..054195f 100644
--- a/interface/web/admin/lib/lang/fr_server_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_list.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['list_head_txt'] = "Serveur";
-$wb['server_name_txt'] = "Nom";
-$wb['mail_server_txt'] = "Mail";
-$wb['web_server_txt'] = "Web";
-$wb['dns_server_txt'] = "DNS";
-$wb['file_server_txt'] = "Fichier";
-$wb['db_server_txt'] = "DB";
-$wb['vserver_server_txt'] = "VServer";
-$wb['add_new_record_txt'] = "Ajouter nouveau serveur";
+$wb['list_head_txt'] = 'Serveur';
+$wb['server_name_txt'] = 'Nom';
+$wb['mail_server_txt'] = 'Mail';
+$wb['web_server_txt'] = 'Web';
+$wb['dns_server_txt'] = 'DNS';
+$wb['file_server_txt'] = 'Fichier';
+$wb['db_server_txt'] = 'Serveur BDD';
+$wb['vserver_server_txt'] = 'Serveur VServer';
+$wb['add_new_record_txt'] = 'Ajouter nouveau serveur';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['firewall_server_txt'] = 'Firewall';
 ?>
-
-

--
Gitblit v1.9.1