- Patch #620446 by Xano: rewrite permission titles and descriptions.

24 files changed, 56 insertions, 116 deletions

diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 4b5a8f490..38d7b2d71 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -305,11 +305,9 @@ function aggregator_permission() {
   return array(
     'administer news feeds' => array(
       'title' => t('Administer news feeds'),
-      'description' => t('Add, edit or delete news feeds that are aggregated to your site.'),
     ),
     'access news feeds' => array(
-      'title' => t('Access news feeds'),
-      'description' => t('View aggregated news feed items.'),
+      'title' => t('View news feeds'),
     ),
   );
 }
diff --git a/modules/block/block.module b/modules/block/block.module
index 38464ffcc..346141203 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -66,7 +66,6 @@ function block_permission() {
   return array(
     'administer blocks' => array(
       'title' => t('Administer blocks'),
-      'description' => t('Select which blocks are displayed, and arrange them on the page.'),
     ),
   );
 }
diff --git a/modules/book/book.module b/modules/book/book.module
index f31754598..a653261d3 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -70,18 +70,15 @@ function book_permission() {
   return array(
     'administer book outlines' => array(
       'title' => t('Administer book outlines'),
-      'description' => t('Manage books through the administration panel.'),
     ),
     'create new books' => array(
       'title' => t('Create new books'),
-      'description' => t('Add new top-level books.'),
     ),
     'add content to books' => array(
-      'title' => t('Add content to books'),
-      'description' => t('Add new content and child pages to books.'),
+      'title' => t('Add content and child pages to books'),
     ),
     'access printer-friendly version' => array(
-      'title' => t('Access printer-friendly version'),
+      'title' => t('View printer-friendly books'),
       'description' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'),
     ),
   );
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 70e301368..3ec48f3f7 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -276,20 +276,16 @@ function comment_node_type_delete($info) {
 function comment_permission() {
   return array(
     'administer comments' => array(
-      'title' => t('Administer comments'),
-      'description' => t('Manage and approve comments, and configure comment administration settings.'),
+      'title' => t('Administer comments and comment settings'),
     ),
     'access comments' => array(
-      'title' => t('Access comments'),
-      'description' => t('View comments attached to content.'),
+      'title' => t('View comments'),
     ),
     'post comments' => array(
-      'title' => t('Post comments'),
-      'description' => t('Add comments to content (approval required).'),
+      'title' => t('Post comments with approval'),
     ),
     'post comments without approval' => array(
       'title' => t('Post comments without approval'),
-      'description' => t('Add comments to content (no approval required).'),
     ),
   );
 }
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index ced9df4db..9f0e3ca16 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -43,16 +43,13 @@ function contact_help($path, $arg) {
 function contact_permission() {
   return array(
     'administer contact forms' => array(
-      'title' => t('Administer contact forms'),
-      'description' => t('Manage contact forms and configure contact form administrative settings.'),
+      'title' => t('Administer contact forms and contact form settings'),
     ),
     'access site-wide contact form' => array(
-      'title' => t('Access site-wide contact form'),
-      'description' => t('Send e-mails to administrator-defined recipients using the site-wide contact form.'),
+      'title' => t('Use the site-wide contact form'),
     ),
     'access user contact forms' => array(
-      'title' => t('Access user contact forms'),
-      'description' => t('Send e-mails to users using their contact forms.'),
+      'title' => t("Use users' personal contact forms"),
     ),
   );
 }
diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module
index 5fd5d6ac8..933ecb8f7 100644
--- a/modules/dashboard/dashboard.module
+++ b/modules/dashboard/dashboard.module
@@ -147,7 +147,7 @@ function dashboard_permission() {
   return array(
     'access dashboard' => array(
       'title' => t('View the administrative dashboard'),
-      'description' => t('Access the site-wide dashboard. Modifying the dashboard requires the "Administer blocks" permission.'),
+      'description' => t('Note: modifying the dashboard requires the !administer_blocks permission.', array('!administer_blocks' => l(t('Administer blocks'), 'admin/config/people/permissions', array('fragment' => 'module-block')))),
     ),
   );
 }
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 09361b9e2..90a7f8f33 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -272,8 +272,8 @@ function filter_admin_format_title($format) {
  */
 function filter_permission() {
   $perms['administer filters'] = array(
-    'title' => t('Administer filters'),
-    'description' => t('Manage text formats and filters, and use any of them, without restriction, when entering or editing content. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+    'title' => t('Administer and use any text formats and filters'),
+    'description' => theme('placeholder', array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
   );
 
   // Generate permissions for each text format. Warn the administrator that any
@@ -285,8 +285,8 @@ function filter_permission() {
       // viewing this will have access to that page.
       $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', array('text' => $format->name));
       $perms[$permission] = array(
-        'title' => t("Use the %text_format text format", array('%text_format' => $format->name)),
-        'description' => t('Use !text_format in forms when entering or editing content. %warning', array('!text_format' => $format_name_replacement, '%warning' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
+        'title' => t("Use the !text_format text format", array('!text_format' => $format_name_replacement,)),
+        'description' => theme('placeholder', array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
       );
     }
   }
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 812be1c59..e1c45700a 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -365,7 +365,6 @@ function forum_permission() {
   $perms = array(
     'administer forums' => array(
       'title' => t('Administer forums'),
-      'description' => t('Forum administration and settings.'),
     ),
   );
   return $perms;
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index df2e133d5..9063137e9 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -297,11 +297,9 @@ function locale_permission() {
   return array(
     'administer languages' => array(
       'title' => t('Administer languages'),
-      'description' => t('Manage the languages in which the website content and interface text may be displayed.'),
     ),
     'translate interface' => array(
-      'title' => t('Translate the interface'),
-      'description' => t('Translate the text of the website interface.'),
+      'title' => t('Translate interface texts'),
     ),
   );
 }
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index f7953d70b..93face4a6 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -45,8 +45,7 @@ function menu_help($path, $arg) {
 function menu_permission() {
   return array(
     'administer menu' => array(
-      'title' => t('Administer menu'),
-      'description' => t('Manage menus and menu items.'),
+      'title' => t('Administer menus and menu items'),
     ),
   );
 }
diff --git a/modules/node/node.module b/modules/node/node.module
index 181e7a0cb..d91139f83 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1401,39 +1401,32 @@ function node_permission() {
   $perms = array(
     'administer content types' => array(
       'title' => t('Administer content types'),
-      'description' => t('Manage content types and content type administration settings.'),
     ),
     'administer nodes' => array(
-      'title' => t('Administer nodes'),
-      'description' => t('Manage all information associated with site content, such as author, publication date and current revision. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'title' => t('Administer content'),
+      'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
     'access content' => array(
-      'title' => t('Access content'),
-      'description' => t('View published content.'),
+      'title' => t('View published content'),
     ),
     'access content overview' => array(
-      'title' => t('Access content overview'),
-      'description' => t('Access the content overview page.'),
+      'title' => t('Access the content overview page'),
     ),
     'bypass node access' => array(
-      'title' => t('Bypass node access'),
-      'description' => t('View, edit and delete all site content. Users with this permission will bypass any content-related access control. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'title' => t('Bypass content access control'),
+      'description' => t('View, edit and delete all content regardless of permission restrictions. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
     'view revisions' => array(
-      'title' => t('View revisions'),
-      'description' => t('View content revisions.'),
+      'title' => t('View content revisions'),
     ),
     'revert revisions' => array(
-      'title' => t('Revert revisions'),
-      'description' => t('Replace content with an older revision.'),
+      'title' => t('Revert content revisions'),
     ),
     'delete revisions' => array(
-      'title' => t('Delete revisions'),
-      'description' => t('Delete content revisions.'),
+      'title' => t('Delete content revisions'),
     ),
     'view own unpublished content' => array(
       'title' => t('View own unpublished content'),
-      'description' => t('View unpublished content created by the user'),
     ),
   );
 
@@ -2529,24 +2522,19 @@ function node_list_permissions($type) {
   // Build standard list of node permissions for this type.
   $perms = array(
     "create $type content" => array(
-      'title' => t('Create %type_name content', array('%type_name' => $info->name)),
-      'description' => t('Create new %type_name content.', array('%type_name' => $info->name)),
+      'title' => t('Create new %type_name content', array('%type_name' => $info->name)),
     ),
     "edit own $type content" => array(
       'title' => t('Edit own %type_name content', array('%type_name' => $info->name)),
-      'description' => t('Edit %type_name content created by the user.', array('%type_name' => $info->name)),
     ),
     "edit any $type content" => array(
       'title' => t('Edit any %type_name content', array('%type_name' => $info->name)),
-      'description' => t('Edit any %type_name content, regardless of its author.', array('%type_name' => $info->name)),
     ),
     "delete own $type content" => array(
       'title' => t('Delete own %type_name content', array('%type_name' => $info->name)),
-      'description' => t('Delete %type_name content created by the user.', array('%type_name' => $info->name)),
     ),
     "delete any $type content" => array(
       'title' => t('Delete any %type_name content', array('%type_name' => $info->name)),
-      'description' => t('Delete any %type_name content, regardless of its author.', array('%type_name' => $info->name)),
     ),
   );
 
diff --git a/modules/path/path.module b/modules/path/path.module
index 02adbba41..c27716186 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -42,11 +42,9 @@ function path_permission() {
   return array(
     'administer url aliases' => array(
       'title' => t('Administer URL aliases'),
-      'description' => t('Manage URL aliases across the entire website.'),
     ),
     'create url aliases' => array(
-      'title' => t('Create URL aliases'),
-      'description' => t('Manage URL aliases on content.'),
+      'title' => t('Create and edit URL aliases'),
     ),
   );
 }
diff --git a/modules/php/php.module b/modules/php/php.module
index 4208acbd0..b623e28ff 100644
--- a/modules/php/php.module
+++ b/modules/php/php.module
@@ -27,7 +27,7 @@ function php_permission() {
   return array(
     'use PHP for settings' => array(
       'title' => t('Use PHP for settings'),
-      'description' => t('Enter PHP in settings fields where PHP is allowed. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
   );
 }
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index be9d94522..1c206a994 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -64,15 +64,12 @@ function poll_permission() {
   $perms = array(
     'vote on polls' => array(
       'title' => t('Vote on polls'),
-      'description' => t('Cast votes on polls.'),
     ),
     'cancel own vote' => array(
-      'title' => t('Cancel own vote'),
-      'description' => t('Retract and optionally change own votes.'),
+      'title' => t('Cancel and change own votes'),
     ),
     'inspect all votes' => array(
-      'title' => t('Inspect all votes'),
-      'description' => t('View voting results.'),
+      'title' => t('View voting results'),
     ),
   );
 
diff --git a/modules/search/search.module b/modules/search/search.module
index 61064cf4b..5a521dcdf 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -144,15 +144,12 @@ function search_permission() {
   return array(
     'administer search' => array(
       'title' => t('Administer search'),
-      'description' => t('Configure search administration settings.'),
     ),
     'search content' => array(
-      'title' => t('Search content'),
-      'description' => t('Search website content.'),
+      'title' => t('Use search'),
     ),
     'use advanced search' => array(
       'title' => t('Use advanced search'),
-      'description' => t('Limit search results with additional criteria, such as specific content types. Could have performance implications.'),
     ),
   );
 }
diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module
index 894d0c060..92bd58c77 100644
--- a/modules/shortcut/shortcut.module
+++ b/modules/shortcut/shortcut.module
@@ -21,15 +21,12 @@ function shortcut_permission() {
   return array(
     'administer shortcuts' => array(
       'title' => t('Administer shortcuts'),
-      'description' => t('Manage all shortcut and shortcut sets.'),
     ),
     'customize shortcut links' => array(
-      'title' => t('Customize shortcut links'),
-      'description' => t("Edit, add and delete the links in shortcut set the user is using."),
+      'title' => t('Customize own shortcuts'),
     ),
     'switch shortcut sets' => array(
-      'title' => t('Choose a different shortcut set'),
-      'description' => t('Choose which set of shortcuts are displayed for the user.')
+      'title' => t('Select own shortcut set'),
     ),
   );
 }
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index 4d1ea4161..1421d8978 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -63,8 +63,8 @@ function simpletest_menu() {
 function simpletest_permission() {
   return array(
     'administer unit tests' => array(
-      'title' => t('Administer unit tests'),
-      'description' => t('Manage and run automated testing. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'title' => t('Administer tests'),
+      'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
   );
 }
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 050456cd8..44c332c45 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -91,17 +91,14 @@ function statistics_exit() {
  */
 function statistics_permission() {
   return array(
-    'access statistics' => array(
-      'title' => t('Access statistics'),
-      'description' => t('View content access statistics.'),
-    ),
     'administer statistics' => array(
       'title' => t('Administer statistics'),
-      'description' => t('Configure statistics settings.'),
+    ),
+    'access statistics' => array(
+      'title' => t('View content access statistics'),
     ),
     'view post access counter' => array(
-      'title' => t('View post access counter'),
-      'description' => t('View the total number of times a piece of content has been accessed.'),
+      'title' => t('View content hits'),
     ),
   );
 }
diff --git a/modules/system/system.module b/modules/system/system.module
index 57048bbf8..9e771aa3f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -198,39 +198,31 @@ function system_permission() {
   return array(
     'administer site configuration' => array(
       'title' => t('Administer site configuration'),
-      'description' => t('Configure site-wide settings such as module or theme administration settings.'),
     ),
     'administer software updates' => array(
-      'title' => t('Administer software updates'),
-      'description' => t('Run the update.php script.'),
+      'title' => t('Run software updates'),
     ),
     'administer actions' => array(
       'title' => t('Administer actions'),
-      'description' => t('Manage the actions defined for your site.'),
     ),
     'administer files' => array(
-      'title' => t('Administer files'),
-      'description' => t('Manage user-uploaded files.'),
+      'title' => t('Administer user-uploaded files'),
     ),
     'access administration pages' => array(
-      'title' => t('Access administration pages'),
-      'description' => t('View the administration panel and browse the help system.'),
+      'title' => t('Use the  administration pages and help'),
     ),
     'access contextual links' => array(
-      'title' => t('Access contextual links'),
+      'title' => t('Use contextual links'),
       'description' => t('Use contextual links to perform actions related to elements on a page.'),
     ),
     'access site in maintenance mode' => array(
-      'title' => t('Access site in maintenance mode'),
-      'description' => t('Log in when the site is in maintenance mode.'),
+      'title' => t('Use the site in maintenance mode'),
     ),
     'access site reports' => array(
-      'title' => t('Access site reports'),
-      'description' => t('View reports from system logs and other status information.'),
+      'title' => t('View site reports'),
     ),
     'block IP addresses' => array(
       'title' => t('Block IP addresses'),
-      'description' => t('Block IP addresses from accessing your site.'),
     ),
   );
 }
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 81a6a2a48..10e8bf32f 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -12,21 +12,18 @@
 function taxonomy_permission() {
   $permissions = array(
     'administer taxonomy' => array(
-      'title' => t('Administer taxonomy'),
-      'description' => t('Manage taxonomy vocabularies and terms.'),
+      'title' => t('Administer vocabularies and terms'),
     ),
   );
   foreach (taxonomy_get_vocabularies() as $vocabulary) {
     $permissions += array(
       'edit terms in ' . $vocabulary->vid => array(
         'title' => t('Edit terms in %vocabulary', array('%vocabulary' => $vocabulary->name)),
-        'description' => t('Edit terms in the %vocabulary vocabulary.', array('%vocabulary' => $vocabulary->name)),
       ),
     );
     $permissions += array(
        'delete terms in ' . $vocabulary->vid => array(
-         'title' => t('Delete terms in %vocabulary', array('%vocabulary' => $vocabulary->name)),
-         'description' => t('Delete terms in the %vocabulary vocabulary.', array('%vocabulary' => $vocabulary->name)),
+         'title' => t('Delete terms from %vocabulary', array('%vocabulary' => $vocabulary->name)),
       ),
     );
   }
diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index b6c473912..ddb1a452d 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -12,8 +12,7 @@
 function toolbar_permission() {
   return array(
     'access toolbar' => array(
-      'title' => t('Access administration toolbar'),
-      'description' => t('Access the persistent administration toolbar displayed on all pages.'),
+      'title' => t('Use the administration toolbar'),
     ),
   );
 }
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index 08a801dea..878c08308 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -89,7 +89,6 @@ function translation_permission() {
   return array(
     'translate content' => array(
       'title' => t('Translate content'),
-      'description' => t('Translate website content.'),
     ),
   );
 }
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index fb5341f21..2c952abd2 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -45,12 +45,10 @@ function upload_theme() {
 function upload_permission() {
   return array(
     'upload files' => array(
-      'title' => t('Upload files'),
-      'description' => t('Attach images and other files to content.'),
+      'title' => t('Upload files for content'),
     ),
     'view uploaded files' => array(
-      'title' => t('View uploaded files'),
-      'description' => t('View and download files attached to content.'),
+      'title' => t('View and download uploaded files'),
     ),
   );
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index b3bd9f860..e9fe427af 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -726,27 +726,25 @@ function user_permission() {
   return array(
     'administer permissions' =>  array(
       'title' => t('Administer permissions'),
-      'description' => t('Manage the permissions assigned to user roles. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
     'administer users' => array(
       'title' => t('Administer users'),
-      'description' => t('Manage or block users, and manage their role assignments. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
     'access user profiles' => array(
-      'title' => t('Access user profiles'),
-      'description' => t('View profiles of users on the site, which may contain personal information.'),
+      'title' => t('View user profiles'),
     ),
     'change own username' => array(
       'title' => t('Change own username'),
-      'description' => t('Select a different username.'),
     ),
     'cancel account' => array(
-      'title' => t('Cancel account'),
-      'description' => t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured <a href="@user-settings-url">user settings</a>.', array('@user-settings-url' => url('admin/config/people/accounts'))),
+      'title' => t('Cancel own user account'),
+      'description' => t('Note: content may be kept, unpublished, deleted or transfered to the %anonymous-name user depending on the configured <a href="@user-settings-url">user settings</a>.', array('%anonymous-name' => variable_get('anonymous', t('Anonymous')), '@user-settings-url' => url('admin/config/people/accounts'))),
     ),
     'select account cancellation method' => array(
       'title' => t('Select method for cancelling own account'),
-      'description' => t('Select the method for cancelling own user account. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
+      'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
   );
 }