summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-09-09 13:30:11 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2011-09-09 13:30:21 +0200
commitccdb46878a7e0e23b0810d802c47e61fa92032de (patch)
treea47616f2f72675ca524fb1415bb965f9213872d0
parent13584d1c510bfe65d631fa38c3276188f606e575 (diff)
downloadsonarqube-ccdb46878a7e0e23b0810d802c47e61fa92032de.tar.gz
sonarqube-ccdb46878a7e0e23b0810d802c47e61fa92032de.zip
SONAR-2603 add some messages
-rw-r--r--plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties10
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/server_key_configuration/index.html.erb6
2 files changed, 13 insertions, 3 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 a3469eac4f0..3d9927c5a69 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
@@ -763,6 +763,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...
+
+
+#------------------------------------------------------------------------------
+#
# NOTIFICATIONS
#
#------------------------------------------------------------------------------
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/server_key_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/server_key_configuration/index.html.erb
index 0153c35c10b..cf7db6f87c5 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/server_key_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/server_key_configuration/index.html.erb
@@ -5,7 +5,7 @@
<% else %>
<% end %>
<p>
- TODO....
+ Speech sur l'utilité de la clé....
</p>
<% form_tag :action => :save do %>
@@ -25,7 +25,7 @@
<% end %>
<tr>
<td colspan="3">
- <%= submit_tag message('server_key_configuration.save'), :disable_with => message('server_key_configuration.saving') %>
+ <%= submit_tag message('server_key_configuration.generate_button'), :disable_with => message('server_key_configuration.generating_button') %>
</td>
</tr>
</tfoot>
@@ -41,7 +41,7 @@
</tr>
<tr class="odd">
<td style="padding: 10px">
- <h3>IP Address</h3>
+ <h3>Fixed IP Address</h3>
<p class="marginbottom10">The IP address is .... Choose one of the following:</p>
<ul class="marginbottom10 bullet">
<% @valid_addresses.each_with_index do |ip_address, index| %>