Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/welcome/course.html.erb

@@ -107,7 +107,7 @@
 <%= stylesheet_link_tag 'welcome' %>
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
 <h3 style="margin-left: 5px; color: #e8770d;"><strong>新开课程</strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1, :project_sort_type => 1}, :target => "_blank"  %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank"  %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% find_miracle_course(10, 7).map do |project| %>

config/locales/zh.yml

@@ -1150,7 +1150,6 @@ zh:
   button_export: 导出
   label_export_options: "%{export_format} 导出选项"
   error_attachment_too_big: 该文件无法上传。超过文件大小限制 (%{max_size})
-  error_attachment_empty: 文件不能为空
   notice_failed_to_save_time_entries: "无法保存下列所选取的 %{total} 个项目中的 %{count} 工时： %{ids}。"
   label_x_issues:
     zero:  0 问题