SONAR-4100 Update labels

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index a8d5adf82d60e4d2a6c979a0145cd0daea3f0b14..15885bd4f62dc7adf260b52259a274ea5e1cc5b1 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -1580,8 +1580,8 @@ my_profile.password.changed=Password changed
 my_profile.password.empty=Password can not be empty
 my_profile.password.mismatch=Password mismatch
 my_profile.password.wrong_old=Wrong old password
-my_profile.notifications.title=Notifications
 my_profile.notifications.submit=Save changes
+my_profile.overall_notifications.title=Overall notifications
 my_profile.per_project_notifications.title=Notifications per project
 my_profile.add_project=Add project
 my_profile.remove_this_line=Remove this line

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb
index c8e77ea0c77cddec6dbcfd70f822ae7352b4c815..5332657ffd67374cb0ca1d9149a527774fffeee3 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb
@@ -1,4 +1,4 @@
-<h2><%= message('my_profile.notifications.title') -%></h2>
+<h2><%= message('my_profile.overall_notifications.title') -%></h2>
 
 <div class="admin marginbottom10">
   <% form_tag({:action => 'update_notifications'}, {:method => 'post'}) do %>