From f511a0c5685e938255638ee86545f2815c66bab8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 10 Jul 2008 16:25:57 +0000
Subject: [PATCH] TimeZone information are more clear.

---
 htdocs/admin/system/dolibarr.php | 4 ++--
 htdocs/langs/en_US/admin.lang    | 6 +++---
 htdocs/langs/fr_FR/admin.lang    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index c7d3eba38f6..6311eea0abe 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -61,10 +61,10 @@ print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("LanguageParameter","
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("LanguageParameter","PHP LC_MONETARY")."</td><td>".setlocale(LC_MONETARY,0)."</td></tr>\n";
 $var=!$var;
-print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("PHPTZ")." (date.timezone)</td><td>".ini_get("date.timezone")."</td></tr>\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
-$var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("ServerTZ")." (TZ)</td><td>".$_ENV["TZ"]."</td></tr>\n";
 $var=!$var;
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("PHPTZ")." (date.timezone)</td><td>".ini_get("date.timezone")."</td></tr>\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+$var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("PHPServerOffsetWithGreenwich")."</td><td>".(- dolibarr_mktime(0,0,0,1,1,1970))."</td></tr>\n";
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentHour")."</td><td>".dolibarr_print_date(time(),'dayhour')."</td></tr>\n";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1e6fe1ff759..0d58e455c61 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -71,9 +71,9 @@ LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
 CurrentDolibarrLanguage=Dolibarr current language
 DolibarrTZ=Time Zone
-ServerTZ=Server Time Zone
-PHPTZ=PHP Time Zone
-PHPServerOffsetWithGreenwich=Server PHP Offset width Greenwich (secondes)
+ServerTZ=Time Zone Server
+PHPTZ=Time Zone PHP
+PHPServerOffsetWithGreenwich=Offset for PHP server width Greenwich (secondes)
 CurrentHour=Current hour
 OSEnv=OS Environment
 Box=Box
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 05bdaca319e..bc3ae640479 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -71,9 +71,9 @@ LanguageBrowserParameter=Variable %s
 LocalisationDolibarrParameters=Paramètres de localisation
 CurrentDolibarrLanguage=Langue Dolibarr courante
 DolibarrTZ=Time Zone
-ServerTZ=Serveur Time Zone
-PHPTZ=PHP Time Zone
-PHPServerOffsetWithGreenwich=Serveur PHP offset avec Greenwich (secondes)
+ServerTZ=Time Zone Serveur
+PHPTZ=Time Zone PHP
+PHPServerOffsetWithGreenwich=Offset serveur PHP avec Greenwich (secondes)
 CurrentHour=Heure courante
 OSEnv=Environnement OS
 Box=Boîte