Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1264
diff -u -p -r1.1264 node.module
--- modules/node/node.module	22 Apr 2010 09:12:35 -0000	1.1264
+++ modules/node/node.module	22 Apr 2010 22:28:54 -0000
@@ -1408,6 +1408,11 @@ function template_preprocess_node(&$vari
  */
 function node_permission() {
   $perms = array(
+    'bypass node access' => array(
+      'title' => t('Bypass content access control'),
+      'description' => t('View, edit and delete all content regardless of permission restrictions.'),
+      'restrict access' => TRUE,
+    ),
     'administer content types' => array(
       'title' => t('Administer content types'),
       'restrict access' => TRUE,
@@ -1416,16 +1421,14 @@ function node_permission() {
       'title' => t('Administer content'),
       'restrict access' => TRUE,
     ),
-    'access content' => array(
-      'title' => t('View published content'),
-    ),
     'access content overview' => array(
       'title' => t('Access the content overview page'),
     ),
-    'bypass node access' => array(
-      'title' => t('Bypass content access control'),
-      'description' => t('View, edit and delete all content regardless of permission restrictions.'),
-      'restrict access' => TRUE,
+    'access content' => array(
+      'title' => t('View published content'),
+    ),
+    'view own unpublished content' => array(
+      'title' => t('View own unpublished content'),
     ),
     'view revisions' => array(
       'title' => t('View content revisions'),
@@ -1436,9 +1439,6 @@ function node_permission() {
     'delete revisions' => array(
       'title' => t('Delete content revisions'),
     ),
-    'view own unpublished content' => array(
-      'title' => t('View own unpublished content'),
-    ),
   );
 
   // Generate standard node permissions for all applicable node types.
@@ -2876,19 +2876,19 @@ function node_list_permissions($type) {
   // Build standard list of node permissions for this type.
   $perms = array(
     "create $type content" => array(
-      'title' => t('Create new %type_name content', array('%type_name' => $info->name)),
+      'title' => t('%type_name: Create new content', array('%type_name' => $info->name)),
     ),
     "edit own $type content" => array(
-      'title' => t('Edit own %type_name content', array('%type_name' => $info->name)),
+      'title' => t('%type_name: Edit own content', array('%type_name' => $info->name)),
     ),
     "edit any $type content" => array(
-      'title' => t('Edit any %type_name content', array('%type_name' => $info->name)),
+      'title' => t('%type_name: Edit any content', array('%type_name' => $info->name)),
     ),
     "delete own $type content" => array(
-      'title' => t('Delete own %type_name content', array('%type_name' => $info->name)),
+      'title' => t('%type_name: Delete own content', array('%type_name' => $info->name)),
     ),
     "delete any $type content" => array(
-      'title' => t('Delete any %type_name content', array('%type_name' => $info->name)),
+      'title' => t('%type_name: Delete any content', array('%type_name' => $info->name)),
     ),
   );