SONAR-6796 apply feedback

diff --git a/server/sonar-web/src/main/js/apps/global-permissions/groups-view.js b/server/sonar-web/src/main/js/apps/global-permissions/groups-view.js
index e579ae334f94a3b1aaac74371177b18c32f9d4f2..5b25ec62db27be447062f66499d8a9a76c75c486 100644 (file)
--- a/server/sonar-web/src/main/js/apps/global-permissions/groups-view.js
+++ b/server/sonar-web/src/main/js/apps/global-permissions/groups-view.js
@@ -24,8 +24,8 @@ define([
         extra: {
           permission: this.options.permission
         },
-        selectParameter: 'groupId',
-        selectParameterValue: 'id',
+        selectParameter: 'groupName',
+        selectParameterValue: 'name',
         parse: function (r) {
           this.more = false;
           return r.groups;

diff --git a/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-groups.hbs b/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-groups.hbs
index 67149ae7b86c21f82d0d28ce98903af3ebbe7dee..d921ae9c0b51c9a78db673ff6ed3840629b68cae 100644 (file)
--- a/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-groups.hbs
+++ b/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-groups.hbs
@@ -1,5 +1,5 @@
 <div class="modal-head">
-  <h2>Update users</h2>
+  <h2>Update Groups</h2>
 </div>
 <div class="modal-body">
   <div class="js-modal-messages"></div>

diff --git a/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-users.hbs b/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-users.hbs
index fd4c59aa98f36e060b77b83064623f7d49440fc1..cea5a6682ce40cf9d8c542e4f277678f75fcda00 100644 (file)
--- a/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-users.hbs
+++ b/server/sonar-web/src/main/js/apps/global-permissions/templates/global-permissions-users.hbs
@@ -1,5 +1,5 @@
 <div class="modal-head">
-  <h2>Update users</h2>
+  <h2>Update Users</h2>
 </div>
 <div class="modal-body">
   <div class="js-modal-messages"></div>

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 67110591de5639dd0bdc209e38ee07a6046e9611..db77759fb01e0f1b13146833cc75e924f765739a 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2796,18 +2796,18 @@ global_permissions.permission=Permission
 global_permissions.users=Users
 global_permissions.groups=Groups
 global_permissions.admin=Administer System
-global_permissions.admin.desc=Ability to perform all administration functions for the instance: global configuration and personalization of default dashboards.
+global_permissions.admin.desc=Ability to perform all administration functions for the instance: global configuration and customization of default dashboards.
 global_permissions.profileadmin=Administer Quality Profiles and Gates
-global_permissions.profileadmin.desc=Ability to perform any action on the quality profiles and gates.
+global_permissions.profileadmin.desc=Ability to perform any action on quality profiles and gates.
 global_permissions.shareDashboard=Share Dashboards And Filters
 global_permissions.shareDashboard.desc=Ability to share dashboards, issue filters and measure filters.
 global_permissions.scan=Execute Analysis
 global_permissions.scan.desc=Ability to execute analyses, and to get all settings required to perform the analysis, even the secured ones like the scm account password, the jira account password, and so on.
 global_permissions.dryRunScan=Execute Preview Analysis
 global_permissions.dryRunScan.desc=Ability to execute preview analysis (results are not pushed to the server). This permission does not include the ability to access secured settings such as the scm account password, the jira account password, and so on.<br/>\
-This permission is <em>required</em> to execute preview analysis in Eclipse or via the Issues Report plugin.
+This permission is <em>required</em> to execute preview analysis in an IDE or for an Issues Report.
 global_permissions.provisioning=Provision Projects
-global_permissions.provisioning.desc=Ability to initialize project structure before first analysis.
+global_permissions.provisioning.desc=Ability to initialize a project so its settings can be configured before the first analysis.
 
 #------------------------------------------------------------------------------
 #