From cef923b8a8788b9ad86b75c6d27656e234748059 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 13 Mar 2015 09:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/invite_members_by_mail.html.erb     |  6 +++---
 config/locales/projects/en.yml                   | 16 ++++++++--------
 config/locales/projects/zh.yml                   |  8 ++++++--
 config/locales/zh.yml                            |  4 +---
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 42a27376b..e8e77be8f 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -23,7 +23,7 @@
 //        }
 </script>
 <div class="project_r_h">
-  <h2 class="project_h2">邀请加入</h2>
+  <h2 class="project_h2"><%= l(:label_invite_join)%></h2>
 </div>
 <div  class="floatbox" style="margin:130px;">
 	<div >
@@ -31,9 +31,9 @@
 	</div>
 	<div class="cl"></div>
 	<div class="box_main">
-		<h3 class="box_h3">发送邮件邀请新用户</h3>
+		<h3 class="box_h3"><%= l(:label_invite_new_user)%></h3>
 		<p class="box_p">
-			输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
+			<%= l(:label_invite_email_tips)%>
 		</p>
 		<div id="is_registed">
 			<%= render :partial => 'regested', locals: { :isregisted => false} %>
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index bc4395df0..1fda000ff 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -82,16 +82,16 @@ en:
   #
   #  邀请
   #    
-  label_invite_new_user: "发送邮件邀请新用户"
-  label_invite_join: 邀请加入
-  label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
-  label_email: 邮箱
-  notice_registed_success: 您所填写的电子邮件格式不正确或者该邮箱已被注册!
-  label_send_email_free: 免费发送
-  label_email_format_error: 您所填写的电子邮件格式不正确
+  label_invite_new_user: "Send email to invite users"
+  label_invite_join: Invite
+  label_invite_email_tips: Enter the email address, Trustie will automatically register a user for the email address!
+  notice_registed_success: Email address is blank or  has been registered!
+  label_email_format_error: Email format is incorrect!
+  label_send_email: Send
+  label_input_email: Please input email address
 
   
-  label_invite_trustie_user: "邀请Trustie注册用户" 
+  label_invite_trustie_user: "Invite Trustie registered users" 
 
 
   #   
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index d6e03fc14..29cf540f8 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -76,6 +76,10 @@ zh:
   label_issue_category_plural: 问题类别
   label_repository_plural: 版本库
   enumeration_activities: 活动（时间跟踪）
+
+
+  text_select_project_modules: '请选择此项目可以使用的模块：'
+
   
   #   
   #  项目托管平台
@@ -86,9 +90,9 @@ zh:
   label_invite_join: 邀请加入
   label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
   notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
-  label_send_email_free: 免费发送
   label_email_format_error: 您所填写的电子邮件格式不正确
-
+  label_send_email: 免费发送
+  label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
   
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8858b0a38..6b80553de 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -989,7 +989,6 @@ zh:
   text_status_changed_by_changeset: "已应用到变更列表 %{value}."
   text_time_logged_by_changeset: "已应用到修订版本 %{value}."
   text_issues_destroy_confirmation: '您确定要删除选中的问题吗？'
-  text_select_project_modules: '请选择此项目可以使用的模块：'
   text_default_administrator_account_changed: 默认的管理员帐号已改变
   text_file_repository_writable: 附件路径可写
   text_plugin_assets_writable: 插件的附件路径可写
@@ -2082,6 +2081,5 @@ zh:
   label_recently_updated_courseware: 最近更新了课件
   label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
   label_end_time: 截止时间
-  label_send_email: 免费发送
-  label_input_email: 请输入邮箱地址
+