From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use

---
 interface/web/admin/lib/lang/fr_language_complete.lng |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_language_complete.lng b/interface/web/admin/lib/lang/fr_language_complete.lng
index 734e75c..30dea02 100644
--- a/interface/web/admin/lib/lang/fr_language_complete.lng
+++ b/interface/web/admin/lib/lang/fr_language_complete.lng
@@ -1,6 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
-$wb["language_select_txt"] = 'Select language';
-$wb['btn_save_txt'] = 'Merge files now';
-$wb['btn_cancel_txt'] = 'Back';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'Fusion de langages';
+$wb['language_select_txt'] = 'Sélectionnez le langage';
+$wb['btn_save_txt'] = 'Fusionner les fichiers';
+$wb['btn_cancel_txt'] = 'Précédent';
+$wb['list_desc_txt'] = 'Fusionne le langage sélectionné avec le langage principal anglais. <br />Ceci ajoute les élements manquants en anglais au fichier sélectionné.';
+?>

--
Gitblit v1.9.1