Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js

@@ -43,7 +43,7 @@ export default {
         noJoin: 'This account has not joined any schools yet!',
         myEv: 'Assessment I started',
         teaEv: 'Assessments started by the instructor',
-        markSetting: 'Marking Assistant',
+        markSetting: 'Marking Task',
         markData: 'Marking Data',
         ftStatus: 'Status：',
         ftType: 'Type：',

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/learnActivity.js

@@ -43,7 +43,7 @@ export default {
         noJoin: '此账号暂未加入任何学校！',
         myEv: '我发布的评测',
         teaEv: '任课老师发布的评测',
-        markSetting: '阅卷助手',
+        markSetting: '阅卷任务',
         markData: '阅卷数据',
         ftStatus: '状态：',
         ftType: '类型：',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js

@@ -43,7 +43,7 @@ export default {
         noJoin: '此帳號暫未加入任何學校！',
         myEv: '我發佈的評量',
         teaEv: '任課老師發佈的評量',
-        markSetting: '閱卷助手',
+        markSetting: '閱卷任務',
         markData: '閱卷數據',
         ftStatus: '狀態：',
         ftType: '類型：',