Follow up for r35065:

* Add new message 'categoriesfrom' to messages.inc
* Add default existing 'categories-summary' as optional message
* Stick together all Special:Categories messages

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 0cafded..fbd3b7f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -567,10 +567,6 @@ XHTML id names.
 'dec'           => 'Dec',
 
 # Categories related messages
-'categories'                     => 'Categories',
-'categoriespagetext'             => 'The following categories contain pages or media.',
-'special-categories-sort-count'  => 'sort by count',
-'special-categories-sort-abc'    => 'sort alphabetically',
 'pagecategories'                 => '{{PLURAL:$1|Category|Categories}}',
 'pagecategorieslink'             => 'Special:Categories', # do not translate or duplicate this message to other languages
 'category_header'                => 'Pages in category "$1"',
@@ -1965,8 +1961,12 @@ It may contain one or more characters which cannot be used in titles.',
 'allpages-bad-ns'   => '{{SITENAME}} does not have namespace "$1".',
 
 # Special:Categories
-'categoriesfrom' => 'Display categories starting at:',
-
+'categories'                    => 'Categories',
+'categories-summary'            => '', # only translate this message to other languages if you have to change it
+'categoriespagetext'            => 'The following categories contain pages or media.',
+'categoriesfrom'                => 'Display categories starting at:',
+'special-categories-sort-count' => 'sort by count',
+'special-categories-sort-abc'   => 'sort alphabetically',
 
 # Special:Listusers
 'listusersfrom'      => 'Display users starting at:',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index c100975..7ca69e6 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -122,6 +122,7 @@ $wgOptionalMessages = array(
        'unit-pixel',
        'allpages-summary',
        'booksources-summary',
+       'categories-summary',
        'ipblocklist-summary',
        'protectedtitles-summary',
        'listusers-summary',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 4ea609f..c4a11a8 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -112,11 +112,7 @@ $wgMessageStructure = array(
                'nov',
                'dec',
        ),
-       'categories' => array(
-               'categories',
-               'categoriespagetext',
-               'special-categories-sort-count',
-               'special-categories-sort-abc',
+       'categorypages' => array(
                'pagecategories',
                'pagecategorieslink',
                'category_header',
@@ -1289,6 +1285,14 @@ $wgMessageStructure = array(
                'allpagesbadtitle',
                'allpages-bad-ns',
        ),
+       'categories' => array(
+               'categories',
+               'categories-summary',
+               'categoriespagetext',
+               'categoriesfrom',
+               'special-categories-sort-count',
+               'special-categories-sort-abc',
+       ),
        'listusers' => array(
                'listusersfrom',
                'listusers-submit',
@@ -2565,7 +2569,7 @@ XHTML id names.",
        'underline'           => '',
        'skinpreview'         => '',
        'dates'               => 'Dates',
-       'categories'          => 'Categories related messages',
+       'categorypages'       => 'Categories related messages',
        'mainpage'            => '',
        'miscellaneous1'      => '',
        'metadata_help'       => 'Metadata in edit box',
@@ -2626,6 +2630,7 @@ XHTML id names.",
        'magicwords'          => 'Magic words',
        'logpages'            => 'Special:Log',
        'allpages'            => 'Special:Allpages',
+       'categories'          => 'Special:Categories',
        'listusers'           => 'Special:Listusers',
        'listgrouprights'     => 'Special:Listgrouprights',
        'emailuser'           => 'E-mail user',