Fix for r32085:

* Add new messages to maintenance/language/messages.inc
* Move categories related messages to a more logical section (WTH is the relation to spamprotection o_O ?)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2a34d67..52a1498 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -561,16 +561,24 @@ XHTML id names.
 'nov'           => 'Nov',
 'dec'           => 'Dec',
 
-# Bits of text used by many pages
-'categories'               => 'Categories',
-'pagecategories'           => '{{PLURAL:$1|Category|Categories}}',
-'pagecategorieslink'       => 'Special:Categories', # don't translate or duplicate this message to other languages
-'category_header'          => 'Pages in category "$1"',
-'subcategories'            => 'Subcategories',
-'category-media-header'    => 'Media in category "$1"',
-'category-empty'           => "''This category currently contains no pages or media.''",
-'hidden-categories'        => '{{PLURAL:$1|Hidden category|Hidden categories}}',
-'hidden-category-category' => 'Hidden categories', # Name of the category where hidden categories will be listed
+# Categories related messages
+'categories'                     => 'Categories',
+'pagecategories'                 => '{{PLURAL:$1|Category|Categories}}',
+'pagecategorieslink'             => 'Special:Categories', # don't translate or duplicate this message to other languages
+'category_header'                => 'Pages in category "$1"',
+'subcategories'                  => 'Subcategories',
+'category-media-header'          => 'Media in category "$1"',
+'category-empty'                 => "''This category currently contains no pages or media.''",
+'hidden-categories'              => '{{PLURAL:$1|Hidden category|Hidden categories}}',
+'hidden-category-category'       => 'Hidden categories', # Name of the category where hidden categories will be listed
+'subcategorycount'               => 'There {{PLURAL:$1|is one subcategory|are $1 subcategories}} to this category.',
+'category-subcat-count'          => '{{PLURAL:$2|This category has only the following subcategory.|This category has the following {{PLURAL:$1|subcategory|$1 subcategories}}, out of $2 total.}}',
+'category-subcat-count-limited'  => 'This category has the following {{PLURAL:$1|subcategory|$1 subcategories}}.',
+'category-article-count'         => '{{PLURAL:$2|This category contains only the following page.|The following {{PLURAL:$1|page is|$1 pages are}} in this category, out of $2 total.}}',
+'category-article-count-limited' => 'The following {{PLURAL:$1|page is|$1 pages are}} in the current category.',
+'category-file-count'            => '{{PLURAL:$2|This category contains only the following file.|The following {{PLURAL:$1|file is|$1 files are}} in this category, out of $2 total.}}',
+'category-file-count-limited'    => 'The following {{PLURAL:$1|file is|$1 files are}} in the current category.',
+'listingcontinuesabbrev'         => 'cont.',
 
 'linkprefix'        => '/^(.*?)([a-zA-Z\x80-\xff]+)$/sD', # only translate this message to other languages if you have to change it
 'mainpagetext'      => "<big>'''MediaWiki has been successfully installed.'''</big>",
@@ -2419,14 +2427,6 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'spamprotectiontitle'            => 'Spam protection filter',
 'spamprotectiontext'             => 'The page you wanted to save was blocked by the spam filter. This is probably caused by a link to an external site.',
 'spamprotectionmatch'            => 'The following text is what triggered our spam filter: $1',
-'subcategorycount'               => 'There {{PLURAL:$1|is one subcategory|are $1 subcategories}} to this category.',
-'category-subcat-count'          => '{{PLURAL:$2|This category has only the following subcategory.|This category has the following {{PLURAL:$1|subcategory|$1 subcategories}}, out of $2 total.}}',
-'category-subcat-count-limited'  => 'This category has the following {{PLURAL:$1|subcategory|$1 subcategories}}.',
-'category-article-count'         => '{{PLURAL:$2|This category contains only the following page.|The following {{PLURAL:$1|page is|$1 pages are}} in this category, out of $2 total.}}',
-'category-article-count-limited' => 'The following {{PLURAL:$1|page is|$1 pages are}} in the current category.',
-'category-file-count'            => '{{PLURAL:$2|This category contains only the following file.|The following {{PLURAL:$1|file is|$1 files are}} in this category, out of $2 total.}}',
-'category-file-count-limited'    => 'The following {{PLURAL:$1|file is|$1 files are}} in the current category.',
-'listingcontinuesabbrev'         => 'cont.',
 'spambot_username'               => 'MediaWiki spam cleanup',
 'spam_reverting'                 => 'Reverting to last version not containing links to $1',
 'spam_blanking'                  => 'All revisions contained links to $1, blanking',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 549a99c..9e444cb 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -122,6 +122,14 @@ $wgMessageStructure = array(
                'category-empty',
                'hidden-categories',
                'hidden-category-category',
+               'subcategorycount',
+               'category-subcat-count',
+               'category-subcat-count-limited',
+               'category-article-count',
+               'category-article-count-limited',
+               'category-file-count',
+               'category-file-count-limited',
+               'listingcontinuesabbrev',
        ),
        'mainpage' => array(
                'linkprefix',
@@ -1758,10 +1766,6 @@ $wgMessageStructure = array(
                'spamprotectiontitle',
                'spamprotectiontext',
                'spamprotectionmatch',
-               'subcategorycount',
-               'categoryarticlecount',
-               'category-media-count',
-               'listingcontinuesabbrev',
                'spambot_username',
                'spam_reverting',
                'spam_blanking',
@@ -2410,7 +2414,7 @@ XHTML id names.",
        'underline'           => '',
        'skinpreview'         => '',
        'dates'               => 'Dates',
-       'categories'          => 'Bits of text used by many pages',
+       'categories'          => 'Categories related messages',
        'mainpage'            => '',
        'miscellaneous1'      => '',
        'metadata_help'       => 'Metadata in edit box',