From 386c7c606754054269db32e097737dd0835cc255 Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Fri, 16 Aug 2013 20:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8D=E8=AF=A5=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/views/welcome/index.html.erb | 3 +--
 config/locales/en.yml            | 2 +-
 config/locales/zh.yml            | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 799338dfb..a8a42a261 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -144,8 +144,7 @@ software development and software crowdsourcing.</td></tr>
 				<td><span class="font_welcome_trustie">Trustie</span><span class="font_welcome_Cdescription">，面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、软件开发和众包平台。</span></td>
 			</tr>
 			<tr>
-				<td class="font_welcome_Edescription">Trustie forge , a socialized collaboration platform for project management ,
-				 software development and software crowdsourcing for creative university students and entrepreneurs.</td>
+				<td class="font_welcome_Edescription">Trustie forge,a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.</td>
 			</tr>
 		</table>
 	</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 11a5cb0a5..838e74d92 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1160,7 +1160,7 @@ en:
   label_front: first page
   label_commit_on: commit times
   label_follow_people: followers
-  label_member_since: join trustie2
+  label_member_since: join
   label_contribute_to: Participate %{project_count} projects：
   label_total_commit: Together %{total_commit} numbers of committing
   label_upload_profile: Upload avatar
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a1ca1a7f5..6d220779d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1150,7 +1150,7 @@ zh:
   label_front: 第一页
   label_commit_on: 次提交 
   label_follow_people: 个关注者
-  label_member_since: 加入trustie2
+  label_member_since: 加入
   label_contribute_to: 参与了 %{project_count} 个项目：
   label_total_commit: 共%{total_commit}次提交
   label_upload_profile: 上传头像