Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/layouts/base_projects.html.erb

@@ -58,13 +58,13 @@
 											<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td>
 											<td class="font_index"><%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist" %></td>
 											<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
-											<td class="font_index"><%=link_to files_count, project_files_path(@project) %></td>
+											<!-- <td class="font_index"><%=link_to files_count, project_files_path(@project) %></td> -->
 											
 										<tr class="font_aram">
-											<td align="center" width="58px"> <%= l(:label_member) %></td> 
-											<td align="center" width="58px"><%= l(:label_user_watcher) %></td>
-											<td align="center" width="58px"> <%= l(:label_project_issues) %></td>
-											<td align="center" width="58px"><%= l(:label_attachment) %></td>
+											<td align="center" width="70px"> <%= l(:label_member) %></td> 
+											<td align="center" width="100px"><%= l(:label_user_watcher) %></td>
+											<td align="center" width="70px"> <%= l(:label_project_issues) %></td>
+											<!-- <td align="center" width="58px"><%= l(:label_attachment) %></td> -->
 											
 										</tr>
 									</table>

config/locales/en.yml

@@ -1116,7 +1116,7 @@ en:
   label_file_new: Download
   label_user_edit: "Edit information"
   label_user_info: "User information"   #huang 添加
-  label_user_watcher: "Followed"  # huang添加的  # modified by bai
+  label_user_watcher: "Followed by"  # huang添加的  # modified by bai
   label_user_fans: "Followed by"   # modified by bai
   label_user_commits: "Code commits"
   label_user_watchered: "Followed"   # huang添加的