Index: app/views/roles/permissions.html.erb
===================================================================
--- app/views/roles/permissions.html.erb	(revision 16166)
+++ app/views/roles/permissions.html.erb	(working copy)
@@ -33,6 +33,7 @@
         </tr>
     <% end %>
     <% perms_by_module[mod].each do |permission| %>
+        <% humanized_perm_name = l_or_humanize(permission.name, :prefix => 'permission_') %>
         <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
         <td class="name">
             <%= link_to_function('',
@@ -39,15 +40,17 @@
                                  "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
                                  :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
                                  :class => 'icon-only icon-checked') %>
-            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+            <%= humanized_perm_name %>
         </td>
         <% @roles.each do |role| %>
-        <td>
-        <% if role.setable_permissions.include? permission %>
-          <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+          <% if role.setable_permissions.include? permission %>
+            <td title="<%= "#{humanized_perm_name} (#{role.name})" %>">
+              <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+            </td>
+          <% else %>
+            <td></td>
+          <% end %>
         <% end %>
-        </td>
-        <% end %>
         </tr>
     <% end %>
 <% end %>