From 8be0703b6e1fc655c1efdf36e0cdb1c551bfa230 Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Fri, 30 Aug 2013 20:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 35 +++++++++++++++++++----------------
 config/locales/zh.yml |  1 +
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6dea8ac0..18546ed4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -223,6 +223,7 @@ en:
   field_firstname: First name
   field_lastname: Last name
   field_mail: Email
+  field_job_category: Job category   # added by bai
   field_filename: File
   field_filesize: Size
   field_downloads: Downloads
@@ -1091,7 +1092,7 @@ en:
  #modify by mkz
   #by young
   label_requirement: Calls
-  label_requirement_focus: Call focus
+  label_requirement_focus: Calls # modified by bai
   label_developer: Users
   label_investor: Investor：
   label_theme: Theme
@@ -1113,11 +1114,11 @@ en:
   label_file_new: Download
   label_user_edit: "Edit information"
   label_user_info: "User information"   #huang 添加
-  label_user_watcher: "Followers"  # huang添加的
-  label_user_fans: "Fans"
+  label_user_watcher: "Following"  # huang添加的  # modified by bai
+  label_user_fans: "Followed by"   # modified by bai
   label_user_commits: "Code commits"
   label_user_watchered: "Followed"   # huang添加的
-  label_user_newfeedback: "Leave a message" ## huang添加的
+  label_user_newfeedback: "Messages" ## huang添加的  # modified by bai
   label_user_login: "Last login:"
   label_user_mail: "E-mail:"
   label_user_joinin: "Join date:"
@@ -1138,7 +1139,7 @@ en:
   button_follow: Follow
   label_delete_confirm: Confirm delete？
   label_more_tags: More
-  label_tags_bid: call name
+  label_tags_bid: Call name
   label_tags_bid_description: call description
   label_tags_issue_description: issue description
   label_tags_all_objects: all objects
@@ -1150,7 +1151,7 @@ en:
   label_message: message board
   field_add: Add before %{time} 
   button_more: More
-  label_user_response: User responses
+  label_user_response: Feedbacks  # modified by bai
   label_bidding_project: projects
   button_bidding: I will participate in it
   label_new_call: New call
@@ -1164,10 +1165,10 @@ en:
   label_users_on_trustie: User
   label_front: first page
   label_commit_on: commit times
-  label_follow_people: followers
+  label_follow_people: following # modified by bai
   label_member_since: join
-  label_contribute_to: Participate %{project_count} projects：
-  label_total_commit: Together %{total_commit} numbers of committing
+  label_contribute_to: Participates %{project_count} projects：
+  label_total_commit: Totally %{total_commit} commits  # modified by bai
   label_upload_profile: Upload avatar
   label_type_as: Type as
   label_status_as: Status as
@@ -1183,12 +1184,12 @@ en:
   label_requirement_list: Requirement list
   label_biding_project: projects
   label_responses: comments
-  label_followers: followers
+  label_followers: following # modified by bai
   label_price: price：
   label_RMB_sign: ￥
   label_investment_budget: Investment budget：
   label_investment_time_limit: Investment time limit：
-  label_my_respond: My respond：
+  label_my_respond: Feedbacks：# modified by bai
   label_respond_requirement: has commented this call
   label_deadline: deadline yyyy-mm-dd
   label_requirement_name: give your requirement a name ~~
@@ -1216,8 +1217,8 @@ en:
   label_milestone_description: Review the commits, branches and versions of your project！
   label_features: Features
   label_has_praisers: praisers(%{count})
-  label_has_watchers: watchers(%{count})
-  label_has_fans: fans(%{count})
+  label_has_watchers: following(%{count}) # modified by bai
+  label_has_fans: followed by(%{count})  # modified by bai
   label_me: me
   label_my: my
   label_i: I
@@ -1311,9 +1312,11 @@ en:
   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
-  label_sort_by_time: sorting by time
-  label_sort_by_active: sorting by active
-  label_sort_by_influence: sorting by influence
+  #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 forge
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index e2991260..c9bf309b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -222,6 +222,7 @@ zh:
   field_firstname: 名字
   field_lastname: 姓氏
   field_mail: 邮件地址
+  field_job_category: 职业   # added by bai
   field_filename: 文件
   field_filesize: 大小
   field_downloads: 下载次数