From 115eb38a02fd02160e2b217d8cfbbbd4ee38ce02 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Tue, 10 Mar 2015 09:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=94=A8=E6=88=B7=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E8=AF=BE=E7=A8=8B=E6=A0=8F=E3=80=81=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=A0=8F=E3=80=81=E9=A1=B9=E7=9B=AE=E6=A0=8F=E5=92=8C=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=A8=A1=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B?=
 =?UTF-8?q?=E5=AF=B9=E4=B8=80=E4=BA=9B=E5=AD=98=E5=82=A8=E5=9C=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=9B=BA=E5=AE=9A=E7=9A=84?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=AF=94=E5=A6=82?=
 =?UTF-8?q?=E5=AD=A6=E6=9C=9F=EF=BC=8C=E8=81=8C=E7=A7=B0=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?helper=E5=92=8Cmodel=E4=B8=AD=E5=AE=9A=E4=B9=89=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=B0=81=E8=A3=85=EF=BC=9B=E5=B9=B3=E5=8F=B0=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=90=84?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=86=85=E9=83=A8=E5=AF=BC=E8=88=AA=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B=E8=AF=BE=E7=A8=8B=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=A8=A1=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96=E6=95=B4?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8A=9F=E8=83=BD=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb                 |  24 +-
 app/helpers/welcome_helper.rb                 |   2 +-
 app/models/user_extensions.rb                 |  26 +-
 app/views/courses/index.html.erb              |   2 +-
 app/views/courses/search.html.erb             |   2 +-
 app/views/files/_attachement_list.html.erb    |   2 +-
 app/views/forums/create_feedback.js.erb       |   2 +-
 .../homework_attach/_add_jour_reply.html.erb  |   4 +-
 app/views/homework_attach/_jour.html.erb      |   2 +-
 .../_journal_reply_items.html.erb             |   4 +-
 app/views/homework_attach/_review.html.erb    |   2 +-
 app/views/homework_attach/_showjour.html.erb  |   2 +-
 .../layouts/_base_homework_attach.html.erb    |   2 +-
 app/views/layouts/base_courses.html.erb       |   6 +-
 app/views/layouts/base_forums.html.erb        |   2 +-
 app/views/layouts/base_homework.html.erb      |   2 +-
 app/views/layouts/base_memos.html.erb         |   2 +-
 app/views/layouts/base_projects.html.erb      |   2 +-
 app/views/memos/new.html.erb                  |   4 +-
 app/views/my/account.html.erb                 |   4 +-
 app/views/projects/Copy of show.html.erb      |   4 +-
 app/views/projects/_new_respond.html.erb      |   4 +-
 app/views/stores/_search_bar.html.erb         |   4 +-
 .../users/_activity_new_score_index.html.erb  |  16 +-
 app/views/users/_course_form.html.erb         |   2 +-
 .../users/_course_list_have_entity.html.erb   |   4 +-
 .../_course_list_have_entity_ex.html.erb      |   4 +-
 .../users/_influence_new_score_index.html.erb |  12 +-
 .../users/_project_new_score_index.html.erb   |   4 +-
 .../users/_topic_new_score_index.html.erb     |  12 +-
 app/views/users/show.html.erb                 |  51 ++-
 app/views/users/user_projects.html.erb        |   2 +-
 app/views/welcome/_search_bar.html.erb        |   4 +-
 app/views/welcome/contest.html.erb            |  19 +-
 app/views/welcome/course.html.erb             |  16 +-
 app/views/words/_feedback.html.erb            |   2 +-
 app/views/words/_journal_reply_items.html.erb |   4 +-
 app/views/words/_message.html.erb             |   2 +-
 app/views/words/_new_respond.html.erb         |   4 +-
 config/locales/commons/en.yml                 | 103 +++++-
 config/locales/commons/zh.yml                 | 114 +++++-
 config/locales/contacts/en.yml                |  15 +
 config/locales/courses/en.yml                 |  58 +++
 config/locales/courses/zh.yml                 |  56 +++
 config/locales/en.yml                         | 344 +++---------------
 config/locales/forums/en.yml                  |   3 +
 config/locales/forums/zh.yml                  |   6 +
 config/locales/mailers/en.yml                 |  15 +
 config/locales/my/en.yml                      |  33 +-
 config/locales/my/zh.yml                      |  10 +-
 config/locales/navigatiors/en.yml             |  77 ++++
 config/locales/navigatiors/zh.yml             |  11 +-
 config/locales/projects/en.yml                |  56 +++
 config/locales/projects/zh.yml                |  46 ++-
 config/locales/users/en.yml                   | 202 +++++++++-
 config/locales/users/zh.yml                   | 198 +++++++---
 config/locales/zh.yml                         | 245 +++++--------
 57 files changed, 1243 insertions(+), 617 deletions(-)
 create mode 100644 config/locales/forums/en.yml
 create mode 100644 config/locales/forums/zh.yml

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 22eb9bfae..db547061f 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -351,10 +351,28 @@ module CoursesHelper
     str
   end
 
-  # added by nwb
+  # added by meng
+  # 课程time+term简写（2014.春/2014.秋）国际化输出
   def get_course_term course
-    str = ( course.try(:time).to_s << '.' << course.try(:term).to_s )
-    str[0..-4]
+    strterm = course.try(:term).to_s
+    if !(User.current.language == 'zh')
+      strterm == '春季学期' ? strterm =  'spring term' : strterm =  'autumn term'
+      str = ( course.try(:time).to_s << '.' << strterm )
+      str[0..-6]
+    else
+      str = ( course.try(:time).to_s << '.' << strterm )
+      str[0..-4]
+    end
+  end
+
+  # added by meng
+  # 课程term（春季学期/秋季学期）国际化输出
+  def get_course_term_locales course
+    str = course.try(:term).to_s
+    if !(User.current.language == 'zh')
+      str == '春季学期' ? str =  ' ' + 'spring term' : str =  ' ' + 'autumn term'
+    end
+    return str
   end
 
   def members_to_user_ids members
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index eba3c0b3c..f6e205e82 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -341,7 +341,7 @@ module WelcomeHelper
     end
     str
   rescue Exception => e
-    str << content_tag("span", l(:field_user_active_unknow))
+    str << content_tag("span", l('user.active.unknow'))
   end
   
   def show_event_reply event
diff --git a/app/models/user_extensions.rb b/app/models/user_extensions.rb
index b21f0ad36..92690d1db 100644
--- a/app/models/user_extensions.rb
+++ b/app/models/user_extensions.rb
@@ -33,16 +33,32 @@ class UserExtensions < ActiveRecord::Base
      return self.brief_introduction
   end
   
-# added by bai  
+# added by meng
   def show_identity
     if self.identity == 0
-      user_identity = '教师'
+      if User.current.language == 'zh'
+        user_identity = '教师'
+      else
+        user_identity = 'Teacher'
+      end
     elsif self.identity == 1
-      user_identity = '学生'
+      if User.current.language == 'zh'
+        user_identity = '学生'
+      else
+        user_identity = 'Student'
+      end
     elsif self.identity == 2
-      user_identity = '企业' 
+      if User.current.language == 'zh'
+        user_identity = '企业'
+      else
+        user_identity = 'Enterprise'
+      end
     elsif self.identity == 3
-      user_identity = '开发者' 
+      if User.current.language == 'zh'
+        user_identity = '开发者'
+      else
+        user_identity = 'Developer'
+      end
     else
       user_identity = ''
     end
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index e7a4a29db..e8a917a2b 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -12,7 +12,7 @@
         <tr>
           <td class="info_font" style="width: 240px;" rowspan="2">
             <a href="http://<%= Setting.host_course%>" style="color: #15bccf;">
-              高校课程实践社区
+              <%= l(:label_courses_community)%>
             </a>
           </td>
           <td class="location-list">
diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb
index 661feb3c9..98b056487 100644
--- a/app/views/courses/search.html.erb
+++ b/app/views/courses/search.html.erb
@@ -7,7 +7,7 @@
         <tr>
           <td class="info_font" style="width: 240px;" rowspan="2">
             <a href="http://<%= Setting.host_course%>" style="color: #15bccf;">
-              高校课程实践社区
+              <%= l(:label_courses_community)%>
             </a>
           </td>
           <td class="location-list">
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index 85739f7c3..001519a28 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -37,7 +37,7 @@
                            :description_placeholder => l(:label_optional_description)
                    } %>
 <!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
-<label class="f_l ml10 c_grey">
+<label class="f_l ml10 c_grey" style=" margin-top: 3px;">
   <span id="upload_file_count">
       <%= l(:label_no_file_uploaded)%>
     </span>
diff --git a/app/views/forums/create_feedback.js.erb b/app/views/forums/create_feedback.js.erb
index b94ac73aa..626840700 100644
--- a/app/views/forums/create_feedback.js.erb
+++ b/app/views/forums/create_feedback.js.erb
@@ -1,6 +1,6 @@
 $(function(){
     $("#button1").click(function(){
-        myTips("您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！","success");
+        myTips(<%= l(:label_feedback_success)%>,"success");
     });
 
 })
\ No newline at end of file
diff --git a/app/views/homework_attach/_add_jour_reply.html.erb b/app/views/homework_attach/_add_jour_reply.html.erb
index 7a51b0ed6..2b353d563 100644
--- a/app/views/homework_attach/_add_jour_reply.html.erb
+++ b/app/views/homework_attach/_add_jour_reply.html.erb
@@ -1,13 +1,13 @@
 <%= form_tag({:controller => 'homework_attach', :action => 'add_jour_reply'}, :remote => true) do %>
 <%= text_area_tag 'user_notes', "", :class => 'noline',
     :style => "resize: none;", :rows => 4,
-    :placeholder => l(:label_projects_feedback_respond_content),
+    :placeholder => l(:label_feedback_respond_content),
     :maxlength => 250 %>
 <span style="float: left; margin-top: 1px; margin-right: 4px;"></span>
 <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
 <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
 <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
-<%= submit_tag l(:button_projects_feedback_respond),
+<%= submit_tag l(:button_feedback_respond),
   :name => nil , :class => "enterprise", :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
 
 <% end %>
\ No newline at end of file
diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
index 412e78259..cae04b0c0 100644
--- a/app/views/homework_attach/_jour.html.erb
+++ b/app/views/homework_attach/_jour.html.erb
@@ -25,7 +25,7 @@
                                                                :homework_id =>homework.id },
                                 :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
                 <% end %>
-                <%= link_to l(:label_projects_feedback_respond),'',
+                <%= link_to l(:label_newfeedback_respone),'',
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), ''); $('##{ids} textarea') ;return false;"}
                 %>
              </span>
diff --git a/app/views/homework_attach/_journal_reply_items.html.erb b/app/views/homework_attach/_journal_reply_items.html.erb
index ac60709ad..2c7ac886c 100644
--- a/app/views/homework_attach/_journal_reply_items.html.erb
+++ b/app/views/homework_attach/_journal_reply_items.html.erb
@@ -11,7 +11,7 @@
   <div class="recall_con">
     <% id = 'project_respond_form_'+ reply.id.to_s %>
     <%= link_to reply.user.name, user_path(reply.user) %>
-    回复
+    <%= l(:label_reply_to)%>
     <% parent_jour = JournalsForMessage.find reply.m_reply_id %>
     <% if show_name && parent_jour %>
         <%= link_to parent_jour.user.name, user_path(parent_jour.user) %>
@@ -34,7 +34,7 @@
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
               <% if reply_allow %>
-                         <%= link_to l(:label_projects_feedback_respond),'',
+                         <%= link_to l(:label_newfeedback_respone),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>
diff --git a/app/views/homework_attach/_review.html.erb b/app/views/homework_attach/_review.html.erb
index b4508d225..1666d8a43 100644
--- a/app/views/homework_attach/_review.html.erb
+++ b/app/views/homework_attach/_review.html.erb
@@ -42,7 +42,7 @@
                 <% ids = 'project_respond_form_'+ jour.id.to_s%>
                 <div class="ping_disfoot">
                   <span>
-                    <%= link_to l(:label_projects_feedback_respond),'',
+                    <%= link_to l(:label_newfeedback_respond),'',
                                 {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), ''); $('##{ids} textarea') ;return false;"}
                     %>
                  </span>
diff --git a/app/views/homework_attach/_showjour.html.erb b/app/views/homework_attach/_showjour.html.erb
index 215767a19..018d16141 100644
--- a/app/views/homework_attach/_showjour.html.erb
+++ b/app/views/homework_attach/_showjour.html.erb
@@ -65,7 +65,7 @@
                 </span>
               <% ids = 'project_respond_form_'+ journal.id.to_s%>
             <span>
-                <%= link_to l(:label_projects_feedback_respond),'',
+                <%= link_to l(:label_newfeedback_respone),'',
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
                 %>
               <% if journal.user==User.current|| User.current.admin? %>
diff --git a/app/views/layouts/_base_homework_attach.html.erb b/app/views/layouts/_base_homework_attach.html.erb
index 7301c87dc..a12997558 100644
--- a/app/views/layouts/_base_homework_attach.html.erb
+++ b/app/views/layouts/_base_homework_attach.html.erb
@@ -7,7 +7,7 @@
     <tr>
       <td class="info_font" style="width: 240px;" rowspan="2">
         <a href="http://<%= Setting.host_course%>" style="color: #15bccf;">
-          高校课程实践社区
+          <%= l(:label_courses_community)%>
         </a>
       </td>
       <td style="width: auto; color: #15bccf">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 06626c155..814478174 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -37,7 +37,7 @@
     <tr>
       <td class="info_font" style="width: 240px;" rowspan="2">
         <a href="http://<%= Setting.host_course%>" style="color: #15bccf;">
-          高校课程实践社区
+          <%= l(:label_courses_community)%>
         </a>
       </td>
       <td style="color: #15bccf">
@@ -86,7 +86,7 @@
 
       <td>
         <p class="top-content-list">
-          <%= link_to "主页", home_path %>
+          <%= link_to l(:field_homepage), home_path %>
           >
           <a href="http://<%= Setting.host_course%>" class="link_other_item">
             <%=l(:label_courses_management_platform)%>
@@ -230,7 +230,7 @@
           </td>
           <td class="font_lighter_sidebar">
             <%= @course.time %>
-            <%= @course.term %>
+            <%= get_course_term_locales @course %>
           </td>
         </tr>
         <!-- end -->
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index d8a0b0a69..cc9cdd071 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -29,7 +29,7 @@
 						<div class="top-content">							
 							<table>
 								<tr>
-									<td class="info_font" style="width: 240px; color: #15bccf">软件项目托管社区</td>
+									<td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 										<div class="top-content-search">
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index f1840c2fd..a858c045e 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -50,7 +50,7 @@
                   <tr>
                     <td class="info_font" style="width: 240px;" rowspan="2">
                       <a href="http://<%= Setting.host_course%>" style="color: #15bccf;">
-                        高校课程实践社区
+                        <%= l(:label_courses_community)%>
                       </a>
                     </td>
                     <td style="width: auto; color: #15bccf">
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index a8b48804b..4c339e7a0 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -33,7 +33,7 @@
 					<div class="top-content">							
 						<table>
 							<tr>
-								<td class="info_font" style="width: 240px; color: #15bccf">软件项目托管社区</td>
+								<td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
 								<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 								<td rowspan="2" width="250px">
                                   <div class="top-content-search">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b8cc2ddc9..abe58bb65 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -32,7 +32,7 @@
 								<tr>
 									<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">
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index 03a60044a..9db393295 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -8,7 +8,7 @@
 						<div class="top-content">							
 							<table>
 								<tr>
-									<td class="info_font" style="width: 240px; color: #15bccf">软件项目托管社区</td>
+									<td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 										<div class="top-content-search">
@@ -17,7 +17,7 @@
 								</tr>
 								<tr>
 									<td style="padding-left: 8px"><%= link_to request.host()+"/forums", forums_path %></td>
-									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name  %></p></td>
+									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_forum), :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name  %></p></td>
 								</tr>
 							</table>							
 						</div>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 554f50633..241bfacd8 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -64,7 +64,7 @@
             $("#my_account_form").submit();
         }
         else {
-            parent.alert("姓氏和名字不能为空");
+            parent.alert("<%= l(:label_firstname_lastname_empty)%>");
         }
     }
     function get_options(value) {
@@ -320,7 +320,7 @@
 
       <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;" for="userProvince"><%= l(:label_location) %></label>
         <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
-          <option value="">--请选择省份--</option>
+          <option value=""><%= l('location.select.click')%></option>
           <option value="北京">北京</option>
           <option value="上海">上海</option>
           <option value="广东">广东</option>
diff --git a/app/views/projects/Copy of show.html.erb b/app/views/projects/Copy of show.html.erb
index 7dfa9e705..63c41ef13 100644
--- a/app/views/projects/Copy of show.html.erb	
+++ b/app/views/projects/Copy of show.html.erb	
@@ -19,7 +19,7 @@
   <div>
    
     <%= render :partial => 'news/news', :collection => @news %>
-    <div class=more><%= link_to"更多",:contoller=>'project',:action=>'index'%></div>
+    <div class=more><%= link_to l(:button_more),:contoller=>'project',:action=>'index'%></div>
   </div>
   <% end %>
   <%= call_hook(:view_projects_show_right, :project => @project) %>	
@@ -47,7 +47,7 @@
  </li> <% end -%>
 </ul>
 <% end -%>
-<div class=more><%= link_to"更多",:contoller=>'project',:action=>'index'%></div>
+<div class=more><%= link_to l(:button_more),:contoller=>'project',:action=>'index'%></div>
 </div>
 
  
diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb
index b7a58bf05..99581812a 100644
--- a/app/views/projects/_new_respond.html.erb
+++ b/app/views/projects/_new_respond.html.erb
@@ -2,12 +2,12 @@
 <%= text_area_tag 'project_respond', "", 
     				:class => 'noline', :required => true, 
     				:style => "resize: none;", :rows => 3, 
-    				:placeholder => l(:label_projects_feedback_respond_content),
+    				:placeholder => l(:label_feedback_respond_content),
     				:maxlength => 250 %>
 
 <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
 <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
 <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
-<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise"%>
+<%= submit_tag l(:button_feedback_respond), :name => nil , :class => "enterprise"%>
 
 <%end%>
diff --git a/app/views/stores/_search_bar.html.erb b/app/views/stores/_search_bar.html.erb
index 884f8b263..e4dea7a02 100644
--- a/app/views/stores/_search_bar.html.erb
+++ b/app/views/stores/_search_bar.html.erb
@@ -1,8 +1,8 @@
 <div style="width: 57%;margin: 10px auto;">
 	<%= form_tag( search_stores_path, method: 'post') do %>
-	<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:450px;'%>
+	<%= text_field_tag 'name', params[:name], placeholder: l('welcome.search.information'), name: "name", :class => 'blueinputbar', :style => 'width:450px;'%>
 	&nbsp;&nbsp;
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
-	<div class='font_lighter' style="display: inline-block; margin-top:3px;">全站文件搜索。不会搜索私有项目中的内容。</div>
+	<div class='font_lighter' style="display: inline-block; margin-top:3px;"><%= l(:label_resources_search_all)%></div>
 </div>
\ No newline at end of file
diff --git a/app/views/users/_activity_new_score_index.html.erb b/app/views/users/_activity_new_score_index.html.erb
index b592b508d..8140fd756 100644
--- a/app/views/users/_activity_new_score_index.html.erb
+++ b/app/views/users/_activity_new_score_index.html.erb
@@ -1,9 +1,9 @@
 
-<div>&nbsp;&nbsp;&nbsp; 踩别人的帖子数量 * (-2) = <%= option_num.tread %> * (-2) = <%= option_num.tread * (-2) %></div>
-<div>&nbsp;&nbsp;&nbsp; 帖子被一级会员顶的次数 * 4 = <%= option_num.praise_by_one %> * 4 = <%= option_num.praise_by_one * 4 %></div>
-<div>&nbsp;&nbsp;&nbsp; 帖子被二级会员顶的次数 * 6 = <%= option_num.praise_by_two %> * 6 = <%= option_num.praise_by_two * 6 %></div>
-<div>&nbsp;&nbsp;&nbsp; 帖子被三级会员顶的次数 * 8 = <%= option_num.praise_by_three %> * 8 = <%= option_num.praise_by_three * 8 %></div>
-<div>&nbsp;&nbsp;&nbsp; 帖子被一级会员踩的次数 * (-2) = <%= option_num.tread_by_one %> * (-2) = <%= option_num.tread_by_one * (-2) %></div>
-<div>&nbsp;&nbsp;&nbsp; 帖子被二级会员踩的次数 * (-4) = <%= option_num.tread_by_two %> * (-4) = <%= option_num.tread_by_two * (-4) %></div>
-<div>&nbsp;&nbsp;&nbsp; 帖子被三级会员踩的次数 * (-6) = <%= option_num.tread_by_three %> * (-6) = <%= option_num.tread_by_three * (-6) %></div>
-<div>&nbsp;&nbsp;&nbsp; 技术得分 = <%= option_num.tread * (-2) %> + <%= option_num.praise_by_one * 4 %> + <%= option_num.praise_by_two * 6 %> + <%= option_num.praise_by_three * 8 %> + (<%= option_num.tread_by_one * (-2) %>) + ( <%= option_num.tread_by_two * (-4) %>) + (<%= option_num.tread_by_three * (-6) %>) = <%= skill(option_num) %>  </div>
\ No newline at end of file
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.tramples')%> * (-2) = <%= option_num.tread %> * (-2) = <%= option_num.tread * (-2) %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level1')%> * 4 = <%= option_num.praise_by_one %> * 4 = <%= option_num.praise_by_one * 4 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level2')%> * 6 = <%= option_num.praise_by_two %> * 6 = <%= option_num.praise_by_two * 6 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level3')%> * 8 = <%= option_num.praise_by_three %> * 8 = <%= option_num.praise_by_three * 8 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.dislike.level1')%> * (-2) = <%= option_num.tread_by_one %> * (-2) = <%= option_num.tread_by_one * (-2) %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.dislike.level2')%> * (-4) = <%= option_num.tread_by_two %> * (-4) = <%= option_num.tread_by_two * (-4) %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.dislike.level3')%> * (-6) = <%= option_num.tread_by_three %> * (-6) = <%= option_num.tread_by_three * (-6) %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_skill)%> = <%= option_num.tread * (-2) %> + <%= option_num.praise_by_one * 4 %> + <%= option_num.praise_by_two * 6 %> + <%= option_num.praise_by_three * 8 %> + (<%= option_num.tread_by_one * (-2) %>) + ( <%= option_num.tread_by_two * (-4) %>) + (<%= option_num.tread_by_three * (-6) %>) = <%= skill(option_num) %>  </div>
\ No newline at end of file
diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index 02ba782ec..c63daf574 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -57,7 +57,7 @@
                           </span>
                           <span style="float: right; padding-left: 8px">
                             <%= l(:label_course_term) %>
-                            : <%= @course.time %><%= @course.term %>
+                            : <%= @course.time %><%= get_course_term_locales @course %>
                           </span>
                       <% end %>
                     </td>
diff --git a/app/views/users/_course_list_have_entity.html.erb b/app/views/users/_course_list_have_entity.html.erb
index a0e721df5..5d2682dbc 100644
--- a/app/views/users/_course_list_have_entity.html.erb
+++ b/app/views/users/_course_list_have_entity.html.erb
@@ -2,8 +2,8 @@
   <div class="menu">
   <%= link_to "#{l(:label_course_new)}", new_course_path, class: 'icon icon-add' if @user == User.current %>
     <ul>
-      <li mode='doing' class="on">进行中</li>
-      <li mode='end'>已完结</li>
+      <li mode='doing' class="on"><%= l('user.courses.doing')%></li>
+      <li mode='end'><%= l('user.courses.done')%></li>
     </ul>
   </div>
 
diff --git a/app/views/users/_course_list_have_entity_ex.html.erb b/app/views/users/_course_list_have_entity_ex.html.erb
index 2307f3a2b..fc2b5af77 100644
--- a/app/views/users/_course_list_have_entity_ex.html.erb
+++ b/app/views/users/_course_list_have_entity_ex.html.erb
@@ -2,8 +2,8 @@
   <div class="menu">
   <%= link_to "#{l(:label_course_new)}", new_course_path, class: 'icon icon-add' if user == User.current %>
     <ul>
-      <li mode='doing' class="on">进行中</li>
-      <li mode='end'>已完结</li>
+      <li mode='doing' class="on"><%= l('user.courses.doing')%></li>
+      <li mode='end'><%= l('user.courses.done')%></li>
     </ul>
   </div>
 
diff --git a/app/views/users/_influence_new_score_index.html.erb b/app/views/users/_influence_new_score_index.html.erb
index 9977494b9..c0a89536a 100644
--- a/app/views/users/_influence_new_score_index.html.erb
+++ b/app/views/users/_influence_new_score_index.html.erb
@@ -1,7 +1,7 @@
 
-<div>&nbsp;&nbsp;&nbsp; 提交代码次数 * 4 = <%= option_num.changeset %> * 4 = <%= option_num.changeset * 4 %></div>
-<div>&nbsp;&nbsp;&nbsp; 提交文档次数 * 4 = <%= option_num.document %> * 4 = <%= option_num.document * 4 %></div>
-<div>&nbsp;&nbsp;&nbsp; 提交附件次数 * 4 = <%= option_num.attachment %> * 4 = <%= option_num.attachment * 4 %></div>
-<div>&nbsp;&nbsp;&nbsp; 更新缺陷完成度次数 * 2 = <%= option_num.issue_done_ratio %> * 2 = <%= option_num.issue_done_ratio * 2 %></div>
-<div>&nbsp;&nbsp;&nbsp; 发布缺陷数量 * 4 = <%= option_num.post_issue %> * 4 = <%= option_num.post_issue * 4 %></div>
-<div>&nbsp;&nbsp;&nbsp; 项目贡献得分 = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> = <%= active(option_num) %> </div>
\ No newline at end of file
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.commit.codes')%> * 4 = <%= option_num.changeset %> * 4 = <%= option_num.changeset * 4 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.commit.documents')%> * 4 = <%= option_num.document %> * 4 = <%= option_num.document * 4 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.commit.attachments')%> * 4 = <%= option_num.attachment %> * 4 = <%= option_num.attachment * 4 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.update_issues')%> * 2 = <%= option_num.issue_done_ratio %> * 2 = <%= option_num.issue_done_ratio * 2 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.active.release_issues')%> * 4 = <%= option_num.post_issue %> * 4 = <%= option_num.post_issue * 4 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_active)%> = <%= option_num.changeset * 4 %> + <%= option_num.document * 4 %> + <%= option_num.attachment * 4 %> + <%= option_num.issue_done_ratio * 2 %> + <%= option_num.post_issue * 4 %> = <%= active(option_num) %> </div>
\ No newline at end of file
diff --git a/app/views/users/_project_new_score_index.html.erb b/app/views/users/_project_new_score_index.html.erb
index d627fba91..14dd0fef2 100644
--- a/app/views/users/_project_new_score_index.html.erb
+++ b/app/views/users/_project_new_score_index.html.erb
@@ -1,3 +1,3 @@
 
-<div>&nbsp;&nbsp;&nbsp; 被关注人数 * 2 = <%= option_num.follow %> * 2 = <%= option_num.follow * 2 %></div>
-<div>&nbsp;&nbsp;&nbsp; 影响力得分 = <%= option_num.follow * 2 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.influence.followers')%> * 2 = <%= option_num.follow %> * 2 = <%= option_num.follow * 2 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_influence)%>  = <%= option_num.follow * 2 %></div>
diff --git a/app/views/users/_topic_new_score_index.html.erb b/app/views/users/_topic_new_score_index.html.erb
index 02bc1de4f..af2ff0da3 100644
--- a/app/views/users/_topic_new_score_index.html.erb
+++ b/app/views/users/_topic_new_score_index.html.erb
@@ -1,7 +1,7 @@
 
-   <div>&nbsp;&nbsp;&nbsp; 发帖数量 * 2 = <%= option_num.memo %> * 2 = <%= option_num.memo * 2 %></div>
-<div>&nbsp;&nbsp;&nbsp; 对缺陷留言数量 * 1 = <%= option_num.messages_for_issues %> * 1 = <%= option_num.messages_for_issues * 1 %></div>
- <div>&nbsp;&nbsp;&nbsp; 更改缺陷状态次数 * 1 = <%= option_num.issues_status %> * 1= <%= option_num.issues_status * 1 %></div>
-<div>&nbsp;&nbsp;&nbsp; 对留言的回复数量 * 1 = <%= option_num.replay_for_message %> * 1 = <%= option_num.replay_for_message * 1 %></div>
-<div>&nbsp;&nbsp;&nbsp; 对帖子的回复数量 * 1 = <%= option_num.replay_for_memo %> * 1 = <%= option_num.replay_for_memo * 1 %></div>
-<div>&nbsp;&nbsp;&nbsp; 协同得分 = <%= option_num.memo * 2 %> + <%= option_num.messages_for_issues * 1 %> + <%= option_num.issues_status * 1 %> + <%= option_num.replay_for_message * 1 %> + <%= option_num.replay_for_memo * 1 %> = <%= collaboration(option_num) %> 　</div>
+   <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.collaboration.memos')%> * 2 = <%= option_num.memo %> * 2 = <%= option_num.memo * 2 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.collaboration.message_for_issues')%> * 1 = <%= option_num.messages_for_issues %> * 1 = <%= option_num.messages_for_issues * 1 %></div>
+ <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.collaboration.issue_status')%> * 1 = <%= option_num.issues_status %> * 1= <%= option_num.issues_status * 1 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.collaboration.reply_for_messages')%> * 1 = <%= option_num.replay_for_message %> * 1 = <%= option_num.replay_for_message * 1 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l('userscore.collaboration.reply_for_memos')%> * 1 = <%= option_num.replay_for_memo %> * 1 = <%= option_num.replay_for_memo * 1 %></div>
+<div>&nbsp;&nbsp;&nbsp; <%= l(:label_user_score_of_collaboration)%> = <%= option_num.memo * 2 %> + <%= option_num.messages_for_issues * 1 %> + <%= option_num.issues_status * 1 %> + <%= option_num.replay_for_message * 1 %> + <%= option_num.replay_for_memo * 1 %> = <%= collaboration(option_num) %> 　</div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index bb250a584..b16c017a7 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,7 +2,7 @@
     <div class="menu-div">
       <div class="menu">
         <span style="color: #000; font-weight: bold;">
-          <%= l(:label_user_activity, :name => @user.name) %>
+          <%= l(:label_user_activities, :name => @user.name) %>
         </span>
         <ul><%#链接绑定在页面最下方的jQuery%>
           <li mode='all' class="<%= "on" if @state.eql?(0) %>">
@@ -63,16 +63,37 @@
                                                   <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
                                                 </strong>
                                                 &nbsp;
+                                                <% if User.current.language == "zh" %>                                               
+                                                <span class="font_lighter">
+                                                <%= l(:label_i_have_feedback) %>
+                                                <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
+                                                <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
+                                                </span>             
+                                                <% else %>
+                                                <span class="font_lighter">
+                                                <%= l(:label_i_have_feedback) %>
+                                                <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
+                                                <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
+                                                </span>
+                                                <% end %>
                                             <% else %>
                                                 <strong>
                                                   <%= link_to("#{e.user.name}", user_path(e.user_id)) %>
                                                 </strong>
-                                            <% end %>
-                                            <span class="font_lighter">
+                                                <% if User.current.language == "zh" %>                                               
+                                                <span class="font_lighter">
                                                 <%= l(:label_have_feedback) %>
                                                 <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
                                                 <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
-                                            </span>
+                                                </span>             
+                                                <% else %>
+                                                <span class="font_lighter">
+                                                <%= l(:label_have_feedback) %>
+                                                <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
+                                                <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
+                                                </span>
+                                                <% end %>  
+                                            <% end %>
                                           </td>
                                         </tr>
                                         <tr>
@@ -91,7 +112,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <div style="display: inline-block; float: right; margin-top: 0px"></div>
@@ -155,7 +176,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <!--<div style="display: inline-block; float: right; margin-top: 0px">-->
@@ -216,7 +237,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <div style="display: inline-block; float: right; margin-top: 0px"></div>
@@ -333,7 +354,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <div style="display: inline-block; float: right; margin-top: 0px"></div>
@@ -372,7 +393,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <div style="display: inline-block; float: right; margin-top: 0px"></div>
@@ -417,7 +438,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <div style="display: inline-block; float: right; margin-top: 0px">
@@ -457,7 +478,7 @@
                                       <td>
                                         <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                         </div>
                                         <div style="display: inline-block; float: right; margin-top: 0px">
@@ -493,7 +514,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                             <div style="display: inline-block; float: right; margin-top: 0px">
@@ -548,7 +569,7 @@
                                           <td>
                                             <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                               <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
                                               </span>
                                             </div>
                                         </tr>
@@ -569,7 +590,7 @@
         </div>
     <% else %> <!-- < %#  unless @activity.empty?  %> -->
         <% if @user == User.current %>
-            <%= l(:label_user_activities) %>
+            <%= l(:label_user_activities_no) %>
         <% else %>
             <p class="font_description">
               <%= l(:label_user_activities_other) %>
@@ -596,7 +617,7 @@
 									<% elsif e.jour_type == 'User' %>
 										<%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %>&nbsp;<%= l(:label_quote_my_words) %>
 									<% elsif e.jour_type == 'Project' %>
-										<%= '在'<<l(:field_project) %><%= link_to(e.jour.name, feedback_path(e.jour)) %>&nbsp;<%= l(:label_reply_plural) %>
+										<%= l(:label_in_projects) %><%= link_to(e.jour.name, feedback_path(e.jour)) %>&nbsp;<%= l(:label_reply_plural) %>
 									<% end %>
 								<% else %>
 									<%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %>&nbsp;<%= l(:label_have_respond) %>
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index ff580cf71..31b66727f 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -25,7 +25,7 @@
 				<table width="580" border="0">
 					<tr>
 						<td colspan="2" valign="top"><strong> <%= link_to_user(membership.user) if membership.respond_to?(:user) %></strong>
-													 <span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td>
+													 <span class="font_lighter"> <%= l(:label_project_take_in) %></span> <%= link_to_project(membership.project) %></td>
 					</tr>
 					<tr>
 						<td colspan="2" width="580" style="word-break:break-all;word-wrap: break-word;">
diff --git a/app/views/welcome/_search_bar.html.erb b/app/views/welcome/_search_bar.html.erb
index 302aa3c26..58f969a20 100644
--- a/app/views/welcome/_search_bar.html.erb
+++ b/app/views/welcome/_search_bar.html.erb
@@ -1,8 +1,8 @@
 <div  >
 	<%= form_tag( search_stores_path, method: 'post') do %>
-	<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:300px;'%>
+	<%= text_field_tag 'name', params[:name], placeholder: l('welcome.search.information'), name: "name", :class => 'blueinputbar', :style => 'width:300px;'%>
 	&nbsp;&nbsp;
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
-	<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;">全站文件搜索。不会搜索私有项目中的内容。</div>
+	<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;"><%= l(:label_resources_search_all)%></div>
 </div>
\ No newline at end of file
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 13fceb50f..9bf0d3b9d 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -133,7 +133,24 @@
 		</div>
 	<div class="welcome_left" id="welcome_left">
         <% unless @contest_page.nil? %>
-			<span class="font_welcome_trustie"><%= @contest_page.title %></span> <span class="font_welcome_tdescription">, <%= @contest_page.description %></span>
+			<span class="font_welcome_trustie">
+		      <!--
+                edit by meng
+                @@contest_page.title存储在first_page表中的title字段
+	                             原本代码
+	               <%= @contest_page.title %>
+              !-->
+              <%= l(:label_welcome_trustie_contest) %>
+			</span> 
+			<span class="font_welcome_tdescription">, 
+			  <!--
+                edit by meng
+                @course_page.description存储在first_page表中的description字段
+	                             原本代码
+	               <%= @contest_page.description %>
+              !-->
+              <%= l(:label_welcome_trustie_contest_description) %>			  			 				
+			</span>
 	    <% end %>
     </div>
 
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index d427a9aea..d04d9787f 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -56,12 +56,24 @@
         </span>
       <% unless @course_page.nil? %>
           <span class="font_welcome_trustie">
-            <%= @course_page.title %>
+            <!--
+            edit by meng
+              @course_page.title存储在first_page表中的title字段
+	                        原本代码
+	                        <%= @course_page.title %>
+            !-->
+            <%= l(:label_welcome_trustie_course) %>
           </span>
 
           <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
               <span class="font_welcome_tdescription">,
-                <%= @course_page.description %>
+                <!--
+                edit by meng
+                @course_page.description存储在first_page表中的description字段
+	                             原本代码
+	                        <%= @course_page.description %>
+                !-->
+                <%= l(:label_welcome_trustie_course_description) %>
               </span>
           <% else %>
               <% if @school_id == "0" %>
diff --git a/app/views/words/_feedback.html.erb b/app/views/words/_feedback.html.erb
index 8478566bb..493378279 100644
--- a/app/views/words/_feedback.html.erb
+++ b/app/views/words/_feedback.html.erb
@@ -11,7 +11,7 @@
           <% id = 'project_respond_form_'+journal.id.to_s%>
           <span>
 			<% if reply_allow %>
-				<%= link_to l(:label_projects_feedback_respond),'#',
+				<%= link_to l(:label_newfeedback_respone),'#',
                             {:focus => 'project_respond',
                              :onclick => "toggleAndSettingWordsVal($('##{id}'),
 							$('##{id} textarea'),
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 24577c2ee..9076006cc 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -14,7 +14,7 @@
       <div class="recall_con">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
         <%= link_to reply.user.name, user_path(reply.user) %>
-        回复
+        <%= l(:label_reply_to)%>
         <% if show_name %>
             <%= link_to parent_jour.user.name, user_path(parent_jour.user) %>
         <% else %>
@@ -36,7 +36,7 @@
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
               <% if reply_allow %>
-                         <%= link_to l(:label_projects_feedback_respond),'',
+                         <%= link_to l(:label_newfeedback_respone),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index ea14be1a6..163f13523 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -51,7 +51,7 @@ function checkMaxLength() {
 			<% ids = 'project_respond_form_'+ journal.id.to_s%>
 		<span>
 			<% if reply_allow %>
-			<%= link_to l(:label_projects_feedback_respond),'',
+			<%= link_to l(:label_newfeedback_respone),'',
                 {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
              %>
       <% end %>
diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index edb313bb5..34e7c1ccf 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -1,14 +1,14 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
     <%= text_area_tag 'user_notes', "", :class => 'noline',
                       :style => "resize: none;", :rows => 4,
-                      :placeholder => l(:label_projects_feedback_respond_content),
+                      :placeholder => l(:label_feedback_respond_content),
                       :maxlength => 250 %>
 
     <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
     <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
-    <%= submit_tag l(:button_projects_feedback_respond), :name => nil ,
+    <%= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "enterprise",
                    :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
 
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml
index 7c003c67b..0cabbfa4c 100644
--- a/config/locales/commons/en.yml
+++ b/config/locales/commons/en.yml
@@ -155,12 +155,20 @@ en:
 
   actionview_instancetag_blank_option: Please select
   
-  
+  #
+  #  Trustie公共标签
+  #
+  #  
+  #   
   label_user: User
   label_project: Project
   label_issue: Issue
   label_requirement: Calls
   label_forum: Forum
+  label_contest: Contest
+
+  
+  
   
   label_issue_plural: Issues Tracking
   label_project_plural: Projects
@@ -172,6 +180,14 @@ en:
   
   label_loading: Loading...
   
+  label_create_time: Created time  
+  label_update_time: Update time
+ 
+  label_reply: Reply 
+ 
+  label_anonymous: Anonymous     #作业和留言 模块
+ 
+  text_are_you_sure: Are you sure?   #js 提示 
   
   #
   #  Trustie按钮类
@@ -186,7 +202,11 @@ en:
   button_project_tags_add: Add
   label_more: More
   button_download: Download
-   
+  button_delete: Delete   
+
+
+
+
   #
   #  Trustie上传头像模块
   #
@@ -194,7 +214,6 @@ en:
   # 
   button_upload_photo: Upload photo
   button_delete_file: delete
-  text_are_you_sure: Are you sure?
   error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
   error_pic_type: "Only supports the following image formats:"
 
@@ -251,14 +270,86 @@ en:
     sharer: "Sharer："
     upload_time: "Upload time:"
   
+  
+  #
+  #  项目托管平台主页 
+  #
+  #  用户动态栏
+  #
+  lable_user_active: Recent Activities
+  user:
+    active:
+      published: released
+      uploaded: uploaded
+      updated: updated
+      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 on
+  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: Question&Feedback
+  label_my_question: My-question
+  label_my_feedback: My-feedback
+  label_updated_time: "Updated %{value} ago"
+  label_question_sponsor: Sponsor
+  label_final_reply: Last-reply   
+    
+ 
+  #
+  #  Trustie 
+  #
+  #  新闻
+  # 
+  label_news: 新闻
   
+
   #
   #  Trustie
   #
-  #  
-  #   
-  
+  #  日志
+  # 
+  label_log_detail: "日志详情"
+  label_log_delete_log: "删除日志"
+  label_log_access_analysis: "访问统计"
+  label_log_time_analysis: "耗时分析"
+  label_log_refresh: "刷新"
+  label_log_key:  "关键字："
+  label_log_time: "时间："
+  label_log_delete_confirm: "确认清除该天日志内容?"
+  label_log_access_count: "访问次数"
+  label_log_url: "URL路径"
+  label_log_ip: "访问IP"
+  label_log_access_time: "访问时间"
+  label_log_access_controller_action: "模块路径"
+  label_log_response_time: "响应时间"
+  label_log_views_time: "页面渲染时间"
+  label_log_views_time_percent: "页面渲染时间百分比"
+  label_log_active_record_time: "AR响应时间"
+  label_log_active_record_time_percent: "AR响应时间百分比"
+  views:
+      pagination:
+        first: "&laquo; 首页"
+        last: "末页 &raquo;"
+        previous: "&laquo; 上一页"
+        next: "下一页 &raquo;"
+        truncate: "..."  
  
\ No newline at end of file
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index cd2c126fd..0e7dc856f 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -111,7 +111,7 @@ zh:
           gb: "GB"
           tb: "TB"
 
-# Used in array.to_sentence.
+  # Used in array.to_sentence.
   support:
     array:
       sentence_connector: "和"
@@ -167,17 +167,33 @@ zh:
   
   actionview_instancetag_blank_option: 请选择
   
+  
+  #
+  #  Trustie公共标签
+  #
+  #  
+  #   
   label_user: 用户
   label_project: 项目
   label_issue: 问题
   label_requirement: 需求
   label_forum: 公共贴吧
-  
+  label_contest: 竞赛
+
   
   field_description: 描述
   
   label_loading: 载入中...
   
+  label_create_time: 创建时间     
+  label_update_time: 更新时间
+  label_reply: 回复
+
+  label_anonymous: 匿名     #作业和留言 模块
+
+
+  text_are_you_sure: 您确定要删除吗？        #js 提示
+  
   #
   #  Trustie按钮类
   #
@@ -191,7 +207,10 @@ zh:
   button_project_tags_add: 增加  
   label_more: 更多>>
   button_download: 下载
- 
+  button_more: 更多 
+  button_delete: 删除
+
+
   #
   #  Trustie上传头像模块
   #
@@ -199,7 +218,6 @@ zh:
   # 
   button_upload_photo: 上传图片
   button_delete_file: 删除 
-  text_are_you_sure: 您确定要删除吗？
   error_attachment_too_big: 该文件无法上传。超过文件大小限制 (%{max_size})
   error_pic_type: "仅支持如下图片格式："
   
@@ -263,5 +281,91 @@ zh:
     sharer: "共享者："
     upload_time: "上传时间:"
   
-
+  #
+  #  项目托管平台主页 
+  #
+  #  用户动态栏
+  #
+  lable_user_active: 用户动态
+  user:
+    active:
+      published: 发表了
+      uploaded: 上传了
+      updated: 更新了     
+      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: "回复("
+  
+  #
+  #  项目托管平台主页 
+  #
+  #  贴吧动态栏
+  # 
+  lable_bar_active: 问题和反馈动态
+  label_my_question: 我要提问
+  label_my_feedback: 我要反馈
+
+  label_updated_time: " 更新于 %{value} 之前"
+  label_question_sponsor: 楼主
+  label_final_reply: 最后回复
+  
+
+  #
+  #  
+  #
+  #  评论
+  # 
+  label_find_all_comments: 查看所有评论
+  label_comments_count: (%{count}条评论)
+  
+  #
+  #  
+  #
+  #  新闻
+  # 
+  label_news: 新闻
+  
+
+  #
+  #  
+  #
+  #  日志
+  # 
+  label_log_detail: "日志详情"
+  label_log_delete_log: "删除日志"
+  label_log_access_analysis: "访问统计"
+  label_log_time_analysis: "耗时分析"
+  label_log_refresh: "刷新"
+  label_log_key:  "关键字："
+  label_log_time: "时间："
+  label_log_delete_confirm: "确认清除该天日志内容?"
+  label_log_access_count: "访问次数"
+  label_log_url: "URL路径"
+  label_log_ip: "访问IP"
+  label_log_access_time: "访问时间"
+  label_log_access_controller_action: "模块路径"
+  label_log_response_time: "响应时间"
+  label_log_views_time: "页面渲染时间"
+  label_log_views_time_percent: "页面渲染时间百分比"
+  label_log_active_record_time: "AR响应时间"
+  label_log_active_record_time_percent: "AR响应时间百分比"
+  views:
+      pagination:
+        first: "&laquo; 首页"
+        last: "末页 &raquo;"
+        previous: "&laquo; 上一页"
+        next: "下一页 &raquo;"
+        truncate: "..."
\ No newline at end of file
diff --git a/config/locales/contacts/en.yml b/config/locales/contacts/en.yml
index d28104260..e72f9f46a 100644
--- a/config/locales/contacts/en.yml
+++ b/config/locales/contacts/en.yml
@@ -1,3 +1,18 @@
 en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
+
+
+  #   托管平台主页 > 底部承办单位
+  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 
\ No newline at end of file
diff --git a/config/locales/courses/en.yml b/config/locales/courses/en.yml
index e124e3f1a..68d4607d9 100644
--- a/config/locales/courses/en.yml
+++ b/config/locales/courses/en.yml
@@ -1,4 +1,62 @@
 en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
+  #
+  #  课程托管平台
+  #
+  #  课程公共标签
+  #
+  label_course_join_student: 加入课程
+  label_course_new: 新建课程
 
+  label_homework: 课程作业
+  label_course_news: 课程通知  
+  label_main_teacher: 主讲教师
+  label_course_term: 开课学期  
+
+  label_join_course: 加入
+  label_exit_course: 退出
+
+  label_exit_course: exit course
+
+
+  #
+  #  课程托管平台主页
+  #
+  #  热门课程栏
+  # 
+  label_school_no_course: The school did not offer any courses, you can view other school curriculum
+  label_school_less_course: The school offers courses in less, you can view other school curriculum
+
+
+  #
+  #  课程托管平台
+  #
+  #  新建课程
+  # 
+  lable_input_class: Type in class period here
+ 
+  
+  # 教师权限课程关闭和重启
+  label_course_closed: Close
+  label_course_reload: Reopen
+  label_course_closed_tips: "Are you sure you want to reopen the course?"
+  # end 
+
+  
+  # 课程排序
+  label_sort_by_time: sorted by time
+  label_sort_by_active: sorted by active
+  label_sort_by_influence: sorted by influence
+  label_sort_by_activity: Sort by activities
+  # end 
+
+
+  #
+  #  课程托管平台
+  #
+  #  课程资源上传
+  # 
+  label_file_upload: Resource files
+  label_file_upload_error_messages: "Upload error, please check your network environment, and refresh the page to upload."
+  button_confirm: Confirm 
\ No newline at end of file
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index 0832cde38..9ce09704b 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -5,6 +5,62 @@ zh:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
   
+  #
+  #  课程托管平台
+  #
+  #  课程公共标签
+  #
+  label_course_join_student: 加入课程
+  label_course_new: 新建课程
+
+  label_homework: 课程作业
+  label_course_news: 课程通知  
+  label_main_teacher: 主讲教师
+  label_course_term: 开课学期  
+
+  label_join_course: 加入
+  label_exit_course: 退出
+
+
+  #
+  #  课程托管平台主页
+  #
+  #  热门课程栏
+  # 
+
+
+
+
+
+
+  label_school_no_course: 该学校本学期未开设任何课程，您可以查看其他学校课程
+  label_school_less_course: 该学校本学期开设课程较少，您也可以查看其他学校课程
+
+
+
+  #
+  #  课程托管平台
+  #
+  #  新建课程
+  # 
+  lable_input_class: 在此输入课时
+ 
+ 
+  # 教师权限课程关闭和重启
+  label_course_closed: 关闭
+  label_course_reload: 重开
+  label_course_closed_tips: "确定要%{desc}课程？"
+  # end 
+
+
+  # 课程排序
+  label_sort_by_time: 按时间排序
+  label_sort_by_active: 按活跃度排序
+  label_sort_by_influence: 按影响力排序
+  label_sort_by_activity: 按动态数排序
+  # end 
+
+
 
 
   #
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0b2bb94ee..aa4784bbd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -102,7 +102,6 @@ en:
   field_user: User
   field_principal: Principal
   field_role: Role
-  field_homepage: Homepage
   field_parent: Subproject of
   field_is_in_roadmap: Issues displayed in roadmap
   field_admin: Administrator
@@ -354,7 +353,7 @@ en:
   label_user_for_project_grade: Score
   label_relation_files: Select an existing resource
   # Personal signature tips
-  label_my_brief_introduction: How are feeling today? Leave your footprints ~
+
 
   # create course and course info
 
@@ -378,7 +377,7 @@ en:
   label_student_score: Student's score
   label_without_score:  No evaluated 
   label_homework_description: Description
-  label_responses: Messages
+
   lable_has_commit_homework: You have submitted your work
   label_user_create_project_homework: created the task
   label_commit_limit: Expired but can submit your work
@@ -395,10 +394,9 @@ en:
   label_user_plural: Users
   label_user_new: New user
   label_user_anonymous: Anonymous
-  label_activity_project: 'Project: ' #added by bai
+  label_user_activity: "%{value}'s activities"
 
   label_project_plural: Projects
-  label_project_deposit: Projects
   label_first_page_made: Homepage customization
   label_project_first_page: Project hosting platform page
   label_course_first_page: Practice teaching platform of home page
@@ -471,17 +469,16 @@ en:
   label_my_projects: My projects
   label_my_page_block: My page block
   label_administration: Administration
-  label_login: Login
+
   # end
   label_help: Help
 
   label_last_login: Last connection
   label_registered_on: Registered on
-  label_activity: Activities
   label_overall_activity: Overall activity
-  label_user_activity: "%{value}'s activity"
+
   label_new: New
-  label_new_user: registered a new account
+
   label_logged_as: Logged in as
   label_environment: Environment
   label_authentication: Authentication
@@ -714,7 +711,7 @@ en:
   label_message_last: Last message
   label_message_new: New message
   label_message_posted: Message added
-  label_reply_plural: Replies
+
   label_send_information: Send account information to the user
   label_year: Year
   label_month: Month
@@ -826,7 +823,7 @@ en:
   button_uncheck_all: Uncheck all
   button_collapse_all: Collapse all
   button_expand_all: Expand all
-  button_delete: Delete
+
   button_create_and_continue: Create and continue
   button_test: Test
   button_edit: Edit
@@ -1030,26 +1027,14 @@ en:
 
   #huang
   label_file_new: Download
-  label_user_edit: "Edit information"
   label_my_course: "My Course"
-  label_user_info: "User information"   #huang 添加
-  label_user_watcher: "Followers"  # huang添加的  # modified by bai
-  label_user_fans: "Followed by"   # modified by bai
 
-  # modify by men
-  label_x_user_fans:
-    zero: fan
-    one: fan
-    other: fans
-  #end
   label_user_commits: "Code commits"
   label_user_watchered: "Followed by"   # huang添加的
-  label_user_newfeedback: "Messages" ## huang添加的  # modified by bai
-  label_user_login: "Last login:"
+
+
   label_user_mail: "E-mail:"
-  label_user_joinin: "Join date:"
-  label_user_activities: "You have no activities,come and join us!"
-  label_user_activities_other: The user has no activities now！
+
   label_project_overview: "Overview"
   label_project_tool: "Tool"
   label_project_issues: "Issues"
@@ -1069,21 +1054,21 @@ en:
   label_unapply_project: Unsubscribe
 
   #fq
-  button_leave_meassge: Submit
+
   button_clear_meassge: Reset
   label_leave_message_to: leave %{name} a message
   label_leave_message: Message content
   label_message: message board
   field_add: Add before %{time}
   button_more: More
-  label_user_response: Feedback  # modified by bai
+
   label_bidding_project: projects
   button_bidding: I will participate in it
   label_new_call: New call
   label_user_information: My informations
 
   #Customer added！Added by nie
-  label_create_time: Created time
+
   label_current_contributors: current contributors
   #modify by men
   label_x_current_contributors:
@@ -1112,10 +1097,7 @@ en:
   label_member_since: joined
   label_contribute_to: Participates %{project_count} projects：
   #modify by men
-  label_x_contribute_to:
-    zero: Participates %{count} project：
-    one: Participates %{count} project：
-    other: Participates %{count} projects：
+
   #end
   label_total_commit: Totally %{total_commit} commits  # modified by bai
   #modify by men
@@ -1170,11 +1152,11 @@ en:
 
   label_leave_me_message: left a message to me
   label_leave_others_message: leave message to him/her
-  label_leave_a_message: Leave him/her a message：
+
   label_leave_your_message: Leave a message to you
   label_new_activities: ' has a new activity in' # modified by bai
-  label_new_activity: ' has a new activity in'
-  label_i_new_activity: ' have a new activity in'
+
+  
   label_create_project: had participated in
   label_praise: praise
   label_cancel_praise: cancel praise
@@ -1199,19 +1181,19 @@ en:
   #end
   label_me: me
   label_my: my
-  label_i: I
+
   label_join_bidding: joined the bidding
   label_bidding_user: Bidding user：
   label_bidding_reason: Bidding reason：
   label_username: username：
   label_password: password：
-  label_about_requirement: about requirement：
-  label_about_issue: about issue：
-  label_quote_my_words: ' quoted my words'
-  label_have_respond: had a respond
+
+
+
+
   label_welcome: Welcome
 
-  label_goto: Go to>>
+
   label_join: join Trustie！
   label_repository_new: link to existing SVN repository
   label_repository_path: path of repository
@@ -1223,7 +1205,7 @@ en:
   label_exist_repository_path: Define exist repository's path of URL and format must be file:///, http://, https://, svn://
   label_project_no_activity: The project has no activities now！
   label_follow_no_requirement: You don't have followed any requirements！
-  label_no_user_respond_you: There is no respond for you！
+
 
   label_all_revisions: All revisions：
   label_repository_name: Repository name
@@ -1242,7 +1224,6 @@ en:
   label_no_current_watchers: The user hasn't watched others
   label_project_tool_response: Response
   label_course_feedback: Feedback
-  label_active_call: call
 
 
   label_boy: Man
@@ -1280,16 +1261,13 @@ en:
   label_bids_new_money: input the award money,such as 500,2.5 etc.
   label_bids_new_credit: input the work corresponding course credits,such as 3,2.5 etc.
   label_bids_new_content: input the award content,such as certificate,things etc.
-  label_user_login_tips: You havn't logged in,for leaving message please login first
+
   label_user_login_new: login
   label_project_sort: the way of sorting
   #modified by bai
-  label_sort_by_time: sorted by time
-  label_sort_by_active: sorted by active
-  label_sort_by_influence: sorted by influence
+
   #end
-  label_bids_published: published
-  label_bids_published_ago: ago
+
   # label_welcome_trustie: Trustie
   # label_welcome_trustie_project: Online projects hosting platform
   # label_welcome_trustie_course: Online Courses practice platform
@@ -1298,15 +1276,12 @@ en:
   # 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_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_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs.
-  label_bid_respond_quote: Respond
+
   label_bid_if_agreement: If you like me, please press me  #bai
-  label_bid_respond_delete: Delete
-  label_newfeedback_message: messages
-  label_newfeedback_quote: Respond
-  label_newfeedback_delete: Delete
-  label_layouts_feedback: Messages
-  label_have_feedback: Have
-  label_of_feedback: Of
+
+
+
+
   label_welcome_participate: participates
   #modify by men
   label_x_welcome_participate:
@@ -1316,25 +1291,20 @@ en:
   #end
   label_welcome_participate_project: projects
   label_projects_feedback: responded to the project
-  label_projects_feedback_respond: Respond
   label_projects_feedback_respond_success: Respond success
-  button_projects_feedback_respond: Respond
-  label_projects_feedback_respond_content: Please input your words
-  label_in_issues: in the issue：
-  label_in_bids: in the call：
-  label_in_users: in the user：
+
+
+
   label_user_create_project: has created
 
 #added by bai
-  label_identity: Identity
   label_teacher: Teacher
   label_student: Student
-  label_school_all: Schools
   label_school_not_fount: Not found by your input query condition.
   label_other: Other
   
   
-  label_location: Location
+
 #end
   label_course: Course
   label_course_new: New course
@@ -1360,18 +1330,15 @@ en:
     one: teachers
     other: teachers
  #add by men
-  label_brief_introduction: Personality words
-  label_technical_title: Title
-  label_technicl_title_professor: Professor
-  label_technicl_title_associate_professor: Associate professor
-  label_technicl_title_lecturer: Lecturer
-  label_technicl_title_teaching_assistant: Teaching assistant
+
+
+  
   label_enter_college: College  Entrance
   lable_enter_enterprise: Enterprise Entrance
   label_homework_info: Status
   label_question_student: Feedback
   label_student_response: Feedback
-  label_my_question: Please raise your questions here！
+#  label_my_question: Please raise your questions here！
   label_teacher_homework: "Teacher's name"
   label_course_homework: Corresponding courses
 
@@ -1395,7 +1362,7 @@ en:
   text_command: The password is required when applying a course, and it will be released by the teacher of.
   label_enterprise_into: Enterprise Entrance
   label_college_into: College  Entrance
-  label_user_course: Courses
+
   label_new_course: Courses
   field_tea_name: Teacher
   label_course_college: College
@@ -1436,7 +1403,7 @@ en:
   label_teacher_work_unit: Position
   label_course_overview: Status
   label_course_file: File
-  label_stores_index: Resource search
+
   label_course_news: News
   #wang
   label_contest_userresponse: Userresponse
@@ -1450,7 +1417,7 @@ en:
 
   label_bids_task_list: Tasks list
   label_join_course: join course
-  label_exit_course: exit course
+
   label_new_join: Join
   label_new_join_order: Please input the course order.
   label_homeworks_form_new_description: Release a task,the submit form of the task may be accessory or project,setting in the task form.
@@ -1468,14 +1435,11 @@ en:
   label_assign_homework: assigned homewok
   label_noawards: No awards
 
-  label_requirement_enterprise: Requirements
   label_requirement_enterprise_list: Requirements List
-  label_contest_innovate: Competition community
-  label_software_user: Users
-  label_course_practice: Courses
+
+
   label_course_all: Teacher
   label_teacher_all: Student
-  label_user_home: User Space
 
   field_hidden_repo: code protected
   label_newbie_faq: newbie FAQ
@@ -1512,209 +1476,22 @@ en:
   label_release_time: Release-time
   label_question_sponsor: Sponsor
   label_final_reply: Final-reply
-  label_reply: Reply
+
   label_weixin: WeiXin
   
   
-  
-  
-  
-  
-  
-  
-  #
-  #  Trustie个人主页
-  #   
-  #  Trustie个人主页> 
-  #  动态栏
-  label_user_activity: "%{name} Activities"
-  label_user_all_activity: All activities
-  label_user_activity_myself: About me
-  label_user_all_respond: All replies  
-  #  项目栏
-  label_project_unadd: "No project, go to creat it!"
-  label_project_un: "You haven't joined any project yet!"
-  
-  
-  label_has_watched_project: The projects of attention
-  label_project_take: The projects of participation 
-
-  
-  
-    
-  # 托管平台主页
-  # 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
- 
-  #   托管平台主页 > 搜索提示信息
-  welcome:
-    search:
-      information: "Please input the keywords!"  #  搜索提示信息 
-      select:                                    #  下拉列表
-        project: project
-        course: course
-        user: user
-        userinfo:
-          nickname: nickname
-          showname: name
-          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_welcome_trustie_project: Trustie online projects hosting platform
-  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." 
-       
-  #   项目托管平台主页 > 热门项目栏
-  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: Recent Activities
-  user:
-    active:
-      published: released
-      uploaded: uploaded
-      updated: updated
-      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 on
-  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: Recent Posts
-  label_my_question: My-question
-  label_my_feedback: My-feedback
-  label_updated_time: "Updated %{value} ago"
-  label_question_sponsor: Sponsor
-  label_final_reply: Last-reply  
-  
-  
-  #   项目托管平台 > 新建项目
-  label_project_new_description: "A project can be used to do anything that requires distributed collaboration."
-  field_name: Name
-  field_description: Description
-  field_identifier: Identifier
-  text_length_between: "Length between %{min} and %{max} characters."
-  text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed."
-  field_is_public: Public
-  field_hidden_repo: code protected  
-  button_create: Create
-  
-  
-  #   项目托管平台 > 加入项目
-  
-  project:
-    join:
-      title: 快速进入项目通道
-      description: "只要持有项目的ID，就可快速申请加入所在项目。项目页面搜索不到的私有项目只能从此通道进入哦！"
-      id: 
-        label: "Project ID:"
-        tips: "Project ID is the number within the project's url"
-        
-  # 公共
-  label_apply_project: Apply Project
-  
-  
-
-  
-  
-  
-  # 课程托管平台主页  
-  #   课程托管平台主页  > 主旨
-  label_welcome_trustie_course: Trustie online courses practice platform
-  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_contest: Trustie online contests practice platform
-  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.
-  #   竞赛托管平台主页 > 
-  
-
-  # edit by meng
-  # emailer translation
-  mail_issue_greetings: "Dear user , Greetings from Trustie"
-  mail_issue_footer: "Unsubscribe this message?"
-  mail_issue_title_userin: "in"
-  mail_issue_title_active: "has a new activity which relevants to you , please pay more attention to this!"
-  mail_issue_subject: "Title："
-  mail_issue_content: "Content："
-  mail_issue_sent_from: "From："
-  mail_issue_from_project: "project issue"
-  mail_issue_attachments: "Attachments："
-  mail_issue_reply: "Want reply"
-  #end
-  # modified by meng 
-  # file_upload translation 
-  label_file_upload: Resource files
-  label_file_upload_error_messages: "Upload error, please check your network environment, and refresh the page to upload."
-  button_confirm: Confirm
-  # shut down and restart course
-  label_course_closed: Close
-  label_course_reopen: Reopen
-  label_course_closed_tips: "Are you sure you want to reopen the course?"
-  # end 
-  
-  
-  
-  
+ 
+ 
+ 
 
   label_work_quantity: work
   label_contest_work: Competition work
@@ -1806,7 +1583,7 @@ en:
 
   label_contest_notification: Notice
   lable_contest_user: Release person
-  label_contest_innovate_community: Competition community
+
 
   label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work!
   label_user_login_notificationcomment: You are not logged in, please log in and then comment the notification!
@@ -1815,7 +1592,7 @@ en:
 
   label_borad_project: Project-borad
   
-  label_update_time: Update time
+
   label_project_notice: release the notice
   label_no_file_uploaded: No file uploaded
   label_forum_new: New forum
@@ -1823,10 +1600,10 @@ en:
   bale_edit_notice: Edit
 
   label_user_grade: Individual score
-  label_active_homework: homework
+
   label_course_term: Semester
   label_comment_time: Comment time
-  label_bidding_user_studentcode: Student ID
+
   label_bidding_user_studentname: name
 
 #  label_organizers: Organizer
@@ -1850,15 +1627,14 @@ en:
   modal_valid_passing: can be used.
 
 
-  label_school_no_course: The school did not offer any courses, you can view other school curriculum
-  label_school_less_course: The school offers courses in less, you can view other school curriculum
+
   label_file_not_found: Sorry, the file can't be downloaded now!
   label_goto_homepage: Return to the home page
   label_trustie_team: The Trustie development team
   label_memos_max_length: The content of the post up to 65535 characters in length
   label_forums_max_length: Post Bar describing the maximum length of 65535 characters
   label_unknow_type: Unknow type
-  label_score_less_than_zero: Score less than 0, revised to 0
+
   review_assignments: Review assignments
   label_my_school: My school
   label_all_schol: All school
diff --git a/config/locales/forums/en.yml b/config/locales/forums/en.yml
new file mode 100644
index 000000000..6b158de89
--- /dev/null
+++ b/config/locales/forums/en.yml
@@ -0,0 +1,3 @@
+en:
+  # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
+  direction: ltr
\ No newline at end of file
diff --git a/config/locales/forums/zh.yml b/config/locales/forums/zh.yml
new file mode 100644
index 000000000..07343faf6
--- /dev/null
+++ b/config/locales/forums/zh.yml
@@ -0,0 +1,6 @@
+
+# Chinese (China) translations for Ruby on Rails
+# 
+zh:
+  # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
+  direction: ltr
\ No newline at end of file
diff --git a/config/locales/mailers/en.yml b/config/locales/mailers/en.yml
index e124e3f1a..4bcbfead1 100644
--- a/config/locales/mailers/en.yml
+++ b/config/locales/mailers/en.yml
@@ -2,3 +2,18 @@ en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
 
+  #
+  # 邮件模块
+  #
+  # 项目问题跟踪邮件
+  # 
+  mail_issue_greetings: "Dear user , Greetings from Trustie"
+  mail_issue_footer: "Unsubscribe this message?"
+  mail_issue_title_userin: "in"
+  mail_issue_title_active: "has a new activity which relevants to you , please pay more attention to this!"
+  mail_issue_subject: "Title："
+  mail_issue_content: "Content："
+  mail_issue_sent_from: "From："
+  mail_issue_from_project: "project issue"
+  mail_issue_attachments: "Attachments："
+  mail_issue_reply: "Want reply"
\ No newline at end of file
diff --git a/config/locales/my/en.yml b/config/locales/my/en.yml
index 22886de6d..fa21d210e 100644
--- a/config/locales/my/en.yml
+++ b/config/locales/my/en.yml
@@ -1,6 +1,19 @@
 en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr  
+
+  #
+  #  Trustie个人账户模块
+  #
+  #  公共类
+  #      
+  
+  field_occupation: Position
+  label_company_name: Company Name
+  label_location: Location
+  label_identity: Identity
+
+
   #
   #  Trustie个人模块
   #
@@ -22,28 +35,26 @@ en:
   field_is_required: Required
   field_firstname: Name
   firstname_empty: "Name cannot be blank"
-  field_firstname_eg: "(eg：Jack Chen，请填写[Jack])"
+  field_firstname_eg: "(eg：Jack Chen，please input[Jack])"
   field_lastname: Lastname
-  lastname_empty: Lastname cannot be blank
-  enterprise_empty: The enterprise name cannot be blank 
-  field_lastname_eg: "(eg：Jack Chen，请填写[Chen])"  
-
-  label_company_name: Company Name
+  lastname_empty: "Lastname cannot be blank"
+  enterprise_empty: "The enterprise name cannot be blank" 
+  field_lastname_eg: "(eg：Jack Chen，please input[Chen])"  
+  label_firstname_lastname_empty: "Last name and first name cannot be blank"
   
   label_gender: Gender
   label_gender_male: male
   label_gender_female: female
   
-  field_occupation: Position
   field_occupation_click: "Click to select provinces and schools"
   lable_school_list: List of schools
   
   field_language: Language
   
   location:  #地区信息在JS中都是中文信息，需要全部翻译
-    labelname: 地区
+    labelname: Location
     select:
-      click: --请选择省份--
+      click: --Please select the provinces--
         
   field_mail_notification: Email notifications
   description_user_mail_notification: Mail notification settings
@@ -69,7 +80,7 @@ en:
   #
   #  Trustie个人账户模块
   #
-  #  可否删除？
+  #  Redmine
   #  
   label_reported_issues: Reported issues
   label_assigned_to_me_issues: Issues assigned to me
@@ -83,7 +94,7 @@ en:
   #
   #  Trustie个人账户模块
   #
-  #  可否删除？
+  #  Redmine
   # 
   notice_account_deleted: "Your account has been permanently deleted."
   notice_feeds_access_key_reseted: Your RSS access key was reset.
diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 393e45625..1e0b975d6 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -39,7 +39,8 @@ zh:
   lastname_empty: 姓氏不能为空
   enterprise_empty: 企业名不能为空
   field_lastname_eg: '(例：张三丰，请填写[张])'
-  
+  label_firstname_lastname_empty: 姓氏和名字不能为空  
+   
   label_gender: 性别
   label_gender_male: 男
   label_gender_female: 女 
@@ -74,12 +75,11 @@ zh:
   #  修改密码
   #  
   button_change_password: 修改密码
-  
-  
+
   #
   #  Trustie个人账户模块
   #
-  #  可否删除？
+  #  BLOCKS   可否删除？Redmine
   #  
   label_assigned_to_me_issues: 指派给我的问题
   label_reported_issues: 已报告的问题
@@ -93,7 +93,7 @@ zh:
   #
   #  Trustie个人账户模块
   #
-  #  可否删除？
+  #  BLOCKS   可否删除？ Redmine
   #  
   notice_account_deleted: 您的账号已被永久删除（账号已无法恢复）
   notice_feeds_access_key_reseted: 您的RSS存取键已被重置。
diff --git a/config/locales/navigatiors/en.yml b/config/locales/navigatiors/en.yml
index 75719ea17..faf3ca715 100644
--- a/config/locales/navigatiors/en.yml
+++ b/config/locales/navigatiors/en.yml
@@ -1,8 +1,85 @@
 en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
+  #
+  #  Trustie平台导航
+  #
+  #  顶部菜单
+  #
+  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_login: Login
 
   
+  #
+  #  项目托管平台主
+  #
+  #  主旨
+  #
+  label_welcome_trustie_project: Trustie online projects hosting platform
+  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_course: Trustie online courses practice platform
+  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_contest: Trustie online contests practice platform
+  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.
+
+ 
+  #  
+  #  Trustie平台导航 
+  #
+  #  搜索
+  #  
+  welcome:
+    search:
+      information: "Please input the keywords!"  #  搜索提示信息 
+      select:                                    #  下拉列表
+        project: project
+        course: course
+        user: user
+        userinfo:
+          nickname: nickname
+          showname: name
+          email: email
+
+  label_resources_search_all: "Search all files in the website, while will not search the contents of private items."     # 资源搜索提示信息
+
+  #
+  #  Trustie平台导航 
+  #
+  #  下方托管平台链接
+  #        
+  label_projects_management_platform: Projects-platform
+  label_courses_management_platform: Courses-platform
+  label_contests_management_platform: Competitions-platform
   
   
+  #
+  #  Trustie平台导航
+  #
+  #  各模块内导航
+  #    
+  label_courses_community: Universities Curriculum Communities of Practice
+  label_projects_community: Software Project Communities of Hosting
+  label_contest_innovate_community: Innovation Communities of Competition
   label_user_location: Location
\ No newline at end of file
diff --git a/config/locales/navigatiors/zh.yml b/config/locales/navigatiors/zh.yml
index 882648385..781dc51b8 100644
--- a/config/locales/navigatiors/zh.yml
+++ b/config/locales/navigatiors/zh.yml
@@ -46,6 +46,7 @@ zh:
   #
   label_welcome_trustie_contest: Trustie在线竞赛实战平台
   label_welcome_trustie_contest_description: "面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。"
+
  
   #  
   #  Trustie平台导航 
@@ -63,6 +64,10 @@ zh:
           nickname: 昵称
           showname: 姓名
           email: 邮箱  
+
+  label_resources_search_all: "全站文件搜索，不会搜索私有项目中的内容。"     # 资源搜索提示信息
+
+
   #
   #  Trustie平台导航 
   #
@@ -78,4 +83,8 @@ zh:
   #
   #  各模块内导航
   #  
-  label_user_location: 当前位置
\ No newline at end of file
+  label_courses_community: 高校课程实践社区
+  label_projects_community: 软件项目托管社区 
+  label_contest_innovate_community: 创新竞赛社区
+  label_user_location: 当前位置
+  
\ No newline at end of file
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 2f09ef8e6..4ff08a1a9 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -2,5 +2,61 @@ en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
 
+  #
+  #  项目托管平台主页 
+  #
+  #  公共类
+  # 
+  label_apply_project: Apply Project
+  label_project_new: New project
+  label_join_project: Join a project
+
+
+  #
+  #  项目托管平台主页 
+  #
+  #  热门项目栏
+  # 
+  lable_hot_projects: Hot Projects
+  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
+
+
+  #   
+  #  项目托管平台
+  #
+  #  新建项目
+  #      
+  label_project_new_description: "A project can be used to do anything that requires distributed collaboration."
+  field_name: Name
+  field_description: Description
+  field_identifier: Identifier
+  field_enterprise_name: Eterprise
+
+  text_length_between: "Length between %{min} and %{max} characters."
+  text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed."
+
+  field_is_public: Public
+  field_hidden_repo: code protected  
+  button_create: Create
+
+
+  #
+  #  项目托管平台
+  # 
+  #  加入项目
+  #
+  project:
+    join:
+      title: 快速进入项目通道
+      description: "只要持有项目的ID，就可快速申请加入所在项目。项目页面搜索不到的私有项目只能从此通道进入哦！"
+      id: 
+        label: "Project ID:"
+        tips: "Project ID is the number within the project's url"
+
+
+
   label_approve: Approve
   label_refusal: Refusal
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 6d72cacf0..d2e4e1530 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -5,14 +5,27 @@ zh:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr 
 
+  #
+  #  项目托管平台主页 
+  #
+  #  公共类
+  # 
+  label_apply_project: 申请加入
+  label_project_new: 新建项目
+  label_join_project: 加入项目
+
+
+
+
+
+
+
   #
   #  项目托管平台主页 
   #
   #  热门项目栏
   # 
   lable_hot_projects: 热门项目
-  label_project_new: 新建项目
-  label_join_project: 加入项目
   label_private: 私有
   label_project_member_amount: "%{count}人"
   label_project_score_tips: 项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度
@@ -28,8 +41,11 @@ zh:
   field_name: 名称
   field_description: 描述
   field_identifier: 标识
+  field_enterprise_name: 组织名称
+
   text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。"
   text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。<br />一旦保存，标识无法修改。"
+
   field_is_public: 公开  
   field_hidden_repo: 隐藏代码库
   button_create: 提交  
@@ -47,10 +63,32 @@ zh:
       id: 
         label: "项目ID："
         tips: "项目ID是所在项目网址中显示的序号"
-  # 公共
-  label_apply_project: 申请加入
   
 
+  #
+  #  项目托管平台
+  #
+  #  项目得分
+  #     
+  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/users/en.yml b/config/locales/users/en.yml
index aa1cf2a45..fbfe1444e 100644
--- a/config/locales/users/en.yml
+++ b/config/locales/users/en.yml
@@ -6,14 +6,212 @@ en:
   #
   #  公共变量
   #
+  label_technicl_title_professor: Professor
+  label_technicl_title_associate_professor: Associate professor
+  label_technicl_title_lecturer: Lecturer
+  label_technicl_title_teaching_assistant: Teaching assistant  
+
+  #
+  #  Trustie用户主页
+  #
+  #  top-content
+  #  
+  label_user_home: User Space
+
+
+  #
+  #  Trustie用户主页
+  #
+  #  左边栏
+  #  
+  label_user_edit: Edit information
+   
+  label_user_score: Individual synthetic score  
+  label_user_score_of_influence: Influence score
+  label_user_score_of_collaboration: Collaborative score
+  label_user_score_of_skill: Skill score
+  label_user_score_of_active: Project score
+  userscore:
+    collaboration: 
+      memos: The number of Posts
+      message_for_issues: The number of messages to issues
+      issue_status: Times of change the issue state
+      reply_for_messages: The number of replies to messages
+      reply_for_memos: The number of replies to posts
+    influence:
+      followers: Followers
+    skill: 
+      tramples: 踩别人的帖子数量 
+      like:
+        level1: 帖子被一级会员顶的次数
+        level2: 帖子被二级会员顶的次数
+        level3: 帖子被三级会员顶的次数
+      dislike: 
+        level1: 帖子被一级会员踩的次数
+        level2: 帖子被二级会员踩的次数
+        level3: 帖子被三级会员踩的次数          
+    active: 
+      commit:
+        codes: 提交代码次数
+        documents: 提交文档次数
+        attachments: 提交附件次数
+      update_issues: 更新缺陷完成度次数
+      release_issues: 发布缺陷数量                 
+  label_score_less_than_zero: Score less than 0, revised to 0 
   
   
- 
+  label_user_info: User information
+  label_user_watcher: Followers 
+  label_user_fans: Followed by  
+  label_x_user_fans:
+    zero: Fan
+    one: Fan
+    other: Fans
   
+  label_brief_introduction: Personality words
+  label_my_brief_introduction: "How are feeling today? Leave your footprints ~"
+  
+  label_user_joinin: Join date
+  label_user_login: Last login
+
+  label_technical_title: Title
+  
+  label_bidding_user_studentcode: Student ID
+  label_account_developer: Developer
+  label_account_student: Student
+
+
+  #
+  #  Trustie用户主页
+  #
+  #  菜单栏  
+  #  
+  label_activity: Activities
+  label_user_course: Courses
+  label_user_project: Projects
+  label_user_newfeedback: Messages
+
+  
+  #
+  #  Trustie用户主页
+  #   
+  #  动态栏
+  #  
+
+  label_user_activities: "%{name}'s Related Activities"
+  label_user_all_activity: Activities
+  label_user_activity_myself: About me
+  label_user_all_respond: Replies  
+  
+  label_i: I
+  label_i_new_activity: " have a new activity in"
+  label_new_activity: " has a new activity in"
+  
+  label_i_have_feedback: have
+  label_have_feedback: has
+  label_layouts_feedback: "a message " 
+  label_of_feedback: from
+
+  label_goto: Go to>>  
+
+  label_activity_project: "Project："
+  label_active_call: call
+  label_active_homework: homework
+  # 评论、评论数在commons模块下
+
+  label_new_user: registered a new account
+    
+  label_search_by_user: search by user         # hidden 
+  label_user_activities_no: "You have no activities,come and join us!"   # hidden
+  label_user_activities_other: The user has no activities now！        # hidden
+
+  #  所有反馈
+  label_in_bids: "in the call—"
+  label_in_users: "in the user—"
+
+  label_quote_my_words: " quoted my words"
+
+  label_in_projects: "in the project—"
+  label_reply_plural: Replies
+  
+  label_about_issue: "about the issue—"
+
+  label_about_requirement: "about requirement—"
+  label_have_respond: had a respond
+
+  label_in_issues: "in the issue—"
+     
+  label_no_user_respond_you: "There is no respond for you！"
+  # end  
+
+  
+  #
+  #  Trustie用户主页
+  #
+  #  项目栏
+  #  
+  label_project_unadd: "No project, go to creat it!"
+  label_project_un: "You haven't joined any project yet!"
+  
+  
+  label_has_watched_project: "The projects of attention"
+  label_project_take: "The projects of participation" 
+  
+  label_project_take_in: "joined the project—"
+  
+  #
+  #  Trustie用户主页
+  #
+  #  课程栏  
+  #    
   label_project_course_un: "The user is not enrolled in any course yet. " 
   label_project_course_unadd: "You have no course,creat one now!"
   label_project_cousre_studentun: "You have not joined any course, come and join now!"   
   user:
     courses:
       doing: Strating
-      done: Finished    
\ No newline at end of file
+      done: Finished    
+
+
+  #
+  #  Trustie用户主页
+  #
+  #  留言栏  
+  #
+  label_responses: Messages  
+  label_user_response: Feedback  
+  label_leave_a_message: Leave him/her a message    
+  button_leave_meassge: Submit
+  button_clear_meassge: Reset
+
+  label_user_login_new: Login
+  label_user_login_tips: You haven't logged in, please login first to leave a message!
+
+  label_bid_respond_delete: Delete
+  label_bid_respond_quote: Respond
+      
+  label_bids_published: published
+  label_bids_published_ago: ago    
+
+  label_feedback_respond_content: Please input your words
+  button_feedback_respond: Respond            # 回复button
+  
+  label_reply_to: reply to
+  label_newfeedback_delete: Delete          # 层级    删除 
+  label_newfeedback_respond: Respond        # 层级    回复 
+
+
+  #
+  #  Trustie用户主页
+  #
+  #  Followers & Fans  
+  #
+  label_x_contribute_to:
+    zero: "participates %{count} project"
+    one: "participates %{count} project—"
+    other: "participates %{count} projects—"
+
+  label_x_course_contribute_to:
+    zero: "participates %{count} course"
+    one: "participates %{count} course—"
+    other: "participates %{count} courses—"
diff --git a/config/locales/users/zh.yml b/config/locales/users/zh.yml
index 042f6c444..d77704aa4 100644
--- a/config/locales/users/zh.yml
+++ b/config/locales/users/zh.yml
@@ -5,40 +5,9 @@ zh:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
 
-  #
-  #  项目托管平台主页 
-  #
-  #  用户动态栏
-  #
-  lable_user_active: 用户动态
-  user:
-    active:
-      published: 发表了
-      uploaded: 上传了
-      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在数据库中以中文字段形式存储
 
-  
+
+
   
   #
   #  Trustie用户主页
@@ -55,17 +24,41 @@ zh:
   #  
   label_user_edit: "修改资料"
    
-  label_user_score: 个人综合得分
-  label_user_score_of_topic: 帖子得分
-  label_user_score_of_project: 项目得分
-  label_user_score_of_activity: 活跃度得分
-  label_user_score_of_influence: 影响力得分
-  label_user_score_of_collaboration: 协同得分
-  label_user_score_of_skill: 技术得分
-  label_user_score_of_active: 项目贡献得分
-  
-  label_user_info: "个人简介"   #huang 添加
-  label_user_watcher: "关注"  # huang添加的
+  label_user_score: 个人综合得分    
+  label_user_score_of_collaboration: 协同得分   
+  label_user_score_of_influence: 影响力得分    
+  label_user_score_of_skill: 技术得分 
+  label_user_score_of_active: 项目贡献得分   
+  userscore:
+    collaboration: 
+      memos: 发帖数量
+      message_for_issues: 对缺陷留言数量
+      issue_status: 更改缺陷状态次数
+      reply_for_messages: 对留言的回复数量
+      reply_for_memos: 对帖子的回复数量
+    influence:
+      followers: 被关注人数
+    skill: 
+      tramples: 踩别人的帖子数量 
+      like:
+        level1: 帖子被一级会员顶的次数
+        level2: 帖子被二级会员顶的次数
+        level3: 帖子被三级会员顶的次数
+      dislike: 
+        level1: 帖子被一级会员踩的次数
+        level2: 帖子被二级会员踩的次数
+        level3: 帖子被三级会员踩的次数          
+    active: 
+      commit:
+        codes: 提交代码次数
+        documents: 提交文档次数
+        attachments: 提交附件次数
+      update_issues: 更新缺陷完成度次数
+      release_issues: 发布缺陷数量                  
+  label_score_less_than_zero: 得分小于0，修正为0  
+
+  label_user_info: "个人简介"
+  label_user_watcher: "关注"
   label_user_fans: "粉丝"
   label_x_user_fans:
     zero: 粉丝
@@ -75,14 +68,23 @@ zh:
   label_brief_introduction: 个性签名
   label_my_brief_introduction: 今天的心情如何？留下你的脚印吧~
   
-  label_user_joinin: "加入时间"
-  label_user_login: "最后登录" 
+  label_user_joinin: 加入时间
+  label_user_login: 最后登录
+   
   label_technical_title: 职称
+  label_technicl_title_professor: 教授
+  label_technicl_title_associate_professor: 副教授
+  label_technicl_title_lecturer: 讲师
+  label_technicl_title_teaching_assistant: 助教
+  
   label_bidding_user_studentcode: 学号
   label_account_developer: 开发者
   label_account_student: 学生
 
-
+  label_no_current_fans: 该用户暂无粉丝
+  label_no_current_watchers: 该用户暂未关注其他用户
+  
+  
   #
   #  Trustie用户主页
   #
@@ -95,29 +97,69 @@ zh:
   
   
   #
-  #  Trustie个人主页
+  #  Trustie用户主页
   #   
-  #  Trustie个人主页> 
   #  动态栏
-  label_user_activity: "%{name}的动态"
+  #  
+  label_user_activities: "%{name}的相关动态"
   label_user_all_activity: 所有动态
   label_user_activity_myself: 我的动态  
   label_user_all_respond: 所有反馈
- 
+
+  label_i: 我 
   label_i_new_activity: 有了新活动在
-  label_have_feedback: 有了
+  label_new_activity: 有了最新动态     
+ 
+  label_i_have_feedback: 有了 
+  label_have_feedback: 有了 
   label_of_feedback: 的
   label_layouts_feedback: 留言   
-  label_new_activity: 有了最新动态  
+   
+  label_goto: 前往>>  
   
+  label_activity_project: "项目："
+  label_active_call: 需求
+  label_active_homework: 作业  
+  # 评论在commons模块下
+
+  label_new_user: "注册了一个新用户 "
+    
+  label_search_by_user: 按用户搜索          # hidden
+
+  label_user_activities_no: "您没有关注该用户，请尝试重新输入！"    # hidden
+  label_user_activities_other: "该用户暂无任何动态！"           # hidden
+
+  #  所有反馈
+  label_in_bids: "在需求："
+  label_in_users: "在用户："   
+  label_quote_my_words: "中对我的话进行了引用" 
+
+  label_in_projects: "在项目："
+  label_reply_plural: 回复  
+
+  label_about_issue: "对问题："
+  label_about_requirement: "对需求："
+  label_have_respond: 进行了反馈  
+
+  label_in_issues: "在问题："
+   
+  label_no_user_respond_you: "暂无任何用户对您进行反馈！"
+  # end
+
+
+  #
+  #  Trustie用户主页
+  #
   #  项目栏
+  #  
   label_project_unadd: "暂无项目，赶快去创建吧！"
   label_project_un: "该用户暂未参与任何项目！"
  
   label_has_watched_project: 关注的项目
   label_project_take: 参与的项目  
  
-  
+  label_project_take_in: "加入了项目——"
+   
   #
   #  Trustie用户主页
   #
@@ -130,10 +172,52 @@ zh:
     courses: 
       doing: 进行中的课程
       done: 已结束的课程
-      
+  
+  label_x_base_courses_member: 
+    zero: 成员
+    one: 成员
+    other: 成员    
+
+
+  #
+  #  Trustie
+  #
+  #  留言栏  
+  #
+  label_responses: 留言  
+  label_user_response: 用户留言  
+  label_leave_a_message: 给他（她）留言
+  button_leave_meassge: 留言
+  button_clear_meassge: 清除留言  
+
+  label_user_login_new: 登录
+  label_user_login_tips: 您还没有登录，请登录后再留言!
+
+  label_bid_respond_delete: 删除
+  label_bid_respond_quote: 回复
+
+  label_bids_published: 发布于
+  label_bids_published_ago: 之前
+  
+  label_feedback_respond_content: 请输入回复内容
+  button_feedback_respond: 回复                # 回复button
+  
+  label_reply_to: 回复
+  label_newfeedback_delete: 删除           # 层级    删除                     
+  label_newfeedback_respond: 回复         # 层级    回复 
+        
 
   #
   #  Trustie用户主页
   #
-  #  留言栏  
-  #
\ No newline at end of file
+  #  Followers & Fans  
+  #
+  label_x_contribute_to:
+    zero: "参与了 %{count} 个项目"
+    one: "参与了 %{count} 个项目——"
+    other: "参与了 %{count} 个项目——"
+    
+  label_x_course_contribute_to:
+    zero: "参与了 %{count} 个课程"
+    one: "参与了 %{count} 个课程——"
+    other: "参与了 %{count} 个课程——"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f2505cb68..cd90fdbd7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -69,13 +69,9 @@ zh:
   mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
   mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
-  # 教师权限课程关闭和重启
-  label_course_closed: 关闭
-  label_course_reload: 重开
-  label_course_closed_tips: "确定要%{desc}课程？"
+
   # end 
   field_name: 名称
-  field_enterprise_name: 组织名称
   #added by huang
   field_tea_name: 教师
   field_couurse_time: 学时
@@ -260,6 +256,9 @@ zh:
   permission_view_gantt: 查看甘特图
   permission_view_calendar: 查看日历
   permission_view_issue_watchers: 查看跟踪者列表
+  
+  
+  
   permission_add_issue_watchers: 添加跟踪者
   permission_delete_issue_watchers: 删除跟踪者
   permission_log_time: 登记工时
@@ -348,10 +347,13 @@ zh:
   label_module_share: DTS测试工具
   project_module_code_review: 代码审查
 
+
+
+
   label_user_new: 新建用户
   label_user_anonymous: 匿名用户
 
-  label_activity_project: '项目: '  #added by bai
+
 
 
   label_first_page_made: 首页定制
@@ -455,7 +457,7 @@ zh:
   lable_contest_user: 竞赛发布人 
 
 
-  label_course_term: 开课学期
+
   label_theme: 主题
   label_logged_as_new: 当前用户
   button_register: 注册
@@ -471,8 +473,7 @@ zh:
   label_activities_settings: 显示设置
   
   
-  label_user_login_new: 登录
-  label_user_login_tips: 您还没有登录，请登录后留言
+
   label_user_login_course_board: 您还没有登录，请登录后参与课程讨论
   label_user_login_project_board: 您还没有登录，请登录后参与项目讨论
   label_user_login_attending_contest: 您还没有登录，请登录后参赛
@@ -492,7 +493,7 @@ zh:
   label_autumn: 秋季学期
   label_winter: 冬季学期
   label_followers: 关注
-  label_teacher: 教师
+
   label_teacher_list: 教师列表
   label_student_list: 学生列表
   label_limit_time: 截止日期
@@ -519,9 +520,8 @@ zh:
   label_registered_on: 注册于
 
   label_overall_activity: 活动概览
-  label_user_activity: "%{value} 的活动"
   label_new: 新建
-  label_new_user: 注册了一个新用户  # added by bai
+
   label_logged_as: 登录为
   label_environment: 环境
   label_authentication: 认证
@@ -552,7 +552,7 @@ zh:
   label_file_added: 文件已添加
   label_report: 报表
   label_report_plural: 报表
-  label_news: 新闻
+
   label_news_new: 添加新闻
   label_edit_contest_notice: 编辑竞赛通知
   bale_news_notice: 添加通知 #huang
@@ -568,7 +568,7 @@ zh:
   label_question_student: 作业交流 #bai
   label_homework_commit: 提交作业 #huang
   label_homework_info: 提交情况  #huang
-  label_course_news: 课程通知
+
   label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；<br/>如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！'
   label_course_board: 讨论区
   label_version: 版本
@@ -708,7 +708,7 @@ zh:
   label_time_tracking: 时间跟踪
   label_change_plural: 变更
   label_statistics: 统计
-  label_contest: 竞赛
+
   label_commits_per_month: 每月提交次数
   label_commits_per_author: 每用户提交次数
   label_view_diff: 查看差别
@@ -750,7 +750,7 @@ zh:
   label_message_last: 最新的帖子
   label_message_new: 发布新帖
   label_message_posted: 发帖成功
-  label_reply_plural: 回复
+
   label_send_information: 给用户发送帐号信息
   label_year: 年
   label_month: 月
@@ -796,8 +796,8 @@ zh:
 
   label_user_mail: "邮件地址"
 
-  label_user_activities: 您没有关注该用户，请尝试重新输入！
-  label_user_activities_other: 该用户暂无任何动态！
+
+
   label_project_overview: "概述"
   label_project_tool: "项目工具集"
   label_project_issues: "问题"
@@ -868,7 +868,7 @@ zh:
 
   button_check_all: 全选
   button_uncheck_all: 清除
-  button_delete: 删除
+
   button_create_and_continue: 创建并继续
   button_test: 测试
   button_edit: 编辑
@@ -1185,10 +1185,10 @@ zh:
   field_closed_on: 已关闭
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: 合计
-  label_create_time: 创建时间                     #Customer added！Added by nie
+                  #Customer added！Added by nie
   label_comment_time: 留言时间
   label_activity_time: 发布时间
-  label_update_time: 更新时间
+
   label_current_contributors: 位当前贡献者
   label_commit_limit: 已截止，但可补交
   label_commit_ar: 作业提交截止时间快到了！
@@ -1221,10 +1221,7 @@ zh:
   label_member_since: 加入
   label_contribute_to: 参与了 %{project_count} 个项目：
   #modify by men
-  label_x_contribute_to:
-    zero: 参与了 %{count} 个项目：
-    one: 参与了 %{count} 个项目：
-    other: 参与了 %{count} 个项目：
+
   #end
   label_total_commit: 共%{total_commit}次提交
   label_question_number: 第%{question_number}题：
@@ -1235,22 +1232,30 @@ zh:
     one: 共 %{count} 次提交
     other: 共 %{count} 次提交
   #end
+
+
   label_upload_profile: 上传头像
   label_type_as: 类型为
   label_status_as: 状态为
   label_priority_as: 优先级为
   label_member_list: 成员列表
   label_author_name: 由%{author_name}发表了
-  label_comments_count: (%{count}条评论)
+
   label_post_on: 发表了
-  label_find_all_comments: 查看所有评论
+  
+
+  
   label_updated_time_on: " 更新于 %{value} "
   label_call_list: 需求列表
+
+
+
+
   #added by liuping
   button_unfollow: 取消关注
   button_follow: 关注
   label_followers: 关注
-  label_responses: 留言
+
   label_delete_confirm: 确认删除？
 
 
@@ -1259,14 +1264,12 @@ zh:
   label_unapply_project: 取消申请
  
   #fq
-  button_leave_meassge: 留言
-  button_clear_meassge: 清除留言
+
   label_leave_message_to: 给用户 %{name}留言
   label_leave_message: 留言内容
   label_message: 留言板
   field_add: 添加于 %{time} 之前
-  button_more: 更多
-  label_user_response: 用户留言
+
   label_student_response: 作业答疑 # modified by bai
   label_bidding_project: 参与项目 
   label_homework_project: 已提交作业  #huang
@@ -1334,7 +1337,7 @@ zh:
   label_investment_budget: 投资预算：
   label_investment_time_limit: 投资时限：
   label_my_respond: 如有问题请在这里留下您的宝贵意见^-^
-  label_my_question: 请在此处留下您的意见或者问题~  # modified by bai
+#  label_my_question: 请在此处留下您的意见或者问题~  # modified by bai
   label_respond_requirement: 对需求进行了反馈
   label_contest_requirement: 对竞赛进行了反馈
   label_question_requirement: 对作业提出了问题！
@@ -1348,7 +1351,7 @@ zh:
 
   label_leave_me_message: 给我留言了
   label_leave_others_message: 给他留言了
-  label_leave_a_message: 给他（她）留言
+
   label_leave_your_message: 给你留言了
 
   label_create_project: 参与了
@@ -1359,7 +1362,7 @@ zh:
   label_create_new_projects: 创建项目
   label_call_for_bids: 发布需求
   label_create_course: 创建课程
-  label_news: 新闻
+
   label_milestone: 里程碑
   label_features: 特性
   label_has_praisers: 赞(%{count})
@@ -1375,9 +1378,9 @@ zh:
     one: 粉丝(%{count})
     other: 粉丝(%{count})
   #end
-  label_me: 我
-  label_my: 我
-  label_i: 我
+  label_me: 我        # delete
+  label_my: 我       # delete
+
   label_you: 你
   label_join_bidding: 参与了应标
   label_jion_bidding_homework: 已提交！
@@ -1389,19 +1392,15 @@ zh:
   label_bidding_reason_homewrok: 作业提交说明
   label_username: 用户名：
   label_password: 密码：
-  label_about_requirement: 对需求：
-  label_about_issue: 对问题：
-  label_quote_my_words: 中对我的话进行了引用
-  label_have_respond: 进行了反馈
-  label_in_issues: 在问题：
-  label_in_bids: 在需求：
-  label_in_users: 在用户：
-  label_have_respond: 进行了反馈
+
+  label_user_activity: "%{value}的动态"
+
+
   label_create_new_projects_description: 创建项目，让我们开启一次神奇的协同创作和开发之旅！
   label_call_for_bids_description: 发布需求，征集解决方案，体验一呼百应的兴奋感觉！
   label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！
   label_milestone_description: 在这里您可以看见任何一个版本的工程！
-  label_have_respond: 进行了反馈
+
   label_welcome: 欢迎
   label_join: 加入Trustie！
   label_repository_path: 库路径
@@ -1414,7 +1413,7 @@ zh:
   label_project_no_activity: 该项目暂无动态！
   label_course_homework_un: 暂未发布任何作业
   label_follow_no_requirement: 暂未关注任何需求！
-  label_no_user_respond_you: 暂无任何用户对您进行反馈！
+
   
   
 
@@ -1436,16 +1435,14 @@ zh:
   label_issue_not_treed_over: 不能踩自己~
   label_issues_score_not_enough: 积分不够，不能踩别人~
  #end
-  label_goto: 前往>>
+
   label_issue_appraise_over: 只能评价一次哦！
   label_welcome_my_respond: 请在此留下你的意见和建议！
-  label_no_current_fans: 该用户暂无粉丝
-  label_no_current_watchers: 该用户暂未关注其他用户
+
   label_project_tool_response: 用户反馈
   label_course_feedback: 留言
   
-  label_active_call: 需求
-  label_active_homework: 作业
+
 
 
   label_boy: 男
@@ -1492,11 +1489,8 @@ zh:
   label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等
   label_bids_new_content: 输入奖励内容，如 奖项，物品等
   label_project_sort: 排序方式
-  label_sort_by_time: 按时间排序
-  label_sort_by_active: 按活跃度排序
-  label_sort_by_influence: 按影响力排序
-  label_bids_published: 发布于
-  label_bids_published_ago: 之前
+
+
   
   
   
@@ -1504,12 +1498,11 @@ zh:
 
   
   
-  label_bid_respond_quote: 回复
+
   label_bid_if_agreement: 如果喜欢我，请点击我
-  label_bid_respond_delete: 删除
-  label_newfeedback_message: 留言
-  label_newfeedback_quote: 回复
-  label_newfeedback_delete: 删除
+
+
+
   
   
   
@@ -1531,10 +1524,10 @@ zh:
   #end
   label_welcome_participate_project: 个项目
   label_projects_feedback: 对项目进行了反馈
-  label_projects_feedback_respond: 回复
+
   label_projects_feedback_respond_success: 回复成功
-  button_projects_feedback_respond: 回复
-  label_projects_feedback_respond_content: 请输入回复内容
+
+
   label_user_create_project: 创建了
   label_user_create_project_homework: 创建了作业
 #added by bai
@@ -1549,7 +1542,7 @@ zh:
   label_developer: 用户
   
   label_time: 年度
-  label_main_teacher: 主讲教师
+
   label_main_term: 课程学期
   label_teacher_work_unit: 教师单位
   label_course_time: 课程年度
@@ -1570,33 +1563,29 @@ zh:
   label_question_down: 问题被踩次数
   label_answer_top: 回答被顶次数
   label_answer_down: 回答被踩次数
-  label_comments_number: 评论的数量
+
   label_news_number: 新闻的数量
   label_wiki_number: wiki的数量
-  label_message_number: 留言的数量
-  label_activity_number: 个人动态数量
+  
+  
+  
+  # redmine活跃度评分
+  label_message_number: 留言的数量              # delete
+  label_activity_number: 个人动态数量        # delete
+  # redmine影响力评分
+  label_comments_number: 评论的数量          # delete
+  label_news_number: 新闻的数量                # delete
+  label_wiki_number: wiki的数量               # delete
+
+
+  
   label_issue_message_number: 对issue的留言数量
   label_code_submit_number: 代码提交次数
   label_topic_number: 讨论区发言数量
-  label_projects_score: 项目综合得分
-  label_issue_score: issue得分
-  label_news_score: 新闻得分
-  label_file_score: 文档得分
-  label_code_submit_score: 代码提交得分
-  label_topic_score: 讨论区得分
-  label_issue_number: issue的数量
-  label_issue_journal_number: issue的留言数量
-  label_new_number: 新闻的数量
-  label_file_number: 文档的数量
-  label_code_submit_number: 代码提交数量
-  label_topic_number: 讨论区帖子数量
+
   label_files_filter: 资源过滤：
   
-  label_course_contribute_to: 参与了 %{project_count} 个项目：
-  label_x_course_contribute_to:
-    zero: "参与了 %{count} 个课程："
-    one: "参与了 %{count} 个课程："
-    other: "参与了 %{count} 个课程："
+
     
   label_join_contest: 加入竞赛
   label_exit_contest: 退出竞赛
@@ -1609,8 +1598,8 @@ zh:
   label_joined_course: 参加的课程
   label_created_course: 创建的课程
   label_course: 课程
-  label_course_new: 新建课程
-  label_course_join_student: 加入课程
+
+
   label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。）
   label_course_public_info: （打钩为公开，不打钩则不公开，若不公开，仅课程成员可见该课程。）
   label_course_open_student_info: （打钩为“学生列表公开”，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）
@@ -1673,12 +1662,8 @@ zh:
 
   
   #add by men
-  label_technicl_title_professor: 教授
-  label_technicl_title_associate_professor: 副教授
-  label_technicl_title_lecturer: 讲师
-  label_technicl_title_teaching_assistant: 助教
 
-  label_account_identity_choose: --请选择身份--
+
     
     
   label_teaching_course: 我执教的课程
@@ -1694,14 +1679,10 @@ zh:
   label_bid_contest_show_teacher_name: 教师
   label_contest_list: 竞赛列表
   
-  label_x_base_courses_member: 
-    zero: 成员
-    one: 成员
-    other: 成员
+
     
   label_bids_task_list: 作业列表
-  label_join_course: 加入
-  label_exit_course: 退出
+
   label_exit_group: 退出当前分班
   label_new_join: 加入
   label_new_join_group: 加入当前分班
@@ -1730,7 +1711,7 @@ zh:
   label_user_grade: 个人得分
   label_user_for_project_grade: 个人得分
   label_system_grade: 系统评分
-  label_teacher: 老师
+
   label_ta: 助教
   label_in_course: 在课程中
   label_assign_homework: 中布置了作业
@@ -1744,7 +1725,7 @@ zh:
   label_watch_no_projects: 没有关注任何项目
   
   label_peoject_take_in: 加入了项目：
-  label_search_by_user: 按用户搜索
+
   label_update_homework_succeed: 作业更新成功
   label_task_plural: 作业
   label_search_by_student_id: 按学号过滤
@@ -1863,8 +1844,8 @@ zh:
   label_contest_notification: 竞赛通知
   
   label_coursefile_sharingarea: 课程资源共享区
-  label_sort_by_activity: 按动态数排序
-  label_homework: 课程作业
+
+
   label_x_activity:
     zero: 个动态
     one: 个动态
@@ -1909,7 +1890,6 @@ zh:
   label_wellmeaning_intimation_contenttwo: 若您已完成开发，且只希望发布您的作品，“托管项目”一项可以不选；
   label_wellmeaning_intimation_contentthree: 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹，请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目，若您还没有创建项目，请点击右边的“创建项目”，然后回到本页再选择。
 
-  notice_account_updated: 帐号更新成功
   notice_attendingcontest_work_successfully_created: 恭喜您，参赛作品创建成功！
   notice_softapplication_was_successfully_updated: 恭喜您，参赛作品更新成功！
   notice_attendingcontest_work_failed_created: 参赛产品创建失败
@@ -1926,29 +1906,16 @@ zh:
   label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！
   lable_not_receive_mail: 点此设置接收本站邮件偏好！
   label_contest_notification: 竞赛通知
-  label_contest_innovate_community: 创新竞赛社区
+
   #english site translation
   label_current_hot_contest: 最新热门竞赛
   label_current_attendingcontest_work: 最新参赛作品
   label_issue_feedback_activities: 问题和反馈动态
   label_more_information: 更多>>
   label_release_time: 发布时间
-  label_reply: 回复
+
   label_weixin: 微信扫码
   
-    
-  #
-  #  项目托管平台主页 
-  #
-  #  贴吧动态栏
-  # 
-  lable_bar_active: 贴吧动态
-  label_my_question: 我要提问
-  label_my_feedback: 我要反馈
-
-  label_updated_time: " 更新于 %{value} 之前"
-  label_question_sponsor: 楼主
-  label_final_reply: 最后回复
   
 
   
@@ -1979,8 +1946,6 @@ zh:
   modal_valid_passing: 可以使用
   label_bug: 漏洞
 
-  label_school_no_course: 该学校本学期未开设任何课程，您可以查看其他学校课程
-  label_school_less_course: 您也可以查看其他学校课程
 
   label_file_not_found: 对不起，该文件现在不能下载
   label_goto_homepage: 返回主页
@@ -1989,7 +1954,7 @@ zh:
   label_memos_max_length: 帖子内容最大长度为5000个字
   label_forums_max_length: 贴吧描述最大长度为5000个字
   label_unknow_type: 未知类型
-  label_score_less_than_zero: 得分小于0，修正为0
+
   review_assignments: 评审任务
   label_my_school: 我的学校
   label_all_schol: 全部学校
@@ -2000,7 +1965,7 @@ zh:
   lable_hot_course: 活跃课程
   lable_student_list_visable: 学生列表是否公开
   lable_sure_exit_project: 是否确认退出该项目
-  lable_input_class: 在此输入课时
+
   lable_input_class_vilidate: 学时只能为整数
 
 
@@ -2028,7 +1993,7 @@ zh:
   label_sure_exit_homework: 是否确认退出该作业
   label_teacher_comments: 教师评论
   label_anonymous_comments: 匿评
-  label_anonymous: 匿名
+
   label_submit_comments: 提交评论
   field_evaluation_num: 匿评分配数量
   label_my_score: 我的评分
@@ -2061,33 +2026,13 @@ zh:
   label_poll_republish_success: 取消成功
   label_answer_total: 总计：
   label_join_project: 加入项目
+  
   label_technical_support: 技术支持：
   label_feedback: 意见反馈
-  label_log_detail: "日志详情"
-  label_log_delete_log: "删除日志"
-  label_log_access_analysis: "访问统计"
-  label_log_time_analysis: "耗时分析"
-  label_log_refresh: "刷新"
-  label_log_key:  "关键字："
-  label_log_time: "时间："
-  label_log_delete_confirm: "确认清除该天日志内容?"
-  label_log_access_count: "访问次数"
-  label_log_url: "URL路径"
-  label_log_ip: "访问IP"
-  label_log_access_time: "访问时间"
-  label_log_access_controller_action: "模块路径"
-  label_log_response_time: "响应时间"
-  label_log_views_time: "页面渲染时间"
-  label_log_views_time_percent: "页面渲染时间百分比"
-  label_log_active_record_time: "AR响应时间"
-  label_log_active_record_time_percent: "AR响应时间百分比"
-  views:
-      pagination:
-        first: "&laquo; 首页"
-        last: "末页 &raquo;"
-        previous: "&laquo; 上一页"
-        next: "下一页 &raquo;"
-        truncate: "..."
+  label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
+  
+  
+