From 6a1dced42e084d1ee59ff63a17b99e592bd0e8c6 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 08 May 2014 08:03:22 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

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

diff --git a/interface/web/admin/lib/lang/fr_server_config_list.lng b/interface/web/admin/lib/lang/fr_server_config_list.lng
index 636c2e0..850cdd1 100644
--- a/interface/web/admin/lib/lang/fr_server_config_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_config_list.lng
@@ -1,4 +1,4 @@
 <?php
-$wb['list_head_txt'] = 'Server Configuration';
-$wb['server_name_txt'] = 'Server';
+$wb['list_head_txt'] = 'Configuration du serveur';
+$wb['server_name_txt'] = 'Serveur';
 ?>

--
Gitblit v1.9.1