aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/sonar-l10n-en-plugin/src
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2011-09-11 18:39:27 +0200
committersimonbrandhof <simon.brandhof@gmail.com>2011-09-11 18:39:27 +0200
commit0d57ce7853c35d7b6c502bd4b1c3284dafc41371 (patch)
tree049eba39c22f35a6deb5e9eca06dacc980ae3ca2 /plugins/sonar-l10n-en-plugin/src
parent77b9a13434344be895a495fcf0eabe77edf10baf (diff)
downloadsonarqube-0d57ce7853c35d7b6c502bd4b1c3284dafc41371.tar.gz
sonarqube-0d57ce7853c35d7b6c502bd4b1c3284dafc41371.zip
SONAR-2603 provide a dedicated page to generate server id
Diffstat (limited to 'plugins/sonar-l10n-en-plugin/src')
-rw-r--r--plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties15
1 files changed, 11 insertions, 4 deletions
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 3d9927c5a69..148bcf9b14c 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -434,7 +434,7 @@ property.category.differentialViews=Differential Views
property.category.codeCoverage=Code Coverage
property.category.duplications=Duplications
property.category.localization=Localization
-property.category.server_key=Server Key
+property.category.server_id=Server ID
#------------------------------------------------------------------------------
@@ -766,9 +766,16 @@ email_configuration.test.email_was_sent_to_x=Email was sent to {0}
# SERVER KEY CONFIGURATION
#
#------------------------------------------------------------------------------
-server_key_configuration.page=Server Key
-server_key_configuration.generate_button=Generate Key
-server_key_configuration.generating_button=Generating Key...
+server_id_configuration.page=Server ID
+server_id_configuration.generate_button=Generate ID
+server_id_configuration.generating_button=Generating ID...
+server_id_configuration.bad_key=The ID is not valid anymore. Please check the organisation and the IP address.
+server_id_configuration.information=The Server ID is a unique identifier of this Sonar instance. It is used for example to obtain a license key for the SonarSource's commercial plugins. Two fields have to be provided to generate the ID : organisation name and one of the IP addresses of the machine that hosts this server.
+server_id_configuration.organisation.title=Organisation
+server_id_configuration.organisation.desc=Name of the organisation
+server_id_configuration.ip.title=Fixed IP Address
+server_id_configuration.ip.desc=A server ID is linked to the IP address of the hosting machine that runs Sonar. If the server IP address was to changed, the server ID will have to be regenerated. The valid addresses are :
+server_id_configuration.generation_error=Organisation and/or IP address are not valid.
#------------------------------------------------------------------------------