From 614f3d3f9f26beef6647098595107d15fc462ec3 Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Sat, 10 Aug 2013 22:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8D=E5=BE=AE=E4=BF=AE=E6=94=B9=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb    |  2 +-
 app/views/welcome/index.html.erb |  2 +-
 config/locales/en.yml            | 10 ++++++++--
 config/locales/zh.yml            |  5 ++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 1f278b578..9d2780716 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -9,7 +9,7 @@
 			<table width="580" border="0">
 				<tr>
 					<% if e.event_author == User.current%>
-					<td colspan="2" valign="top"><strong> <%= link_to("我", user_path(e.event_author)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
+					<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.event_author)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
 
 					<% else %>
 					<td colspan="2" valign="top"><strong> <%= link_to(h(e.event_author), user_path(e.event_author)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 5b1a59ed1..5901725b9 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -238,7 +238,7 @@
 <div style="padding-top: 30px">
 <table width="700" border="0" align="center" >
   <tr class="font_welcome" align="center" >
-    <td><img src="/images/welcome/discuss.png" width="30" height="26" /><span style="vertical-align: top"><%= l(:label_board) %></span></td>
+    <td><img src="/images/welcome/discuss.png" width="30" height="26" /><span style="vertical-align: top"><%= l(:project_module_boards) %></span></td>
     <td width="50">&nbsp;</td>
     <td><img src="/images/welcome/news.png" width="30" height="26" /><span style="vertical-align: top"><%= l(:label_news) %></span></td>
     <td width="50">&nbsp;</td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 48d912285..753d679a8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1108,7 +1108,7 @@ en:
   label_file_new: Download
   label_user_edit: "Edit information"
   label_user_info: "User information"   #huang 添加
-  label_user_watcher: "Follower"  # huang添加的
+  label_user_watcher: "Followers"  # huang添加的
   label_user_fans: "Fans"
   label_user_commits: "Code commits"
   label_user_watchered: "Followed"   # huang添加的
@@ -1201,4 +1201,10 @@ en:
   label_create_course: Create courses
   label_news: News
   label_milestone: Milestone
-  label_features: Features
\ No newline at end of file
+  label_features: Features
+  label_has_praisers: praisers(%{count})
+  label_has_watchers: watchers(%{count})
+  label_has_fans: fans(%{count})
+  label_me: me
+  label_my: my
+  label_i: I
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bca508b3e..31c7599a9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1213,4 +1213,7 @@ zh:
   label_features: 特性
   label_has_praisers: 赞(%{count})
   label_has_watchers: 关注(%{count})
-  label_has_fans: 粉丝(%{count})
\ No newline at end of file
+  label_has_fans: 粉丝(%{count})
+  label_me: 我
+  label_my: 我
+  label_i: 我
\ No newline at end of file