From 57c85754702dbb2daacf5449012a29ca938f1fbe Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Wed, 11 Mar 2015 17:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=A1=B9=E7=9B=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C=E7=9B=AE=E5=89=8D?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=84=E9=A1=B9=E7=9B=AE=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=EF=BC=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/watchers_helper.rb               |  2 +-
 app/views/layouts/base_contest.html.erb      |  2 +-
 app/views/layouts/base_newcontest.html.erb   |  2 +-
 app/views/layouts/base_opensource_p.html.erb |  2 +-
 app/views/layouts/base_projects.html.erb     | 32 +++++-----
 app/views/tags/_project_tag.html.erb         |  2 +-
 config/locales/commons/en.yml                |  2 +-
 config/locales/commons/zh.yml                |  2 +
 config/locales/courses/en.yml                |  6 +-
 config/locales/courses/zh.yml                |  4 +-
 config/locales/en.yml                        | 13 +---
 config/locales/my/en.yml                     |  4 ++
 config/locales/my/zh.yml                     |  9 ++-
 config/locales/navigatiors/en.yml            |  2 +
 config/locales/navigatiors/zh.yml            |  2 +
 config/locales/projects/en.yml               | 63 +++++++++++++++++++-
 config/locales/projects/zh.yml               | 30 ++++++++++
 config/locales/users/zh.yml                  | 24 ++++----
 config/locales/zh.yml                        | 37 +++---------
 19 files changed, 157 insertions(+), 83 deletions(-)

diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 971bf603d..b9e658bb5 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -283,6 +283,6 @@ module WatchersHelper
 
     def exit_project_link(project)
       link_to(l(:label_exit_project),exit_cur_project_path(project.id),
-        :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px;margin-right:10px;height:22px;background:none repeat scroll 0% 0% #64BDD9;TES" )
+        :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 22px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES" )
     end
   end
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index d28456329..a11defebf 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -154,7 +154,7 @@
 									<!--description-->
 								<div class="inf_user_context">
 									<div class="font_title_left">
-										<%= l(:label_project_overview) %>
+										<%= l(:label_overview) %>
 									</div>
 									<div style="padding-bottom: 8px">
 										<% if @bid.description.size>0 %>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 957c8498b..f3c598598 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -174,7 +174,7 @@
 
 								<div class="inf_user_context" style="line-height: normal;margin-top: 10px;">
 									<div class="font_title_left">
-										<%= l(:label_project_overview) %>
+										<%= l(:label_overview) %>
 									</div>
 									<div style="padding-bottom: 8px">
 										<% if @contest.description.size>0 %>
diff --git a/app/views/layouts/base_opensource_p.html.erb b/app/views/layouts/base_opensource_p.html.erb
index e184bdc21..60b403449 100644
--- a/app/views/layouts/base_opensource_p.html.erb
+++ b/app/views/layouts/base_opensource_p.html.erb
@@ -86,7 +86,7 @@
 
 								<div class="inf_user_context">
 									<div class="font_title_left">
-										<%= l(:label_project_overview) %>
+										<%= l(:label_overview) %>
 									</div>
 
 									<div style="padding-bottom: 8px">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 9b4c22b75..262aa2f69 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -29,7 +29,7 @@
 						<div class="top-content">
 							<table>
 								<tr>
-									<td class="info_font" style="width: 240px;" rowspan="2"><a href="http://<%= Setting.host_name%>" style="color: #15bccf;"> 软件项目托管社区 </a></td>
+									<td class="info_font" style="width: 240px;" rowspan="2"><a href="http://<%= Setting.host_name%>" style="color: #15bccf;"> <%= l(:label_projects_community)%> </a></td>
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 									<div class="top-content-search">
@@ -105,13 +105,13 @@
 									<div class="pr_info_name">
                                       <%= link_to @project.name, project_path(@project) %>
 									    <% if !@project.is_public? %>
-									        <span class="img_private">私有</span>
+									        <span class="img_private"><%= l(:label_private)%></span>
                                          <% end %>
                                     </div>
 									<div class="cl"></div>
 									<div class="pr_info_score">
 										<% if @project.project_type == 0 %>
-											<%= l(:label_project_grade)%> :
+											<%= l(:label_project_score)%> :
 											<%= link_to(format("%.2f" ,project_scores(@project)  ).to_i,  {:controller => 'projects',
 																										      :action => 'show_projects_score',
 																										      :remote => true,
@@ -121,17 +121,17 @@
 									</div>
 									<div class="pr_info_foot">
 										<%= l(:label_member) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to "#{@project.members.count}", project_member_path(@project) %></a>）
-										<span>| </span><%= l(:label_user_watchered) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %></a>）
+										<span>| </span><%= l(:label_user_watcher) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %></a>）
 										<span>| </span><%= l(:project_module_attachments) %>（<a class="info_foot_num" href="#" target="_blank"><%= link_to "#{@project.attachments.count}", project_files_path(@project) %></a>）</div>
 										<div class="cl"></div>
 									</div><!--项目信息 end-->
 
 									<div class="subNavBox">
                                         <% if User.current.member_of?(@project) %>
-										<div class="subNav currentDd currentDt subNav_jiantou">邀请</div>
+										<div class="subNav currentDd currentDt subNav_jiantou"><%= l(:label_invite)%></div>
 											<ul class="navContent " style="display:block; padding-left: 0px; margin-top:0px;">
-												<li><%=  link_to "发送邮件邀请新用户", :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
-												<li><%=  link_to "邀请Trustie注册用户", :controller=>"projects", :action=>"invite_members", :id => @project %></li>
+												<li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
+												<li><%=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>
 											</ul>
                                         <% end %>
 										<div class="subNav">
@@ -141,27 +141,27 @@
 											<%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.issues.count %>)</span>
 											<span>
                                               <% if User.current.logged? &&  User.current.member_of?(@project) %>
-                                                <%= link_to "+发布问题", new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
+                                                <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %></span>
                                               <% end %>
 										</div>
 										<div class="subNav">
-											<%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %>
+											<%= link_to l(:project_module_boards), project_boards_path(@project), :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
                                             <% if User.current.logged? &&  User.current.member_of?(@project) %>
-											    <%= link_to "+发贴", project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
+											    <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
 										<div class="subNav">
 											<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
                                             <% if User.current.logged? &&  User.current.member_of?(@project) %>
-                                                <%= link_to "+上传资源", new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+                                                <%= link_to "+"+l(:label_upload_files), new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
 										<div class="subNav">
-											<%= link_to l(:field_user_active_changeset), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
+											<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
                                             <% if User.current.logged? &&  User.current.member_of?(@project) %>
-											    <%= link_to "+创建版本库",  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+											    <%= link_to "+"+l(:project_module_create_repository),  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
                                             <% end %>
 										</div>
 
@@ -172,13 +172,13 @@
 									</div><!--项目侧导航 end-->
 									<div class="cl"></div>
 									<div class="project_intro">
-										<h4 class="project_h4">项目简介：</h4><%= @project.description %>
+										<h4 class="project_h4"><%= l(:label_project_overview)%></h4><%= @project.description %>
 										<div class="lg-foot">
-											展开更多信息 <span class="g-arr-down"><img src="/images/new_project/jiantou.jpg" width="12" height="6" /></span>
+                                          <%= l(:label_expend_information)%> <span class="g-arr-down"><img src="/images/new_project/jiantou.jpg" width="12" height="6" /></span>
 										</div>
 									</div><!--项目简介 end-->
 									<div class="project_Label">
-										<h4 class="project_h4">标签:</h4>
+										<h4 class="project_h4"><%= l(:label_tag)%>:</h4>
 										<div class="tag_h" >
 											<div class="user_tags">
 												<div id="tags">
diff --git a/app/views/tags/_project_tag.html.erb b/app/views/tags/_project_tag.html.erb
index 1f91c984e..75e2ee801 100644
--- a/app/views/tags/_project_tag.html.erb
+++ b/app/views/tags/_project_tag.html.erb
@@ -2,7 +2,7 @@
 	<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
 </div>
 <% if User.current.logged? %>
-	<span> <%= toggle_link ("+ 添加标签"), 'put-tag-form', {:focus => 'tags_name'} %> </span>
+	<span> <%= toggle_link ("+"+l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
 <% end %>
 <div id="put-tag-form" style="display: none;text-align: center">
 	<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml
index 5543112d7..3132bc6cd 100644
--- a/config/locales/commons/en.yml
+++ b/config/locales/commons/en.yml
@@ -226,7 +226,7 @@ en:
   label_tag: Tag
   label_tags_no: no tags now！
   label_more_tags: More
-  label_add_tag: '+ Add tags'
+  label_add_tag: "+ Add tags"
   
   label_tags_count: "The total number of tags："
   
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 7f9099cf5..17d5cecf4 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -335,6 +335,8 @@ zh:
   label_feedback_value: "该贴来自用户反馈！"
   
 
+
+
   #
   #  
   #
diff --git a/config/locales/courses/en.yml b/config/locales/courses/en.yml
index 68d4607d9..f21029944 100644
--- a/config/locales/courses/en.yml
+++ b/config/locales/courses/en.yml
@@ -15,10 +15,10 @@ en:
   label_course_term: 开课学期  
 
   label_join_course: 加入
-  label_exit_course: 退出
-
   label_exit_course: exit course
-
+  # 资源库 (课程、项目按类型分)
+  label_course_file: File
+  label_upload_files: Upload
 
   #
   #  课程托管平台主页
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index 9ce09704b..3e9e1e9f6 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -20,7 +20,9 @@ zh:
 
   label_join_course: 加入
   label_exit_course: 退出
-
+  # 资源库 (课程、项目按类型分)
+  label_course_file: 资源库 
+  label_upload_files: 上传资源
 
   #
   #  课程托管平台主页
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4622e2e8a..c594a7a10 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -335,7 +335,6 @@ en:
   project_module_documents: Documents
   project_module_files: Files
   project_module_wiki: Wiki
-  project_module_repository: Repository
   project_module_boards: Forums
   project_module_calendar: Calendar
   project_module_gantt: Gantt
@@ -463,8 +462,7 @@ en:
   label_home: Home
   label_my_page: My page
 
-  label_my_message: Msgs
-  label_my_projects: My projects
+
   label_my_page_block: My page block
   label_administration: Administration
 
@@ -642,7 +640,6 @@ en:
   label_roadmap_due_in: "Due in %{value}"
   label_roadmap_overdue: "%{value} late"
   label_roadmap_no_issues: No issues for this version
-  label_search: Search
   label_result_plural: Results
   label_all_words: All words
   label_wiki: Wiki
@@ -1025,15 +1022,13 @@ en:
 
   #huang
   label_file_new: Download
-  label_my_course: "My Course"
 
   label_user_commits: "Code commits"
-  label_user_watchered: "Followed by"   # huang添加的
 
 
   label_user_mail: "E-mail:"
 
-  label_project_overview: "Overview"
+  label_overview: "Overview"
   label_project_tool: "Tool"
   label_project_issues: "Issues"
   label_project_newother: "See other comments"
@@ -1400,7 +1395,7 @@ en:
   label_main_term: Term
   label_teacher_work_unit: Position
   label_course_overview: Status
-  label_course_file: File
+
 
   label_course_news: News
   #wang
@@ -1505,7 +1500,6 @@ en:
   label_attendingcontestwork_deposit_project: Deposit project
   label_attendingcontestwork_sorting_intimation: You can re-scoring, but just record the last scoring result!
 
-  label_upload_files: Files-upload
   label_upload_softwarepackage: Softwarepackage-upload
   label_upload_cuttingphoto: Photo-upload
   label_system_platform: Platform
@@ -1637,7 +1631,6 @@ en:
   label_my_school: My school
   label_all_schol: All school
   label_select_province: Please select the provinces
-  label_search_conditions_not_null: The search conditions cannot be blank
 
   label_attachment: attachment
   label_max_length: A maximum of 250 characters
diff --git a/config/locales/my/en.yml b/config/locales/my/en.yml
index fa21d210e..d2beaea97 100644
--- a/config/locales/my/en.yml
+++ b/config/locales/my/en.yml
@@ -12,6 +12,10 @@ en:
   label_company_name: Company Name
   label_location: Location
   label_identity: Identity
+  #  top_menu 个人相关
+  label_my_course: My Course
+  label_my_message: Msgs
+  label_my_projects: My projects
 
 
   #
diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 1e0b975d6..57c4ceac3 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -6,12 +6,15 @@ zh:
   #  Trustie个人账户模块
   #
   #  公共类
-  #      
-  
+  #        
   field_occupation: 工作单位
   label_company_name: 组织名
   label_location: 位置
-  label_identity: 身份
+  label_identity: 身份 
+  #  top_menu 个人相关
+  label_my_course: 我的课程
+  label_my_projects: 我的项目
+  label_my_message: 留言
 
   #
   #  Trustie个人账户模块
diff --git a/config/locales/navigatiors/en.yml b/config/locales/navigatiors/en.yml
index faf3ca715..52ee1a4a7 100644
--- a/config/locales/navigatiors/en.yml
+++ b/config/locales/navigatiors/en.yml
@@ -50,6 +50,7 @@ en:
   #
   #  搜索
   #  
+  label_search: Search
   welcome:
     search:
       information: "Please input the keywords!"  #  搜索提示信息 
@@ -62,6 +63,7 @@ en:
           showname: name
           email: email
 
+  label_search_conditions_not_null: The search conditions cannot be blank
   label_resources_search_all: "Search all files in the website, while will not search the contents of private items."     # 资源搜索提示信息
 
   #
diff --git a/config/locales/navigatiors/zh.yml b/config/locales/navigatiors/zh.yml
index 781dc51b8..bfda10a85 100644
--- a/config/locales/navigatiors/zh.yml
+++ b/config/locales/navigatiors/zh.yml
@@ -53,6 +53,7 @@ zh:
   #
   #  搜索
   #  
+  label_search: 搜索
   welcome:
     search:
       information: 请输入要搜索的关键字   #  搜索提示信息 
@@ -65,6 +66,7 @@ zh:
           showname: 姓名
           email: 邮箱  
 
+  label_search_conditions_not_null: 搜索条件不能为空
   label_resources_search_all: "全站文件搜索，不会搜索私有项目中的内容。"     # 资源搜索提示信息
 
 
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 4ff08a1a9..6c27d5685 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -24,6 +24,38 @@ en:
   label_project_score: Score
 
 
+  #
+  #  项目托管平台主页 
+  #
+  #  左边栏
+  #           
+  label_id: "ID:"
+    
+  label_apply_project: Apply to Join
+  label_exit_project: Exit
+  label_apply_project_waiting: "Application has been processed, please wait for administrator review."
+  label_unapply_project: Cancel the application
+  
+  label_member: Members
+  project_module_attachments: Resources  
+
+  label_invite: Invitation
+  label_invite_new_user: "Send e-mail to invite new user"
+  label_invite_trustie_user: "Invite the Trustie registered user"
+
+  label_issue_tracking: Issue Tracking
+  label_release_issue: New Issue
+ 
+  project_module_boards: Forums
+  project_module_boards_post: New Post
+  # 与课程公用资源库
+  project_module_repository: Repository
+  project_module_create_repository: New Repository
+
+  label_project_overview: "Profile:"
+  label_expend_information: More Information
+
+
   #   
   #  项目托管平台
   #
@@ -50,11 +82,36 @@ en:
   #
   project:
     join:
-      title: 快速进入项目通道
-      description: "只要持有项目的ID，就可快速申请加入所在项目。项目页面搜索不到的私有项目只能从此通道进入哦！"
+      title: Quickly Join to Project
+      description: "Just hold the project ID, while you can quickly apply to join the project.Private projects can only join by this channel!"
       id: 
         label: "Project ID:"
-        tips: "Project ID is the number within the project's url"
+        tips: "Project ID is the number within project URL"
+
+  #
+  #  项目托管平台
+  #
+  #  项目得分
+  #     
+  label_projects_score: 项目综合得分
+  
+  label_issue_score: issue得分
+  label_issue_number: issue的数量
+  label_issue_journal_number: issue的留言数量 
+  
+  label_news_score: 新闻得分
+  label_new_number: 新闻的数量
+  
+  label_file_score: 文档得分
+  label_file_number: 文档的数量
+  
+  label_code_submit_score: 代码提交得分
+  label_code_submit_number: 代码提交数量
+  
+  label_topic_score: 讨论区得分
+  label_topic_number: 讨论区帖子数量
+
+
 
 
 
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index d2e4e1530..dfa0e241b 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -31,7 +31,37 @@ zh:
   label_project_score_tips: 项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度
   label_project_score: 项目评分
 
+
+  #
+  #  项目托管平台主页 
+  #
+  #  左边栏
+  #           
+  label_id: "ID:"
+    
+  label_apply_project: 申请加入
+  label_exit_project: 退出项目
+  label_apply_project_waiting: 已处理申请，请等待管理员审核
+  label_unapply_project: 取消申请
   
+  label_member: 成员
+  project_module_attachments: 资源  
+
+  label_invite: 邀请
+  label_invite_new_user: "发送邮件邀请新用户"
+  label_invite_trustie_user: "邀请Trustie注册用户"
+
+  label_issue_tracking: 问题跟踪
+  label_release_issue: 发布问题
+
+  project_module_boards: 讨论区
+  project_module_boards_post: 发帖
+  # 与课程公用资源库
+  project_module_repository: 版本库
+  project_module_create_repository: 创建版本库
+
+  label_project_overview: "项目简介："
+  label_expend_information: 展开更多信息
   #   
   #  项目托管平台
   #
diff --git a/config/locales/users/zh.yml b/config/locales/users/zh.yml
index d77704aa4..1362380a0 100644
--- a/config/locales/users/zh.yml
+++ b/config/locales/users/zh.yml
@@ -16,7 +16,18 @@ zh:
   #    
   label_user_home: 创客空间
   
-  
+
+  #
+  #  Trustie用户主页
+  #
+  #  菜单栏 (公共) 
+  #  
+  label_activity: 动态  
+  label_user_course: 课程
+  label_user_project: 项目
+  label_user_newfeedback: 留言  
+
+
   #
   #  Trustie用户主页
   #
@@ -85,17 +96,6 @@ zh:
   label_no_current_watchers: 该用户暂未关注其他用户
   
   
-  #
-  #  Trustie用户主页
-  #
-  #  菜单栏  
-  #  
-  label_activity: 动态  
-  label_user_course: 课程
-  label_user_project: 项目
-  label_user_newfeedback: 留言
-  
-  
   #
   #  Trustie用户主页
   #   
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c21cf78bb..f7a2c6780 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -523,10 +523,9 @@ zh:
   project_module_news: 新闻
   project_module_documents: 文档
   project_module_files: 作品下载
-  project_module_attachments: 资源
+
   project_module_wiki: Wiki
-  project_module_repository: 版本库
-  project_module_boards: 讨论区
+
   project_module_calendar: 日历
   project_module_gantt: 甘特图
   project_module_course: 课程
@@ -594,7 +593,7 @@ zh:
   label_role_plural: 角色
   label_role_new: 新建角色
   label_role_and_permissions: 角色和权限
-  label_member: 成员
+
   label_search_member: 搜索
   label_search_member_count: 共搜索到
   label_member_people: 人
@@ -710,8 +709,6 @@ zh:
   #end
   label_my_page: 我的工作台
   label_my_account: 我的帐号
-  label_my_message: 留言
-  label_my_projects: 我的项目
   label_my_page_block: 我的工作台模块
   label_administration: 管理
   label_login: 登录
@@ -720,7 +717,6 @@ zh:
   label_assigned_to_me_issues: 指派给我的问题
   label_last_login: 最后登录
   label_registered_on: 注册于
-  label_activity: 动态  # modified by bai
   label_overall_activity: 活动概览
   label_new: 新建
 
@@ -892,7 +888,6 @@ zh:
   label_search_by_login: 登录名
   label_search_by_name: 名字
   label_search_by_email: 邮箱
-  label_search: 搜索
   label_result_plural: 结果
   label_all_words: 所有单词
   label_wiki: Wiki
@@ -906,7 +901,6 @@ zh:
   label_preview: 预览
   label_feed_plural: Feeds
   label_changes_details: 所有变更的详情
-  label_issue_tracking: 问题跟踪
   label_spent_time: 耗时
   label_overall_spent_time: 总体耗时
   label_f_hour: "%{value} 小时"
@@ -989,23 +983,14 @@ zh:
   label_poll_title: 问卷调查_问卷页面
   #huang
   label_file_new: 下载
-  label_user_edit: "修改资料"
-  label_user_info: "个人简介"   #huang 添加
-  label_user_watcher: "关注"  # huang添加的
-  label_user_fans: "粉丝"
-  # modify by men
-  label_x_user_fans:
-    zero: 粉丝
-    one: 粉丝
-    other: 粉丝
-  #end
+
   label_x_join_in_contest:
     zero: 参与者
     one: 参与者
     other: 参与者
   #end
   label_user_commits: "代码提交"
-  label_user_watchered: "关注"   # huang添加的
+
   label_user_newfeedback: "留言" ## huang添加的
   label_feedback_success: "留言成功"
   label_feedback_fail: "留言失败"
@@ -1014,7 +999,7 @@ zh:
   label_user_joinin: "加入时间"
 
 
-  label_project_overview: "概述"
+  label_overview: "概述"
   label_project_tool: "项目工具集"
   label_project_issues: "问题"
   label_project_newother: "查看其他评论"
@@ -1473,10 +1458,6 @@ zh:
   label_tags_bid_description: 需求描述
   label_tags_issue_description: 问题描述
   label_tags_all_objects: 所有
-  label_apply_project: 申请加入
-  label_exit_project: 退出项目
-  label_apply_project_waiting: 已处理申请，请等待管理员审核
-  label_unapply_project: 取消申请
 
   #fq
 
@@ -1768,7 +1749,6 @@ zh:
   label_i_new_activity: 有了新活动在
   label_choose_course: 选择课程
   button_submit_homework: 提交作业
-  label_my_course: 我的课程
   button_submit_bid: 参与竞标
   label_requirement_from: 需求来源
   label_course_view: 作业界面
@@ -1832,7 +1812,7 @@ zh:
   label_course_open_student_info: （打钩为“学生列表公开”，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）
   label_course_view_student: 查看其他课程
   label_course_student: 学生
-  label_course_file: 资源库 #资料共享
+
   label_course_new_homework: 新建作业
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
@@ -2087,7 +2067,7 @@ zh:
     zero: 个动态
     one: 个动态
     other: 个动态
-  label_upload_files: 上传资源
+
   label_relation_files: 关联已有资源
   label_contest_settings: 配置竞赛
   label_contest_delete: 删除竞赛
@@ -2260,7 +2240,6 @@ zh:
   label_all_schol: 全部学校
   label_school_all: 中国高校
   label_select_province: 请选择省份
-  label_search_conditions_not_null: 搜索条件不能为空
 
   lable_hot_course: 活跃课程
   lable_student_list_visable: 学生列表是否公开