diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2014-07-23 14:03:42 +0200 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2014-07-23 14:03:42 +0200 |
commit | 2a2294d055cc7f7cebb6f3f2138cd0637a646576 (patch) | |
tree | 10bf56ee0abfd8a2e6c90235c81fe488da5f5f9e /sonar-core | |
parent | 3017f1dd753af8baa461cc9901f9d5a737a28946 (diff) | |
parent | 4d828a37de90b1664855ab601836fbc931370102 (diff) | |
download | sonarqube-2a2294d055cc7f7cebb6f3f2138cd0637a646576.tar.gz sonarqube-2a2294d055cc7f7cebb6f3f2138cd0637a646576.zip |
Merge remote-tracking branch 'origin/branch-4.4'
Conflicts:
sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee
sonar-server/src/main/coffee/component-viewer/main.coffee
Diffstat (limited to 'sonar-core')
-rw-r--r-- | sonar-core/src/main/resources/org/sonar/l10n/core.properties | 2 |
1 files changed, 2 insertions, 0 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 7f396cbdd73..8d538ffb626 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2667,6 +2667,8 @@ component_viewer.header.toggle_coverage=Toggle coverage component_viewer.header.toggle_duplications=Toggle duplications component_viewer.header.toggle_scm=Toggle SCM +component_viewer.scm.modified_lines=Modified Lines + component_viewer.transition.coverage=Covered By component_viewer.transition.covers=Covers component_viewer.transition.duplication=Duplicated By |