From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/fr_server.lng |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server.lng b/interface/web/admin/lib/lang/fr_server.lng
index 7224e1d..fe7f4a4 100644
--- a/interface/web/admin/lib/lang/fr_server.lng
+++ b/interface/web/admin/lib/lang/fr_server.lng
@@ -6,10 +6,11 @@
 $wb['file_server_txt'] = 'Serveur de fichier';
 $wb['active_txt'] = 'Actif';
 $wb['config_txt'] = 'Config';
-$wb['db_server_txt'] = 'Serveur BDD';
+$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