[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Consistently refer to actions in abusefilter-warning

2016-12-05 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Consistently refer to actions in abusefilter-warning
..


Consistently refer to actions in abusefilter-warning

Mentioning edits rather than actions is confusing when the warning
is about an action such as an upload. We talk of actions everywhere
else.

Spotted by Steinsplitter.

Change-Id: I4f9ca0b397a1d8354310704c355a5ac7fc902aa6
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  MusikAnimal: Looks good to me, but someone else must approve
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 5fc586b..290ccc3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,7 @@
"abuselog": "Abuse log",
"abusefilter-intro": "Welcome to the Abuse Filter management 
interface.\nThe Abuse Filter is an automated software mechanism of applying 
automatic heuristics to all actions.\nThis interface shows a list of defined 
filters, and allows them to be modified.",
"abusefilter-mustbeeditor": "For security reasons, only users with the 
right to modify abuse filters may use this interface.",
-   "abusefilter-warning": "'''Warning:''' This action has been 
automatically identified as harmful.\nUnconstructive edits will be quickly 
reverted,\nand egregious or repeated unconstructive editing will result in your 
account or IP address being blocked.\nIf you believe this action to be 
constructive, you may submit it again to confirm it.\nA brief description of 
the abuse rule which your action matched is: $1",
+   "abusefilter-warning": "'''Warning:''' This action has been 
automatically identified as harmful.\nUnconstructive actions will be quickly 
reverted,\nand egregious or repeated unconstructive editing will result in your 
account or IP address being blocked.\nIf you believe this action to be 
constructive, you may submit it again to confirm it.\nA brief description of 
the abuse rule which your action matched is: $1",
"abusefilter-disallowed": "This action has been automatically 
identified as harmful, and therefore disallowed.\nIf you believe your action 
was constructive, please inform an administrator of what you were trying to 
do.\nA brief description of the abuse rule which your action matched is: $1",
"abusefilter-blocked-display": "This action has been automatically 
identified as harmful,\nand you have been prevented from executing it.\nIn 
addition, to protect {{SITENAME}}, your user account and all associated IP 
addresses have been blocked from editing.\nIf this has occurred in error, 
please contact an administrator.\nA brief description of the abuse rule which 
your action matched is: $1",
"abusefilter-degrouped": "This action has been automatically identified 
as harmful.\nConsequently, it has been disallowed, and, since your account is 
suspected of being compromised, all rights have been revoked.\nIf you believe 
this to have been in error, please contact a bureaucrat with an explanation of 
this action, and your rights may be restored.\nA brief description of the abuse 
rule which your action matched is: $1",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f9ca0b397a1d8354310704c355a5ac7fc902aa6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Consistently refer to actions in abusefilter-warning

2016-09-21 Thread Nemo bis (Code Review)
Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311985

Change subject: Consistently refer to actions in abusefilter-warning
..

Consistently refer to actions in abusefilter-warning

Mentioning edits rather than actions is confusing when the warning
is about an action such as an upload. We talk of actions everywhere
else.

Spotted by Steinsplitter.

Change-Id: I4f9ca0b397a1d8354310704c355a5ac7fc902aa6
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/85/311985/1

diff --git a/i18n/en.json b/i18n/en.json
index 5fc586b..290ccc3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,7 @@
"abuselog": "Abuse log",
"abusefilter-intro": "Welcome to the Abuse Filter management 
interface.\nThe Abuse Filter is an automated software mechanism of applying 
automatic heuristics to all actions.\nThis interface shows a list of defined 
filters, and allows them to be modified.",
"abusefilter-mustbeeditor": "For security reasons, only users with the 
right to modify abuse filters may use this interface.",
-   "abusefilter-warning": "'''Warning:''' This action has been 
automatically identified as harmful.\nUnconstructive edits will be quickly 
reverted,\nand egregious or repeated unconstructive editing will result in your 
account or IP address being blocked.\nIf you believe this action to be 
constructive, you may submit it again to confirm it.\nA brief description of 
the abuse rule which your action matched is: $1",
+   "abusefilter-warning": "'''Warning:''' This action has been 
automatically identified as harmful.\nUnconstructive actions will be quickly 
reverted,\nand egregious or repeated unconstructive editing will result in your 
account or IP address being blocked.\nIf you believe this action to be 
constructive, you may submit it again to confirm it.\nA brief description of 
the abuse rule which your action matched is: $1",
"abusefilter-disallowed": "This action has been automatically 
identified as harmful, and therefore disallowed.\nIf you believe your action 
was constructive, please inform an administrator of what you were trying to 
do.\nA brief description of the abuse rule which your action matched is: $1",
"abusefilter-blocked-display": "This action has been automatically 
identified as harmful,\nand you have been prevented from executing it.\nIn 
addition, to protect {{SITENAME}}, your user account and all associated IP 
addresses have been blocked from editing.\nIf this has occurred in error, 
please contact an administrator.\nA brief description of the abuse rule which 
your action matched is: $1",
"abusefilter-degrouped": "This action has been automatically identified 
as harmful.\nConsequently, it has been disallowed, and, since your account is 
suspected of being compromised, all rights have been revoked.\nIf you believe 
this to have been in error, please contact a bureaucrat with an explanation of 
this action, and your rights may be restored.\nA brief description of the abuse 
rule which your action matched is: $1",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9ca0b397a1d8354310704c355a5ac7fc902aa6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits