aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core
diff options
context:
space:
mode:
authorJeremy Davis <jeremy.davis@sonarsource.com>2019-02-12 17:55:08 +0100
committersonartech <sonartech@sonarsource.com>2019-03-06 11:30:41 +0100
commit980cb9cb6854597e5adbad6fe2536f87cb519bd1 (patch)
tree07eba48ac0e92543568c2c340490e8a9b5a6c1e3 /sonar-core
parent80a41987529c43329119c90e2575c9b52a9a82d8 (diff)
downloadsonarqube-980cb9cb6854597e5adbad6fe2536f87cb519bd1.tar.gz
sonarqube-980cb9cb6854597e5adbad6fe2536f87cb519bd1.zip
SONARCLOUD-380 Trigger member sync when importing ALM org
- Remove team button and refactor modals - Sync members after importing alm organization - Update AlmOrganization type and introduce mock function - Add info box when importing or binding organization - Remove manage team button in bound org empty state if member sync
Diffstat (limited to 'sonar-core')
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties18
1 files changed, 10 insertions, 8 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 cbbb966a3a1..ac74be9ca5b 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -123,6 +123,8 @@ off=Off
on=On
or=Or
organization_key=Organization Key
+organization.bitbucket=Bitbucket team
+organization.github=GitHub organization
open=Open
optional=Optional
order=Order
@@ -2677,8 +2679,7 @@ organization.members.manage_a_team=Manage a team
organization.members.add_to_members=Add to members
organization.members.config_synchro=Configure Synchronization
organization.members.auto_sync_with_x=Automatic sync with {0}
-organization.members.auto_sync_members_from_org.bitbucket=Members can be synchronized automatically from your Bitbucket team
-organization.members.auto_sync_members_from_org.github=Members can be synchronized automatically from your GitHub organization
+organization.members.auto_sync_members_from_org_x=Members can be synchronized automatically from your {0}
organization.members.auto_sync_total_help.bitbucket=You might not see all members from your Bitbucket team yet, as they need to reconnect to SonarCloud to be members of the organization.
organization.members.auto_sync_total_help.github=You might not see all members from your GitHub organization yet, as they need to connect to SonarCloud at least once to appear in this list.
organization.members.see_all_members_on_x=See all members on {0}
@@ -2688,8 +2689,7 @@ organization.members.management.manual=Manual
organization.members.management.manual.add_members_manually=Admin add members manually from Sonarcloud existing users
organization.members.management.manual.choose_members_permissions=Admin chooses each member permissions
organization.members.management.automatic=Automatic sync with {0}
-organization.members.management.automatic.synchronized_from.bitbucket=Members are synchronized automatically from your Bitbucket team
-organization.members.management.automatic.synchronized_from.github=Members are synchronized automatically from your GitHub organization
+organization.members.management.automatic.synchronized_from_x=Members are synchronized automatically from your {0}
organization.members.management.automatic.members_changes_reflected.bitbucket=Your team members must reconnect to SonarCloud to be automatically added to correct SonarCloud organization
organization.members.management.automatic.members_changes_reflected.github=If you add or remove a member on GitHub, SonarCloud immediately reflect the changes
organization.members.management.automatic.still_choose_members_permissions=Admin still manages permissions for each member in SonarCloud
@@ -2750,6 +2750,7 @@ onboarding.footer=Don't worry you can do all of this later. Just click the "+" i
onboarding.project.header=Analyze a project
onboarding.project.header.description=Want to quickly analyze a first project? Follow these {0} easy steps.
+onboarding.project.create=Create a new project
onboarding.project_analysis.header=Analyze your project
onboarding.project_analysis.description=We initialized your project on {instance}, now it's up to you to launch analyses!
@@ -2819,8 +2820,7 @@ onboarding.create_organization.enter_your_coupon=Enter your coupon
onboarding.create_organization.create_and_upgrade=Create Organization and Upgrade
onboarding.create_organization.ready=All set! Your organization is now ready to go
onboarding.import_organization.bind=Bind Organization
-onboarding.import_organization.choose_unbound_installation.bitbucket=Choose one of your Bitbucket teams that already have the SonarCloud application installed:
-onboarding.import_organization.choose_unbound_installation.github=Choose one of your GitHub organizations that already have the SonarCloud application installed:
+onboarding.import_organization.choose_unbound_installation_x=Choose one of your {0} that already have the SonarCloud application installed:
onboarding.import_organization.import=Import Organization
onboarding.import_organization.import_org_details=Import organization details
onboarding.import_organization.org_not_found=We were not able to find the requested organization, here are a few tips to help you troubleshoot the issue:
@@ -2833,11 +2833,13 @@ onboarding.import_organization.installing=Finalize installation of the {0} appli
onboarding.import_organization.personal.page.header=Bind to your personal organization
onboarding.import_organization.personal.import_org_details=Import personal organization details
onboarding.import_organization.private.disabled=Selecting private repository is not available yet and will come soon. Meanwhile, you need to create the project manually.
-onboarding.import_organization.bitbucket=Import from Bitbucket teams
-onboarding.import_organization.github=Import from GitHub organizations
+onboarding.import_organization.import_from_x=Import from {0}
onboarding.import_organization.bind_existing=Bind to an existing SonarCloud organization
onboarding.import_organization.create_new=Create new SonarCloud organization from it
onboarding.import_organization.already_bound_x=Your organization {avatar} {name} is already bound to the SonarCloud organization {boundAvatar} {boundName}. Try again and choose a different organization.
+onboarding.import_organization.members_sync_info_x=All members from your {0} {1} will be added to your SonarCloud organization. As they connect to SonarCloud with their {2} account, members will automatically have access to your SonarCloud organization and its projects.
+onboarding.import_organization.bind_members_not_sync_info_x=We'll keep your members, groups and permissions as they are today on SonarCloud. To sync your members with your {0}, enable members sync in your Members tab.
+onboarding.import_organization.see_who_has_access=See who will have access
onboarding.import_organization_x=Import {avatar} {name} into a SonarCloud organization
onboarding.import_personal_organization_x=Bind {avatar} {name} with your personal SonarCloud organization {personalAvatar} {personalName}