Rename the page 'Settings' to 'General Settings' and move up 'Email Settings'

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 12e43941c3641e53925ebefd1bc160578d50bd18..8aa669a8ae4801f84447291c05b138a05051c188 100644 (file)
--- 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
@@ -266,28 +266,28 @@ backup.page=Backup
 clouds.page=Clouds
 components.page=Components
 coverage.page=Coverage
-default_dashboards.page=Default dashboards
-default_filters.page=Default filters
+default_dashboards.page=Default Dashboards
+default_filters.page=Default Filters
 dependencies.page=Dependencies
-email_configuration.page=Email settings
-event_categories.page=Event categories
+email_configuration.page=Email Settings
+event_categories.page=Event Categories
 filters.page=Filters
-global_roles.page=Global roles
-manual_metrics.page=Manual metrics
-manual_measures.page=Manual measures
-my_profile.page=My profile
-project_roles.page=Project roles
+global_roles.page=Global Roles
+manual_metrics.page=Manual Metrics
+manual_measures.page=Manual Measures
+my_profile.page=My Profile
+project_roles.page=Project Roles
 project_settings.page=Settings
-quality_profiles.page=Quality profiles
+quality_profiles.page=Quality Profiles
 reviews.page=Reviews
-settings.page=Settings
+settings.page=General Settings
 source.page=Source
 system_info.page=System Info
 timemachine.page=Time Machine
 user_groups.page=Groups
 users.page=Users
 violations.page=Violations
-violations_drilldown.page=Violations drilldown
+violations_drilldown.page=Violations Drilldown
 update_center.page=Update Center
 
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index e8364f9b06b82200b88fcf384eda4a12c244e2b8..871641fa03a728a583438a6359d98793dd9de727 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -80,13 +80,13 @@
 
               <li class="h2"><%= message('sidebar.system') -%></li>
               <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>"><a href="<%= ApplicationController.root_context -%>/settings/index"><%= message('settings.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='email_configuration' -%>"><a href="<%= ApplicationController.root_context -%>/email_configuration"><%= message('email_configuration.page') -%></a></li>
               <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup"><%= message('backup.page') -%></a></li>
               <li class="<%= 'selected' if controller.controller_path=='system' -%>"><a href="<%= ApplicationController.root_context -%>/system"><%= message('system_info.page') -%></a></li>
               <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true';
               if update_center_activated=='true' %>
                 <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"><a href="<%= ApplicationController.root_context -%>/updatecenter"><%= message('update_center.page') -%></a></li>
               <% end %>
-              <li class="<%= 'selected' if controller.controller_path=='email_configuration' -%>"><a href="<%= ApplicationController.root_context -%>/email_configuration"><%= message('email_configuration.page') -%></a></li>
             <% end %>
 
         <% end %>