* Add the new messages from r32198 to messages.inc

* While I am in this section, move some other messages to their corresponding sections

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7d5f344..97e0b2f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -564,6 +564,11 @@ XHTML id names.
 
 # 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',
+'special-categories-sort-asc'    => 'ascending',
+'special-categories-sort-desc'   => 'descending',
 'pagecategories'                 => '{{PLURAL:$1|Category|Categories}}',
 'pagecategorieslink'             => 'Special:Categories', # don't translate or duplicate this message to other languages
 'category_header'                => 'Pages in category "$1"',
@@ -1318,6 +1323,9 @@ Make sure that this change will maintain historical page continuity.
 'files'                    => 'Files',
 
 # User rights
+'userrights'                       => 'User rights management',
+'userrights-summary'               => '', # only translate this message to other languages if you have to change it
+'groups'                           => 'User groups',
 'userrights-lookup-user'           => 'Manage user groups',
 'userrights-user-editname'         => 'Enter a username:',
 'editusergroup'                    => 'Edit User Groups',
@@ -1691,8 +1699,6 @@ The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''\$7''
 'mostimages-summary'              => '', # only translate this message to other languages if you have to change it
 'mostrevisions'                   => 'Pages with the most revisions',
 'mostrevisions-summary'           => '', # only translate this message to other languages if you have to change it
-'allpages'                        => 'All pages',
-'allpages-summary'                => '', # only translate this message to other languages if you have to change it
 'prefixindex'                     => 'Prefix index',
 'prefixindex-summary'             => '', # only translate this message to other languages if you have to change it
 'shortpages'                      => 'Short pages',
@@ -1738,20 +1744,13 @@ The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''\$7''
 'booksources-go'            => 'Go',
 'booksources-text'          => 'Below is a list of links to other sites that sell new and used books, and may also have further information about books you are looking for:',
 
-'categoriespagetext'            => 'The following categories contain pages or media.',
-'special-categories-sort-count' => 'sort by count',
-'special-categories-sort-abc'   => 'sort alphabetically',
-'special-categories-sort-asc'   => 'ascending',
-'special-categories-sort-desc'  => 'descending',
-'data'                          => 'Data',
-'userrights'                    => 'User rights management',
-'userrights-summary'            => '', # only translate this message to other languages if you have to change it
-'groups'                        => 'User groups',
-'isbn'                          => 'ISBN', # only translate this message to other languages if you have to change it
-'rfcurl'                        => 'http://tools.ietf.org/html/rfc$1', # don't translate or duplicate this message to other languages
-'pubmedurl'                     => 'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1', # don't translate or duplicate this message to other languages
-'alphaindexline'                => '$1 to $2',
-'version'                       => 'Version',
+# Magic words
+'isbn'      => 'ISBN', # only translate this message to other languages if you have to change it
+'rfcurl'    => 'http://tools.ietf.org/html/rfc$1', # don't translate or duplicate this message to other languages
+'pubmedurl' => 'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1', # don't translate or duplicate this message to other languages
+
+'data'           => 'Data',
+'version'        => 'Version',
 
 # Special:Log
 'specialloguserlabel'  => 'User:',
@@ -1766,6 +1765,9 @@ You can narrow down the view by selecting a log type, the user name, or the affe
 'log-title-wildcard'   => 'Search titles starting with this text',
 
 # Special:Allpages
+'allpages'          => 'All pages',
+'allpages-summary'  => '', # only translate this message to other languages if you have to change it
+'alphaindexline'    => '$1 to $2',
 'nextpage'          => 'Next page ($1)',
 'prevpage'          => 'Previous page ($1)',
 'allpagesfrom'      => 'Display pages starting at:',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index e7719f9..13fa67a 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -114,6 +114,11 @@ $wgMessageStructure = array(
        ),
        'categories' => array(
                'categories',
+               'categoriespagetext',
+               'special-categories-sort-count',
+               'special-categories-sort-abc',
+               'special-categories-sort-asc',
+               'special-categories-sort-desc',
                'pagecategories',
                'pagecategorieslink',
                'category_header',
@@ -755,6 +760,9 @@ $wgMessageStructure = array(
                'files',
        ),
        'userrights' => array(
+               'userrights',
+               'userrights-summary',
+               'groups',
                'userrights-lookup-user',
                'userrights-user-editname',
                'editusergroup',
@@ -1095,8 +1103,6 @@ $wgMessageStructure = array(
                'mostimages-summary',
                'mostrevisions',
                'mostrevisions-summary',
-               'allpages',
-               'allpages-summary',
                'prefixindex',
                'prefixindex-summary',
                'shortpages',
@@ -1142,16 +1148,13 @@ $wgMessageStructure = array(
                'booksources-go',
                'booksources-text',
        ),
-       'specialpages2' => array(
-               'categoriespagetext',
-               'data',
-               'userrights',
-               'userrights-summary',
-               'groups',
+       'magicwords' => array(
                'isbn',
                'rfcurl',
                'pubmedurl',
-               'alphaindexline',
+       ),
+       'specialpages2' => array(
+               'data',
                'version',
        ),
        'logpages' => array(
@@ -1166,6 +1169,9 @@ $wgMessageStructure = array(
                'log-title-wildcard',
        ),
        'allpages' => array(
+               'allpages',
+               'allpages-summary',
+               'alphaindexline',
                'nextpage',
                'prevpage',
                'allpagesfrom',
@@ -2478,6 +2484,7 @@ XHTML id names.",
        'fewestrevisions'     => '',
        'specialpages'        => 'Miscellaneous special pages',
        'booksources'         => 'Book sources',
+       'magicwords'          => 'Magic words',
        'specialpages2'       => '',
        'logpages'            => 'Special:Log',
        'allpages'            => 'Special:Allpages',