* Removing two unused messages: 'watchlistcount', 'imagelistforuser'

* Sorting messages a bit.
* Question: The following message seems unused in whole trunk but I hesitate to remove it, maybe there is some magic usage somewhere?
# HTML dump
'redirectingto' => 'Redirecting to [[$1]]...',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 372a080..247c201 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -682,30 +682,32 @@ XHTML id names.
 'versionrequired'     => 'Version $1 of MediaWiki required',
 'versionrequiredtext' => 'Version $1 of MediaWiki is required to use this page. See [[Special:Version|version page]].',
 
-'ok'                   => 'OK',
-'sitetitle'            => '{{SITENAME}}', # don't translate or duplicate this message to other languages
-'pagetitle'            => '$1 - {{SITENAME}}',
-'sitesubtitle'         => '', # don't translate or duplicate this message to other languages
-'retrievedfrom'        => 'Retrieved from "$1"',
-'youhavenewmessages'   => 'You have $1 ($2).',
-'newmessageslink'      => 'new messages',
-'newmessagesdifflink'  => 'last change',
-'editsection'          => 'edit',
-'editsection-brackets' => '[$1]', # only translate this message to other languages if you have to change it
-'editold'              => 'edit',
-'editsectionhint'      => 'Edit section: $1',
-'toc'                  => 'Contents',
-'showtoc'              => 'show',
-'hidetoc'              => 'hide',
-'thisisdeleted'        => 'View or restore $1?',
-'viewdeleted'          => 'View $1?',
-'restorelink'          => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}',
-'feedlinks'            => 'Feed:',
-'feed-invalid'         => 'Invalid subscription feed type.',
-'feed-atom'            => 'Atom', # only translate this message to other languages if you have to change it
-'feed-rss'             => 'RSS', # only translate this message to other languages if you have to change it
-'sitenotice'           => '-', # the equivalent to wgSiteNotice; don't translate or duplicate this message to other languages
-'anonnotice'           => '-', # don't translate or duplicate this message to other languages
+'ok'                      => 'OK',
+'sitetitle'               => '{{SITENAME}}', # don't translate or duplicate this message to other languages
+'pagetitle'               => '$1 - {{SITENAME}}',
+'sitesubtitle'            => '', # don't translate or duplicate this message to other languages
+'retrievedfrom'           => 'Retrieved from "$1"',
+'youhavenewmessages'      => 'You have $1 ($2).',
+'newmessageslink'         => 'new messages',
+'newmessagesdifflink'     => 'last change',
+'youhavenewmessagesmulti' => 'You have new messages on $1',
+'newtalkseperator'        => ',_', # don't translate or duplicate this message to other languages
+'editsection'             => 'edit',
+'editsection-brackets'    => '[$1]', # only translate this message to other languages if you have to change it
+'editold'                 => 'edit',
+'editsectionhint'         => 'Edit section: $1',
+'toc'                     => 'Contents',
+'showtoc'                 => 'show',
+'hidetoc'                 => 'hide',
+'thisisdeleted'           => 'View or restore $1?',
+'viewdeleted'             => 'View $1?',
+'restorelink'             => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}',
+'feedlinks'               => 'Feed:',
+'feed-invalid'            => 'Invalid subscription feed type.',
+'feed-atom'               => 'Atom', # only translate this message to other languages if you have to change it
+'feed-rss'                => 'RSS', # only translate this message to other languages if you have to change it
+'sitenotice'              => '-', # the equivalent to wgSiteNotice; don't translate or duplicate this message to other languages
+'anonnotice'              => '-', # don't translate or duplicate this message to other languages
 
 # Short words for each namespace, by default used in the 'article' tab in monobook
 'nstab-main'      => 'Article',
@@ -884,6 +886,14 @@ will be sent for any of the following features.',
 format. Please enter a well-formatted address or empty that field.',
 'accountcreated'             => 'Account created',
 'accountcreatedtext'         => 'The user account for $1 has been created.',
+'loginlanguagelabel'         => 'Language: $1',
+'loginlanguagelinks'         => '* Deutsch|de
+* English|en
+* Esperanto|eo
+* Français|fr
+* Español|es
+* Italiano|it
+* Nederlands|nl', # don't translate or duplicate this message to other languages
 
 # Password reset dialog
 'resetpass'               => 'Reset account password',
@@ -1442,7 +1452,6 @@ If you have this image in full resolution upload this one, otherwise change the
 '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.",
-'imagelistforuser'          => 'This shows only images uploaded by $1.',
 'getimagelist'              => 'fetching file list',
 'ilsubmit'                  => 'Search',
 'showlast'                  => 'Show last $1 files sorted $2.',
@@ -1719,7 +1728,6 @@ or has chosen not to receive e-mail from other users.',
 'watchlistfor'         => "(for '''$1''')",
 'nowatchlist'          => 'You have no items on your watchlist.',
 'watchlistanontext'    => 'Please $1 to view or edit items on your watchlist.',
-'watchlistcount'       => "'''You have {{PLURAL:$1|$1 item|$1 items}} on your watchlist, including talk pages.'''",
 'watchnologin'         => 'Not logged in',
 'watchnologintext'     => 'You must be [[Special:Userlogin|logged in]] to modify your watchlist.',
 'addedwatch'           => 'Added to watchlist',
@@ -2838,9 +2846,7 @@ Please confirm that really want to recreate this page.",
 $1',
 'confirm_purge_button' => 'OK',
 
-'youhavenewmessagesmulti' => 'You have new messages on $1',
-'newtalkseperator'        => ',_', # don't translate or duplicate this message to other languages
-
+# AJAX search
 'searchcontaining' => "Search for articles containing ''$1''.",
 'searchnamed'      => "Search for articles named ''$1''.",
 'articletitles'    => "Articles starting with ''$1''",
@@ -2849,15 +2855,6 @@ $1',
 # Separator for categories in page lists
 'catseparator' => '|', # don't translate or duplicate this message to other languages
 
-'loginlanguagelabel' => 'Language: $1',
-'loginlanguagelinks' => '* Deutsch|de
-* English|en
-* Esperanto|eo
-* Français|fr
-* Español|es
-* Italiano|it
-* Nederlands|nl', # don't translate or duplicate this message to other languages
-
 # Multipage image navigation
 'imgmultipageprev'   => '← previous page',
 'imgmultipagenext'   => 'next page →',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 2e96596..627a232 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -248,6 +248,8 @@ $wgMessageStructure = array(
                'youhavenewmessages',
                'newmessageslink',
                'newmessagesdifflink',
+               'youhavenewmessagesmulti',
+               'newtalkseperator',
                'editsection',
                'editsection-brackets',
                'editold',
@@ -397,6 +399,8 @@ $wgMessageStructure = array(
                'invalidemailaddress',
                'accountcreated',
                'accountcreatedtext',
+               'loginlanguagelabel',
+               'loginlanguagelinks',
        ),
        'resetpass' => array(
                'resetpass',
@@ -845,7 +849,6 @@ $wgMessageStructure = array(
                'imagelist',
                'imagelist-summary',
                'imagelisttext',
-               'imagelistforuser',
                'getimagelist',
                'ilsubmit',
                'showlast',
@@ -1105,7 +1108,6 @@ $wgMessageStructure = array(
                'watchlistfor',
                'nowatchlist',
                'watchlistanontext',
-               'watchlistcount',
                'watchnologin',
                'watchnologintext',
                'addedwatch',
@@ -2097,10 +2099,6 @@ $wgMessageStructure = array(
                'confirm_purge',
                'confirm_purge_button',
        ),
-       'newmessagesmulti' => array(
-               'youhavenewmessagesmulti',
-               'newtalkseperator',
-       ),
        'search2' => array(
                'searchcontaining',
                'searchnamed',
@@ -2110,10 +2108,6 @@ $wgMessageStructure = array(
        'catseparator' => array(
                'catseparator',
        ),
-       'loginlanguage' => array(
-               'loginlanguagelabel',
-               'loginlanguagelinks',
-       ),
        'imgmulti' => array(
                'imgmultipageprev',
                'imgmultipagenext',
@@ -2341,10 +2335,8 @@ Variants for Chinese language",
        'unit-pixel'          => '',
        'htmldump'            => 'HTML dump',
        'purge'               => 'action=purge',
-       'newmessagesmulti'    => '',
-       'search2'             => '',
+       'search2'             => 'AJAX search',
        'catseparator'        => 'Separator for categories in page lists',
-       'loginlanguage'       => '',
        'imgmulti'            => 'Multipage image navigation',
        'tablepager'          => 'Table pager',
        'autosumm'            => 'Auto-summaries',