* Various things related to the new preferences

diff --git a/languages/Language.php b/languages/Language.php
index 5c570c5..3ffde99 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -275,7 +275,7 @@ global $wgRightsText;
 'tog-editsection'              => 'Enable section editing via [edit] links',
 'tog-editsectiononrightclick'  => 'Enable section editing by right clicking<br /> on section titles (JavaScript)',
 'tog-showtoc'                  => 'Show table of contents<br />(for pages with more than 3 headings)',
-'tog-rememberpassword' => 'Remember password across sessions',
+'tog-rememberpassword' => 'Remember across sessions',
 'tog-editwidth' => 'Edit box has full width',
 'tog-watchdefault' => 'Add pages you edit to your watchlist',
 'tog-minordefault' => 'Mark all edits minor by default',
@@ -580,11 +580,12 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'createaccountmail'    => 'by email',
 'badretype'            => 'The passwords you entered do not match.',
 'userexists'   => 'The user name you entered is already in use. Please choose a different name.',
-'youremail'            => 'Your email²',
-'yourrealname'         => 'Your real name¹',
-'yourlanguage' => 'Interface language',
-'yourvariant'  => 'Language variant',
-'yournick'             => 'Your nickname (for signatures)',
+'youremail'            => 'Email²',
+'yourrealname'         => 'Real name¹',
+'yourlanguage' => 'Language',
+'yourvariant'  => 'Variant',
+'yournick'             => 'Nickname',
+'email'                        => 'Email',
 'emailforlost'         => "Fields marked with stars (*, **) are optional.  Storing an email address enables people to contact you through the website without you having to reveal your
 email address to them, and it can be used to send you a new password if you forget it.<br /><br />Your real name, if you choose to provide it, will be used for giving you attribution for your work.",
 'prefs-help-email-enotif' => 'This address is also used to send you email notifications if you enabled the options.',
@@ -794,7 +795,7 @@ example "fish and and scales".
 Please try another query.',
 'matchtotals'  => "The query \"$1\" matched $2 page titles
 and the text of $3 pages.",
-'nogomatch' => 'No page with this exact title exists, trying full text search.',
+'nogomatch' => 'No page with [[$1|this exact title]] exists, trying full text search.',
 'titlematches' => 'Article title matches',
 'notitlematches' => 'No page title matches',
 'textmatches'  => 'Page text matches',
@@ -873,23 +874,22 @@ See [[Project:User preferences help]] for help deciphering the options.",
 'resetprefs'   => 'Reset preferences',
 'oldpassword'  => 'Old password',
 'newpassword'  => 'New password',
-'retypenew'            => 'Retype new password',
+'retypenew'            => 'Again',
 'textboxsize'  => 'Editing',
 'rows'                 => 'Rows',
 'columns'              => 'Columns',
 'searchresultshead' => 'Search',
-'resultsperpage' => 'Hits to show per page',
-'contextlines' => 'Lines to show per hit',
-'contextchars' => 'Characters of context per line',
+'resultsperpage' => 'Hits per page',
+'contextlines' => 'Lines per hit',
+'contextchars' => 'Context per line',
 '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',
-'timezoneoffset' => 'Offset',
-'servertime'   => 'Server time is now',
+'timezonetext' => 'The number of hours your local time differs from server time (UTC).',
+'localtime'    => 'Local time',
+'timezoneoffset' => 'Offset¹',
+'servertime'   => 'Server time',
 'guesstimezone' => 'Fill in from browser',
 'emailflag'            => 'Disable e-mail from other users',
 'defaultns'            => 'Search in these namespaces by default:',
@@ -1061,10 +1061,8 @@ this old version, (rev) = revert to this old version.
 
 <div class=\"editExternally\">
 '''[$1 Upload this image]'''
-</div><br clear=all />",
-'uploadnewversion' => "<div class=\"editExternally\">
-[$1 Upload a new version of this image]
-</div><br clear=all />",
+</div>",
+'uploadnewversion' => "[$1 Upload a new version of this image]",
 
 # Statistics
 #