# HG changeset patch
# User Chris Cannam
# Date 1300880016 0
# Node ID 2de308601155de912e7df6af4e9313eed0cd15d9
# Parent  8b569484ba955e27a464d94773a7deaefa42986a# Parent  fa07572ee073d0e660162633b012dd2610b25972
Merge from branch "bug_95"

diff -r 8b569484ba95 -r 2de308601155 app/views/projects/settings/_members.rhtml
--- a/app/views/projects/settings/_members.rhtml	Wed Mar 23 11:33:03 2011 +0000
+++ b/app/views/projects/settings/_members.rhtml	Wed Mar 23 11:33:36 2011 +0000
@@ -2,6 +2,7 @@
 <% roles = Role.find_all_givable
    members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
 
+
 <div class="splitcontentleft">
 <% if members.any? %>
 <table class="list members">
@@ -73,10 +74,10 @@
 		<% end %>
 		</div>
 		
-    <p><%= l(:label_role_plural) %>:
+    <p><%= l(:label_set_role_plural) %>:</p>
     <% roles.each do |role| %>
-    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
-   	<% end %></p>
+    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %> </label><div style="margin-left: 2em; margin-bottom: 0.5em"><i><%=l( 'label_' + role.name.downcase + "_description").to_sym %></i></div>
+   	<% end %>
    	
     <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
 		</fieldset>
diff -r 8b569484ba95 -r 2de308601155 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Wed Mar 23 11:33:03 2011 +0000
+++ b/config/locales/en-GB.yml	Wed Mar 23 11:33:36 2011 +0000
@@ -960,3 +960,9 @@
   label_user_search: "Search for user:"
   field_visible: Visible
   setting_emails_header: Emails header
+
+  label_manager_description: All powers including adding and removing members and adjusting project settings
+  label_developer_description: Can commit to repository and carry out most project editing tasks
+  label_reporter_description: Can submit bug reports; has read access for private projects
+
+  label_set_role_plural: Choose roles for new member
\ No newline at end of file
diff -r 8b569484ba95 -r 2de308601155 config/locales/en.yml
--- a/config/locales/en.yml	Wed Mar 23 11:33:03 2011 +0000
+++ b/config/locales/en.yml	Wed Mar 23 11:33:36 2011 +0000
@@ -954,3 +954,9 @@
   enumeration_activities: Activities (time tracking)
   enumeration_system_activity: System Activity
 
+  label_manager_description: All powers including adding and removing members and adjusting project settings
+  label_developer_description: Can commit to repository and carry out most project editing tasks
+  label_reporter_description: Can submit bug reports; has read access for private projects
+
+  label_set_role_plural: Choose roles for new member
+