aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core
diff options
context:
space:
mode:
authorPhilippe Perrin <philippe.perrin@sonarsource.com>2019-11-27 22:16:40 +0100
committerSonarTech <sonartech@sonarsource.com>2019-12-09 20:46:17 +0100
commit064e1d872f584f4568a12fa0f31e6a4f975a7437 (patch)
tree2dba1212e3aff2309b4d016c75ae5d9809bf423c /sonar-core
parent7197bceddc7c51d51cd46e22b68cdc71d277aa65 (diff)
downloadsonarqube-064e1d872f584f4568a12fa0f31e6a4f975a7437.tar.gz
sonarqube-064e1d872f584f4568a12fa0f31e6a4f975a7437.zip
SONAR-12679 Drop short & long living branch concept
Diffstat (limited to 'sonar-core')
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties4
1 files changed, 2 insertions, 2 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 6017c2b9038..5fe84a20d03 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -743,8 +743,8 @@ issues.hotspots.helper=Security Hotspots aren't necessarily issues, but they nee
issue.changelog.changed_to={0} changed to {1}
issue.changelog.was=was {0}
issue.change.file_move=The file has been moved from {0} to {1}
-issue.change.from_long_branch=The issue has been copied from branch '{0}' to branch '{1}'
-issue.change.from_short_branch=The issue has been merged from '{0}' into '{1}'
+issue.change.from_branch=The issue has been copied from branch '{0}' to branch '{1}'
+issue.change.from_non_branch=The issue has been merged from '{0}' into '{1}'
issue.changelog.removed={0} removed
issue.changelog.line_removed_X=Line number removed from issue (was {0})
issue.changelog.field.severity=Severity