From 79b5544bc0c81f568b952e6816f12890fee98fbf Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Thu, 8 Aug 2013 22:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=80=E4=BA=9B=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |  1 +
 config/locales/en.yml                         | 91 ++++++++++++++++++-
 ...20130806072429_add_project_id_to_shares.rb |  5 +
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20130806072429_add_project_id_to_shares.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d415566a6..6568149d3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -24,6 +24,7 @@ class UsersController < ApplicationController
   #william
   before_filter :require_login,:only=>[:tag_save]
 
+
   helper :sort
   include SortHelper
   helper :custom_fields
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 135d078d3..bdbb3783c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -547,7 +547,7 @@ en:
   label_assigned_to_me_issues: Issues assigned to me
   label_last_login: Last connection
   label_registered_on: Registered on
-  label_activity: Activity
+  label_activity: Activities
   label_overall_activity: Overall activity
   label_user_activity: "%{value}'s activity"
   label_new: New
@@ -588,7 +588,7 @@ en:
   label_news_added: News added
   label_news_comment_added: Comment added to a news
   label_settings: Settings
-  label_overview: Overview
+  label_overview: Activities
   label_version: Version
   label_version_new: New version
   label_version_plural: Versions
@@ -1082,3 +1082,90 @@ en:
   description_date_from: Enter start date
   description_date_to: Enter end date
   text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
+
+ #modify by mkz
+  #by young
+  label_requirement: Requirement
+  label_requirement_focus: Requirement focus
+  label_developer: Developer
+  label_investor: Investor
+  label_theme: Theme
+  label_logged_as_new: Current user
+  button_register: Register
+  issue_list: Issue list
+  lastest_respond: Lastest respond
+  label_news_lastest: Lastest news
+  label_versions_settings: Display settings
+  label_versions_progress: Complete schedule
+  label_versions_description: Versions description
+  label_my_photo: My photo
+  label_documents_sort: Order setting：
+  label_activities_settings: Display settings
+  #end
+
+
+  #huang
+  label_file_new: Download
+  label_user_edit: "Edit information"
+  label_user_info: "User information"   #huang 添加
+  label_user_watcher: "Follower"  # huang添加的
+  label_user_fans: "Fans"
+  label_user_commits: "Code commits"
+  label_user_watchered: "Followed"   # huang添加的
+  label_user_newfeedback: "Leave a message" ## huang添加的
+  label_user_login: "Lastest login:"
+  label_user_mail: "Mail address:"
+  label_user_joinin: "Join date:"
+  label_user_activities: "You have no activities,come and join us!"
+  label_project_overview: "Overview"
+  label_project_tool: "Tool"
+  label_project_defect: "Defect"
+  label_project_newother: "See other comments"
+  label_project_newshare: "share"
+  label_project_newadd: "added"
+  label_project_unadd: "No project,go to creat it!"
+  label_project_un: "You haven't joined any project!"
+  #end by huang
+  
+  #added by liuping
+  button_unfollow: Unfollow
+  button_follow: Follow
+  label_delete_confirm: Confirm delete？
+  label_more_tags: More
+  
+  #fq
+  button_leave_meassge: Leave message
+  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: User response
+  label_bidding_project: Bidding project
+  button_bidding: I want to be the bid
+  button_new_bid: New bid
+  label_user_information: "My information"
+  
+  #Customer added！Added by nie 
+  label_create_time: Creat time                     
+  label_current_contributors: current contributors
+  label_lines_of_code: lines of code
+  label_since_last_commits: since last commit 
+  label_users_on_trustie: User
+  label_front: first page
+  label_commit_on: commit times
+  label_follow_people: followers
+  label_member_since: join trustie2
+  label_contribute_to: Participate in %{project_count} numbers of projects：
+  label_total_commit: Together %{total_commit} numbers of committing
+  label_upload_profile: Upload avatar
+  label_type_as: Type as
+  label_status_as: Status as
+  label_priority_as: Priority as
+  label_member_list: Member list
+  label_author_name: Posted by %{author_name}
+  label_comments_count: (%{count} numbers of comments)
+  label_post_on: Post on
+  label_find_all_comments: view all comments
+  label_updated_time_on: " Updated on %{value} "
+  label_bid_plural: Requirement
\ No newline at end of file
diff --git a/db/migrate/20130806072429_add_project_id_to_shares.rb b/db/migrate/20130806072429_add_project_id_to_shares.rb
new file mode 100644
index 000000000..65e0852d8
--- /dev/null
+++ b/db/migrate/20130806072429_add_project_id_to_shares.rb
@@ -0,0 +1,5 @@
+class AddProjectIdToShares < ActiveRecord::Migration
+  def change
+    add_column :shares, :project_id, :integer
+  end
+end