SONAR-20392 Update wording

diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
index bd93b13cfbba7ac8b552fc53b0af8e08e63080b7..23651360fb24b6981ef865ff87cd4b597a0de12e 100644 (file)
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubSettings.java
@@ -227,7 +227,8 @@ public class GitHubSettings {
         .build(),
       PropertyDefinition.builder(GROUPS_SYNC)
         .name("Synchronize teams as groups")
-        .description("For each team they belong to, the user will be associated to a group named 'Organization/Team' (if it exists) in SonarQube.")
+        .description("Synchronize GitHub team with SonarQube group memberships when users log in to SonarQube."
+          + " For each GitHub team they belong to, users will be associated to a group of the same name if it exists in SonarQube.")
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)
         .type(BOOLEAN)
@@ -263,8 +264,8 @@ public class GitHubSettings {
         .build(),
       PropertyDefinition.builder(PROVISION_VISIBILITY)
         .name("Provision project visibility")
-        .description("Change project visibility based on GitHub repository visibility. If disabled, every provisioned project will be private and will be seen only for those users"
-                     + " that have explicit GitHub permissions for the according repository.")
+        .description("Change project visibility based on GitHub repository visibility. If disabled, every provisioned project will be private in SonarQube and visible only"
+          + " to users with explicit GitHub permissions for the corresponding repository. Changes take effect at the next synchronization.")
         .type(BOOLEAN)
         .category(CATEGORY)
         .subCategory(SUBCATEGORY)

diff --git a/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts b/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts
index 354aa3925f515721443b37197674726f23523583..bb61f1e9f369425d87ca15dcd5aaa283fe206aa3 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts
+++ b/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts
@@ -268,7 +268,7 @@ export const definitions: ExtendedSettingDefinition[] = [
     key: 'sonar.auth.github.groupsSync',
     name: 'Synchronize teams as groups',
     description:
-      "For each team they belong to, the user will be associated to a group named 'Organization/Team' (if it exists) in SonarQube.",
+      'Synchronize GitHub team with SonarQube group memberships when users log in to SonarQube. For each GitHub team they belong to, users will be associated to a group of the same name if it exists in SonarQube.',
     type: SettingType.BOOLEAN,
     category: 'authentication',
     subCategory: 'github',
@@ -2531,7 +2531,7 @@ export const definitions: ExtendedSettingDefinition[] = [
     name: 'Provision project visibility',
     key: 'provisioning.github.project.visibility.enabled',
     description:
-      'Change project visibility based on GitHub repository visibility. If disabled, every provisioned project will be private and will be seen only for those users that have explicit GitHub permissions for the according repository.',
+      'Change project visibility based on GitHub repository visibility. If disabled, every provisioned project will be private in SonarQube and visible only to users with explicit GitHub permissions for the corresponding repository. Changes take effect at the next synchronization.',
     type: SettingType.BOOLEAN,
     category: 'authentication',
     subCategory: 'github',

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 bfc920199e9aee4a975621ce3e0c1213a8206950..ca2f97c61e6e2544edeb0cef90ad9524f2a6c897 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1507,7 +1507,7 @@ settings.authentication.github.form.provisioning_with_github_short.autoProvision
 settings.authentication.github.form.provisioning_with_github_short.jit=Just-in-Time provisioning
 settings.authentication.github.form.provisioning_with_github.description=Users, groups and permissions are automatically provisioned from your GitHub organizations. Once activated, users and groups can only be created and modified from your GitHub organizations/teams. Existing local users will be kept and can only be deactivated.
 settings.authentication.github.form.description.doc=For more details, see {documentation}.
-settings.authentication.github.form.provisioning_at_login.description=User and group will be synchronise only when user log into Sonarqube.
+settings.authentication.github.form.provisioning_at_login.description=Users and groups are synchronized only when users log in to SonarQube.
 settings.authentication.github.form.provisioning.disabled=Your current edition does not support provisioning with GitHub. See the {documentation} for more information.
 settings.authentication.github.synchronize_now=Synchronize now
 settings.authentication.github.synchronization_in_progress=Synchronization is in progress.
@@ -1531,7 +1531,7 @@ settings.authentication.github.configuration.validation.details.valid_label=Vali
 settings.authentication.github.configuration.validation.details.invalid_label=Invalid
 settings.authentication.github.configuration.validation.details.org_not_found={0} (not found or app not installed)
 settings.authentication.github.configuration.roles_mapping.title=Role permission mapping
-settings.authentication.github.configuration.roles_mapping.description=When synchronizing users and groups we rely on GitHub user and team roles to assign sonarqube permissions. You can customize how the mapping will be applied. Be aware that the mapping will take effect from the next synchronization.
+settings.authentication.github.configuration.roles_mapping.description=When synchronizing users and groups, SonarQube assigns permissions based on GitHub user and team roles. You can customize the mapping of permissions. The new mapping will take effect at the next synchronization.
 settings.authentication.github.configuration.roles_mapping.button_label=Edit mapping
 settings.authentication.github.configuration.roles_mapping.dialog.title=GitHub Roles Mapping
 settings.authentication.github.configuration.roles_mapping.dialog.roles_column=Roles