Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.302
diff -u -d -F^\s*function -r1.302 aggregator.module
--- modules/aggregator/aggregator.module	23 Aug 2006 18:38:41 -0000	1.302
+++ modules/aggregator/aggregator.module	27 Aug 2006 19:38:15 -0000
@@ -237,7 +237,10 @@ function aggregator_admin_settings() {
  * Implementation of hook_perm().
  */
 function aggregator_perm() {
-  return array('administer news feeds', 'access news feeds');
+  return array(
+    'administer news feeds' => t('Add, edit or delete news feeds that are aggregated to your site.'),
+    'access news feeds' => t('View aggregated news feed items.'),
+  );
 }
 
 /**
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.224
diff -u -d -F^\s*function -r1.224 block.module
--- modules/block/block.module	27 Aug 2006 12:43:18 -0000	1.224
+++ modules/block/block.module	27 Aug 2006 19:38:17 -0000
@@ -56,7 +56,10 @@ function block_help($section) {
  * Implementation of hook_perm().
  */
 function block_perm() {
-  return array('administer blocks', 'use PHP for block visibility');
+  return array(
+    'administer blocks' => t('Select which blocks are displayed and arrange them on the page.'),
+    'use PHP for block visibility' => t('Allow this user to enter PHP commands in the field for the block visibility settings. %warning', array('%warning' => t('Use with caution!'))),
+  );
 }
 
 /**
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.264
diff -u -d -F^\s*function -r1.264 blog.module
--- modules/blog/blog.module	27 Aug 2006 12:43:18 -0000	1.264
+++ modules/blog/blog.module	27 Aug 2006 19:38:18 -0000
@@ -23,7 +23,9 @@ function blog_node_info() {
  * Implementation of hook_perm().
  */
 function blog_perm() {
-  return array('edit own blog');
+  return array(
+    'edit own blog' => t('Maintain an own blog and post blog entries to it.'),
+  );
 }
 
 /**
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.386
diff -u -d -F^\s*function -r1.386 book.module
--- modules/book/book.module	23 Aug 2006 06:38:49 -0000	1.386
+++ modules/book/book.module	27 Aug 2006 19:38:20 -0000
@@ -23,7 +23,14 @@ function book_node_info() {
  * Implementation of hook_perm().
  */
 function book_perm() {
-    return array('outline posts in books', 'create book pages', 'create new books', 'edit book pages', 'edit own book pages', 'see printer-friendly version');
+    return array(
+      'outline posts in books' => t('View the outline of a book by clicking on the \'outline\' tab on book page within the book.'),
+      'create book pages' => t('Create posts with the content type %type.', array('%type' => t('book page'))),
+      'create new books' => t('Create book pages that act as independent books by not selecting a parent for the book page.'),
+      'edit book pages' => t('Edit any post with the content type %type.', array('%type' => t('book page'))),
+      'edit own book pages' => t('Edit posts with the content type %type the user has created.', array('%type' => t('book page'))),
+      'see printer-friendly version' => t('View a printer-friendly version of a book page to prevent unneeded page elements from being printed.'),
+    );
 }
 
 /**
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.479
diff -u -d -F^\s*function -r1.479 comment.module
--- modules/comment/comment.module	27 Aug 2006 12:54:01 -0000	1.479
+++ modules/comment/comment.module	27 Aug 2006 19:38:24 -0000
@@ -161,7 +161,12 @@ function comment_menu($may_cache) {
  * Implementation of hook_perm().
  */
 function comment_perm() {
-  return array('access comments', 'post comments', 'administer comments', 'post comments without approval');
+  return array(
+    'access comments' => t('View the comments from users of the site.'),
+    'post comments' => t('Write own comments on a post.'),
+    'post comments without approval' => t('Write own comments on a post without them being approved by a site administrator before publication.'),
+    'administer comments' => t('Edit and delete comments, select the comment options for a post and choose how comments are displayed.'),
+  );
 }
 
 /**
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.63
diff -u -d -F^\s*function -r1.63 contact.module
--- modules/contact/contact.module	20 Aug 2006 05:57:40 -0000	1.63
+++ modules/contact/contact.module	27 Aug 2006 19:38:26 -0000
@@ -42,7 +42,10 @@ function contact_help($section) {
  * Implementation of hook_perm
  */
 function contact_perm() {
-  return array('access site-wide contact form', 'access personal contact forms');
+  return array(
+    'access site-wide contact form' => t('Send feedback using the site-wide contact form.'),
+    'access personal contact forms' => t('Send a message to a user who has enabled his contact form.'),
+  );
 }
 /**
  * Implementation of hook_menu().
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.137
diff -u -d -F^\s*function -r1.137 filter.module
--- modules/filter/filter.module	27 Aug 2006 12:54:01 -0000	1.137
+++ modules/filter/filter.module	27 Aug 2006 19:38:29 -0000
@@ -145,7 +145,9 @@ function filter_menu($may_cache) {
  * Implementation of hook_perm().
  */
 function filter_perm() {
-  return array('administer filters');
+  return array(
+    'administer filters' => t('Create, edit and delete filter formats and choose who is allowed to use them.'),
+  );
 }
 
 /**
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.354
diff -u -d -F^\s*function -r1.354 forum.module
--- modules/forum/forum.module	26 Aug 2006 00:19:02 -0000	1.354
+++ modules/forum/forum.module	27 Aug 2006 19:38:32 -0000
@@ -144,7 +144,11 @@ function forum_access($op, $node) {
  * Implementation of hook_perm().
  */
 function forum_perm() {
-  return array('create forum topics', 'edit own forum topics', 'administer forums');
+  return array(
+    'create forum topics' => t('Create posts with the content type %type.', array('%type' => t('forum topic'))),
+    'edit own forum topics' => t('Edit posts with the content type %type the user has created.', array('%type' => t('forum topic'))),
+    'administer forums' => t('Manage, create and delete forums.'),
+  );
 }
 
 /**
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.143
diff -u -d -F^\s*function -r1.143 locale.module
--- modules/locale/locale.module	18 Aug 2006 18:58:46 -0000	1.143
+++ modules/locale/locale.module	27 Aug 2006 19:38:33 -0000
@@ -140,7 +140,9 @@ function locale_menu($may_cache) {
  * Implementation of hook_perm().
  */
 function locale_perm() {
-  return array('administer locales');
+  return array(
+    'administer locales' => t('Manage the locales and translate interface strings.'),
+  );
 }
 
 /**
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.82
diff -u -d -F^\s*function -r1.82 menu.module
--- modules/menu/menu.module	22 Aug 2006 11:13:03 -0000	1.82
+++ modules/menu/menu.module	27 Aug 2006 19:38:35 -0000
@@ -179,7 +179,9 @@ function menu_nodeapi(&$node, $op) {
  * Implementation of hook_perm().
  */
 function menu_perm() {
-  return array('administer menu');
+  return array(
+    'administer menu' => t('Create, edit and delete menus and menu items.'),
+  );
 }
 
 /**
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.687
diff -u -d -F^\s*function -r1.687 node.module
--- modules/node/node.module	26 Aug 2006 18:21:00 -0000	1.687
+++ modules/node/node.module	27 Aug 2006 19:38:41 -0000
@@ -742,14 +742,20 @@ function node_show($node, $cid) {
  * Implementation of hook_perm().
  */
 function node_perm() {
-  $perms = array('administer content types', 'administer nodes', 'access content', 'view revisions', 'revert revisions');
+  $perms = array(
+    'administer content types' => t('Add and remove simple content types and change the name of any content type.'), 
+    'administer nodes' => t('Edit and delete arbitrary posts.'),
+    'access content' => t('View published posts.'), 
+    'view revisions' => t('View all revisions of a node.'), 
+    'revert revisions' => t('Roll posts back to an older revision.')
+  );
 
   foreach (node_get_types() as $type) {
     if ($type->module == 'node') {
       $name = check_plain($type->name);
-      $perms[] = 'create '. $name .' content';
-      $perms[] = 'edit own '. $name .' content';
-      $perms[] = 'edit '. $name .' content';
+      $perms['create '. $name .' content'] = t('Create posts with the content type %type.', array('%type' => t($name)));
+      $perms['edit own '. $name .' content'] = t('Edit posts with the content type %type the user has created.', array('%type' => t($name)));
+      $perms['edit '. $name .' content'] = t('Edit any post with the content type %type.', array('%type' => t($name)));
     }
   }
 
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.91
diff -u -d -F^\s*function -r1.91 path.module
--- modules/path/path.module	22 Aug 2006 11:13:04 -0000	1.91
+++ modules/path/path.module	27 Aug 2006 19:38:42 -0000
@@ -287,7 +287,10 @@ function path_form_alter($form_id, &$for
  * Implementation of hook_perm().
  */
 function path_perm() {
-  return array('create url aliases', 'administer url aliases');
+  return array(
+    'create url aliases' => t('Create, edit and delete the url alias for posts.'),
+    'administer url aliases' => t('Create, edit and delete any url alias.'),
+  );
 }
 
 /**
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.211
diff -u -d -F^\s*function -r1.211 poll.module
--- modules/poll/poll.module	24 Aug 2006 08:56:17 -0000	1.211
+++ modules/poll/poll.module	27 Aug 2006 19:38:43 -0000
@@ -305,7 +305,12 @@ function poll_page() {
  * Implementation of hook_perm().
  */
 function poll_perm() {
-  return array('create polls', 'vote on polls', 'cancel own vote', 'inspect all votes');
+  return array(
+    'create polls' => t('Create posts with the content type %type.', array('%type' => t('poll'))),
+    'vote on polls' => t('Cast a vote on a poll.'),
+    'cancel own vote' => t('Delete the vote from the result.'),
+    'inspect all votes' => t('See which user voted for which choice.'),
+  );
 }
 
 /**
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.193
diff -u -d -F^\s*function -r1.193 search.module
--- modules/search/search.module	18 Aug 2006 18:58:46 -0000	1.193
+++ modules/search/search.module	27 Aug 2006 19:38:46 -0000
@@ -126,7 +126,11 @@ function search_help($section) {
  * Implementation of hook_perm().
  */
 function search_perm() {
-  return array('search content', 'use advanced search', 'administer search');
+  return array(
+    'search content' => t('Perform a search on the content of the site.'),
+    'use advanced search' => t('Use advanced search parameters like post types.'),
+    'administer search' => t('Change settings that affect the behavior of the search function.'),
+  );
 }
 
 /**
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.237
diff -u -d -F^\s*function -r1.237 statistics.module
--- modules/statistics/statistics.module	18 Aug 2006 18:58:46 -0000	1.237
+++ modules/statistics/statistics.module	27 Aug 2006 19:38:48 -0000
@@ -86,7 +86,10 @@ function statistics_init() {
  * Implementation of hook_perm().
  */
 function statistics_perm() {
-  return array('access statistics', 'view post access counter');
+  return array(
+    'access statistics' => t('View the gathered statistics.'),
+    'view post access counter' => t('See how many people have visisted a post.'),
+  );
 }
 
 /**
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.352
diff -u -d -F^\s*function -r1.352 system.module
--- modules/system/system.module	27 Aug 2006 12:54:01 -0000	1.352
+++ modules/system/system.module	27 Aug 2006 19:38:52 -0000
@@ -52,7 +52,11 @@ function system_help($section) {
  * Implementation of hook_perm().
  */
 function system_perm() {
-  return array('administer site configuration', 'access administration pages', 'select different theme');
+  return array(
+    'administer site configuration' => t('Changes settings that affect the whole site like module configuration, site status and information.'), 
+    'access administration pages' => t('View the administration backend and browse the help system.'), 
+    'select different theme' => t('Select a theme other than the default theme set by the site administrator.'),
+  );
 }
 
 /**
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.308
diff -u -d -F^\s*function -r1.308 taxonomy.module
--- modules/taxonomy/taxonomy.module	24 Aug 2006 06:29:50 -0000	1.308
+++ modules/taxonomy/taxonomy.module	27 Aug 2006 19:38:55 -0000
@@ -10,7 +10,9 @@
  * Implementation of hook_perm().
  */
 function taxonomy_perm() {
-  return array('administer taxonomy');
+  return array(
+    'administer taxonomy' => t('Edit, create and delete vocabularies and terms.'),
+  );
 }
 
 /**
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.123
diff -u -d -F^\s*function -r1.123 upload.module
--- modules/upload/upload.module	27 Aug 2006 12:43:18 -0000	1.123
+++ modules/upload/upload.module	27 Aug 2006 19:38:57 -0000
@@ -35,7 +35,10 @@ function upload_help($section) {
  * Implementation of hook_perm().
  */
 function upload_perm() {
-  return array('upload files', 'view uploaded files');
+  return array(
+    'upload files' => t('Attach images and other files to posts.'), 
+    'view uploaded files' => t('See and download the files other users uploaded.'),
+  );
 }
 
 /**
Index: modules/user/user.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.css,v
retrieving revision 1.2
diff -u -d -F^\s*function -r1.2 user.css
--- modules/user/user.css	17 Aug 2006 19:19:15 -0000	1.2
+++ modules/user/user.css	27 Aug 2006 19:38:57 -0000
@@ -6,6 +6,9 @@
 #permissions td.permission {
   padding-left: 1.5em;
 }
+#permissions .description {
+  font-size: 0.85em;
+}
 #access-rules .access-type, #access-rules .rule-type {
   margin-right: 1em;
   float: left;
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.662
diff -u -d -F^\s*function -r1.662 user.module
--- modules/user/user.module	27 Aug 2006 08:56:35 -0000	1.662
+++ modules/user/user.module	27 Aug 2006 19:39:04 -0000
@@ -402,7 +402,12 @@ function user_fields() {
  * Implementation of hook_perm().
  */
 function user_perm() {
-  return array('administer access control', 'administer users', 'access user profiles', 'change own username');
+  return array(
+    'administer access control' => t('Manage the permissions for roles.'), 
+    'administer users' => t('Delete, block or add users and manage their roles.'),  
+    'access user profiles' => t('View user profiles.'), 
+    'change own username' => t('The permission to change the own username.')
+  );
 }
 
 /**
@@ -1785,10 +1790,17 @@ function user_admin_perm($str_rids = NUL
   foreach (module_list(FALSE, FALSE, TRUE) as $module) {
     if ($permissions = module_invoke($module, 'perm')) {
       $form['permission'][] = array('#type' => 'markup', '#value' => t('@module module', array('@module' => $module)));
-      asort($permissions);
-      foreach ($permissions as $perm) {
+      ksort($permissions); 
+      foreach ($permissions as $perm => $description) {
+        if (is_int($perm)) {
+          $perm = $description;
+          $description = NULL;
+        }
         $options[$perm] = '';
-        $form['permission'][$perm] = array('#type' => 'markup', '#value' => t($perm));
+        $form['permission'][$perm] = array(
+          '#type' => 'markup', 
+          '#value' => t($perm) . (!is_null($description) ? '<div class="description">'. $description .'</div>' : '')
+        );
         foreach ($role_names as $rid => $name) {
           // Builds arrays for checked boxes for each role
           if (strstr($role_permissions[$rid], $perm)) {