diff options
| author | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2017-02-21 08:01:49 +0100 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2017-02-21 08:01:49 +0100 |
| commit | 7ce73daef17c282256aebc4513bbf5718e0b351d (patch) | |
| tree | 2a96f079c1ceab0d3ece1f429c28f0386052d4a8 /sonar-core | |
| parent | 6c8d575311a638cd6ca565feff991db0f8c86bdb (diff) | |
| parent | 5f09ded3a60950b1db7714f70f66850216acbff9 (diff) | |
| download | sonarqube-7ce73daef17c282256aebc4513bbf5718e0b351d.tar.gz sonarqube-7ce73daef17c282256aebc4513bbf5718e0b351d.zip | |
Automatic merge from branch-6.3
* origin/branch-6.3:
SONAR-8658 display "Apply Template" button for org admin
SONAR-8658 add field configuration.canApplyPermissionTemplate to response of api/navigation/component
change wording in organization form
return `isDefault` in /api/navigation/organization
SONAR-8658 fix applying of permission template
fix ui glitch on settings page on safari
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/l10n/core.properties | 4 |
1 files changed, 2 insertions, 2 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 56479a79be1..108206c6bce 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2773,7 +2773,7 @@ organization.delete.description=Delete this organization from SonarQube. All pro organization.delete.question=Are you sure you want to delete this organization? organization.deleted=Organization has been deleted. organization.description=Description -organization.description.description=Description of the organization (256 characters max). +organization.description.description=Description of the organization. organization.edit=Edit Organization organization.key=Key organization.key.description=Key of the organization (2 to 32 characters). All chars must be lower-case letters (a to z), digits or dash (but dash can neither be trailing nor heading). When not specified, the key is computed from the name. @@ -2781,4 +2781,4 @@ organization.name=Name organization.name.description=Name of the organization (2 to 64 characters). organization.updated=Organization details have been updated. organization.url=Url -organization.url.description=Url of the homepage of the organization (256 characters max). +organization.url.description=Url of the homepage of the organization. |