From 80d901f666ec039f0bdbff8dd77b4005b9cfd39a Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Wed, 14 Aug 2013 21:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E5=88=86=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/controllers/tags_controller.rb       | 2 +-
 app/views/layouts/base_projects.html.erb | 2 +-
 app/views/versions/index.html.erb        | 2 +-
 app/views/welcome/index.html.erb         | 6 +++---
 config/locales/en.yml                    | 6 +++---
 config/locales/zh.yml                    | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f26f0a05..9aac1c93 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,6 +1,6 @@
 # This controller was added by william
 class TagsController < ApplicationController
-#  layout "base_tags"
+  layout "base_tags"
   before_filter :require_admin,:only => :show
   include ProjectsHelper
   include IssuesHelper
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 31176e18..8e376e36 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -55,7 +55,7 @@
 											<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
 										<tr class="font_aram">
 											<td align="center" width="80px"> <%= l(:label_member) %></td> 
-											<td align="center" width="80px"> <%= l(:label_project_defects) %></td>
+											<td align="center" width="80px"> <%= l(:label_project_issues) %></td>
 											<td align="center" width="80px"><%= l(:label_attachment) %></td>
 										</tr>
 									</table>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index ef066e9d..e00ef83d 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -6,7 +6,7 @@
 <h3 style="padding-top:0px;padding-bottom: 0px;"><%=l(:label_roadmap)%></h3>
 <!--check boxes-->
 <fieldset id="filters" class="collapsible collapsed" style="background-color: #FFF">
-	<legend><%= l(:label_versions_settings)%></legend>
+	<legend><%= l(:label_version_display_settings)%></legend>
 <%= form_tag({}, :method => :get) do %>
 <% @trackers.each do |tracker| %>
   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b563cc65..8ca94e94 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -141,11 +141,11 @@ software development and software crowdsourcing.</td></tr>
 	<div class="welcone_left">
 		<table width="350px">
 			<tr>
-				<td><span class="font_welcome_trustie">Trustie</span><span class="font_welcome_Cdescription">是一个社交化的项目管理、软件开发和众包平台。</span></td>
+				<td><span class="font_welcome_trustie">Trustie</span><span class="font_welcome_Cdescription">，面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、软件开发和众包平台。</span></td>
 			</tr>
 			<tr>
-				<td class="font_welcome_Edescription">Trustieforge is a socialized collaboration platform for project management,
-				software development and software crowdsourcing.</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 60c8bbc4..fd0bbc77 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1092,7 +1092,7 @@ en:
   #by young
   label_requirement: Requirement
   label_requirement_focus: Requirement focus
-  label_developer: Developer
+  label_developer: User
   label_investor: Investor：
   label_theme: Theme
   label_logged_as_new: Current user
@@ -1100,7 +1100,7 @@ en:
   issue_list: Issue list
   lastest_respond: Lastest respond
   label_news_lastest: Lastest news
-  label_versions_settings: Display settings
+  label_version_display_settings: Display settings
   label_versions_progress: Complete schedule
   label_versions_description: Versions description
   label_my_photo: My photo
@@ -1124,7 +1124,7 @@ en:
   label_user_activities: "You have no activities,come and join us!"
   label_project_overview: "Overview"
   label_project_tool: "Tool"
-  label_project_defects: "Defects"
+  label_project_issues: "Issues"
   label_project_newother: "See other comments"
   label_project_newshare: "has shared"
   label_project_newadd: "added"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b09733f1..f6ddb94d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -491,7 +491,7 @@ zh:
   #by young
   label_requirement: 需求
   label_requirement_focus: 关注需求
-  label_developer: 开发者
+  label_developer: 用户
   label_investor: 投资人
   label_theme: 主题
   label_logged_as_new: 当前用户
@@ -500,7 +500,7 @@ zh:
   lastest_respond: 最新反馈
   label_respond_view_all: 其他120个反馈
   label_news_lastest: 最新动态
-  label_versions_settings: 显示设置
+  label_version_display_settings: 显示设置
   label_versions_progress: 完成进度
   label_versions_description: 版本描述
   label_my_photo: 我的头像
@@ -773,7 +773,7 @@ zh:
   label_user_activities: "您当前还没有活动，快来加入我们吧！"
   label_project_overview: "概述"
   label_project_tool: "工具"
-  label_project_defects: "缺陷"
+  label_project_issues: "缺陷"
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
   label_project_newadd: "添加了"