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 |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server.lng b/interface/web/admin/lib/lang/fr_server.lng
index e753c59..fe7f4a4 100644
--- a/interface/web/admin/lib/lang/fr_server.lng
+++ b/interface/web/admin/lib/lang/fr_server.lng
@@ -5,11 +5,12 @@
 $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'] = 'DB-Server';
-$wb['vserver_server_txt'] = 'VServer-Server';
-$wb['mirror_server_id_txt'] = 'Serveur miroir';
-$wb['- None -'] = '- Aucun(e) -';
+$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