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

app/helpers/application_helper.rb

@@ -1844,7 +1844,7 @@ module ApplicationHelper
     users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :host => Setting.user_domain}
     # contest_link = link_to l(:label_contest_innovate), {:controller => 'contests', :action => 'index'}
     bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
-    forum_link = link_to l(:label_project_module_forums), {:controller => "forums", :action => "index"}
+    forum_link = link_to l(:label_forum_all), {:controller => "forums", :action => "index"}
     stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'}
     school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'}
 

app/helpers/welcome_helper.rb

@@ -314,38 +314,38 @@ module WelcomeHelper
     str = ' '.html_safe
     case event.event_type
     when 'news'
-      str << content_tag("span", "发表了") << 
+      str << content_tag("span", l(:field_user_active_published)) <<
         content_tag("span", find_all_event_type(event)) << 
         ':&nbsp;'.html_safe << 
         link_to(strip_tags(event.event_description).gsub(/&nbsp;/,''), event.event_url, {:title => event.event_description})
     when 'issue', 'message' , 'bid' , 'wiki-page' , 'document'
-      str << content_tag("span", "发表了") <<
+      str << content_tag("span", l(:field_user_active_published)) <<
              content_tag("span", find_all_event_type(event)) << 
              ':&nbsp;'.html_safe << 
              link_to(event.event_title, event.event_url, {:title => event.event_title})
     when 'reply' ,'Reply', 'Memo'
-      str << content_tag("span", "发表了") << 
+      str << content_tag("span", l(:field_user_active_published)) <<
-        content_tag("span", find_all_event_type(event)) << 
+        content_tag("span", find_all_event_type(event)) <<
         ':&nbsp;'.html_safe << 
         link_to(strip_tags(event.event_description).gsub(/&nbsp;/,''), event.event_url, {:title => event.event_description})
     when 'attachment'
-      str << content_tag('span', '上传了') << 
+      str << content_tag('span', l(:field_user_active_uploaded)) <<
         content_tag('span', find_all_event_type(event)) << 
         ':&nbsp;'.html_safe << 
         link_to(event.event_title, event.event_url, {:title => event.event_title}) <<
         link_to(('&nbsp;['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container.project), :class => "attachments_list_color")
     else
-      str << content_tag("span", "更新了") << 
+      str << content_tag("span",  l(:field_user_active_updated)) <<
         content_tag("span", find_all_event_type(event)) << 
         ':&nbsp;'.html_safe << link_to(event.event_title, event.event_url, {:title => event.event_title})
     end
     str
   rescue Exception => e
-    str << content_tag("span", '未知内容')
+    str << content_tag("span", l(:field_user_active_unknow))
   end
   
   def show_event_reply event
-    str = "回复("
+    str = l(:field_active_reply)
     case event.event_type
     when 'news'
       str << link_to( event.comments.count, news_path(event)) << ")"
@@ -463,25 +463,25 @@ module WelcomeHelper
   def find_all_event_type event
     case event.event_type
     when 'news'
-      '新闻'
+      l(:field_user_active_news)
     when 'issue'
-      '缺陷'
+      l(:field_user_active_issue)
     when 'attachment'
-      '附件'
+      l(:field_user_active_attachment)
     when 'message'
-      '主题'
+      l(:field_user_active_message)
     when 'Reply','reply'
-      '回复'
+      l(:field_user_active_reply)
     when 'bid'
-      '作业'
+      l(:field_user_active_bid)
     when 'Memo'
-      '主题'
+      l(:field_user_active_memo)
     when 'document'
-      '文件'
+      l(:field_user_active_document)
     when 'changeset'
-      '版本库'
+      l(:field_user_active_changeset)
     when 'issue-note'
-      '问题说明'
+      l(:field_user_active_issue_note)
     else
     event.event_type
     end

app/views/layouts/_base_footer.html.erb

@@ -9,12 +9,12 @@
    <p>
     <% if @organizer.nil? %>
         <p>
-          <span>主办单位</span>
+          <span><%= l(:label_hosted_organization) %></span>
-          <span class="footer_text_link"><a target="_blank" href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47">国防科学技术大学并行与分布处理国家重点实验室</a></span>
+          <span class="footer_text_link"><a target="_blank" href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47"><%= l(:label_hosted_by) %></a></span>
-          <span class="footer_text_link"><a target="_blank" href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41">计算机科学与技术系</a></span>
+          <span class="footer_text_link"><a target="_blank" href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41"><%= l(:label_sponsor) %></a></span>
-          <span id="copyright">版权©2007~2014</span>
+          <span id="copyright"><%= l(:label_rights_reserved)%></span>
-          <span class="footer_text_link" id="contact_us"><a target="_blank" href="http://forge.trustie.net/projects/2/member">联系我们</a></span>
+          <span class="footer_text_link" id="contact_us"><a target="_blank" href="http://forge.trustie.net/projects/2/member"><%= l(:label_contact_us) %></a></span>
-          <span class="footer_text_link" id="record"><a target="_blank" href="http://www.miibeian.gov.cn/">湘ICP备09019772</a></span>
+          <span class="footer_text_link" id="record"><a target="_blank" href="http://www.miibeian.gov.cn/"><%= l(:label_license) %></a></span>
         </p>
     <% else %>
       <%= @organizer.description.html_safe %>
@@ -22,11 +22,11 @@
   </p>
   <div id="logo_link">
     <% if @companies.nil? || @companies.count == 0 %>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>l(:label_co_organizer_NUDT)),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>l(:label_co_organizer_EECS)), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>l(:label_co_organizer_BHU)), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>l(:label_co_organizer_CAS)), "http://www.iscas.ac.cn", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>l(:label_co_organizer_InforS)), "http://www.inforbus.com", :target => "_blank" %></span>
       <% else %>
         <% @companies && @companies.each do |company| %>
             <span class="footer_logo_link"><%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %></span>

app/views/layouts/_bootstrap_base_footer.html.erb

@@ -2,14 +2,14 @@
 <div id="footer" class="muted ">
   <div style="border-top:solid 1px #C6E9F1;"></div>
   <div class="desc center block-inline">
-    主办单位:
+    <%= l(:label_hosted_organization)%>
-    <%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47"%>
+    <%= link_to l(:label_hosted_by),"http://www.nudt.edu.cn/ArticleShow.asp?ID=47"%>
-    <%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41"%>
+    <%= link_to l(:label_sponsor), "http://www.nudt.edu.cn/ArticleShow.asp?ID=41"%>
-    <%= link_to "联系我们","http://" + Setting.host_name + "/projects/2/member"%>
+    <%= link_to l(:label_contact_us),"http://" + Setting.host_name + "/projects/2/member"%>
-    <%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/"%>
+    <%= link_to l(:label_license),"http://www.miibeian.gov.cn/"%>
   </div>
   <div class="center">
-    2007~2014
+    <%= l(:label_rights_reserved)%>
   </div>
 
   <%= footer_logo("center ul-style-none", "float-left") %>

app/views/welcome/_search_course.html.erb

@@ -1,8 +1,8 @@
 <%
 	select_option = []
-	(select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project
+	(select_option << [l(:label_select_project), 'projects']) if project_type == Project::ProjectType_project
-	(select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course
+	(select_option << [l(:label_select_course), 'courses']) if project_type == Project::ProjectType_course
-	select_option << ['用户', 'users']
+	select_option << [l(:label_select_user), 'users']
 	#select_option << ['教师', 'users_teacher'],
 	#select_option << ['学生', 'users_student']
 %>
@@ -49,7 +49,7 @@ form #search_type{
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
 <div class="project-search" style="float: right">
 	<div class='search_widget'>
-		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, style: "float:left"  %>
+		<%= text_field_tag :q, nil, :placeholder => l(:label_search_information), :size => 27, style: "float:left"  %>
 		<%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>
 	</div>
 		<%#= hidden_field_tag 'project_type', project_type %>

app/views/welcome/_search_project.html.erb

@@ -1,8 +1,8 @@
 <%
 	select_option = []
-	(select_option << ['项目', 'projects']) if project_type == Project::ProjectType_project
+	(select_option << [l(:label_select_project), 'projects']) if project_type == Project::ProjectType_project
-	(select_option << ['课程', 'courses']) if project_type == Project::ProjectType_course
+	(select_option << [l(:label_select_course), 'courses']) if project_type == Project::ProjectType_course
-	select_option << ['用户', 'users']
+	select_option << [l(:label_select_user), 'users']
 %>
 <style type="text/css">
 form #q, form #search_type{
@@ -89,10 +89,10 @@ form #search_by
 <div class="project-search" style="float: right">
 	<div class='search_widget' >
 
-		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', style:"float:left" %>
+		<%= text_field_tag :q, nil, :placeholder => l(:label_search_information), style:"float:left;" %>
         <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
 		<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %>
-        <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]]), :onchange => "searchByChange();",:style => "float:right" )  %>
+        <%= select_tag(:search_by,options_for_select([[l(:label_select_user_nickname),"0"],[l(:label_select_user_showname),"1"],[l(:label_select_user_email),"2"]]), :onchange => "searchByChange();",:style => "float:right" )  %>
 	</div>
 		<%#= hidden_field_tag 'project_type', project_type %>
 		<%= submit_tag l(:label_search), :class => "enterprise", :name => nil,:style =>"float: right; margin-left:3px;margin-top:2px" %>

app/views/welcome/contest.html.erb

@@ -140,7 +140,7 @@
 <!--搜索框-->
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
       <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-			<%= text_field_tag 'name', params[:name], :placeholder => l(:label_search_intimation), name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
+			<%= text_field_tag 'name', params[:name], :placeholder => l(:label_search_information), name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>

app/views/welcome/index.html.erb

@@ -88,7 +88,7 @@
                      </span>
                   <% end %>
 					<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
-					(<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)
+					(<%= link_to l(:label_project_member_amount, :count=>projectCount(project)), project_member_path(project) , :course =>'0' %>)
 				</div>
 				<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;min-height: 42px;">
 					<span class='font_lighter' title ='<%=project.short_description%>'>
@@ -98,7 +98,7 @@
 				<div >
                   <%= content_tag "span", l(:label_project_score)+ ":" + red_project_scores(project).to_i.to_s,
          	        :style => "cursor: pointer; display: inline-block; float: right; color: #ec6300;",
-			        :title => "项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度",
+			        :title => l(:label_project_score_tips),
 			        :class => "tooltip",
 			        :id => "tooltip-#{project.id}" %>
 				</div>
@@ -136,6 +136,7 @@
                             <span style="color: rgb(172, 174, 177)">
                               <%= l(:field_updated_on) %>
                               <%= format_time event.event_datetime %>
+                              <%= l(:field_time_ago) %>
                             </span>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <span style="float: right; color: rgb(172, 174, 177);">

config/locales/en.yml

@@ -273,7 +273,6 @@ en:
   field_downloads: Downloads
   field_author: Author
   field_created_on: Created
-  field_updated_on: Updated
   field_closed_on: Closed
   field_field_format: Format
   field_is_for_all: For all projects
@@ -547,13 +546,9 @@ en:
   project_module_gantt: Gantt
   
   # edit by meng
-  lable_hot_course: Hot projects
+  lable_hot_course: Hot Courses
-  lable_hot_projects: Active courses
+  lable_user_active: User Movements
-  lable_user_active: User movements
-  lable_bar_active: Bar posts
-  label_project_score: Score
   label_course_join_student: Join a course
-  label_join_project: Join a project
   label_contest_modify_settings: Configuration
   bale_news_notice: Add a notification
   label_field_correct: correct input
@@ -609,7 +604,7 @@ en:
   label_user_anonymous: Anonymous
   label_project: Project
   label_activity_project: 'Project: ' #added by bai
-  label_project_new: New project
+
   label_project_plural: Projects
   label_project_deposit: Projects
   label_first_page_made: Homepage customization
@@ -953,7 +948,6 @@ en:
   label_module_plural: Modules
   label_added_time_by: "Added by %{author} %{age} ago"
   label_updated_time_by: "Updated by %{author} %{age} ago"
-  label_updated_time: "Updated %{value} ago"
   label_jump_to_a_project: Jump to a project...
   label_file_plural: Files
   label_changeset_plural: Changesets
@@ -978,7 +972,6 @@ en:
   label_age: Age
   label_change_properties: Change properties
   label_general: General
-  label_more: More
   label_scm: SCM
   label_plugins: Plugins
   label_ldap_authentication: LDAP authentication
@@ -1782,18 +1775,140 @@ en:
   label_current_attendingcontest_work: Latest Competition Work
   label_issue_feedback_activities: Question&Feedback
   label_more_information: More...
-  label_my_question: My-question
-  label_my_feedback: My-feedback
   label_release_time: Release-time
   label_question_sponsor: Sponsor
   label_final_reply: Final-reply
   label_reply: Reply
   label_weixin: WeiXin
-  label_search_intimation: please input the keywords
+  
-  label_work_quantity: work
+  
+  # 托管平台主页
+  # edit by meng
+  #   托管平台主页> 顶部菜单
+  field_homepage: Homepage
+  label_project_deposit: Projects
+  label_course_practice: Courses
+  label_forum_all: Forums
+  label_school_all: Schools 
+  label_contest_innovate: Competition community  
+  label_software_user: Users
+  label_requirement_enterprise: Requirements
+  label_stores_index: Resource search
+
+  
+  #   托管平台主页 > 搜索提示信息
+  label_search_information: Please input the keywords!
+  #   托管平台主页 > 下拉列表
+  label_select_project: project
+  label_select_course: course
+  label_select_user: user
+  label_select_user_nickname: nickname
+  label_select_user_showname: name
+  label_select_user_email: email
+
+  
+  #   托管平台主页 > 下方托管平台链接
   label_projects_management_platform: Projects-platform
   label_courses_management_platform: Courses-platform
   label_contests_management_platform: Competitions-platform
+
+  
+  #   托管平台主页 > 底部承办单位
+  label_hosted_by: Organizer
+  label_hosted_by: National Key Laboratory for Parallel and Distributed Processing, NUDT
+  label_sponsor: Department of Computer Science and Technology, NUDT
+  label_co_organizer_NUDT: College of Computer, NUDT
+  label_co_organizer_EECS: Institute of Software, EECS
+  label_co_organizer_BHU:  Beihang University School of Computer Science & Engineering
+  label_co_organizer_CAS: Institute of Software, CAS
+  label_co_organizer_InforS: InforSuite
+  label_rights_reserved: ©2007~2014
+  label_contact_us: Contact 
+  #      英文版不需要显示国内许可证 ，需要页面做判断
+  #label_license: 湘ICP备09019772 
+
+
+
+
+
+  # 项目托管平台
+  #   项目托管平台主页 >主旨
+  label_project_trustie: 
+  label_project_trustie_theme: 
+   
+    
+  #   项目托管平台主页 >热门项目栏
+  lable_hot_projects: Hot Projects
+  label_project_new: New project
+  label_join_project: Join a project
+  label_private: private
+  label_project_member_amount: "%{count} members"
+  label_project_score_tips: "Considering all activities of the project, project's score reflects the activity level of project"
+  label_project_score: Score
+  
+  
+  #   项目托管平台主页 >用户动态栏
+  lable_user_active: User Movements
+  field_user_active_published: released
+  field_user_active_uploaded: uploaded
+  field_user_active_updated: updated
+  field_user_active_unknow: Unknown content
+
+  field_user_active_news: ' news'
+  field_user_active_issue: ' issue'
+  field_user_active_attachment: ' attachment'
+  field_user_active_message: ' message'
+  field_user_active_reply: ' reply'
+  field_user_active_bid: ' work'
+  field_user_active_memo: ' memo'
+  field_user_active_document: ' document'
+  field_user_active_changeset: ' repository'
+  field_user_active_issue_note: ' issue-note'
+    
+  field_updated_on: Updated
+  field_time_ago: ago
+  field_active_reply: "Reply("
+  #     用户动态中event.title和event.description
+  #     通过act_as_event方法的option配置
+  #     "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"
+  #     "缺陷 #1869 (已解决):subject"
+  #     tracker.name和status在数据库中以中文字段形式存储
+  
+  
+  #   项目托管平台主页 >用户动态栏
+  lable_bar_active: Bar Posts
+  label_my_question: My-question
+  label_my_feedback: My-feedback
+  label_more: More
+  label_updated_time: "Updated %{value} ago"
+  
+  
+  
+  
+  
+  
+  
+  # 课程托管平台主页  
+  #   课程托管平台主页  >主旨
+  label_course_trustie: 
+  label_course_trustie_theme: 
+  #    课程托管平台主页 >
+   
+    
+  # 竞赛托管平台主页 
+  #   竞赛托管平台主页  >主旨
+  label_contest_trustie: 
+  label_contest_trustie_theme: 
+  #   竞赛托管平台主页 >
+  
+
+  
+  
+  
+  
+  
+
+  label_work_quantity: work
   label_contest_work: Competition work
   label_contests_reward_method: Reward method
   label_attendingcontestwork_developers: Developers
@@ -1892,7 +2007,7 @@ en:
 
 
   label_borad_project: Project-borad
-  label_search_intimation: please input the searching keywords!
+  
   label_update_time: Update time
   label_project_notice: release the notice
   label_no_file_uploaded: No file uploaded
@@ -1905,13 +2020,17 @@ en:
   label_course_term: Semester
   label_comment_time: Comment time
   label_bidding_user_studentcode: Student ID
+  label_bidding_user_studentname: name
+
+#  label_organizers: Organizer
+#  label_organizers_information: National Key Laboratory of Parallel and Distributed Processing, NUDT
+#  label_organizers_information_institute: Department of Computer Sciencer and Technology
+#  label_copyright: Copyright
+#  label_contact_us: Contact us
+#  label_record: 湘ICP备09019772
+
+
 
-  label_organizers: Organizer
-  label_organizers_information: National Key Laboratory of Parallel and Distributed Processing, NUDT
-  label_organizers_information_institute: Department of Computer Sciencer and Technology
-  label_copyright: Copyright
-  label_contact_us: Contact us
-  label_record: 湘ICP备09019772
   label_check_comment: Check comment
   label_notification: Notification
   label_must_answer: Will answer
@@ -1935,7 +2054,6 @@ en:
   label_unknow_type: Unknow type
   label_score_less_than_zero: Score less than 0, revised to 0
   review_assignments: Review assignments
-  label_private: private
   label_my_school: My school
   label_all_schol: All school
   label_select_province: Please select the provinces

config/locales/zh.yml

@@ -568,10 +568,9 @@ zh:
   label_user_anonymous: 匿名用户
   label_project: 项目
   label_activity_project: '项目: '  #added by bai
-  label_project_new: 新建项目
+
   label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
   label_project_plural: 项目列表
-  label_project_score: 项目评分
   label_first_page_made: 首页定制
   label_project_first_page: 项目托管平台首页
   label_course_first_page: 课程实践平台首页
@@ -662,13 +661,8 @@ zh:
   #by young
   label_requirement: 需求
   label_new_course: 课程列表
-  label_course_practice: 课程实践
   label_course_all: 课程列表
   label_teacher_all: 所有教师
-  label_project_deposit: 项目托管
-  label_software_user: 软件创客
-  label_contest_innovate: 创新竞赛
-  label_requirement_enterprise: 软件众包
   label_requirement_enterprise_list: 众包列表
   label_new_homework: 作业
   label_new_contest: 竞赛
@@ -996,7 +990,6 @@ zh:
   label_module_plural: 模块
   label_added_time_by: "由 %{author} 在 %{age} 之前添加"
   label_added_time: "在 %{age} 之前添加"
-  label_updated_time: " 更新于 %{value} 之前"
   label_updated_time_by: "由 %{author} 更新于 %{age} 之前"
   label_jump_to_a_project: 选择一个项目...
   label_file_plural: 文件
@@ -1063,7 +1056,6 @@ zh:
   label_age: 提交时间
   label_change_properties: 修改属性
   label_general: 一般
-  label_more: 更多>>
   label_scm: 管理系统
   label_plugins: 插件
   label_ldap_authentication: LDAP 认证
@@ -1873,7 +1865,6 @@ zh:
   label_course_view_student: 查看其他课程
   label_course_student: 学生
   label_course_file: 资源库 #资料共享
-  label_stores_index: 资源搜索
   label_course_new_homework: 新建作业
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
@@ -1980,7 +1971,6 @@ zh:
   label_student: 学生
   
   #added by Wen
-  label_school_all: 中国高校
   label_school_not_fount: 没有符合的高校信息
   
   
@@ -2202,18 +2192,140 @@ zh:
   label_final_reply: 最后回复
   label_reply: 回复
   label_weixin: 微信扫码
-  label_search_intimation: 请输入要搜索的关键字
+  
-  label_work_quantity: 个作品
+  
+  
+  
+  # 托管平台主页公共组件
+  # edit by meng
+  #   托管平台主页> 顶部菜单
+  field_homepage: 主页
+  label_project_deposit: 项目托管
+  label_course_practice: 课程实践
+  label_forum_all: 公共贴吧 
+  label_school_all: 中国高校 
+  label_contest_innovate: 创新竞赛  
+  label_software_user: 软件创客
+  label_requirement_enterprise: 软件众包
+  label_stores_index: 资源搜索
+  
+  
+  #   托管平台主页 > 搜索提示信息
+  label_search_information: 请输入要搜索的关键字
+  #   托管平台主页 > 下拉列表
+  label_select_project: 项目
+  label_select_course: 课程
+  label_select_user: 用户
+  label_select_user_nickname: 昵称
+  label_select_user_showname: 姓名
+  label_select_user_email: 邮箱
+  
+  
+  #   托管平台主页 > 下方托管平台链接
   label_projects_management_platform: 项目托管平台
   label_courses_management_platform: 课程实践平台
   label_contests_management_platform: 竞赛托管平台
   
-  label_organizers: 主办单位
+  
-  label_organizers_information: 国防科学技术大学并行与分布处理国家重点实验室
+  #   托管平台主页 > 底部承办单位等信息
-  label_organizers_information_institute: 计算机科学与技术系
+  label_hosted_organization: 主办单位
-  label_copyright: 版权
+  label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室
+  label_sponsor: 计算机科学与技术系
+  label_co_organizer_NUDT: 国防科学技术大学计算机学院
+  label_co_organizer_EECS: 北京大学信息科学技术学院软件研究所
+  label_co_organizer_BHU: 北京航空航天大学计算机学院
+  label_co_organizer_CAS: 中国科学院软件研究所
+  label_co_organizer_InforS: 山东中创软件商用中间件股份有限公司
+  label_rights_reserved: 版权©2007~2014
   label_contact_us: 联系我们
-  label_record: 湘ICP备09019772
+  #     英文版不需要显示国内许可证
+  label_license: 湘ICP备09019772
+  
+ 
+
+  
+     
+  # 项目托管平台主页 
+  #   项目托管平台主页 >主旨
+  label_project_trustie: Trustie在线项目托管平台
+  label_project_trustie_theme: ", 面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。"
+  
+  
+  #   项目托管平台主页 >热门项目栏
+  lable_hot_projects: 热门项目
+  label_project_new: 新建项目
+  label_join_project: 加入项目
+  label_private: 私有
+  label_project_member_amount: "%{count}人"
+  label_project_score_tips: 项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度
+  label_project_score: 项目评分
+  
+  
+  #   项目托管平台主页 >用户动态栏
+  lable_user_active: 用户动态
+  field_user_active_published: 发表了
+  field_user_active_uploaded: 上传了
+  field_user_active_updated: 更新了
+  field_user_active_unknow: 未知内容
+  field_user_active_news: 新闻
+  field_user_active_issue: 问题
+  field_user_active_attachment: 附件
+  field_user_active_message: 主题
+  field_user_active_reply: 回复
+  field_user_active_bid: 作业 
+  field_user_active_memo: 主题
+  field_user_active_document: 文件
+  field_user_active_changeset: 版本库
+  field_user_active_issue_note: 问题说明   
+  field_updated_on: 更新于
+  field_time_ago: 前
+  field_active_reply: "回复("
+  #     用户动态中event.title和event.description
+  #     通过act_as_event方法的option配置
+  #     "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"
+  #     "缺陷 #1869 (已解决):subject"
+  #     tracker.name和status在数据库中以中文字段形式存储
+  
+  
+  #   项目托管平台主页 >用户动态栏
+  lable_bar_active: 贴吧动态
+  label_my_question: 我要提问
+  label_my_feedback: 我要反馈
+  label_more: 更多>>
+  label_updated_time: " 更新于 %{value} 之前"
+  
+  # 课程托管平台主页  
+  #   课程托管平台主页  >主旨
+  label_course_trustie: Trustie在线课程实践平台
+  label_course_trustie_theme: ", 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。"
+  #   课程托管平台主页 >
+   
+    
+  # 竞赛托管平台主页 
+  #   竞赛托管平台主页  >主旨
+  label_contest_trustie: Trustie在线竞赛实战平台
+  label_contest_trustie_theme: ", 面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。"
+  #   竞赛托管平台主页 >
+  
+  
+  
+  
+  
+  
+  
+  
+  label_work_quantity: 个作品
+
+#  label_organizers: 主办单位
+#  label_organizers_information: 国防科学技术大学并行与分布处理国家重点实验室
+#  label_organizers_information_institute: 计算机科学与技术系
+#  label_copyright: 版权  
+#  label_contact_us: 联系我们
+#  label_record: 湘ICP备09019772
+ 
+ 
+ 
+ 
   label_check_comment: 查看通知评论
   label_notification: 通知公告
   label_course_ad_description: 课程模块正在优化中，使用过程中如有问题请您与我们联系，感谢大家的支持！
@@ -2239,16 +2351,12 @@ zh:
   label_unknow_type: 未知类型
   label_score_less_than_zero: 得分小于0，修正为0
   review_assignments: 评审任务
-  label_private: 私有
   label_my_school: 我的学校
   label_all_schol: 全部学校
   label_select_province: 请选择省份
   label_search_conditions_not_null: 搜索条件不能为空
 
   lable_hot_course: 活跃课程
-  lable_hot_projects: 热门项目
-  lable_user_active: 用户动态
-  lable_bar_active: 贴吧动态
   lable_student_list_visable: 学生列表是否公开
   lable_sure_exit_project: 是否确认退出该项目
   lable_input_class: 在此输入课时