From 24eb7fb507bf805a54a5277a522069f4593c3b75 Mon Sep 17 00:00:00 2001
From: Jens Frank <jeluf@users.mediawiki.org>
Date: Mon, 31 May 2004 20:50:01 +0000
Subject: [PATCH] changed duplicate 'Time format' entry in user preferences to
 use different wfMsg's. BUG 963143

---
 includes/SpecialPreferences.php | 3 ++-
 languages/Language.php          | 1 +
 languages/LanguageDe.php        | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 010c15c6d0..49904c03ea 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -302,6 +302,7 @@ class PreferencesForm {
 		$tbr = wfMsg( "rows" );
 		$tbc = wfMsg( "columns" );
 		$ltz = wfMsg( "localtime" );
+		$timezone = wfMsg( "timezonelegend" );
 		$tzt = wfMsg( "timezonetext" );
 		$tzo = wfMsg( "timezoneoffset" );
 		$tzGuess = wfMsg( "guesstimezone" );
@@ -430,7 +431,7 @@ class PreferencesForm {
 	</fieldset>
 	
 	<fieldset>
-		<legend>$dateFormat</legend>
+		<legend>$timezone</legend>
 		<div><b>$tzServerTime:</b> $nowserver</div>
 		<div><b>$ltz:</b> $nowlocal</div>
 		<div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"{$this->mHourDiff}\" size='6' /></label></div>
diff --git a/languages/Language.php b/languages/Language.php
index 158731718c..4e7a8aa07d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -901,6 +901,7 @@ See [[{{ns:4}}:User preferences help]] for help deciphering the options.",
 "stubthreshold" => "Threshold for stub display",
 "recentchangescount" => "Number of titles in recent changes",
 "savedprefs"	=> "Your preferences have been saved.",
+"timezonelegend" => "Time zone",
 "timezonetext"	=> "Enter number of hours your local time differs
 from server time (UTC).",
 "localtime"	=> "Local time display",
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index d3e44feaad..251b9435e2 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -575,6 +575,7 @@ Ihre interne ID-Nummer ist $2.",
 "stubthreshold" => "Kurze Artikel markieren bis",
 "recentchangescount" => "Anzahl \"Letzte Änderungen\"",
 "savedprefs"	=> "Ihre Einstellungen wurden gespeichert.",
+"timezonelegend" => "Zeitzone",
 "timezonetext"	=> "Geben Sie die Anzahl der Stunden ein, die zwischen Ihrer Zeitzone und UTC liegen.",
 "localtime"	=> "Ortszeit",
 "timezoneoffset" => "Unterschied",
-- 
2.20.1