From: Roan Kattouw Date: Sat, 18 Mar 2017 01:45:47 +0000 (-0700) Subject: RCFilters: Update conflict messages X-Git-Tag: 1.31.0-rc.0~3764^2 X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=a3d3caa38aa44c57cec5a845fb1dc826af835abc;p=lhc%2Fweb%2Fwiklou.git RCFilters: Update conflict messages Bug: T160803 Change-Id: I5c645ddce991f9352d779ba4d72d5171a948f836 --- diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 41050ad143..2553acdf21 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1383,15 +1383,15 @@ "rcfilters-filter-registered-description": "Logged-in editors.", "rcfilters-filter-unregistered-label": "Unregistered", "rcfilters-filter-unregistered-description": "Editors who aren’t logged in.", - "rcfilters-filter-unregistered-conflicts-user-experience-level": "The \"Unregistered\" filter is inactive because its effect is being canceled by the following Experience {{PLURAL:$2|filter|filters}}, which {{PLURAL:$2|finds|find}} only registered users: $1", + "rcfilters-filter-unregistered-conflicts-user-experience-level": "This filter conflicts with the following Experience {{PLURAL:$2|filter|filters}}, which {{PLURAL:$2|finds|find}} only registered users: $1", "rcfilters-filtergroup-authorship": "Edit authorship", "rcfilters-filter-editsbyself-label": "Your own edits", "rcfilters-filter-editsbyself-description": "Edits by you.", "rcfilters-filter-editsbyother-label": "Edits by others", "rcfilters-filter-editsbyother-description": "Edits created by other users (not you).", "rcfilters-filtergroup-userExpLevel": "Experience level (for registered users only)", - "rcfilters-filtergroup-user-experience-level-conflicts-unregistered": "This filter is inactive because it finds only registered users, so the \"Unregistered\" filter is canceling its effect.", - "rcfilters-filtergroup-user-experience-level-conflicts-unregistered-global": "The \"Unregistered\" filter is in conflict with one or more Experience filters. Experience filters find registered users only. The conflicting filters are marked as inactive above.", + "rcfilters-filtergroup-user-experience-level-conflicts-unregistered": "Experience filters find only registered users, so this filter conflicts with the “Unregistered” filter.", + "rcfilters-filtergroup-user-experience-level-conflicts-unregistered-global": "The \"Unregistered\" filter conflicts with one or more Experience filters, which find registered users only. The conflicting filters are marked in the Active Filters area, above.", "rcfilters-filter-user-experience-level-newcomer-label": "Newcomers", "rcfilters-filter-user-experience-level-newcomer-description": "Fewer than 10 edits and 4 days of activity.", "rcfilters-filter-user-experience-level-learner-label": "Learners",