Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

config/locales/tidings/zh-CN.yml

@@ -49,9 +49,9 @@
         Apply_end: "申请发布实训：%{name}"
       ApplySubject:
         System:
-          "1_end": "你提交的实训课程发布申请：%{name}，审核已通过"
-          "2_end": "你提交的实训课程发布申请：%{name}，审核未通过<br/><span>原因：%{reason}</span>"
-        Apply_end: "申请发布实训课程：%{name}"
+          "1_end": "你提交的实践课程发布申请：%{name}，审核已通过"
+          "2_end": "你提交的实践课程发布申请：%{name}，审核未通过<br/><span>原因：%{reason}</span>"
+        Apply_end: "申请发布实践课程：%{name}"
       TrialAuthorization:
         System:
           "1_end": "你提交的试用授权申请，审核已通过"
@@ -61,7 +61,7 @@
     Course:
       Delete_end: "你删除了课堂：%s"
     Shixun_end: "你创建了实训：%s"
-    Subject_end: "你创建了实训课程：%s"
+    Subject_end: "你创建了实践课程：%s"
     ArchiveCourse_end: "你的课堂已经归档：%s"
     JournalsForMessage:
       Mentioned_end: "@了你：%s"