Merge "Revert "Prevent new users from being sent emails""

diff --combined includes/user/User.php
index a9fe5f8,390c4b8..7684d2e
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -179,7 -179,6 +179,6 @@@ class User implements IDBAccessObject, 
                'reupload-shared',
                'rollback',
                'sendemail',
-               'sendemail-new-users',
                'siteadmin',
                'suppressionlog',
                'suppressredirect',
@@@ -4584,7 -4583,7 +4583,7 @@@
         * (T8957 with Gmail and Internet Explorer).
         *
         * @param string $page Special page
 -       * @param string $token Token
 +       * @param string $token
         * @return string Formatted URL
         */
        protected function getTokenUrl( $page, $token ) {

diff --combined languages/i18n/qqq.json
index 8f8d871,e7e0f42..6621e72
--- 1/languages/i18n/qqq.json
--- 2/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@@ -1435,7 -1435,6 +1435,6 @@@
        "right-siteadmin": "{{doc-right|siteadmin}}",
        "right-override-export-depth": "{{doc-right|override-export-depth}}",
        "right-sendemail": "{{doc-right|sendemail}}",
-       "right-sendemail-new-users": "{{doc-right|sendemail-new-users}}",
        "right-managechangetags": "{{doc-right|managechangetags}}",
        "right-applychangetags": "{{doc-right|applychangetags}}",
        "right-changetags": "{{doc-right|changetags}}",
@@@ -1638,10 -1637,10 +1637,10 @@@
        "rcfilters-filter-watchlist-notwatched-label": "Label for the filter for showing changes to pages not on your watchlist.",
        "rcfilters-filter-watchlist-notwatched-description": "Description for the filter for showing changes to pages not on your watchlist.",
        "rcfilters-filtergroup-watchlistactivity": "Title for the watchlist activity filter group (only available on [[Special:Watchlist]])",
 -      "rcfilters-filter-watchlistactivity-unseen-label": "Label for unseen changes in the watchlist activity filter group.",
 -      "rcfilters-filter-watchlistactivity-unseen-description": "Description for unseen changes in the watchlist activity filter group.",
 -      "rcfilters-filter-watchlistactivity-seen-label": "Label for seen changes in the watchlist activity filter group.",
 -      "rcfilters-filter-watchlistactivity-seen-description": "Description for seen changes in the watchlist activity filter group.",
 +      "rcfilters-filter-watchlistactivity-unseen-label": "Label for unseen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}",
 +      "rcfilters-filter-watchlistactivity-unseen-description": "Description for unseen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}",
 +      "rcfilters-filter-watchlistactivity-seen-label": "Label for seen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}",
 +      "rcfilters-filter-watchlistactivity-seen-description": "Description for seen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}",
        "rcfilters-filtergroup-changetype": "Title for the filter group for edit type.",
        "rcfilters-filter-pageedits-label": "Label for the filter for showing the edits to existing pages.",
        "rcfilters-filter-pageedits-description": "Description for the filter for showing edits to existing pages.",
@@@ -4384,7 -4383,7 +4383,7 @@@
        "expandtemplates": "{{doc-special|ExpandTemplates}}\nThe name of the [[mw:Extension:ExpandTemplates|Expand Templates extension]].",
        "expand_templates_intro": "This is the explanation given in the heading of the [[Special:ExpandTemplates]] page; it describes its functionality to the users.\nFor more information, see [[mw:Extension:ExpandTemplates]]",
        "expand_templates_title": "The label of the input box for the context title on the form displayed at [[Special:ExpandTemplates]] page.",
 -      "expand_templates_input": "{{Identical|Input text}}",
 +      "expand_templates_input": "Used as an indicator.",
        "expand_templates_output": "{{Identical|Result}}",
        "expand_templates_xml_output": "Used as HTML <code><nowiki><h2></nowiki></code> heading.",
        "expand_templates_html_output": "Used as HTML <code><nowiki><h2></nowiki></code> heading.",