Merge "Kill 'newmessageslink' and 'newmessagesdifflink' messages"

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 9ac5bd4..df3b214 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -287,7 +287,6 @@ $wgMessageStructure = array(
                'disclaimerpage',
                'edithelp',
                'edithelppage',
-               'help',
                'helppage',
                'mainpage',
                'mainpage-description',
@@ -313,8 +312,6 @@ $wgMessageStructure = array(
                'backlinksubtitle',
                'retrievedfrom',
                'youhavenewmessages',
-               'newmessageslink',
-               'newmessagesdifflink',
                'youhavenewmessagesfromusers',
                'youhavenewmessagesmanyusers',
                'newmessageslinkplural',
@@ -434,6 +431,7 @@ $wgMessageStructure = array(
                'invalidtitle-unknownnamespace',
                'exception-nologin',
                'exception-nologin-text',
+               'exception-nologin-text-manual',
        ),
        'virus' => array(
                'virus-badscanner',
@@ -1028,7 +1026,7 @@ $wgMessageStructure = array(
                'mypreferences',
                'prefs-edits',
                'prefsnologin',
-               'prefsnologintext',
+               'prefsnologintext2',
                'changepassword',
                'changepassword-summary',
                'prefs-skin',
@@ -1090,7 +1088,6 @@ $wgMessageStructure = array(
                'prefs-namespaces',
                'defaultns',
                'default',
-               'defaultns',
                'prefs-files',
                'prefs-custom-css',
                'prefs-custom-js',
@@ -1517,7 +1514,6 @@ $wgMessageStructure = array(
                'lockmanager-fail-deletelock',
                'lockmanager-fail-acquirelock',
                'lockmanager-fail-openlock',
-               'lockmanager-fail-acquirelock',
                'lockmanager-fail-releaselock',
                'lockmanager-fail-db-bucket',
                'lockmanager-fail-db-release',
@@ -1769,7 +1765,6 @@ $wgMessageStructure = array(
                'nmembers',
                'nrevisions',
                'nviews',
-               'nchanges',
                'nimagelinks',
                'ntransclusions',
                'specialpage-empty',
@@ -2724,7 +2719,8 @@ $wgMessageStructure = array(
                'tooltip-undo',
                'tooltip-preferences-save',
                'tooltip-summary',
-               'tooltip-iwiki',
+               'interlanguage-link-title',
+               'interlanguage-link-title-langonly',
        ),
        'stylesheets' => array(
                'common.css',
@@ -3523,6 +3519,7 @@ $wgMessageStructure = array(
                'percent',
                'parentheses',
                'brackets',
+               'quotation-marks',
        ),
        'imgmulti' => array(
                'imgmultipageprev',
@@ -3583,9 +3580,6 @@ $wgMessageStructure = array(
                'lag-warn-normal',
                'lag-warn-high',
        ),
-       'watch' => array(
-               'confirm-watch-button',
-       ),
        'watchlisteditor' => array(
                'editwatchlist-summary',
                'watchlistedit-numitems',
@@ -3740,6 +3734,7 @@ $wgMessageStructure = array(
        'special-specialpages' => array(
                'specialpages',
                'specialpages-summary',
+               'specialpages-note-top',
                'specialpages-note',
                'specialpages-group-maintenance',
                'specialpages-group-other',
@@ -3821,9 +3816,6 @@ $wgMessageStructure = array(
                'sqlite-has-fts',
                'sqlite-no-fts',
        ),
-       'unwatch' => array(
-               'confirm-unwatch-button',
-       ),
        'logging' => array(
                'logentry-delete-delete',
                'logentry-delete-restore',
@@ -3882,8 +3874,6 @@ $wgMessageStructure = array(
                'newuserlog-create-entry',
                'newuserlog-create2-entry',
                'newuserlog-autocreate-entry',
-               'suppressedarticle',
-               'deletedarticle',
                // 'uploadedimage',
                // 'overwroteimage',
                'rightslogentry',
@@ -3983,6 +3973,20 @@ $wgMessageStructure = array(
                'limitreport-expensivefunctioncount',
                'limitreport-expensivefunctioncount-value',
        ),
+       'expandtemplates' => array(
+               'expandtemplates',
+               'expandtemplates-desc',
+               'expand_templates_intro',
+               'expand_templates_title',
+               'expand_templates_input',
+               'expand_templates_output',
+               'expand_templates_xml_output',
+               'expand_templates_ok',
+               'expand_templates_remove_comments',
+               'expand_templates_remove_nowiki',
+               'expand_templates_generate_xml',
+               'expand_templates_preview',
+       ),
 );
 
 /** Comments for each block */
@@ -4003,7 +4007,8 @@ future releases. Also note that since each list value is wrapped in a unique
        'cologneblue' => 'Cologne Blue skin',
        'vector' => 'Vector skin',
        'miscellaneous2' => '',
-       'links' => 'All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage).',
+       'links' => 'All link text and link target definitions of links into project namespace ' .
+               'that get used by other message strings, with the exception of user group pages (see grouppage).',
        'badaccess' => '',
        'versionrequired' => '',
        'miscellaneous3' => '',
@@ -4053,7 +4058,8 @@ future releases. Also note that since each list value is wrapped in a unique
        'uploadstash' => 'Special:UploadStash',
        'img-auth' => 'img_auth script messages',
        'http-errors' => 'HTTP errors',
-       'upload-curl-errors' => 'Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>',
+       'upload-curl-errors' => 'Some likely curl errors. More could be added from ' .
+               '<http://curl.haxx.se/libcurl/c/libcurl-errors.html>',
        'licenses' => '',
        'filelist' => 'Special:ListFiles',
        'filedescription' => 'File description page',
@@ -4123,7 +4129,8 @@ future releases. Also note that since each list value is wrapped in a unique
        'imagedeletion' => 'Image deletion',
        'browsediffs' => 'Browsing diffs',
        'newfiles' => 'Special:NewFiles',
-       'video-info' => 'Video information, used by Language::formatTimePeriod() to format lengths in the above messages',
+       'video-info' => 'Video information, used by Language::formatTimePeriod() to ' .
+               'format lengths in the above messages',
        'human-timestamps' => 'Human-readable timestamps',
        'badimagelist' => 'Bad image list',
        'variantname-zh' => "Short names for language variants used for language conversion links.
@@ -4227,4 +4234,5 @@ Variants for Chinese language",
        'cachedspecial' => 'SpecialCachedPage',
        'rotation' => 'Image rotation',
        'limitreport' => 'Limit report',
+       'expandtemplates' => 'Special:ExpandTemplates'
 );