Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/projects/invite_members_by_mail.html.erb

config/locales/projects/en.yml

@@ -77,6 +77,13 @@ en:
   label_repository_plural: Repositories
   enumeration_activities: Activities
 
+  #   
+  #  项目托管平台
+  #
+  #  邀请
+  #    
+  notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
+
 
   #   
   #  项目托管平台
@@ -88,7 +95,7 @@ en:
   field_description: Description
   field_identifier: Identifier
   field_enterprise_name: Enterprise
-
+  label_organization_choose: "- Please select an organization -"
   text_length_between: "Length between %{min} and %{max} characters."
   text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed."
 

config/locales/projects/zh.yml

@@ -43,9 +43,7 @@ zh:
   project_module_attachments: 资源  
 
   label_invite: 邀请
-  label_invite_new_user: "发送邮件邀请新用户"
-  label_invite_trustie_user: "邀请Trustie注册用户"
-
+  
   label_issue_tracking: 问题跟踪
   label_release_issue: 发布问题
 
@@ -80,6 +78,18 @@ zh:
   label_repository_plural: 版本库
   enumeration_activities: 活动（时间跟踪）
   
+  #   
+  #  项目托管平台
+  #
+  #  邀请
+  #    
+  label_invite_new_user: "发送邮件邀请新用户"
+  label_invite_trustie_user: "邀请Trustie注册用户"
+  label_invite_join: 邀请加入
+  label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
+  notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
+  
+  
   
   #   
   #  项目托管平台
@@ -91,10 +101,9 @@ zh:
   field_description: 描述
   field_identifier: 标识
   field_enterprise_name: 组织名称
-
+  label_organization_choose: --请选择组织--
   text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。"
   text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。<br />一旦保存，标识无法修改。"
-
   field_is_public: 公开  
   field_hidden_repo: 隐藏代码库
   button_create: 提交