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

config/locales/en.yml

@@ -345,7 +345,7 @@ en:
   field_identity_url: OpenID URL
   field_content: Content
   field_group_by: Group results by
-  field_sharing: Sharing
+  field_sharing: Sharinglable_hot_course
   field_parent_issue: Parent task
   field_member_of_group: "Assignee's group"
   field_assigned_to_role: "Assignee's role"
@@ -537,6 +537,70 @@ en:
   project_module_calendar: Calendar
   project_module_gantt: Gantt
   
+  #edit by meng
+  lable_hot_course: Hot projects
+  lable_hot_projects: Active courses
+  lable_user_active: User movements
+  lable_bar_active: Bar posts
+  label_project_score: Score
+  label_course_join_student: Join a course
+  label_join_project: Join a project
+  label_contest_modify_settings: Configuration
+  bale_news_notice: Add a notification
+  label_field_correct: correct input
+  label_work_description_lengthlimit: less than 500 characters
+  label_create_new_projects: Create a project
+  label_work_scores_people: The total number of users given scores
+  label_project_new_description: A project can be used to do anything that requires distributed collaboration
+  label_project_grade: Score
+  label_user_for_project_grade: Score
+  label_relation_files: Select an existing resource
+  
+  label_my_brief_introduction: How are feeling today? Leave your footprints ~
+  label_submit: Submit  
+  
+  label_tags_course_name: Course Title
+  label_new_course_password: Password
+  label_new_course_description: Description
+  field_open_student: Student list is public?
+  label_course_board: Forum
+  label_course_open_student_info: (Tick as "open list of students," if not open, the external person couldn't see the list of students)
+  label_teacher_list: Teacher list
+  label_student_list: Student list
+  label_export_excel: Export list
+  
+  label_course_organizers: Institute
+  label_poll: Questionnaire
+  
+  field_open_anonymous_evaluation: Use anonymous mutual-evaluation
+  field_evaluation_num: Number of anonymous works sent to each student
+  
+  label_edit_homework: Update homework
+  label_homework_list: Work list
+  
+  label_teacher_score: Teacher's score
+  label_time: Commit time
+  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
+  
+  label_current_group: Current group
+  
+  project_module_dts: DTS Test tool
+  label_module_share: DTS Test tool
+  field_dts_test: DTS Test tool
+  
+  label_technical_support: Support ：
+  label_feedback: Feedback
+  #end
+
   label_user: User
   label_user_plural: Users
   label_user_new: New user
@@ -618,7 +682,7 @@ en:
   label_home: Home
   label_my_page: My page
   label_my_account: My account
-  label_my_message: My messages
+  label_my_message: Msgs
   label_my_projects: My projects
   label_my_page_block: My page block
   label_administration: Administration
@@ -1249,6 +1313,7 @@ en:
 
   #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
@@ -1350,9 +1415,9 @@ en:
   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 new activity in' # modified by bai
+  label_new_activities: ' has a new activity in' # modified by bai
-  label_new_activity: ' has new activity in'
+  label_new_activity: ' has a new activity in'
-  label_i_new_activity: ' have 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
@@ -1631,7 +1696,7 @@ en:
   label_bids_form_contest_new_description: Enterprise or college can release a contest here.
   label_contest_name: Input the name of the contest
   label_contest_description: Content：description your contest
-  label_main_teacher: Main teacher
+  label_main_teacher: Lecturer
   label_main_term: Term
   label_teacher_work_unit: Position
   label_course_overview: Status
@@ -1698,7 +1763,7 @@ en:
   label_reply_empty: Reply Cann't Empty.
   label_setup_time: Start date
   label_endup_time: Over date
-  label_class_period: Class hour
+  label_class_period: Lessons
   label_class_hour: period
   label_activity_time: publish date