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

config/locales/commons/en.yml

@@ -371,6 +371,33 @@ en:
   label_news: News
   label_news_description: "Track the latest activities of projects, and obtain the latest information"
   label_news_title_tips: "(less than 60 characters)"
+ 
+  #
+  #  
+  #
+  #  导出
+  # 
+  description_all_columns: All Columns
+  button_export: Export
+  label_export_options: "%{export_format} export options"
+  label_changes_details: Details of all changes
+  
+ 
+  #
+  #  
+  #
+  #  顶和踩
+  # 
+  label_issue_praise: Good question，praise！
+  label_issue_tread: Poor question，tread！
+  label_issue_praise_over: Praised over！
+  label_issue_tread_over: Treaded over！
+  label_issue_appraise_over: Appraised over！
+  label_issue_not_praise_over: Cannot tread yourself~
+  label_issue_not_treed_over: Cannot praise yourself~
+ 
+ 
+ 
   #
   #  Trustie
   #

config/locales/commons/zh.yml

@@ -376,7 +376,33 @@ zh:
   label_news: 新闻
   label_news_description: 实时了解项目的最新动态，掌握最新项目咨询！  
   label_news_title_tips: (60个字符以内)
-  
+
+
+  #
+  #  
+  #
+  #  导出
+  # 
+  description_all_columns: 所有列
+  button_export: 导出
+  label_export_options: "%{export_format} 导出选项"
+  label_changes_details: 所有变更的详情
+
+  #
+  #  
+  #
+  #  顶和踩
+  # 
+  label_issue_praise: 好问题，顶！
+  label_issue_tread: 烂问题，踩！
+  label_issue_praise_over: 我刚才顶过了~
+  label_issue_tread_over: 我刚才踩过了~
+  label_issue_not_praise_over: 不能顶自己~
+  label_issue_not_treed_over: 不能踩自己~
+  label_issues_score_not_enough: 积分不够，不能踩别人~ 
+  label_issue_appraise_over: 只能评价一次哦！
+ 
+ 
   
   #
   #  

config/locales/en.yml

@@ -590,8 +590,7 @@ en:
   label_current_version: Current version
 
   label_feed_plural: Feeds
-  label_changes_details: Details of all changes
-  
+
   label_overall_spent_time: Overall spent time
   label_f_hour: "%{value} hour"
   label_f_hour_plural: "%{value} hours"
@@ -724,7 +723,7 @@ en:
   label_git_report_last_commit: Report last commit for files and directories
   label_parent_revision: Parent
   label_child_revision: Child
-  label_export_options: "%{export_format} export options"
+
   label_copy_attachments: Copy attachments
   label_copy_subtasks: Copy subtasks
   label_item_position: "%{position} of %{count}"
@@ -789,7 +788,7 @@ en:
   button_show: Show
   button_hide: Hide
   button_edit_section: Edit this section
-  button_export: Export
+
   button_delete_my_account: Delete my account
   button_close: Close
   button_reopen: Reopen
@@ -914,7 +913,7 @@ en:
 
   description_available_columns: Available Columns
   description_selected_columns: Selected Columns
-  description_all_columns: All Columns
+
   description_issue_category_reassign: Choose issue category
   description_wiki_subpages_reassign: Choose new parent page
   description_date_range_list: Choose range from list
@@ -1122,11 +1121,7 @@ en:
   label_how_commit_code_chinese: Chinese
   label_welcome_leave_message: Hi!The platform is currently in beta version.If you have any comments and suggestions, please
   label_welcome_click_me: Click me
-  label_issue_praise: Good question，praise！
-  label_issue_tread: Poor question，tread！
-  label_issue_praise_over: Praised over！
-  label_issue_tread_over: Treaded over！
-  label_issue_appraise_over: Appraised over！
+
   label_welcome_my_respond: Please leave your comments and suggestions here！
   label_no_current_fans: The user has no fans now
   label_no_current_watchers: The user hasn't watched others

config/locales/projects/zh.yml

@@ -148,8 +148,8 @@ zh:
   #  问题跟踪
   #
   label_successful_create: 创建成功
-  label_issues_sum: '问题总数'
-  lable_issues_undo: '未解决：'
+  label_issues_sum: "问题总数"
+  lable_issues_undo: "未解决"
   label_issue_new: 新建问题
   label_query: 自定义查询
   
@@ -240,14 +240,7 @@ zh:
 
   #问题更新
   
-  #顶和踩
-  label_issue_praise: 好问题，顶！
-  label_issue_tread: 烂问题，踩！
-  label_issue_praise_over: 我刚才顶过了~
-  label_issue_tread_over: 我刚才踩过了~
-  label_issue_not_praise_over: 不能顶自己~
-  label_issue_not_treed_over: 不能踩自己~
-  label_issues_score_not_enough: 积分不够，不能踩别人~
+
 
 
 

config/locales/zh.yml

@@ -675,7 +675,7 @@ zh:
   label_current_version: 当前版本
 
   label_feed_plural: Feeds
-  label_changes_details: 所有变更的详情
+
   label_spent_time: 耗时
   label_overall_spent_time: 总体耗时
   label_f_hour: "%{value} 小时"
@@ -1035,9 +1035,7 @@ zh:
   setting_default_issue_start_date_to_creation_date: 使用当前日期作为新问题的开始日期
   button_edit_section: 编辑此区域
   setting_repositories_encodings: 附件和版本库编码
-  description_all_columns: 所有列
-  button_export: 导出
-  label_export_options: "%{export_format} 导出选项"
+
 
   error_pic_type: "仅支持如下图片格式："
   notice_failed_to_save_time_entries: "无法保存下列所选取的 %{total} 个项目中的 %{count} 工时： %{ids}。"
@@ -1360,7 +1358,7 @@ zh:
   label_issues_score_not_enough: 积分不够，不能踩别人~
  #end
 
-  label_issue_appraise_over: 只能评价一次哦！
+
   label_welcome_my_respond: 请在此留下你的意见和建议！
 
   label_course_feedback: 留言