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

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} %>

config/locales/commons/zh.yml

@@ -1,12 +1,169 @@
-
-# Chinese (China) translations for Ruby on Rails
-# by tsechingho (http://github.com/tsechingho)
 zh:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
   jquery:
     locale: "zh-CN"
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d"
+      short: "%b%d日"
+      long: "%Y年%b%d日"
+  zh_date:
+    formats:
+      default: "%Y年%m月%d日"
+
+    day_names: [星期天, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
+    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    # Used in date_select and datime_select.
+    order:
+      - :year
+      - :month
+      - :day
+
+
+  errors:
+    messages:
+       email_verifier:
+         email_not_real: 必须指定一个真实的邮箱地址
+         out_of_mail_server: 指向了一个已停用的邮箱服务器
+         no_mail_server: 域名地址没有邮件功能
+         failure: 邮箱地址不能被验证
+         exception: 邮箱不能发送成功
+
+
+  time:
+    formats:
+      default: "%Y年%b%d日 %A %H:%M:%S"
+      time: "%H:%M"
+      short: "%b%d日 %H:%M"
+      long: "%Y年%b%d日 %H:%M"
+    am: "上午"
+    pm: "下午"
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "半分钟"
+      less_than_x_seconds:
+        one: "1秒内"
+        other: "少于 %{count} 秒"
+      x_seconds:
+        one: "1秒"
+        other: "%{count} 秒"
+      less_than_x_minutes:
+        one: "1分钟内"
+        other: "少于 %{count} 分钟"
+      x_minutes:
+        one: "1分钟"
+        other: "%{count} 分钟"
+      about_x_hours:
+        one: "大约1小时"
+        other: "大约 %{count} 小时"
+      x_hours:
+        one:   "1 小时"
+        other: "%{count} 小时"
+      x_days:
+        one: "1天"
+        other: "%{count} 天"
+      about_x_months:
+        one: "大约1个月"
+        other: "大约 %{count} 个月"
+      x_months:
+        one: "1个月"
+        other: "%{count} 个月"
+      about_x_years:
+        one: "大约1年"
+        other: "大约 %{count} 年"
+      over_x_years:
+        one: "超过1年"
+        other: "超过 %{count} 年"
+      almost_x_years:
+        one:   "将近 1 年"
+        other: "将近 %{count} 年"
+
+  number:
+    # Default format for numbers
+    format:
+      separator: "."
+      delimiter: ""
+      precision: 3
+    human:
+      format:
+        delimiter: ""
+        precision: 3
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one: "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      sentence_connector: "和"
+      skip_last_comma: false
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "由于发生了一个错误 %{model} 无法保存"
+          other:  "%{count} 个错误使得 %{model} 无法保存"
+      messages:
+        inclusion: "不包含于列表中"
+        exclusion: "是保留关键字"
+        invalid: "是无效的"
+        confirmation: "与确认值不匹配"
+        accepted: "必须是可被接受的"
+        empty: "不能留空"
+        blank: "不能为空字符"
+        too_long: "过长（最长为 %{count} 个字符）"
+        too_short: "过短（最短为 %{count} 个字符）"
+        wrong_length: "长度非法（必须为 %{count} 个字符）"
+        taken: "已经被使用"
+        not_a_number: "不是数字"
+        not_a_date: "不是合法日期"
+        greater_than: "必须大于 %{count}"
+        greater_than_or_equal_to: "必须大于或等于 %{count}"
+        equal_to: "必须等于 %{count}"
+        less_than: "必须小于 %{count}"
+        less_than_or_equal_to: "必须小于或等于 %{count}"
+        odd: "必须为单数"
+        even: "必须为双数"
+        greater_than_start_date: "必须在起始日期之后"
+        not_same_project: "不属于同一个项目"
+        circular_dependency: "此关联将导致循环依赖"
+        cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
+        groupname_repeat: "该班名已存在"
+
+  attachment_all: "全部"
+  attachment_sufix_browse: "文件类型"
+  attachment_browse: "内容类型"
+  attachment_type: '分类'
+  general_text_No: '否'
+  general_text_Yes: '是'
+  general_text_no: '否'
+  general_text_yes: '是'
+  general_lang_name: 'Simplified Chinese (简体中文)'
+  general_csv_separator: ','
+  general_csv_decimal_separator: '.'
+  general_csv_encoding: gb18030
+  general_pdf_encoding: gb18030
+  general_first_day_of_week: '7'  
   
+  actionview_instancetag_blank_option: 请选择
+    
   
   #
   #  Trustie公共标签

config/locales/projects/en.yml

@@ -82,16 +82,16 @@ en:
   #
   #  邀请
   #    
-  label_invite_new_user: "发送邮件邀请新用户"
+  label_invite_new_user: "Send email to invite users"
-  label_invite_join: 邀请加入
+  label_invite_join: Invite
-  label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
+  label_invite_email_tips: Enter the email address, Trustie will automatically register a user for the email address!
-  label_email: 邮箱
+  notice_registed_success: Email address is blank or  has been registered!
-  notice_registed_success: 您所填写的电子邮件格式不正确或者该邮箱已被注册!
+  label_email_format_error: Email format is incorrect!
-  label_send_email_free: 免费发送
+  label_send_email: Send
-  label_email_format_error: 您所填写的电子邮件格式不正确
+  label_input_email: Please input email address
 
   
-  label_invite_trustie_user: "邀请Trustie注册用户" 
+  label_invite_trustie_user: "Invite Trustie registered users" 
 
 
   #   
@@ -131,23 +131,23 @@ en:
   #
   #  项目得分
   #     
-  label_projects_score: 项目综合得分
+  label_projects_score: Project Total Score
   
-  label_issue_score: issue得分
+  label_issue_score: Issue Score
-  label_issue_number: issue的数量
+  label_issue_number: issues 
-  label_issue_journal_number: issue的留言数量 
+  label_issue_journal_number: messages of issue
   
-  label_news_score: 新闻得分
+  label_news_score: News Score
-  label_new_number: 新闻的数量
+  label_new_number: news
   
-  label_file_score: 文档得分
+  label_file_score: Document Scores
-  label_file_number: 文档的数量
+  label_file_number: documents
   
-  label_code_submit_score: 代码提交得分
+  label_code_submit_score: Code Commit Score
-  label_code_submit_number: 代码提交数量
+  label_code_submit_number: commit code frequency
   
-  label_topic_score: 讨论区得分
+  label_topic_score: Forum Score
-  label_topic_number: 讨论区帖子数量
+  label_topic_number: posts
 
 
 

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注册用户" 
   
@@ -142,7 +146,7 @@ zh:
   label_file_number: 文档的数量
   
   label_code_submit_score: 代码提交得分
-  label_code_submit_number: 代码提交数量
+  label_code_submit_number: 代码提交频率
   
   label_topic_score: 讨论区得分
   label_topic_number: 讨论区帖子数量

config/locales/zh.yml

@@ -8,9 +8,6 @@ zh:
   jquery:
     locale: "zh-CN"
 
-  label_approve: 批准
-  label_refusal: 拒绝
-
   notice_account_updated: 帐号更新成功
   notice_account_wrong_password: 密码错误
   name_can_be_empty: 可以不填写真实姓名[保密所需]
@@ -989,7 +986,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 +2078,5 @@ zh:
   label_recently_updated_courseware: 最近更新了课件
   label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
   label_end_time: 截止时间
-  label_send_email: 免费发送
+
-  label_input_email: 请输入邮箱地址