Merge "Add tags for undo edits"

[lhc/web/wiklou.git] / languages / i18n / en.json

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4b65fbc..301408f 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1064,6 +1064,7 @@
        "timezoneregion-indian": "Indian Ocean",
        "timezoneregion-pacific": "Pacific Ocean",
        "allowemail": "Allow other users to email me",
+       "email-allow-new-users-label": "Allow emails from brand-new users",
        "email-blacklist-label": "Prohibit these users from emailing me:",
        "prefs-searchoptions": "Search",
        "prefs-namespaces": "Namespaces",
@@ -1239,6 +1240,7 @@
        "right-siteadmin": "Lock and unlock the database",
        "right-override-export-depth": "Export pages including linked pages up to a depth of 5",
        "right-sendemail": "Send email to other users",
+       "right-sendemail-new-users": "Send email to users with no logged actions",
        "right-managechangetags": "Create and (de)activate [[Special:Tags|tags]]",
        "right-applychangetags": "Apply [[Special:Tags|tags]] along with one's changes",
        "right-changetags": "Add and remove arbitrary [[Special:Tags|tags]] on individual revisions and log entries",
@@ -1482,9 +1484,9 @@
        "rcfilters-preference-label": "Hide the improved version of Recent Changes",
        "rcfilters-preference-help": "Rolls back the 2017 interface redesign and all tools added then and since.",
        "rcfilters-filter-showlinkedfrom-label": "Show changes on pages linked from",
-       "rcfilters-filter-showlinkedfrom-option-label": "Show changes on pages linked <strong>FROM</strong> a page",
-       "rcfilters-filter-showlinkedto-label": "Show changes on pages linked to",
-       "rcfilters-filter-showlinkedto-option-label": "Show changes on pages linked <strong>TO</strong> a page",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Pages linked from</strong> the selected page",
+       "rcfilters-filter-showlinkedto-label": "Show changes on pages linking to",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Pages linking to</strong> the selected page",
        "rcfilters-target-page-placeholder": "Enter a page name",
        "rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since <strong>$3, $4</strong> (up to <strong>$1</strong> shown).",
        "rclistfromreset": "Reset date selection",
@@ -3889,6 +3891,8 @@
        "tag-mw-replace-description": "Edits that remove more than 90% of the content of a page",
        "tag-mw-rollback": "Rollback",
        "tag-mw-rollback-description": "Edits that roll back previous edits using the rollback link",
+       "tag-mw-undo": "Undo",
+       "tag-mw-undo-description": "Edits that undo previous edits using the undo link",
        "tags-title": "Tags",
        "tags-intro": "This page lists the tags that the software may mark an edit with, and their meaning.",
        "tags-tag": "Tag name",