SONAR-13391 Add reference branch option to new code setting

1 files changed, 19 insertions, 11 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 7affd182602..3cee83507fc 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -563,8 +563,8 @@ project_branch_pull_request.table.branch=Branch
 project_branch_pull_request.table.pull_request=Pull Request
 project_branch_pull_request.last_analysis_date=Last Analysis Date
 
-project_baseline.page=New Code Period
-project_baseline.page.description=Use this page to manage the New Code Period of your project. {link}
+project_baseline.page=New Code
+project_baseline.page.description=Use this page to define the New Code of your project. {link}
 project_baseline.page.description.link=Learn More
 project_baseline.page.description2=You can adjust this setting globally in {link}
 project_baseline.page.description2.link=General Settings
@@ -574,18 +574,26 @@ project_baseline.specific_setting=Define a specific setting for this project
 project_baseline.configure_branches=Set a specific setting for a branch
 
 baseline.previous_version=Previous version
-baseline.previous_version.description=The New Code Period will begin with the analysis following the previous version.
+baseline.previous_version.description=The New Code will be based on the analysis following the previous version.
 baseline.number_days=Number of days
-baseline.number_days.description=A floating New Code Period window set to a specific number of days.
-baseline.specific_date=Specific date
-baseline.specific_date.description=Set a specific date as the start of the New Code Period. (First analysis on this date will be used)
+baseline.number_days.description=A floating window set to a specific number of days used to define New Code.
 baseline.specific_analysis=Specific analysis
-baseline.specific_analysis.description=Choose an analysis as the baseline for the New Code Period.
+baseline.specific_analysis.description=Choose an analysis as the baseline for the New Code.
+baseline.reference_branch=Reference branch
+
+baseline.reference_branch.description=Choose a branch as the reference for the New Code.
+baseline.reference_branch.description2=The branch you select as the reference branch will need its own New Code definition to prevent it from using itself as a reference.
 
 baseline.specify_days=Specify a number of days
 baseline.last_analysis_before=Last analysis before
 baseline.next_analysis_notice=Changes will take effect after the next analysis
 
+baseline.reference_branch.choose=Choose a branch
+baseline.reference_branch.does_not_exist=Branch {0} could not be found in SonarQube.
+baseline.reference_branch.cannot_be_itself=A branch cannot be used as its own reference branch
+baseline.reference_branch.invalid_branch_setting=Branch {0} cannot use itself as a reference. Define a specific setting instead of using the project-level setting.
+baseline.edit_branch_setting=Edit the branch's setting
+
 branch_list.branch=Branch
 branch_list.current_setting=Setting
 branch_list.current_baseline=Current Baseline
@@ -1000,10 +1008,10 @@ settings.analysis_scope.wildcards.zero_more_char=Match zero or more characters
 settings.analysis_scope.wildcards.zero_more_dir=Match zero or more directories
 settings.analysis_scope.wildcards.single_char=Match a single character
 
-settings.new_code_period.category=New Code Period
-settings.new_code_period.title=Default New Code Period behavior
-settings.new_code_period.description=The New Code Period is the period used to compare measures and track new issues. {link}
-settings.new_code_period.description2=This setting is the default for all projects. A specific New Code Period setting can be configured at project level.
+settings.new_code_period.category=New Code
+settings.new_code_period.title=Default New Code behavior
+settings.new_code_period.description=The New Code definition is used to compare measures and track new issues. {link}
+settings.new_code_period.description2=This setting is the default for all projects. A specific New Code definition can be configured at project level.
 
 settings.languages.select_a_language_placeholder=Select a language