Branch merge of preferences work branch. Includes fixes for several bugs. WARNING...

[lhc/web/wiklou.git] / languages / messages / MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ed41ce6..c457554 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -495,14 +495,14 @@ XHTML id names.
 * LANGUAGES', # do not translate or duplicate this message to other languages
 
 # User preference toggles
-'tog-underline'               => 'Underline links:',
+'tog-underline'               => 'Link underlining:',
 'tog-highlightbroken'         => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>)',
 'tog-justify'                 => 'Justify paragraphs',
 'tog-hideminor'               => 'Hide minor edits in recent changes',
 'tog-hidepatrolled'           => 'Hide patrolled edits in recent changes',
 'tog-newpageshidepatrolled'   => 'Hide patrolled pages from new page list',
 'tog-extendwatchlist'         => 'Expand watchlist to show all changes, not just the most recent',
-'tog-usenewrc'                => 'Enhanced recent changes (requires JavaScript)',
+'tog-usenewrc'                => 'Use enhanced recent changes (requires JavaScript)',
 'tog-numberheadings'          => 'Auto-number headings',
 'tog-showtoolbar'             => 'Show edit toolbar (requires JavaScript)',
 'tog-editondblclick'          => 'Edit pages on double click (requires JavaScript)',
@@ -510,7 +510,7 @@ XHTML id names.
 'tog-editsectiononrightclick' => 'Enable section editing by right clicking on section titles (requires JavaScript)',
 'tog-showtoc'                 => 'Show table of contents (for pages with more than 3 headings)',
 'tog-rememberpassword'        => 'Remember my login on this computer',
-'tog-editwidth'               => 'Edit box has full width',
+'tog-editwidth'               => 'Widen the edit box to fill the entire screen',
 'tog-watchcreations'          => 'Add pages I create to my watchlist',
 'tog-watchdefault'            => 'Add pages I edit to my watchlist',
 'tog-watchmoves'              => 'Add pages I move to my watchlist',
@@ -910,6 +910,7 @@ Please choose a different name.',
 'username'                   => 'Username:',
 'uid'                        => 'User ID:',
 'prefs-memberingroups'       => 'Member of {{PLURAL:$1|group|groups}}:',
+'prefs-registration'        => 'Registration time:',
 'yourrealname'               => 'Real name:',
 'yourlanguage'               => 'Language:',
 'yourvariant'                => 'Variant:', # only translate this message to other languages if you have to change it
@@ -1559,12 +1560,12 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'qbsettings-floatingleft'   => 'Floating left',
 'qbsettings-floatingright'  => 'Floating right',
 'changepassword'            => 'Change password',
-'skin'                      => 'Skin',
+'prefs-skin'                      => 'Skin',
 'skin-preview'              => 'Preview',
 'math'                      => 'Math',
 'dateformat'                => 'Date format',
 'datedefault'               => 'No preference',
-'datetime'                  => 'Date and time',
+'prefs-datetime'                  => 'Date and time',
 'math_failure'              => 'Failed to parse',
 'math_unknown_error'        => 'unknown error',
 'math_unknown_function'     => 'unknown function',
@@ -1585,10 +1586,12 @@ please see math/README to configure.',
 'prefs-watchlist-edits-max' => '(maximum number: 1000)',
 'prefs-misc'                => 'Misc',
 'prefs-resetpass'           => 'Change password',
+'prefs-email'                      => 'Email options',
+'prefs-rendering'           => 'Page Rendering',
 'saveprefs'                 => 'Save',
 'resetprefs'                => 'Clear unsaved changes',
 'restoreprefs'              => 'Restore all default settings',
-'textboxsize'               => 'Editing',
+'prefs-editing'             => 'Editing',
 'prefs-edit-boxsize'        => 'Size of the edit window.',
 'rows'                      => 'Rows:',
 'columns'                   => 'Columns:',
@@ -1625,9 +1628,10 @@ please see math/README to configure.',
 'prefs-namespaces'          => 'Namespaces',
 'defaultns'                 => 'Search in these namespaces by default:',
 'default'                   => 'default',
-'files'                     => 'Files',
+'prefs-files'                     => 'Files',
 'prefs-custom-css'          => 'Custom CSS',
 'prefs-custom-js'           => 'Custom JS',
+'prefs-reset-intro'                => 'You can use this page to reset your preferences to the site defaults. This cannot be undone.',
 
 # User rights
 'userrights'                     => 'User rights management',
@@ -3163,7 +3167,7 @@ $1',
 
 # Media information
 'mediawarning'         => "'''Warning''': This file may contain malicious code, by executing it your system may be compromised.<hr />",
-'imagemaxsize'         => 'Limit images on file description pages to:',
+'imagemaxsize'         => "Image size limit:<br/>''(for file description pages)''",
 'thumbsize'            => 'Thumbnail size:',
 'widthheight'          => '$1×$2', # only translate this message to other languages if you have to change it
 'widthheightpage'      => '$1×$2, $3 {{PLURAL:$3|page|pages}}',
@@ -3907,4 +3911,13 @@ Enter the filename without the "{{ns:file}}:" prefix.',
 'dberr-outofdate'   => 'Note that their indexes of our content may be out of date.',
 'dberr-cachederror' => 'This is a cached copy of the requested page, and may not be up to date.',
 
+# HTML forms
+'htmlform-invalid-input' => 'There are problems with some of your input',
+'htmlform-select-badoption' => 'The value you specified is not a valid option.',
+'htmlform-int-invalid' => 'The value you specified is not an integer.',
+'htmlform-int-toolow' => 'The value you specified is below the minimum of $1',
+'htmlform-int-toohigh' => 'The value you specified is above the maximum of $1',
+'htmlform-submit' => 'Submit',
+'htmlform-reset' => 'Undo changes',
+'htmlform-selectorother-other' => 'Other',
 );