Merge "Disable Special:PasswordReset when $wgEnableEmail is false"

[lhc/web/wiklou.git] / maintenance / language / messages.inc

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 077b7fd..6dddebd 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -56,8 +56,6 @@ $wgMessageStructure = array(
                'tog-shownumberswatching',
                'tog-oldsig',
                'tog-fancysig',
-               'tog-externaleditor',
-               'tog-externaldiff',
                'tog-showjumplinks',
                'tog-uselivepreview',
                'tog-forceeditsummary',
@@ -72,6 +70,7 @@ $wgMessageStructure = array(
                'tog-showhiddencats',
                'tog-noconvertlink',
                'tog-norollbackdiff',
+               'tog-useeditwarning',
        ),
        'underline' => array(
                'underline-always',
@@ -538,6 +537,7 @@ $wgMessageStructure = array(
                'passwordreset-text',
                'passwordreset-legend',
                'passwordreset-disabled',
+               'passwordreset-emaildisabled',
                'passwordreset-pretext',
                'passwordreset-username',
                'passwordreset-domain',
@@ -695,6 +695,7 @@ $wgMessageStructure = array(
                'content-failed-to-parse',
                'invalid-content-data',
                'content-not-allowed-here',
+               'editwarning-warning',
        ),
        'contentmodels' => array(
                'content-model-wikitext',
@@ -943,19 +944,11 @@ $wgMessageStructure = array(
                'search-external',
                'searchdisabled',
                'googlesearch',
+               'search-error',
        ),
        'opensearch' => array(
                'opensearch-desc',
        ),
-       'quickbar' => array(
-               'qbsettings',
-               'qbsettings-none',
-               'qbsettings-fixedleft',
-               'qbsettings-fixedright',
-               'qbsettings-floatingleft',
-               'qbsettings-floatingright',
-               'qbsettings-directionality',
-       ),
        'preferences' => array(
                'preferences',
                'preferences-summary',
@@ -1480,7 +1473,6 @@ $wgMessageStructure = array(
                'http-read-error',
                'http-timed-out',
                'http-curl-error',
-               'http-host-unreachable',
                'http-bad-status',
        ),
 
@@ -2280,6 +2272,7 @@ $wgMessageStructure = array(
                'sorbs',
                'sorbsreason',
                'sorbs_create_account_reason',
+               'xffblockreason',
                'cant-block-while-blocked',
                'cant-see-hidden-user',
                'ipbblocked',
@@ -2624,13 +2617,8 @@ $wgMessageStructure = array(
        ),
        'stylesheets' => array(
                'common.css',
-               'standard.css',
-               'nostalgia.css',
                'cologneblue.css',
                'monobook.css',
-               'myskin.css',
-               'chick.css',
-               'simple.css',
                'modern.css',
                'vector.css',
                'print.css',
@@ -2643,13 +2631,8 @@ $wgMessageStructure = array(
        ),
        'scripts' => array(
                'common.js',
-               'standard.js',
-               'nostalgia.js',
                'cologneblue.js',
                'monobook.js',
-               'myskin.js',
-               'chick.js',
-               'simple.js',
                'modern.js',
                'vector.js',
                'group-autoconfirmed.js',
@@ -2731,13 +2714,8 @@ $wgMessageStructure = array(
                'pageinfo-category-files'
        ),
        'skin' => array(
-               'skinname-standard',
-               'skinname-nostalgia',
                'skinname-cologneblue',
                'skinname-monobook',
-               'skinname-myskin',
-               'skinname-chick',
-               'skinname-simple',
                'skinname-modern',
                'skinname-vector',
        ),
@@ -3696,6 +3674,8 @@ $wgMessageStructure = array(
                'htmlform-submit',
                'htmlform-reset',
                'htmlform-selectorother-other',
+               'htmlform-no',
+               'htmlform-yes',
        ),
        'sqlite' => array(
                'sqlite-has-fts',
@@ -3893,7 +3873,6 @@ XHTML id names.",
        'diffs'               => 'Diffs',
        'search'              => 'Search results',
        'opensearch'          => 'OpenSearch description',
-       'quickbar'            => 'Quickbar',
        'preferences'         => 'Preferences page',
        'preferences-email'   => 'User preference: email validation using jQuery',
        'userrights'          => 'User rights',