From 75ae8325570f4852f66a4bea95c2e970904b8f52 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 7 Jul 2003 01:34:43 +0000
Subject: [PATCH] slight preference text tweaks; default underline setting to
 _not_ override browser setting; add missing toc toggle strings

---
 includes/Skin.php      | 7 +++----
 languages/Language.php | 8 ++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index b7c1ed18d5..7f68821632 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -81,15 +81,14 @@ class Skin {
 
 		$s = "";
 		if ( 1 == $wgUser->getOption( "underline" ) ) {
-			$s .= "a.stub, a.new, a.internal, a.external { " .
-			  "text-decoration: underline; }\n";
+			# Don't override browser settings
 		} else {
+			# Force no underline
 			$s .= "a.stub, a.new, a.internal, a.external { " .
 			  "text-decoration: none; }\n";
 		}
 		if ( 1 == $wgUser->getOption( "highlightbroken" ) ) {
-			$s .= "a.new { color: #CC2200; }\n" .
-			  "#quickbar a.new { color: CC2200; }\n";
+			$s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
 		}
 		if ( 1 == $wgUser->getOption( "justify" ) ) {
 			$s .= "#article { text-align: justify; }\n";
diff --git a/languages/Language.php b/languages/Language.php
index ec946a75a9..232089a59a 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -66,7 +66,7 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
 	"rememberpassword" => "Remember password across sessions",
 	"editwidth" => "Edit box has full width",
 	"editondblclick" => "Edit pages on double click (JavaScript)",
-	"watchdefault" => "Watch new and modified articles",
+	"watchdefault" => "Add pages you edit to your watchlist",
 	"minordefault" => "Mark all edits minor by default",
 	"previewontop" => "Show preview before edit box and not after it",
 	"nocache" => "Disable page caching"
@@ -365,6 +365,8 @@ See $1.",
 "newmessageslink" => "new messages",
 "editsection"=>"edit",
 "toc" => "Table of contents",
+"showtoc" => "show",
+"hidetoc" => "hide",
 
 # Main script and global functions
 #
@@ -611,7 +613,9 @@ $2 List redirects &nbsp; Search for $3 $9",
   wfLocalUrl( "Special:Userlogin" ) . "\">logged in</a>
 to set user preferences.",
 "prefslogintext" => "You are logged in as \"$1\".
-Your internal ID number is $2.",
+Your internal ID number is $2.
+
+See [[Wikipedia:User preferences help]] for help deciphering the options.",
 "prefsreset"	=> "Preferences have been reset from storage.",
 "qbsettings"	=> "Quickbar settings", 
 "changepassword" => "Change password",
-- 
2.20.1