# HG changeset patch
# User Chris Cannam
# Date 1315298822 -3600
# Node ID eaec823e6e23e030a48ec1c66a0f5657159fbc8b
# Parent  bd1d512f9e1b4957dae1dc61641cd937566335c9# Parent  3ebf9b76e57f1e34db3f0baa0988f0c435b15d75
Merge from branch "cannam"

diff -r bd1d512f9e1b -r eaec823e6e23 app/views/members/_list.rhtml
--- a/app/views/members/_list.rhtml	Thu Jul 14 12:07:42 2011 +0100
+++ b/app/views/members/_list.rhtml	Tue Sep 06 09:47:02 2011 +0100
@@ -10,7 +10,7 @@
 <dt id="member-<%= member.id %>" class="member <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
 <%= avatar(member.user, :size => "24") %>
 <span class="user"><%= link_to_user member.principal %></span>
-<span class="email"><%= member.user.mail %></span>
+<span class="email"><%= member.user.mail if !member.user.pref.hide_mail %></span>
 <dd id="member-<%= member.id %>" class="roles <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
 <span class="roles" id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
 </dd>
diff -r bd1d512f9e1b -r eaec823e6e23 app/views/projects/index.rhtml
--- a/app/views/projects/index.rhtml	Thu Jul 14 12:07:42 2011 +0100
+++ b/app/views/projects/index.rhtml	Tue Sep 06 09:47:02 2011 +0100
@@ -4,7 +4,6 @@
 
 <div class="contextual">
     <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
-    <%= '| ' + link_to(l(:label_issue_view_all), { :controller => 'issues' }) if User.current.allowed_to?(:view_issues, nil, :global => true) %>
     <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
 </div>
 
diff -r bd1d512f9e1b -r eaec823e6e23 config/locales/en.yml
--- a/config/locales/en.yml	Thu Jul 14 12:07:42 2011 +0100
+++ b/config/locales/en.yml	Tue Sep 06 09:47:02 2011 +0100
@@ -473,7 +473,7 @@
   label_user_new: New user
   label_user_anonymous: Anonymous
   label_project: Project
-  label_project_new: New project
+  label_project_new: Start a new project
   label_project_plural: Projects
   label_my_project_plural: My Projects
   label_other_project_plural: Other Projects