From 9172f5279524f1654e24066cef5224c02453b84a Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <fabrice.bellingard@sonarsource.com>
Date: Wed, 4 Sep 2013 11:21:45 +0200
Subject: [PATCH] Update the label of 2 menu entries in the project
 "Configuration" menu

- Project Permissions => Permissions
- Project Deletion => Deletion
---
 .../src/main/resources/org/sonar/l10n/core.properties         | 3 ++-
 .../app/views/layouts/_menu_resource_settings.html.erb        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 a6588db6c2a..03d0770838a 100644
--- 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
@@ -346,6 +346,7 @@ manual_measures.page=Manual Measures
 manual_rules.page=Manual Rules
 my_profile.page=My Profile
 roles.page=Project Permissions
+permissions.page=Permissions
 project_settings.page=Settings
 project_links.page=Links
 project_history.page=History
@@ -361,7 +362,7 @@ users.page=Users
 violations.page=Violations
 update_center.page=Update Center
 lcom4_viewer.page=LCOM4
-resource_deletion.page={0} Deletion
+deletion.page=Deletion
 update_key.page=Update Key
 project_quality_profiles.page=Quality Profiles
 bulk_deletion.page=Bulk Deletion
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb
index fde05bbc14d..2eadf79f01d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb
@@ -20,7 +20,7 @@
          <li><a href="<%= ApplicationController.root_context -%>/project/links/<%= @project.id -%>"><%= message('project_links.page') -%></a></li>
       <% end %>
       <% if is_admin && controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'hasRolePolicy') %>
-      <li><a href="<%= ApplicationController.root_context -%>/project_roles/index/<%= @project.id -%>"><%= message('roles.page') -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/project_roles/index/<%= @project.id -%>"><%= message('permissions.page') -%></a></li>
       <% end %>
       <% if is_admin && controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'modifiable_history') %>
         <li><a href="<%= ApplicationController.root_context -%>/project/history/<%= @project.id -%>"><%= message('project_history.page') -%></a></li>
@@ -29,7 +29,7 @@
         <li><a href="<%= ApplicationController.root_context -%>/project/key/<%= @project.id -%>"><%= message('update_key.page') -%></a></li>
       <% end %>
       <% if is_admin && controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'deletable') %>
-        <li><a href="<%= ApplicationController.root_context -%>/project/deletion/<%= @project.id -%>"><%= message('resource_deletion.page', :params => message('qualifier.' + @project.qualifier)) -%></a></li>
+        <li><a href="<%= ApplicationController.root_context -%>/project/deletion/<%= @project.id -%>"><%= message('deletion.page') -%></a></li>
       <% end %>
       <% if is_admin
           controller.java_facade.getPages(Navigation::SECTION_RESOURCE_CONFIGURATION, @project.scope, @project.qualifier, @project.language, nil).each do |page|
-- 
2.39.5