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 |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server_list.lng b/interface/web/admin/lib/lang/fr_server_list.lng
index b4e6569..ddaeb63 100644
--- a/interface/web/admin/lib/lang/fr_server_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_list.lng
@@ -1,12 +1,14 @@
-<?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';
-?>
-
+<?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