r112128: Comment out dupe message keys

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2efd882..2de2503 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4736,14 +4736,14 @@ This site is experiencing technical difficulties.',
 '1movedto2'                   => 'moved [[$1]] to [[$2]]',
 '1movedto2_redir'             => 'moved [[$1]] to [[$2]] over redirect',
 'move-redirect-suppressed'    => 'redirect suppressed',
-'newuserlog-byemail'          => 'password sent by e-mail',
+// 'newuserlog-byemail'          => 'password sent by e-mail', // Dupe in the "New logging system" section
 'newuserlog-create-entry'     => 'New user account',
 'newuserlog-create2-entry'    => 'created new account $1',
 'newuserlog-autocreate-entry' => 'Account created automatically',
 'suppressedarticle'           => 'suppressed "[[$1]]"',
 'deletedarticle'              => 'deleted "[[$1]]"',
-'uploadedimage'               => 'uploaded "[[$1]]"',
-'overwroteimage'              => 'uploaded a new version of "[[$1]]"',
+// 'uploadedimage'               => 'uploaded "[[$1]]"', // Dupe in the "Upload" section
+// 'overwroteimage'              => 'uploaded a new version of "[[$1]]"', // Dupe in the "Upload" section
 
 # 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 5fd6fd7..b33e2c4 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -210,14 +210,14 @@ $wgIgnoredMessages = array(
        '1movedto2',
        '1movedto2_redir',
        'move-redirect-suppressed',
-       'newuserlog-byemail',
+       // 'newuserlog-byemail',
        'newuserlog-create-entry',
        'newuserlog-create2-entry',
        'newuserlog-autocreate-entry',
        'suppressedarticle',
        'deletedarticle',
-       'uploadedimage',
-       'overwroteimage',
+       // 'uploadedimage',
+       // 'overwroteimage',
 );
 
 /** Optional messages, which may be translated only if changed in the target language. */

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index f7d4d1b..63d8501 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3598,14 +3598,14 @@ $wgMessageStructure = array(
                '1movedto2',
                '1movedto2_redir',
                'move-redirect-suppressed',
-               'newuserlog-byemail',
+               // 'newuserlog-byemail',
                'newuserlog-create-entry',
                'newuserlog-create2-entry',
                'newuserlog-autocreate-entry',
                'suppressedarticle',
                'deletedarticle',
-               'uploadedimage',
-               'overwroteimage',
+               // 'uploadedimage',
+               // 'overwroteimage',
        ),
        'feedback' => array(
                'feedback-bugornote',