Merge "(bug 38556) Add header and footer messages to MediaWiki's info action"

diff --combined languages/messages/MessagesEn.php
index 910c0ae,9873c68..515a433
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1435,7 -1435,6 +1435,7 @@@ You are also promising us that you wrot
  If you do not want your writing to be edited mercilessly, then do not submit it here.<br />
  You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see $1 for details).
  '''Do not submit copyrighted work without permission!'''",
 +'editpage-head-copy-warn'          => '-', # do not translate or duplicate this message to other languages
  'editpage-tos-summary'             => '-', # do not translate or duplicate this message to other languages
  'longpage-hint'                    => '-', # do not translate or duplicate this message to other languages
  'longpageerror'                    => "'''Error: The text you have submitted is {{PLURAL:$1|one kilobyte|$1 kilobytes}} long, which is longer than the maximum of {{PLURAL:$2|one kilobyte|$2 kilobytes}}.'''
@@@ -3735,6 -3734,7 +3735,7 @@@ This is probably caused by a link to a 
  'spam_deleting'       => 'All revisions contained links to $1, deleting',
  
  # Info page
+ 'pageinfo-header'              => '-', # do not translate or duplicate this message to other languages
  'pageinfo-title'               => 'Information for "$1"',
  'pageinfo-header-basic'        => 'Basic information',
  'pageinfo-header-edits'        => 'Edit history',
@@@ -3765,6 -3765,7 +3766,7 @@@
  'pageinfo-magic-words'         => 'Magic {{PLURAL:$1|word|words}} ($1)',
  'pageinfo-hidden-categories'   => 'Hidden {{PLURAL:$1|category|categories}} ($1)',
  'pageinfo-templates'           => 'Transcluded {{PLURAL:$1|template|templates}} ($1)',
+ 'pageinfo-footer'              => '-', # do not translate or duplicate this message to other languages
  
  # Skin names
  'skinname-standard'    => 'Classic', # only translate this message to other languages if you have to change it

diff --combined languages/messages/MessagesQqq.php
index 0beef17,e460c34..3081b9b
--- 1/languages/messages/MessagesQqq.php
--- 2/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@@ -2569,10 -2569,10 +2569,10 @@@ Part of the "Newuserlog" extension. It 
  'listgrouprights-helppage' => "The link used on [[Special:ListGroupRights]]. Just translate \"Group rights\", and '''leave the \"Help:\" namespace exactly as it is'''.",
  'listgrouprights-members' => 'Used on [[Special:ListGroupRights]] and [[Special:Statistics]] as a link to [[Special:ListUsers|Special:ListUsers/"group"]], a list of members in that group.',
  'listgrouprights-right-display' => "{{optional}}
 -* $1 is the text from the 'right-...' messages, i.e. [[MediaWiki:right-edit]] = {{int:right-edit}}
 +* $1 is the text from the 'right-...' messages, i.e. {{msg-mw|right-edit}}
  * $2 is the codename of this right",
  'listgrouprights-right-revoked' => "{{optional}}
 -* $1 is the text from the 'right-...' messages, i.e. [[MediaWiki:right-edit]] = {{int:right-edit}}
 +* $1 is the text from the 'right-...' messages, i.e. {{msg-mw|right-edit}}
  * $2 is the codename of this right",
  'listgrouprights-addgroup' => 'This is an individual right for groups, used on [[Special:ListGroupRights]].
  * $1 is an enumeration of group names.
@@@ -3455,6 -3455,7 +3455,7 @@@ See also {{msg-mw|Anonuser}} and {{msg-
  * $1 is a spammed domain name.',
  
  # Info page
+ 'pageinfo-header' => 'Header for action=info, set by wiki administrator(s).',
  'pageinfo-title' => 'Page title for action=info. Parameters:
  * $1 is the page name',
  'pageinfo-header-basic' => 'Table section header in action=info.',
@@@ -3494,6 -3495,7 +3495,7 @@@
  * $1 is the number of hidden categories on the page.',
  'pageinfo-templates' => 'The list of templates transcluded within the page. Parameters:
  * $1 is the number of templates transcluded within the page.',
+ 'pageinfo-footer' => 'Footer for action=info, set by wiki administrator(s).',
  
  # Skin names
  'skinname-standard' => '{{optional}}

diff --combined maintenance/language/messageTypes.inc
index 1324bd7,8a0249b..ce1dbb9
--- 1/maintenance/language/messageTypes.inc
--- 2/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@@ -189,7 -189,6 +189,7 @@@ $wgIgnoredMessages = array
        'wantedtemplates-summary',
        'activeusers-summary',
        'search-summary',
 +      'editpage-head-copy-warn',
        'editpage-tos-summary',
        'addsection-preload',
        'addsection-editintro',
@@@ -244,6 -243,8 +244,8 @@@
        'version-entrypoints-api-php',
        'version-entrypoints-load-php',
        'ipb-default-expiry',
+       'pageinfo-header',
+       'pageinfo-footer',
  );
  
  /** Optional messages, which may be translated only if changed in the target language. */

diff --combined maintenance/language/messages.inc
index 71beec6,5ac8cf8..b644d8e
--- 1/maintenance/language/messages.inc
--- 2/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@@ -653,7 -653,6 +653,7 @@@ $wgMessageStructure = array
                'yourdiff',
                'copyrightwarning',
                'copyrightwarning2',
 +              'editpage-head-copy-warn',
                'editpage-tos-summary',
                'longpage-hint',
                'longpageerror',
@@@ -2664,6 -2663,7 +2664,7 @@@
                'spam_deleting',
        ),
        'info' => array(
+               'pageinfo-header',
                'pageinfo-title',
                'pageinfo-header-basic',
                'pageinfo-header-edits',
@@@ -2694,6 -2694,7 +2695,7 @@@
                'pageinfo-magic-words',
                'pageinfo-hidden-categories',
                'pageinfo-templates',
+               'pageinfo-footer',
        ),
        'skin' => array(
                'skinname-standard',