Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

app/views/projects/settings/_new_members.html.erb

@@ -141,7 +141,7 @@
                     <%= check_box_tag 'membership[role_ids][]', role.id %>
                     <% if User.current.language == "zh" %>
                         <% if role.id == 3 %>
-                            <label >管理员</label>
+                            <label >管理人员</label>
                         <% elsif role.id == 4 %>
                             <label >开发人员</label>
                         <% else %>