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.lng |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server.lng b/interface/web/admin/lib/lang/fr_server.lng
index af354c8..fe7f4a4 100644
--- a/interface/web/admin/lib/lang/fr_server.lng
+++ b/interface/web/admin/lib/lang/fr_server.lng
@@ -1,13 +1,16 @@
 <?php
-$wb["server_name_txt"] = 'Nom du serveur';
-$wb["mail_server_txt"] = 'Serveur Mail';
-$wb["web_server_txt"] = 'Serveur Web';
-$wb["dns_server_txt"] = 'Serveur DNS';
-$wb["file_server_txt"] = 'Serveur de fichier';
-$wb["mysql_server_txt"] = 'Serveur MySQL';
-$wb["postgresql_server_txt"] = 'Serveur PostgreSQL';
-$wb["firebird_server_txt"] = 'Serveur Firebird';
-$wb["active_txt"] = 'Actif';
-$wb["btn_save_txt"] = 'Sauver';
-$wb["btn_cancel_txt"] = 'Annuler';
-?>
\ No newline at end of file
+$wb['server_name_txt'] = 'Nom du serveur';
+$wb['mail_server_txt'] = 'Serveur Mail';
+$wb['web_server_txt'] = 'Serveur Web';
+$wb['dns_server_txt'] = 'Serveur DNS';
+$wb['file_server_txt'] = 'Serveur de fichier';
+$wb['active_txt'] = 'Actif';
+$wb['config_txt'] = 'Config';
+$wb['db_server_txt'] = 'Serveur BDd';
+$wb['vserver_server_txt'] = 'Serveur VServer';
+$wb['mirror_server_id_txt'] = 'Est miroir du serveur';
+$wb['- None -'] = '- Aucun -';
+$wb['proxy_server_txt'] = 'Proxy-Server';
+$wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+?>

--
Gitblit v1.9.1