Merge "Clean up mediawiki.legacy.protect a bit."

diff --combined resources/Resources.php
index 3b06640,166dd7e..64b21cf
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1313,6 -1313,7 +1313,6 @@@ return array
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ),
        'mediawiki.special.upload' => array(
 -              // @todo merge in remainder of mediawiki.legacy.upload
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
                'messages' => array(
                        'widthheight',
@@@ -1323,10 -1324,7 +1323,10 @@@
                        'largefileserver',
                ),
                'dependencies' => array(
 +                      'jquery.spinner',
 +                      'mediawiki.api',
                        'mediawiki.libs.jpegmeta',
 +                      'mediawiki.Title',
                        'mediawiki.util',
                ),
        ),
@@@ -1425,26 -1423,29 +1425,26 @@@
                'position' => 'top',
        ),
        'mediawiki.legacy.commonPrint' => array(
 -              'styles' => array( 'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
 +              ),
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',
                'dependencies' => array(
                        'jquery.byteLimit',
                ),
-               'position' => 'top',
+               'messages' => array( 'protect-unchain-permissions' )
        ),
        'mediawiki.legacy.shared' => array(
                // Used in the web installer. Test it after modifying this definition!
 -              'styles' => array( 'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
 +              ),
        ),
        'mediawiki.legacy.oldshared' => array(
 -              'styles' => array( 'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' ) ),
 -      ),
 -      'mediawiki.legacy.upload' => array(
 -              'scripts' => 'resources/src/mediawiki.legacy/upload.js',
 -              'dependencies' => array(
 -                      'jquery.spinner',
 -                      'mediawiki.api',
 -                      'mediawiki.Title',
 -                      'mediawiki.util',
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' )
                ),
        ),
        'mediawiki.legacy.wikibits' => array(