* Remove 5 messages, unused since ages:

** 'getimagelist', 'showlast', 'byname', 'bysize', 'imgdelete'
* Regroup messages for Special:Imagelist, Special:NewImages and the image description page
* Add short descriptions to 'newimages-summary' and 'imagelist-summary' and remove their optional message status

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 52a1498..166ec13 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1508,19 +1508,19 @@ PICT # misc.
 'upload_source_url'  => ' (a valid, publicly accessible URL)',
 'upload_source_file' => ' (a file on your computer)',
 
-# Image list
-'imagelist'                 => 'File list',
-'imagelist-summary'         => '', # only translate this message to other languages if you have to change it
-'imagelisttext'             => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.",
-'getimagelist'              => 'fetching file list',
-'ilsubmit'                  => 'Search',
-'showlast'                  => 'Show last $1 files sorted $2.',
-'byname'                    => 'by name',
-'bydate'                    => 'by date',
-'bysize'                    => 'by size',
-'imgdelete'                 => 'del',
-'imgdesc'                   => 'desc',
-'imgfile'                   => 'file',
+# Special:Imagelist
+'imagelist-summary'     => 'This special page shows all uploaded files. By default the last uploaded files are shown at top of the list. A click on a column header changes the sorting.', 
+'imagelist_search_for'  => 'Search for media name:',
+'imgdesc'               => 'desc',
+'imgfile'               => 'file',
+'imagelist'             => 'File list',
+'imagelist_date'        => 'Date',
+'imagelist_name'        => 'Name',
+'imagelist_user'        => 'User',
+'imagelist_size'        => 'Size',
+'imagelist_description' => 'Description',
+
+# Image description page
 'filehist'                  => 'File history',
 'filehist-help'             => 'Click on a date/time to view the file as it appeared at that time.',
 'filehist-deleteall'        => 'delete all',
@@ -1543,12 +1543,6 @@ PICT # misc.
 'noimage'                   => 'No file by this name exists, you can $1.',
 'noimage-linktext'          => 'upload it',
 'uploadnewversion-linktext' => 'Upload a new version of this file',
-'imagelist_date'            => 'Date',
-'imagelist_name'            => 'Name',
-'imagelist_user'            => 'User',
-'imagelist_size'            => 'Size',
-'imagelist_description'     => 'Description',
-'imagelist_search_for'      => 'Search for media name:',
 
 # File reversion
 'filerevert'                => 'Revert $1',
@@ -2029,8 +2023,6 @@ $1',
 'sp-contributions-footer'      => '-', # don't translate or duplicate this message to other languages
 'sp-contributions-footer-anon' => '-', # don't translate or duplicate this message to other languages
 
-'sp-newimages-showfrom' => 'Show new files starting from $1',
-
 # What links here
 'whatlinkshere'         => 'What links here',
 'whatlinkshere-title'   => 'Pages that link to $1',
@@ -2495,10 +2487,14 @@ $1',
 'show-big-image-thumb' => '<small>Size of this preview: $1 × $2 pixels</small>',
 
 # Special:Newimages
-'newimages'         => 'Gallery of new files',
-'newimages-summary' => '', # only translate this message to other languages if you have to change it
-'showhidebots'      => '($1 bots)',
-'noimages'          => 'Nothing to see.',
+'newimages'             => 'Gallery of new files',
+'imagelisttext'         => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.",
+'newimages-summary'     => 'This special page shows the last uploaded files',
+'showhidebots'          => '($1 bots)',
+'noimages'              => 'Nothing to see.',
+'ilsubmit'              => 'Search',
+'bydate'                => 'by date',
+'sp-newimages-showfrom' => 'Show new files starting from $1',
 
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
 'video-dims'     => '$1, $2×$3', # only translate this message to other languages if you have to change it

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index b1b0289..f2b2511 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -129,7 +129,6 @@ $wgOptionalMessages = array(
        'specialpages-summary',
        'whatlinkshere-summary',
        'whatlinkshere-barrow',
-       'imagelist-summary',
        'listredirects-summary',
        'uncategorizedpages-summary',
        'uncategorizedcategories-summary',
@@ -148,7 +147,6 @@ $wgOptionalMessages = array(
        'shortpages-summary',
        'newpages-summary',
        'ancientpages-summary',
-       'newimages-summary',
        'unwatchedpages-summary',
        'userrights-summary',
        'brokenredirects-summary',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 9e444cb..3000b4e 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -924,18 +924,18 @@ $wgMessageStructure = array(
                'upload_source_file',
        ),
        'imagelist' => array(
-               'imagelist',
                'imagelist-summary',
-               'imagelisttext',
-               'getimagelist',
-               'ilsubmit',
-               'showlast',
-               'byname',
-               'bydate',
-               'bysize',
-               'imgdelete',
+               'imagelist_search_for',
                'imgdesc',
                'imgfile',
+               'imagelist',
+               'imagelist_date',
+               'imagelist_name',
+               'imagelist_user',
+               'imagelist_size',
+               'imagelist_description',
+       ),
+       'imagedesciption' => array(
                'filehist',
                'filehist-help',
                'filehist-deleteall',
@@ -958,12 +958,6 @@ $wgMessageStructure = array(
                'noimage',
                'noimage-linktext',
                'uploadnewversion-linktext',
-               'imagelist_date',
-               'imagelist_name',
-               'imagelist_user',
-               'imagelist_size',
-               'imagelist_description',
-               'imagelist_search_for',
        ),
        'filerevert' => array(
                'filerevert',
@@ -1403,9 +1397,6 @@ $wgMessageStructure = array(
                'sp-contributions-footer',
                'sp-contributions-footer-anon',
        ),
-       'newimages-showfrom' => array(
-               'sp-newimages-showfrom',
-       ),
        'whatlinkshere' => array(
                'whatlinkshere',
                'whatlinkshere-title',
@@ -1833,9 +1824,13 @@ $wgMessageStructure = array(
        ),
        'newimages' => array(
                'newimages',
+               'imagelisttext',
                'newimages-summary',
                'showhidebots',
                'noimages',
+               'ilsubmit',
+               'bydate',
+               'sp-newimages-showfrom',
        ),
        'video-info' => array(
                'video-dims',
@@ -2453,9 +2448,10 @@ XHTML id names.",
        'upload-errors'       => '',
        'upload-curl-errors'  => 'Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>',
        'licenses'            => '',
-       'imagelist'           => 'Image list',
+       'imagelist'           => 'Special:Imagelist',
+       'imagedesciption'     => 'Image description page',
        'filerevert'          => 'File reversion',
-       'filedelete'              => 'File deletion',
+       'filedelete'          => 'File deletion',
        'mimesearch'          => 'MIME search',
        'unwatchedpages'      => 'Unwatched pages',
        'listredirects'       => 'List redirects',
@@ -2485,7 +2481,6 @@ XHTML id names.",
        'nsform'              => 'Namespace form on various pages',
        'contributions'       => 'Contributions',
        'sp-contributions'    => '',
-       'newimages-showfrom'  => '',
        'whatlinkshere'       => 'What links here',
        'block'               => 'Block/unblock',
        'developertools'      => 'Developer tools',