Merge "Change "e-mail" to "email" in Log-action-filter-newusers-byemail/en"

diff --combined languages/i18n/en.json
index 36d6ca0,8bdfe00..b0819de
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -2680,10 -2680,6 +2680,10 @@@
        "blocklist-userblocks": "Hide account blocks",
        "blocklist-tempblocks": "Hide temporary blocks",
        "blocklist-addressblocks": "Hide single IP blocks",
 +      "blocklist-type": "Type:",
 +      "blocklist-type-opt-all": "All",
 +      "blocklist-type-opt-sitewide": "Sitewide",
 +      "blocklist-type-opt-partial": "Partial",
        "blocklist-rangeblocks": "Hide range blocks",
        "blocklist-timestamp": "Timestamp",
        "blocklist-target": "Target",
@@@ -2707,7 -2703,7 +2707,7 @@@
        "blocklist-editing-page": "pages",
        "blocklist-editing-ns": "namespaces",
        "ipblocklist-empty": "The block list is empty.",
 -      "ipblocklist-no-results": "The requested IP address or username is not blocked.",
 +      "ipblocklist-no-results": "No matching blocks found for the requested IP address or username.",
        "blocklink": "block",
        "unblocklink": "unblock",
        "change-blocklink": "change block",
@@@ -4094,7 -4090,7 +4094,7 @@@
        "log-action-filter-newusers-create": "Creation by anonymous user",
        "log-action-filter-newusers-create2": "Creation by registered user",
        "log-action-filter-newusers-autocreate": "Automatic creation",
-       "log-action-filter-newusers-byemail": "Creation with password sent by e-mail",
+       "log-action-filter-newusers-byemail": "Creation with password sent by email",
        "log-action-filter-patrol-patrol": "Manual patrol",
        "log-action-filter-patrol-autopatrol": "Automatic patrol",
        "log-action-filter-protect-protect": "Protection",