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/fr_server_list.lng |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server_list.lng b/interface/web/admin/lib/lang/fr_server_list.lng
index 58b0704..ddaeb63 100644
--- a/interface/web/admin/lib/lang/fr_server_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_list.lng
@@ -1,15 +1,14 @@
-<?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"] = "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";
-?>
-
+<?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'] = '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';
+$wb['xmpp_server_txt'] = 'XMPP';
+?>

--
Gitblit v1.9.1