Fix conflicts after rebase

1 files changed, 4 insertions, 4 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 fa2dd55de20..c12ed32138e 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -543,10 +543,10 @@ project_baseline.page.description=Use this page to manage the New Code Period of
 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
-project_baseline.default_setting=Project default setting
-project_baseline.default_setting.description=This setting is the default for all branches of the project
-project_baseline.general_setting=General setting
-project_baseline.reset_to_general=Reset to general setting
+project_baseline.default_setting=Project setting
+project_baseline.general_setting=Use the general setting
+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.