From ca09583fa522cae68c80ac97a56b904409da74f5 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Tue, 3 Sep 2013 09:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=92=8C=E7=B2=89=E4=B8=9D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 2 +-
 config/locales/en.yml                    | 4 ++--
 config/locales/zh.yml                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b95ad4e94..404a20fa1 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -62,7 +62,7 @@
 											
 										<tr class="font_aram">
 											<td align="center" width="70px"> <%= l(:label_member) %></td> 
-											<td align="center" width="100px"><%= l(:label_user_watcher) %></td>
+											<td align="center" width="100px"><%= l(:label_user_watchered) %></td>
 											<td align="center" width="70px"> <%= l(:label_project_issues) %></td>
 											<!-- <td align="center" width="58px"><%= l(:label_attachment) %></td> -->
 											
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 74df372f5..680eedbf4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1116,10 +1116,10 @@ en:
   label_file_new: Download
   label_user_edit: "Edit information"
   label_user_info: "User information"   #huang 添加
-  label_user_watcher: "Followed by"  # huang添加的  # modified by bai
+  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_watchered: "Followed by"   # huang添加的
   label_user_newfeedback: "Messages" ## huang添加的  # modified by bai
   label_user_login: "Last login:"
   label_user_mail: "E-mail:"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b661e8710..9ed8b5107 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -769,7 +769,7 @@ zh:
   label_user_watcher: "关注"  # huang添加的
   label_user_fans: "粉丝"
   label_user_commits: "代码提交"
-  label_user_watchered: "被关注"   # huang添加的
+  label_user_watchered: "关注"   # huang添加的
   label_user_newfeedback: "留言" ## huang添加的
   label_user_login: "最后登录:"
   label_user_mail: "邮件地址:"