jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/343431 )

Change subject: Update RCFilters conflict messages
......................................................................


Update RCFilters conflict messages

Bug: T160803
Change-Id: I280abcce05aab22622d99332b5a932a7cf1221de
---
M i18n/en.json
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/i18n/en.json b/i18n/en.json
index 7fe13f7..058bd2a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,12 +16,12 @@
        "ores-hide-nondamaging-filter": "Hide probably good edits",
        "ores-pref-damaging": "ORES sensitivity",
        "ores-rcfilters-whats-this-link-text": "Learn more",
-       "ores-rcfilters-ores-conflicts-logactions-global": "The \"Logged 
actions\" filter is conflicting with one or more \"Contribution quality\" or 
\"User intent\" filters. Quality and Intent predictions are not available for 
logged actions. The conflicting filters are marked as inactive above.",
-       "ores-rcfilters-logactions-conflicts-ores": "This filter is conflicting 
with one or more Contribution Quality or User Intent filters. Quality and 
Intent predictions are not available for logged actions.",
+       "ores-rcfilters-ores-conflicts-logactions-global": "The \"Logged 
actions\" filter conflicts with one or more Contribution Quality or User Intent 
filters. Quality and Intent predictions are not available for logged actions. 
The conflicting filters are marked in the Active Filters area, above.",
+       "ores-rcfilters-logactions-conflicts-ores": "This filter conflicts with 
one or more Contribution Quality or User Intent filters. Quality and Intent 
predictions are not available for logged actions.",
        "ores-rcfilters-damaging-title": "Contribution quality predictions",
        "ores-rcfilters-damaging-whats-this-header": "About contribution 
quality predictions",
        "ores-rcfilters-damaging-whats-this-body": "These predictions are made 
by a machine-learning service trained on a large set of edits scored by human 
editors. Stricter, more accurate filters find fewer false positives but miss 
more of their target. Less accurate filters find more of their target, but they 
also find more false positives.",
-       "ores-rcfilters-damaging-conflicts-logactions": "Contribution Quality 
predictions are not available for certain types of change. This filter is 
inactive because it is in conflict with the following Type of Change 
{{PLURAL:$2|filter|filters}}: $1",
+       "ores-rcfilters-damaging-conflicts-logactions": "Contribution Quality 
predictions are not available for certain types of change, so this filter 
conflicts with the following Type of Change {{PLURAL:$2|filter|filters}}: $1",
        "ores-rcfilters-damaging-likelygood-label": "Very likely good",
        "ores-rcfilters-damaging-likelygood-desc": "Highly accurate at finding 
almost all problem-free edits.",
        "ores-rcfilters-damaging-maybebad-label": "May have problems",
@@ -33,7 +33,7 @@
        "ores-rcfilters-goodfaith-title": "User intent predictions",
        "ores-rcfilters-goodfaith-whats-this-header": "About user intent 
predictions",
        "ores-rcfilters-goodfaith-whats-this-body": "These predictions about 
users' good faith are made by a machine-learning service trained on a large set 
of edits scored by human editors. Stricter, more accurate filters find fewer 
false positives but miss more of their target. Less accurate filters find more 
of their target, but they also find more false positives.",
-       "ores-rcfilters-goodfaith-conflicts-logactions": "User Intent 
predictions are not available for certain types of change. This filter is 
inactive because it is in conflict with the following Type of Change 
{{PLURAL:$2|filter|filters}}: $1",
+       "ores-rcfilters-goodfaith-conflicts-logactions": "User Intent 
predictions are not available for certain types of change, so this filter 
conflicts with the following Type of Change {{PLURAL:$2|filter|filters}}: $1",
        "ores-rcfilters-goodfaith-good-label": "Very likely good faith",
        "ores-rcfilters-goodfaith-good-desc": "Highly accurate at finding 
almost all good-faith edits.",
        "ores-rcfilters-goodfaith-maybebad-label": "May be bad faith",

-- 
To view, visit https://gerrit.wikimedia.org/r/343431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I280abcce05aab22622d99332b5a932a7cf1221de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to