Move logentry-* messages from newusers and rights log near the other ones

'rightslogentry' and 'rightslogentry-autopromote' are now marked as ignored since
they are only used for IRC notifications.

Also moved new users log description messages near the ones for user rights log.

Change-Id: I63f90d824ff454c0e4177f9f80542c36175c3ffe

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index bb8f4cf..e4da1dd 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2049,15 +2049,13 @@ Your e-mail address is not revealed when other users contact you.',
 'right-sendemail'             => 'Send e-mail to other users',
 'right-passwordreset'         => 'View password reset e-mails',
 
+# Special:Log/newusers
+'newuserlogpage'     => 'User creation log',
+'newuserlogpagetext' => 'This is a log of user creations.',
+
 # User rights log
-'rightslog'                     => 'User rights log',
-'rightslogtext'                 => 'This is a log of changes to user rights.',
-'rightslogentry'                => 'changed group membership for $1 from $2 to $3',
-'rightslogentry-autopromote'    => 'was automatically promoted from $2 to $3',
-'logentry-rights-rights'        => '$1 changed group membership for $3 from $4 to $5',
-'logentry-rights-rights-legacy' => '$1 changed group membership for $3',
-'logentry-rights-autopromote'   => '$1 was automatically promoted from $4 to $5',
-'rightsnone'                    => '(none)',
+'rightslog'     => 'User rights log',
+'rightslogtext' => 'This is a log of changes to user rights.',
 
 # Associated actions - in the sentence "You do not have permission to X"
 'action-read'                 => 'read this page',
@@ -2780,10 +2778,6 @@ Supported {{PLURAL:$2|protocol|protocols}}: <code>$1</code> (defaults to http://
 'activeusers-hidesysops' => 'Hide administrators',
 'activeusers-noresult'   => 'No users found.',
 
-# Special:Log/newusers
-'newuserlogpage'     => 'User creation log',
-'newuserlogpagetext' => 'This is a log of user creations.',
-
 # Special:ListGroupRights
 'listgrouprights'                      => 'User group rights',
 'listgrouprights-summary'              => 'The following is a list of user groups defined on this wiki, with their associated access rights.
@@ -4883,6 +4877,10 @@ This site is experiencing technical difficulties.',
 'logentry-newusers-create2'           => 'User account $3 was created by $1',
 'logentry-newusers-autocreate'        => 'User account $1 was created automatically',
 'newuserlog-byemail'                  => 'password sent by e-mail',
+'logentry-rights-rights'              => '$1 changed group membership for $3 from $4 to $5',
+'logentry-rights-rights-legacy'       => '$1 changed group membership for $3',
+'logentry-rights-autopromote'         => '$1 was automatically promoted from $4 to $5',
+'rightsnone'                          => '(none)',
 
 # For IRC, see bug 34508. Do not change
 'revdelete-logentry'          => 'changed revision visibility of "[[$1]]"', # do not translate or duplicate this message to other languages
@@ -4906,6 +4904,8 @@ This site is experiencing technical difficulties.',
 'newuserlog-create-entry'     => 'New user account', # do not translate or duplicate this message to other languages
 'newuserlog-create2-entry'    => 'created new account $1', # do not translate or duplicate this message to other languages
 'newuserlog-autocreate-entry' => 'Account created automatically', # do not translate or duplicate this message to other languages
+'rightslogentry'              => 'changed group membership for $1 from $2 to $3',
+'rightslogentry-autopromote'  => 'was automatically promoted from $2 to $3',
 
 # Feedback
 'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug].

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 960ead9..f53cf91 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -218,6 +218,8 @@ $wgIgnoredMessages = array(
        'newuserlog-create-entry',
        'newuserlog-create2-entry',
        'newuserlog-autocreate-entry',
+       'rightslogentry',
+       'rightslogentry-autopromote',
        'suppressedarticle',
        'deletedarticle',
        // 'uploadedimage',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 16e7546..6544514 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1188,15 +1188,13 @@ $wgMessageStructure = array(
                'right-sendemail',
                'right-passwordreset',
        ),
+       'newuserlog' => array(
+               'newuserlogpage',
+               'newuserlogpagetext',
+       ),
        'rightslog' => array(
                'rightslog',
                'rightslogtext',
-               'rightslogentry',
-               'rightslogentry-autopromote',
-               'logentry-rights-rights',
-               'logentry-rights-rights-legacy',
-               'logentry-rights-autopromote',
-               'rightsnone',
        ),
        'action' => array(
                'action-read',
@@ -1848,10 +1846,6 @@ $wgMessageStructure = array(
                'activeusers-submit',
                'activeusers-noresult',
        ),
-       'newuserlog' => array(
-               'newuserlogpage',
-               'newuserlogpagetext',
-       ),
        'listgrouprights' => array(
                'listgrouprights',
                'listgrouprights-summary',
@@ -3732,6 +3726,10 @@ $wgMessageStructure = array(
                'logentry-newusers-create2',
                'logentry-newusers-autocreate',
                'newuserlog-byemail',
+               'logentry-rights-rights',
+               'logentry-rights-rights-legacy',
+               'logentry-rights-autopromote',
+               'rightsnone',
        ),
        'logging-irc' => array(
                'revdelete-logentry',
@@ -3760,6 +3758,8 @@ $wgMessageStructure = array(
                'deletedarticle',
                // 'uploadedimage',
                // 'overwroteimage',
+               'rightslogentry',
+               'rightslogentry-autopromote',
        ),
        'feedback' => array(
                'feedback-bugornote',