SONAR-13035 Group global ALM related settings into a single category

1 files changed, 63 insertions, 53 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 12ff218a47f..171b69d4e0a 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1016,55 +1016,64 @@ settings.new_code_period.description2=This setting is the default for all projec
 
 settings.languages.select_a_language_placeholder=Select a language
 
-settings.pr_decoration.category=Pull Request Decoration
-settings.pr_decoration.title=Pull Request Decoration
-settings.pr_decoration.description=Pull Request Decoration adds SonarQube analysis and a Quality Gate to your Pull Requests directly in your ALM provider's interface.
-settings.pr_decoration.manage_instances=Manage instances
-settings.pr_decoration.azure.info=Accounts that will be used to decorate Pull Requests need Code: Read & Write permission. {link}
-settings.pr_decoration.bitbucket.info=Accounts that will be used to decorate Pull Requests need write permission. {link}
-settings.pr_decoration.github.info=You need to install a GitHub App with specific settings and permissions to enable Pull Request Decoration on your Organization or Repository. {link}
-settings.pr_decoration.gitlab.info=Accounts that will be used to decorate Merge Requests need comment permissions on projects. The personal key needs the API scope permission. {link}
-settings.pr_decoration.table.title=Pull Request Decoration configurations
-settings.mr_decoration.table.title=Merge Request Decoration configurations
-settings.pr_decoration.table.empty.azure=Create your first Azure DevOps configuration to enable Pull Request Decoration on your projects.
-settings.pr_decoration.table.empty.bitbucket=Create your first Bitbucket configuration to enable Pull Request Decoration on your projects.
-settings.pr_decoration.table.empty.github=Create your first GitHub configuration to enable Pull Request Decoration on your organization or repository.
-settings.pr_decoration.table.empty.gitlab=Create your first GitLab configuration to enable Merge Request Decoration on your repository.
-settings.pr_decoration.table.create=Create configuration
-settings.pr_decoration.table.column.name=Name
-settings.pr_decoration.table.column.bitbucket.url=Bitbucket Server URL
-settings.pr_decoration.table.column.github.url=GitHub Enterprise or GitHub.com URL
-settings.pr_decoration.table.column.app_id=App ID
-settings.pr_decoration.table.column.edit=Edit
-settings.pr_decoration.table.column.delete=Delete
-settings.pr_decoration.delete.header=Delete configuration
-settings.pr_decoration.delete.message=Are you sure you want to delete the {id} configuration?
-settings.pr_decoration.delete.info={0} projects will no longer get Pull Request Decorations.
-settings.pr_decoration.delete.no_info=An unknown number of projects will no longer get Pull Request Decorations.
-settings.pr_decoration.form.header.create=Create a Pull Request Decoration configuration
-settings.mr_decoration.form.header.create=Create a Merge Request Decoration configuration
-settings.pr_decoration.form.header.edit=Edit the Pull Request Decoration configuration
-settings.mr_decoration.form.header.edit=Edit the Merge Request Decoration configuration
-settings.pr_decoration.form.name.azure=Configuration name
-settings.pr_decoration.form.name.azure.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured Azure instance for a project.
-settings.pr_decoration.form.name.bitbucket=Configuration name
-settings.pr_decoration.form.name.bitbucket.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured Bitbucket instance for a project.
-settings.pr_decoration.form.name.github=Configuration name
-settings.pr_decoration.form.name.github.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured GitHub App for a project.
-settings.pr_decoration.form.name.gitlab=Configuration name
-settings.pr_decoration.form.name.gitlab.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured GitLab instance for a project.
-settings.pr_decoration.form.url.bitbucket=Bitbucket Server URL
-settings.pr_decoration.form.url.bitbucket.help=Example: {example}
-settings.pr_decoration.form.url.github=GitHub URL
-settings.pr_decoration.form.url.github.help1=Example for Github Enterprise:
-settings.pr_decoration.form.url.github.help2=If using GitHub.com:
-settings.pr_decoration.form.app_id=GitHub App ID
-settings.pr_decoration.form.private_key=Private Key
-settings.pr_decoration.form.personal_access_token=Personal Access token
-settings.pr_decoration.form.personal_access_token.azure.help=Token of the user that will be used to decorate the Pull Requests. Needs authorized scope: "Code (read and write)".
-settings.pr_decoration.form.personal_access_token.gitlab.help=Token of the user that will be used to decorate the Merge Requests. Needs API scope authorization.
-settings.pr_decoration.form.save=Save configuration
-settings.pr_decoration.form.cancel=Cancel
+settings.almintegration.title=Integration configurations
+settings.almintegration.description=ALM integrations allow SonarQube to interact with your ALM. This enables things like authentication, or providing analysis details and a Quality Gate to your Pull Requests directly in your ALM provider's interface.
+settings.almintegration.manage_instances=Manage instances
+settings.almintegration.azure.info=Accounts that will be used to decorate Pull Requests need Code: Read & Write permission. {link}
+settings.almintegration.github.info=You need to install a GitHub App with specific settings and permissions to enable Pull Request Decoration on your Organization or Repository. {link}
+settings.almintegration.gitlab.info=Accounts that will be used to decorate Merge Requests need comment permissions on projects. The personal key needs the API scope permission. {link}
+settings.almintegration.bitbucket.help_1=SonarQube needs a Personal Access Token to communicate with Bitbucket Server. This token will be used to decorate Pull Requests.
+settings.almintegration.bitbucket.help_2=The account used for integration needs write permission.
+settings.almintegration.bitbucket.help_3=We recommend to integrate with SonarQube using a Bitbucket Server Service Account.
+settings.almintegration.table.title=ALM integration configurations
+settings.almintegration.table.empty.azure=Create your first Azure DevOps configuration to enable Pull Request Decoration on your projects.
+settings.almintegration.table.empty.bitbucket=Create your first Bitbucket configuration to enable Pull Request Decoration on your projects.
+settings.almintegration.table.empty.github=Create your first GitHub configuration to enable Pull Request Decoration on your organization or repository.
+settings.almintegration.table.empty.gitlab=Create your first GitLab configuration to enable Merge Request Decoration on your repository.
+settings.almintegration.table.create=Create configuration
+settings.almintegration.table.column.name=Name
+settings.almintegration.table.column.bitbucket.url=Bitbucket Server URL
+settings.almintegration.table.column.github.url=GitHub Enterprise or GitHub.com URL
+settings.almintegration.table.column.app_id=App ID
+settings.almintegration.table.column.edit=Edit
+settings.almintegration.table.column.delete=Delete
+settings.almintegration.delete.header=Delete configuration
+settings.almintegration.delete.message=Are you sure you want to delete the {id} configuration?
+settings.almintegration.delete.info={0} projects will no longer get Pull Request Decorations.
+settings.almintegration.delete.no_info=An unknown number of projects will no longer get Pull Request Decorations.
+settings.almintegration.form.header.create=Create a configuration
+settings.almintegration.form.header.edit=Edit the configuration
+settings.almintegration.form.name.azure=Configuration name
+settings.almintegration.form.name.azure.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured Azure instance for a project.
+settings.almintegration.form.name.bitbucket=Configuration name
+settings.almintegration.form.name.bitbucket.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured Bitbucket instance for a project.
+settings.almintegration.form.name.github=Configuration name
+settings.almintegration.form.name.github.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured GitHub App for a project.
+settings.almintegration.form.name.gitlab=Configuration name
+settings.almintegration.form.name.gitlab.help=Give your configuration a clear and succinct name. This name will be used at project level to identify the correct configured GitLab instance for a project.
+settings.almintegration.form.url.bitbucket=Bitbucket Server URL
+settings.almintegration.form.url.bitbucket.help=Example: {example}
+settings.almintegration.form.url.github=GitHub URL
+settings.almintegration.form.url.github.help1=Example for Github Enterprise:
+settings.almintegration.form.url.github.help2=If using GitHub.com:
+settings.almintegration.form.app_id=GitHub App ID
+settings.almintegration.form.private_key=Private Key
+settings.almintegration.form.personal_access_token=Personal Access token
+settings.almintegration.form.personal_access_token.azure.help=Token of the user that will be used to decorate the Pull Requests. Needs authorized scope: "Code (read and write)".
+settings.almintegration.form.personal_access_token.gitlab.help=Token of the user that will be used to decorate the Merge Requests. Needs API scope authorization.
+settings.almintegration.form.save=Save configuration
+settings.almintegration.form.cancel=Cancel
+settings.almintegration.features=ALM integration features
+settings.almintegration.feature.enabled=This feature is enabled
+settings.almintegration.feature.disabled=This feature is currently disabled
+settings.almintegration.feature.need_at_least_1_binding=You need to have at least 1 binding configured to use this feature
+settings.almintegration.feature.pr_decoration.title=Pull Request Decoration
+settings.almintegration.feature.pr_decoration.description=Add analysis and a Quality Gate to your Pull Requests directly in your ALM provider's interface.
+settings.almintegration.feature.mr_decoration.title=Merge Request Decoration
+settings.almintegration.feature.mr_decoration.description=Add analysis and a Quality Gate to your Merge Requests directly in your ALM provider's interface.
+settings.almintegration.feature.alm_repo_import.title=Import repositories from your ALM
+settings.almintegration.feature.alm_repo_import.description=Select repositories from your ALM, and import them into SonarQube.
+settings.almintegration.feature.alm_repo_import.disabled_if_multiple_bbs_instances=Connecting to multiple Bitbucket Server instances will deactivate the {feature} feature. Projects will have to be set up manually.
 
 settings.pr_decoration.binding.category=Pull Request Decoration
 settings.pr_decoration.binding.no_bindings=This feature must first be enabled in the global settings. {link}
@@ -1088,13 +1097,14 @@ property.category.general.databaseCleaner=Database Cleaner
 property.category.general.looknfeel=Look & Feel
 property.category.general.issues=Issues
 property.category.general.subProjects=Sub-projects
+property.category.almintegration=ALM Integrations
+property.category.almintegration.github=GitHub Authentication
+property.category.almintegration.github.description=In order to enable authentication on GitHub.com or GitHub Enterprise:<ul><li>SonarQube must be publicly accessible through HTTPS only</li><li>The property 'sonar.core.serverBaseURL' must be set to this public HTTPS URL</li><li>In your GitHub profile, you need to create a Developer Application for which the 'Authorization callback URL' must be set to <code>'&lt;value_of_sonar.core.serverBaseURL_property&gt;/oauth2/callback'</code>.</li></ul>
+property.category.almintegration.gitlab=GitLab Authentication
+property.category.almintegration.gitlab.description=In order to enable GitLab authentication, the property 'sonar.core.serverBaseURL' must be set to the public URL
 property.category.organizations=Organizations
 property.category.security=Security
 property.category.security.encryption=Encryption
-property.category.security.github=GitHub
-property.category.security.github.description=In order to enable authentication on GitHub.com or GitHub Enterprise:<ul><li>SonarQube must be publicly accessible through HTTPS only</li><li>The property 'sonar.core.serverBaseURL' must be set to this public HTTPS URL</li><li>In your GitHub profile, you need to create a Developer Application for which the 'Authorization callback URL' must be set to <code>'&lt;value_of_sonar.core.serverBaseURL_property&gt;/oauth2/callback'</code>.</li></ul>
-property.category.security.gitlab=Gitlab
-property.category.security.gitlab.description=In order to enable Gitlab authentication, the property 'sonar.core.serverBaseURL' must be set to the public URL
 property.category.security.saml=SAML
 property.category.security.saml.description=In order to enable SAML authentication, the property 'sonar.core.serverBaseURL' must be set to the public URL
 property.category.java=Java