From 1fabad8c2fc2f6cb588f934effae183272440625 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 24 Mar 2014 16:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E6=89=98?=
 =?UTF-8?q?=E7=AE=A1=E4=B8=BB=E9=A1=B5=E5=92=8C=E8=AF=BE=E7=A8=8B=E5=AE=9E?=
 =?UTF-8?q?=E8=B7=B5=E4=B8=BB=E9=A1=B5=E4=B8=BB=E9=A2=98=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/course.html.erb  | 2 +-
 app/views/welcome/index.html.erb   | 2 +-
 config/locales/zh.yml              | 6 ++++--
 public/stylesheets/application.css | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 517e81f30..a5b5a351c 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -92,7 +92,7 @@
 	</div> 
 	<div class="main-content-bar">
 	<div class="welcome_left" >
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_course) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
 	</div>
 	<div class="search-bar">
 		<%= render :partial => "search_bar"%>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b3d057c54..3f9ddea3c 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -92,7 +92,7 @@
 	</div> 
 	<div class="main-content-bar">
 	<div class="welcome_left" >
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_project) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_project_description) %></span>
 	</div>
 	<div class="search-bar">
 		<%= render :partial => "search_bar"%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 4aac82bf2..a305a7240 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1544,8 +1544,10 @@ zh:
   label_sort_by_influence: 按影响力排序
   label_bids_published: 发布于
   label_bids_published_ago: 之前
-  label_welcome_trustie: Trustie
-  label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。
+  label_welcome_trustie_project: Trustie在线项目托管平台
+  label_welcome_trustie_course: Trustie在线课程实践平台
+  label_welcome_trustie_project_description: 面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。
+  label_welcome_trustie_course_description: 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。
   label_user_project: 项目
   label_user_course: 课程
   label_user_homework: 作业
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0661235d0..7bd31f469 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -608,7 +608,7 @@ ul.tool li{list-style-type:none;
 .font_welcome_trustie{
 	font-family:Impact;
 	font-weight: regular;
-	font-size: 24px;
+	font-size: 18px;
 	color:#15bccf;
 }