slight preference text tweaks; default underline setting to _not_ override browser...

diff --git a/includes/Skin.php b/includes/Skin.php
index b7c1ed1..7f68821 100644 (file)
--- 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 ec946a7..232089a 100644 (file)
--- 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",