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

app/api/mobile/apis/users.rb

@@ -14,7 +14,7 @@ module Mobile
           us = UsersService.new
           user = us.register params.merge(:password_confirmation => params[:password],
                                           :should_confirmation_password => true)
-          raise "register failed #{user.errors.full_messages}" if user.new_record?
+          raise "该邮箱已经被注册过了" if user.new_record?
           
           present :data, user, with: Mobile::Entities::User
           present :status, 0

app/views/boards/_project_show.html.erb

@@ -10,7 +10,7 @@
 <div id="add-message" class="add_frame" style="display:<%= !@flag.nil?&&@flag=='true' ? '' : 'none' %>;">
   <% if User.current.logged? %>
       <div class="project_r_h">
-        <h2 class="project_h2"><%= l(:label_message_new) %></h2>
+        <h2 class="project_h2"><%= l(:project_module_boards_post) %></h2>
       </div>
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form', :locals => {:f => f} %>
@@ -39,12 +39,18 @@
 <!-- 内容显示部分 -->
  <div class="project_right">
     	<div class="project_r_h">
-        	<h2 class="project_h2"><%= h @board.name %></h2>
+        	<h2 class="project_h2">
+        		<% if User.current.language == "zh"%>
+        		<%= h @board.name %>
+        		<% else %>
+        		<%= l(:project_module_boards) %>
+        		<% end %>
+            </h2>
         </div>
         <div class="talk_top">
-        	<div class="fl">项目讨论区共有<span><%= @topic_count %></span>个帖子  </div>       	
+        	<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>       	
         		<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>  
-        		<span><%= link_to l(:label_message_new), new_board_message_path(@board),
+        		<span><%= link_to l(:project_module_boards_post), new_board_message_path(@board),
                     		  :class => 'problem_new_btn fl',                   		  
                     		  :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
   				<% end %>        	
@@ -61,15 +67,15 @@
       			<div>
                 	<span><%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %></span>
                 	<% if topic.sticky? %>
-                		<span class="talk_up">置顶</span>
+                		<span class="talk_up" style="float:right;"><%= l(:label_board_sticky)%></span>
                 	<% end %>
                 </div>
                 <div class="problem_line">
-                	<span>由<%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %></span>
+                	<span><%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %></span>
-                	<span>添加于<%= format_time topic.created_on %></span> 
+                	&nbsp;<span><%= l(:label_post_by_time)%><%= format_time topic.created_on %></span> 
 				</div>
             </div>
-                	<span class="talk_btn fr"><%= link_to (l(:label_reply) + topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;" %></span>
+                	<span class="talk_btn fr"><%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;line-height: 18px;" %></span>
                 <div class="cl"></div>
              </div><!--讨论主类容 end-->
              <% end %>

app/views/issues/index.html.erb

@@ -12,7 +12,7 @@
                     :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
       </span>
   <% end %>
-  <span class="problem_p fr"><%= l(:label_issues_sum) %>：<span><%= @project.issues.count %></span> <%= l(:lable_issues_undo) %> <span><%= @project.issues.where('status_id in (1,2,4,6)').count  %></span></span>
+  <span class="problem_p fr"><%= l(:label_issues_sum) %>：<span><%= @project.issues.count %></span> <%= l(:lable_issues_undo) %>：<span><%= @project.issues.where('status_id in (1,2,4,6)').count  %></span></span>
 </div>
 <div class="contextual">
   <% if !@query.new_record? && @query.editable_by?(User.current) %>

app/views/layouts/base_users.html.erb

@@ -173,7 +173,7 @@
 										<table style="font-family:'微软雅黑'" width="240">
 											<tr>
 												<td style=" float: right" width="70px">
-                                                 <span style="float: right"> <%= l(:label_user_joinin) %>：</span>
+                                                 <span style="float: right"> <%= l(:label_user_join) %>：</span>
                                                 </td>
                                               <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
                                                 <%= format_time(@user.created_on) %>

app/views/open_source_projects/master_apply.html.erb

@@ -64,6 +64,7 @@
 				<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
 				<% memberships = user.memberships.all(:conditions => cond) %>
 				<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
+				<%= "：" unless user_courses.empty? %>
 				<% for member in memberships %>
 				<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 				<% end %>

app/views/projects/files_tags.html.erb

@@ -7,7 +7,7 @@
 <div>
 	<h3><strong><%= l(:label_tags_search_result) %></strong></h3>
 	<div align="right">
-		<%= l(:label_tags_numbers) %>
+		<%= l(:label_tags_numbers) %>：
 		<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) |
 		<%= l(:label_project_plural) %>(<%= @projects_tags_num %>) |
 		<%= l(:label_user_plural) %>(<%= @users_tags_num %>) |

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

@@ -4,7 +4,7 @@
                       :method => :post} do |f| %>
 
 <fieldset class="box">
-<legend><%= l(:text_select_project_modules) %></legend>
+<legend><%= l(:text_select_project_modules) %>：</legend>
 
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
  

app/views/projects/show.html.erb

@@ -93,7 +93,7 @@
            <%= link_to(h(e.user), user_path(e.user_id)) %>
           <%= l(:label_new_activity) %>
         </span>
-            <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %>
+            <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
             <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
                         {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
             <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">

app/views/repositories/show.html.erb

@@ -1,6 +1,6 @@
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
 <div class="project_r_h">
-  <h2 class="project_h2">版本库</h2>
+  <h2 class="project_h2"><%=l(:project_module_repository)%></h2>
 </div>
 <div class="contextual" style="padding-right: 10px;">
   <%= render :partial => 'navigation' %>

app/views/tags/_show_attachments.html.erb

@@ -24,19 +24,19 @@
                 
               <%= file.description %>
 		      <div class="c9 gray-color">
-                <%= l('attachment.category')%>
+                <%= l('attachment.category')%>：
                 <%=result_come_from file%>
               </div>
 		      <span class="gray blue-color">
-		        <%= l('attachment.download_num')%>
+		        <%= l('attachment.download_num')%>：
                 <%= file.downloads%>|
-		        <%= l('attachment.size')%>
+		        <%= l('attachment.size')%>：
                 <%= number_to_human_size(file.filesize) %>|
-		        <%= l('attachment.sharer')%>
+		        <%= l('attachment.sharer')%>：
                 <a class="gray" >
                     <%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %>
                 </a>|
-		        <%= l('attachment.upload_time')%>
+		        <%= l('attachment.upload_time')%>：
                 <%= format_time(file.created_on) %>
 		      </span> 
 		      <div style="display: none"></div>

app/views/tags/_show_issues.html.erb

@@ -3,7 +3,7 @@
 	<hr />
 	<% issues_results.each do |issue| %>
 	<p class="font_description2">
-		<strong><%= l(:label_tags_issue) %><%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %></strong>
+		<strong><%= l(:label_tags_issue) %>：<%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %></strong>
 		<br />
 		<strong><%= l(:label_tags_issue_description) %>：</strong><%= textilizable issue.description %>
 	</p>

app/views/tags/_show_open_source_projects.html.erb

@@ -4,7 +4,7 @@
 <% projects_results.each do |prj| %>
 <div>
 	<p class="font_description2">
-	<strong><%= l(:label_tags_project_name) %><%= link_to "#{prj.name}",:controller => "open_source_projects",:action => "show",:id => prj.id %></strong>
+	<strong><%= l(:label_tags_project_name) %>：<%= link_to "#{prj.name}",:controller => "open_source_projects",:action => "show",:id => prj.id %></strong>
 	<br />
 	<strong><%= l(:label_tags_project_description) %></strong><%= textilizable prj.short_description %>
 	</p>

app/views/tags/index.html.erb

@@ -17,7 +17,7 @@
 <div>
 	<h3><strong><%= l(:label_tags_search_result) %></strong></h3>
 	<div align="right">
-		<%= l(:label_tags_numbers) %>
+		<%= l(:label_tags_numbers) %>：
 		<%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) |
 		<%= l(:label_project_plural) %>(<%= @projects_tags_num %>) |
 		<%= l(:label_user_plural) %>(<%= @users_tags_num %>) |

app/views/tags/show_all.html.erb

@@ -1,5 +1,5 @@
 <% content_for :content do %>
-<h3 style="color: red;"><%= l(:label_tags_count) %><%= @tags.size %>个</h3>
+<h3 style="color: red;"><%= l(:label_tags_count) %>：<%= @tags.size %>个</h3>
 <hr />
 <% i = 0 %>
 <div id="show_all_tags">

app/views/users/_user_show.html.erb

@@ -42,6 +42,7 @@
 				<%# memberships = user.memberships.all(:conditions => cond) %>
 			    <% user_courses = user_courses_list(user) %>
                 <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                <%= "：" unless user_courses.empty? %>
 				<% for course in user_courses %>
 				    <%# if course.name != nil %>
                       <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>

app/views/users/show.html.erb

@@ -202,7 +202,7 @@
                                                   <%= l(:label_i_new_activity) %>
                                                 </span>
                                                 &nbsp;
-                                                <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %>
+                                                <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
                                                 <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
                                                             {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
                                               </td>
@@ -216,7 +216,7 @@
                                                   <%= l(:label_new_activity) %>
                                                 </span>
                                                 &nbsp;
-                                                <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %>
+                                                <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
                                                 <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
                                                             {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
                                               </td>

app/views/users/user_fanslist.html.erb

@@ -30,6 +30,7 @@
                       <p class="font_description">
                         <% user_courses = user_courses_list(user) %>
                         <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                        <%= "：" unless user_courses.empty? %>
                         <% for course in user_courses %>
                             <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
                         <% end %>

app/views/welcome/contest.html.erb

@@ -277,11 +277,11 @@
 						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
 					</span>
 					<span class="memo_author">
-						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
+						<%=l(:label_question_sponsor)%>&nbsp;<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
 					</span>
 					<span class="memo_last_person">
                       <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
-                          <%=l(:label_final_reply)%>:&nbsp;
+                          <%=l(:label_final_reply)%>&nbsp;
                           <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
                       <% end %>
 					</span>

app/views/welcome/course.html.erb

@@ -203,12 +203,12 @@
 						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
 					</span>
 					<span class="memo_author" title="<%= topic.author.login%>">
-					  <%= l(:label_question_sponsor)%>：
+					  <%= l(:label_question_sponsor)%>
                       <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
 					</span>
 					<span class="memo_last_person" title="<%= topic.last_reply.author.login unless (topic.last_reply.nil? || topic.last_reply.author.nil?)%>">
                       <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
-                          <%= l(:label_final_reply)%>：
+                          <%= l(:label_final_reply)%>
                           <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
                       <% end %>
 					</span>

app/views/welcome/index.html.erb

@@ -44,7 +44,11 @@
 		<div class="welcome_left" id="welcome_left">
 			<% if @organization.nil? %>
 				<% unless @first_page.nil? %>
-					<%= @first_page.description.html_safe %>
+					<!-- 改为国际化后无法通过后台配置
+						 <%= @first_page.description.html_safe %> 
+						 -->
+					<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_project)%></span>,&nbsp;
+				    <span class="font_welcome_tdescription"><span class="font_welcome_tdescription"><%= l(:label_welcome_trustie_project_description)%></span></span>
 				<% end %>
 			<% else %>
                 <span class="font_welcome_school" style="color: #E8770D">
@@ -132,12 +136,12 @@
                           <%= format_time topic_last_time topic %>
                         </span>
                         <span class="memo_author">
-                          <%= l(:label_question_sponsor)%>：
+                          <%= l(:label_question_sponsor)%>
                           <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
                         </span>
                         <span class="memo_last_person">
                           <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
-                              <%= l(:label_final_reply)%>：
+                              <%= l(:label_final_reply)%>
                               <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
                           <% end %>
                         </span>

config/locales/commons/en.yml

@@ -176,16 +176,16 @@ en:
   
   label_loading: Loading...
   
-  label_create_time: Created time  
+  label_create_time: Created at  
-  label_update_time: Update time
+  label_update_time: Update at
  
   label_reply: Reply 
  
   label_anonymous: Anonymous     #作业和留言 模块
  
   text_are_you_sure: Are you sure?   #js 提示 
-  text_are_you_sure_out: 你确定要退出该课程吗？
+  text_are_you_sure_out: Are you sure to quit from this course?
-  text_are_you_sure_out_group: 你确定要退出该分班吗？
+  text_are_you_sure_out_group: Are you sure to quit from this group?
 
 
 
@@ -225,9 +225,9 @@ en:
   #  
   # 
   button_upload_photo: Upload photo
-  button_delete_file: delete
+  button_delete_file: Delete
-  error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
+  error_attachment_too_big: "Cannot be uploaded when exceeding (%{max_size})"
-  error_pic_type: "Only supports the following image formats:"
+  error_pic_type: "Only supports the following image formats: "
 
 
   #
@@ -240,47 +240,47 @@ en:
   label_more_tags: More
   label_add_tag: "+ Add tags"
   
-  label_tags_count: "The total number of tags："
+  label_tags_count: "Total number of tags"
   
   label_tags_selected: Selected Tags
   label_tags_related: Related Tags
   label_tags_search_result: Search Results
-  label_tags_numbers: "Tag numbers："
+  label_tags_numbers: "Tags"
   
   label_tags_call: Calls
-  label_tags_contest: Competition tag
+  label_tags_contest: Competitions
-  label_tags_opensource: Open source projects
+  label_tags_opensource: Projects
   
-  label_tags_all_objects: all objects
+  label_tags_all_objects: All objects
    
-  label_tags_bid: Call name
+  label_tags_bid: Name
-  label_tags_bid_description: call description
+  label_tags_bid_description: Description
   
-  label_tags_course_name: Course Title  
+  label_tags_course_name: Title  
   label_new_course_description: Description
     
-  label_tags_issue: "issue：" 
+  label_tags_issue: Issue
-  label_tags_issue_description: issue description
+  label_tags_issue_description: Description
   
-  label_tags_project_name: "Project name："
+  label_tags_project_name: "Project name"
-  label_tags_project_description: "Project description："
+  label_tags_project_description: "Description"
   
   label_tags_user_mail: "User E-mail："
   label_tags_user_name: "User Name："
   
-  label_tags_contest_name: Contest name
+  label_tags_contest_name: Name
-  label_tags_contest_description: Contest description
+  label_tags_contest_description: Description
   
-  label_tags_forum_description: Forum description
+  label_tags_forum_description: Description
-  label_tags_forum: Call forum
+  label_tags_forum: Forum
   
   label_attachment: Files
   attachment: 
-    category: "From："
+    category: "From"
-    download_num: "Downloads:"
+    download_num: "Downloads"
-    size: "Size:"
+    size: "Size"
-    sharer: "Sharer："
+    sharer: "Sharer"
-    upload_time: "Upload time:"
+    upload_time: "Upload time"
   
   
   #
@@ -316,14 +316,18 @@ en:
   #     "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"
   #     "缺陷 #1869 (已解决):subject"
   #     tracker.name和status在数据库中以中文字段形式存储
-  
+ 
-  #   项目托管平台主页 > 贴吧动态栏
+   #
-  lable_bar_active: Question&Feedback
+  #  项目托管平台主页 
-  label_my_question: My-question
+  #
-  label_my_feedback: My-feedback
+  #  贴吧动态栏
+  #
+  lable_bar_active: Feedbacks
+  label_my_question: Ask
+  label_my_feedback: Comment
   label_updated_time: "Updated %{value} ago"
-  label_question_sponsor: Sponsor
+  label_question_sponsor: Created by
-  label_final_reply: Last-reply   
+  label_final_reply: Updated by   
     
 
   #
@@ -334,17 +338,30 @@ en:
   label_feedback: Feedback
   label_feedback_tips: "Anything you want to say， roar it here ~~"
   label_technical_support: "Support: "
-  label_feedback_success: "Your comments have been posted back to the bar of discussion by newbie(in the Public Post Bar), we will be the first time to solve your problem, thanks for your support!"
+  label_feedback_success: "Your comments have been sent to the public bar in the home page, thanks for your support!"
-  label_feedback_value: "The posts comes from user feedback！"
+  label_feedback_value: "The post comes from user feedback box!"
+
+  #
+  #  
+  #
+  #  评论
+  # 
+  label_find_all_comments: view all comments
+  label_comments_count: 
+    zero: "(%{count} comment)"
+    one: "(%{count} comment)"
+    other: "(%{count} comments)"   
+
+
+
 
- 
   #
   #  Trustie 
   #
   #  新闻
   # 
-  label_news: 新闻
+  label_news: News
-  
+  label_news_description: Track the latest activities of projects, and obtain the latest information！
 
   #
   #  Trustie

config/locales/commons/zh.yml

@@ -244,12 +244,12 @@ zh:
   label_more_tags: 更多
   label_add_tag: "+ 添加标签"
   
-  label_tags_count: "总标签数："
+  label_tags_count: "总标签数"
   
   label_tags_selected: 已选标签
   label_tags_related: 相关标签  
   label_tags_search_result: 搜索结果
-  label_tags_numbers: "Tag统计："
+  label_tags_numbers: "Tag统计"
   
   label_issue_plural: 问题跟踪
   label_project_plural: 项目列表
@@ -270,11 +270,11 @@ zh:
   label_tags_course_name: 课程名称
   label_new_course_description: 课程描述
     
-  label_tags_issue: "问题名称："  
+  label_tags_issue: "问题名称"  
   label_tags_issue_description: 问题描述
   
   label_tags_project_name: "项目名称："  
-  label_tags_project_description: "项目描述："
+  label_tags_project_description: "项目描述"
   
   label_tags_user_mail: "用户邮箱："
   label_tags_user_name: "用户名："
@@ -287,11 +287,11 @@ zh:
   
   label_attachment: 文件
   attachment: 
-    category: "所属分类："
+    category: "所属分类"
-    download_num: "下载:"
+    download_num: "下载"
-    size: "大小:"
+    size: "大小"
-    sharer: "共享者："
+    sharer: "共享者"
-    upload_time: "上传时间:"
+    upload_time: "上传时间"
   
   #
   #  项目托管平台主页 
@@ -355,7 +355,10 @@ zh:
   #  评论
   # 
   label_find_all_comments: 查看所有评论
-  label_comments_count: (%{count}条评论)
+  label_comments_count: 
+    zero: (%{count}条评论)
+    one: (%{count}条评论)
+    other: (%{count}条评论)  
   
   #
   #  
@@ -363,7 +366,7 @@ zh:
   #  新闻
   # 
   label_news: 新闻
-  
+  label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！  
 
   #
   #  

config/locales/en.yml

@@ -570,10 +570,7 @@ en:
   label_copied: copied
   label_renamed: renamed
   label_deleted: deleted
-  label_latest_revision: Latest revision
+
-  label_latest_revision_plural: Latest revisions
-  label_view_revisions: View revisions
-  label_view_all_revisions: View all revisions
   label_sort_highest: Move to top
   label_sort_higher: Move up
   label_sort_lower: Move down
@@ -637,7 +634,7 @@ en:
   label_board_new: New forum
   label_board_plural: Forums
   label_board_locked: Locked
-  label_board_sticky: Sticky
+
   label_topic_plural: Topics
   field_sticky: ''
   field_locked: ''
@@ -654,7 +651,7 @@ en:
   label_date_from: From
   label_date_to: To
   label_language_based: Based on user's language
-  label_sort_by: "Sort by %{value}"
+
   label_send_test_email: Send a test email
   label_feeds_access_key: RSS access key
   label_missing_feeds_access_key: Missing a RSS access key
@@ -971,9 +968,6 @@ en:
 
   label_delete_confirm: Confirm delete？
 
-  label_exit_project: Exit Project
-  label_apply_project_waiting: "Application has been submitted, please wait for administrator review."
-  label_unapply_project: Unsubscribe
 
   #fq
 
@@ -1029,9 +1023,8 @@ en:
   label_priority_as: Priority as
 
   label_author_name: Posted by %{author_name}
-  label_comments_count: (%{count} comments)
   label_post_on: posts on
-  label_find_all_comments: view all comments
+
   label_updated_time_on: " Updated on %{value} "
   label_call_list: Calls list
 
@@ -1082,8 +1075,7 @@ en:
   label_create_new_projects_description: Create a new project, you will open a magical journey of collaborative creation and development！
   label_call_for_bids_description: Publish your call for anything, feel the excitement of hundreds respond to a single call！
   label_create_course_description: Create a new course, let us share the public resources in the course community which are more than you can imagine！
-  label_news: News
+
-  label_news_description: Track the latest activities of projects, and obtain the latest information！
   label_milestone: Milestone
   label_milestone_description: Review the commits, branches and versions of your project！
   label_features: Features
@@ -1124,7 +1116,7 @@ en:
   label_follow_no_requirement: You don't have followed any requirements！
 
 
-  label_all_revisions: All revisions：
+
   label_repository_name: Repository name
   label_upassword_info: The password can be shared in the group
   label_how_commit_code: How to commit code：

config/locales/my/en.yml

@@ -13,9 +13,9 @@ en:
   label_location: Location
   label_identity: Identity
   #  top_menu 个人相关
-  label_my_course: My Course
+  label_my_course: My Courses
   label_my_message: Msgs
-  label_my_projects: My projectsed
+  label_my_projects: My Projects
 
 
   #

config/locales/navigatiors/en.yml

@@ -11,10 +11,10 @@ en:
   label_course_practice: Courses
   label_forum_all: Forums
   label_school_all: Schools
-  label_contest_innovate: Competition community  
+  label_contest_innovate: Competitions  
   label_software_user: Users      # 删除
   label_requirement_enterprise: Requirements     # 删除
-  label_stores_index: Resource search
+  label_stores_index: Search
   label_login: Login
 
   
@@ -23,8 +23,8 @@ en:
   #
   #  主旨
   #
-  label_welcome_trustie_project: Trustie online projects hosting platform
+  label_welcome_trustie_project: Trustie online projects hosting services
-  label_welcome_trustie_project_description: "Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange." 
+  label_welcome_trustie_project_description: "Socialized research & development communities for distributed collaboration, resource sharing, code hosting and acitivity analysis." 
  
 
   #
@@ -32,8 +32,8 @@ en:
   #
   #  主旨
   #
-  label_welcome_trustie_course: Trustie online courses practice platform
+  label_welcome_trustie_course:  "Trustie online course & practice hosting services"
-  label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research.
+  label_welcome_trustie_course_description: "Socialized innovative practicing communities for classroom hosting, resource sharing, collaborative homeworking and ranking."
 
  
   #  
@@ -41,9 +41,8 @@ en:
   #
   #  主旨
   #
-  label_welcome_trustie_contest: Trustie online contests practice platform
+  label_welcome_trustie_contest: "Trustie online contest hosting services"
-  label_welcome_trustie_contest_description: Software for Chinese college students and practitioners to provide social-oriented contest management, code hosting, resource sharing, cooperation and exchange.
+  label_welcome_trustie_contest_description: "Socialized competition communities for contest management, demo destration and ranking."
-
  
   #  
   #  Trustie平台导航 
@@ -53,7 +52,7 @@ en:
   label_search: Search
   welcome:
     search:
-      information: "Please input the keywords!"  #  搜索提示信息 
+      information: "Please input the keywords :)"  #  搜索提示信息 
       select:                                    #  下拉列表
         project: project
         course: course
@@ -63,17 +62,17 @@ en:
           showname: name
           email: email
 
-  label_search_conditions_not_null: The search conditions cannot be blank
+  label_search_conditions_not_null: Search conditions cannot be blank
-  label_resources_search_all: "Search all files in the website, while will not search the contents of private items."     # 资源搜索提示信息
+  label_resources_search_all: "Search all public resources in the website."     # 资源搜索提示信息
 
   #
   #  Trustie平台导航 
   #
   #  下方托管平台链接
   #        
-  label_projects_management_platform: Projects-platform
+  label_projects_management_platform: Projects
-  label_courses_management_platform: Courses-platform
+  label_courses_management_platform: Courses
-  label_contests_management_platform: Competitions-platform
+  label_contests_management_platform: Competitions
   
   
   #
@@ -81,7 +80,7 @@ en:
   #
   #  各模块内导航
   #    
-  label_courses_community: Universities Curriculum Communities of Practice
+  label_courses_community: Project hosting communities
-  label_projects_community: Software Project Communities of Hosting
+  label_projects_community: Course & practice hosting communities
-  label_contest_innovate_community: Innovation Communities of Competition
+  label_contest_innovate_community: Innovative competition communities
   label_user_location: Location