SONAR-6282 Rename and reorganise some menu entries of "Settings"

diff --git a/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs
index d368d724dd1b235dfacff0ed59d49381bdf48b1f..667dc00b5ad93c153e62b2c5faee5e1053233021 100644 (file)
--- a/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs
+++ b/server/sonar-web/src/main/hbs/nav/nav-settings-navbar.hbs
@@ -50,7 +50,7 @@
 
     <li class="dropdown">
       <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-        {{t 'sidebar.system'}}&nbsp;<i class="icon-dropdown"></i>
+        {{t 'sidebar.projects'}}&nbsp;<i class="icon-dropdown"></i>
       </a>
       <ul class="dropdown-menu">
         {{#if settingsProvisioning}}
@@ -61,6 +61,17 @@
         <li>
           <a href="{{link '/bulk_deletion'}}">{{t 'bulk_deletion.page'}}</a>
         </li>
+        <li>
+          <a href="{{link '/analysis_reports'}}">{{t 'analysis_reports.page'}}</a>
+        </li>
+      </ul>
+    </li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        {{t 'sidebar.system'}}&nbsp;<i class="icon-dropdown"></i>
+      </a>
+      <ul class="dropdown-menu">
         {{#if settingsUpdateCenter}}
           <li>
             <a href="{{link '/updatecenter'}}">{{t 'update_center.page'}}</a>
@@ -69,9 +80,6 @@
         <li>
           <a href="{{link '/system'}}">{{t 'system_info.page'}}</a>
         </li>
-        <li>
-          <a href="{{link '/analysis_reports'}}">{{t 'analysis_reports.page'}}</a>
-        </li>
       </ul>
     </li>
   </ul>

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 2d0fa3b2f144efe6d7768eef78d0217e8fc9908e..c370613d9eb7161c1750e288e44438e9a9e0a4ee 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -425,7 +425,7 @@ layout.home=Home
 layout.login=Log in
 layout.logout=Log out
 layout.measures=Measures
-layout.settings=Settings
+layout.settings=Administration
 layout.print=Print
 layout.permalink=Permalink
 layout.sonar.slogan=Embrace Quality
@@ -435,6 +435,7 @@ layout.projects=Projects
 layout.recent_projects=Recent Projects
 layout.user_panel.my_profile=My profile
 
+sidebar.projects=Projects
 sidebar.project_settings=Configuration
 sidebar.security=Security
 sidebar.system=System
@@ -450,7 +451,7 @@ sidebar.tools=Tools
 action_plans.page=Action Plans
 action_plans.page.description=Create and administer Action Plans for this project. Action Plans allow you to prioritize and group issues, and to monitor progress on those groups.
 all_rules.page=All Rules
-analysis_reports.page=Analysis Reports
+analysis_reports.page=Project Computation
 coding_rules.page=Rules
 global_permissions.page=Global Permissions
 global_permissions.page.description=Grant and revoke permissions to make changes at the global level. These permissions include editing quality profiles, sharing dashboards, and performing global system administration.