SONAR-20870 Update issue transitions to allow accepting issues

1 files changed, 33 insertions, 13 deletions

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index f24fae9f333..d0942e614b0 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -192,6 +192,7 @@ reset_verb=Reset
 reset_to_default=Reset To Default
 reset_date=Reset dates
 resolution=Resolution
+resolve=Resolve
 restart=Restart
 restore=Restore
 result=Result
@@ -923,22 +924,34 @@ issue.severity.severity_x_click_to_change=Severity: {0}, click to change
 issue.transition.community_plug_link=SonarSource Community
 issue.transition.status_x_click_to_change=Issue status: {0}, click to change
 issue.transition=Transition
+issue.transition.accept=Accept
+issue.transition.accept.description="Won't fix now"
 issue.transition.confirm=Confirm
-issue.transition.confirm.description=This issue has been reviewed and something should be done eventually to handle it.
-issue.transition.unconfirm=Unconfirm
-issue.transition.unconfirm.description=This issue should be reviewed again to decide what to do with it.
-issue.transition.resolve=Resolve as fixed
-issue.transition.resolve.description=This issue has been fixed in the code and is waiting for the next analysis to close it - or reopen it if it was not actually fixed.
-issue.transition.falsepositive=Resolve as false positive
-issue.transition.falsepositive.description=This issue can be suppressed as it was not raised accurately. Please report false-positives to the {community_plug_link}!
-issue.transition.reopen=Reopen
-issue.transition.reopen.description=This issue is not resolved, and should be reviewed again.
+issue.transition.confirm.description=Deprecated
+issue.transition.confirm.deprecated_tooltip.1=The Confirm action is deprecated.
+issue.transition.confirm.deprecated_tooltip.2=The next analysis result will show if the issue has been fixed, otherwise it will reopen it automatically.
+issue.transition.confirm.deprecated_tooltip.3=If you were using Confirm to communicate with team members, consider assigning the issue or using comments and tags instead.
+issue.transition.confirm.deprecated_tooltip.4=If you have reviewed this issue but cannot fix it now, consider marking it as Accepted.
+issue.transition.unconfirm=Open
+issue.transition.unconfirm.description=Reopen issue
+issue.transition.resolve=Fixed
+issue.transition.resolve.description=Deprecated
+issue.transition.resolve.deprecated_tooltip.1=The Resolve as Fixed action is deprecated. 
+issue.transition.resolve.deprecated_tooltip.2=The next analysis result will show if the issue has been fixed, otherwise it will reopen the issue automatically.
+issue.transition.resolve.deprecated_tooltip.3=If you were using Resolve as Fixed to communicate with team members that an issue is being fixed, consider assigning it or using comments and tags instead.
+issue.transition.falsepositive=False Positive
+issue.transition.falsepositive.description=Analysis is mistaken
+issue.transition.reopen=Open
+issue.transition.reopen.description=Reopen issue
+issue.transition.comment=Status change comment
+issue.transition.comment.placeholder.accept=Share why (optional)
+issue.transition.comment.placeholder.confirm=Share why this is confirmed (optional)
+issue.transition.comment.placeholder.resolve=Share why this is fixed (optional)
+issue.transition.comment.placeholder.falsepositive=Share why this is a false positive (optional)
 issue.transition.close=Close
 issue.transition.close.description=
-issue.transition.wontfix=Resolve as won't fix
-issue.transition.wontfix.description=This issue can be suppressed because the rule is irrelevant in this context.
-issue.transition.setinreview=Set as In Review
-issue.transition.setinreview.description=A review is in progress to check for a vulnerability
+issue.transition.wontfix=Won't Fix
+issue.transition.wontfix.description=Deprecated
 issue.transition.openasvulnerability=Open as Vulnerability
 issue.transition.openasvulnerability.description=There's a Vulnerability in the code that must be fixed
 issue.transition.resolveasreviewed=Resolve as Reviewed
@@ -1040,6 +1053,13 @@ issue.clean_code_attribute.TRUSTWORTHY=Not trustworthy
 issue.clean_code_attribute.TRUSTWORTHY.title=This is a responsibility issue, the code is not trustworthy enough.
 issue.clean_code_attribute.TRUSTWORTHY.advice=To be trustworthy, the code needs to abstain from revealing or hard-coding private information.
 
+issue.simple_status.OPEN=Open
+issue.simple_status.ACCEPTED=Accepted
+issue.simple_status.CONFIRMED=Confirmed
+issue.simple_status.FIXED=Fixed
+issue.simple_status.FALSE_POSITIVE=False Positive
+
+issue.status.ACCEPTED=Accepted
 issue.status.REOPENED=Reopened
 issue.status.RESOLVED=Resolved
 issue.status.OPEN=Open