變更字串

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

@@ -1,99 +1,99 @@
 export default {
-    addCourse: 'New course',
-    courseList: 'course list',
-    courseList: 'my courses',
-    courseShow: 'show all courses',
-    baseSetting: 'course setting',
-    syllabusSetting: 'course outline setting',
-    classroomSetting: 'class setting',
+    addCourse: 'New Course',
+    courseList: 'Course List',
+    courseList: 'My Course',
+    courseShow: 'Show all courses',
+    baseSetting: 'Course Settings',
+    syllabusSetting: 'Syllabus Settings',
+    classroomSetting: 'Class Settings',
     btnEdit: 'Edit',
     btnSave: 'OK',
     btnDel: 'Delete',
-    btnCancel: 'Cancel change',
-    noData1: 'no data yet',
-    noData2: 'classroom plan information',
+    btnCancel: 'Cancel Change',
+    noData1: 'No data yet',
+    noData2: 'Classroom plan information',
     base: {
-        baseTag: 'basic settings',
-        courseName: 'course name',
-        coursePeriod: 'set period',
-        courseGrade: 'set grade',
-        courseSubject: 'set account',
-        courseNotice: 'course notice',
-        teachers: 'collaborative teacher settings',
-        teachers1: 'teacher settings',
-        addTeacher: 'add out of school teacher',
+        baseTag: 'Basic Settings',
+        courseName: 'Course Name',
+        coursePeriod: 'Set school system',
+        courseGrade: 'Set grade',
+        courseSubject: 'Set subject',
+        courseNotice: 'Course Announcement',
+        teachers: 'Co-teacher Settings',
+        teachers1: 'Teacher Settings',
+        addTeacher: 'Add teachers from other school',
         searchHolder: 'ID or name search',
-        courseTime: 'time interval setting',
+        courseTime: 'Schedule Settings',
         courseClassroom: 'Classroom：',
-        addTime: 'Add time period',
+        addTime: 'Add Schedule',
         text: 'To',
-        courseTag: 'weekday course',
+        courseTag: 'Weekday Course',
         start: 'Start',
         end: 'End',
         selectClassroomHolder: 'Please select classroom'
     },
     syllabus: {
-        schoolSyllabus: 'school based syllabus',
-        personalSyllabus: 'private syllabus',
-        period: 'period:',
-        subject: 'subject:',
-        grade: 'grade:',
-        text: 'display all unselected class syllabus',
-        knowledge: 'knowledge points:',
-        content: 'content:',
-        question: 'question bank:',
-        placeHolder1: 'please choose a school system',
-        placeHolder2: 'please select account',
-        placeHolder3: 'please select grade'
+        schoolSyllabus: 'School Syllabus',
+        personalSyllabus: 'Personal Syllabus',
+        period: 'School System:',
+        subject: 'Subject:',
+        grade: 'Grade:',
+        text: 'Display all unselected syllabus',
+        knowledge: 'Key Concept:',
+        content: 'Content:',
+        question: 'Question Bank:',
+        placeHolder1: 'Please choose a school system',
+        placeHolder2: 'Please select subject',
+        placeHolder3: 'Please select grade'
     },
     classroom: {
-        classroomList: 'classroom list',
+        classroomList: 'Course List',
         studentCount: 'number of students: ',
-        headmaster: 'head teacher: ',
-        classroomManage: 'class management',
-        baseSetting: 'basic setting',
-        studentList: 'student list',
-        classroomCode: 'classroom code',
-        classroomName: 'classroom name',
-        classroomAttr: 'classroom attribute',
-        classroomType: 'classroom type',
-        classroomTeacher: 'instructor',
-        classroomNotice: 'remarks',
-        deleteStudent: 'delete the selected student',
+        headmaster: 'Class Teacher: ',
+        classroomManage: 'Class Management',
+        baseSetting: 'Basic Settings',
+        studentList: 'Student List',
+        classroomCode: 'Classroom Code',
+        classroomName: 'Classroom Name',
+        classroomAttr: 'Classroom Attribute',
+        classroomType: 'Classroom Type',
+        classroomTeacher: 'Instructor',
+        classroomNotice: 'Remarks',
+        deleteStudent: 'Delete the selected student',
         deleteStuBtn: 'Delete',
         addStuBtn: 'Add',
-        removeStudent1: 'move the selected students to',
-        removeStudent2: '',
-        removeStuBtn: 'apply',
+        removeStudent1: 'Move the selected students to',
+        removeStudent2: 'Group',
+        removeStuBtn: 'Apply',
         autoGroupBtn: 'Auto Group',
-        studentTableC1: 'seat number',
-        studentTableC2: 'name',
-        studentTableC3: 'period',
-        studentTableC4: 'grade',
-        studentTableC5: 'group',
-        studentTableC6: 'group name',
-        addClassroomProp1: 'select Default classroom',
-        addClassroomProp2: 'new private classroom',
-        chooseClassroom: 'please select system classroom',
-        searchHolder1: 'keyword search',
-        classroomTableC1: 'classroom code',
-        classroomTableC2: 'classroom name',
-        classroomTableC3: 'school system',
-        classroomTableC4: 'grade',
-        classroomTableC5: 'number of students',
-        personalClassroomTitle: 'create a private classroom',
+        studentTableC1: 'Seat Number',
+        studentTableC2: 'Name',
+        studentTableC3: 'School System',
+        studentTableC4: 'Grade',
+        studentTableC5: 'Group',
+        studentTableC6: 'Group Name',
+        addClassroomProp1: 'Select Default classroom',
+        addClassroomProp2: 'New personal classroom',
+        chooseClassroom: 'Please select system classroom',
+        searchHolder1: 'Keyword search',
+        classroomTableC1: 'Classroom Code',
+        classroomTableC2: 'Classroom Name',
+        classroomTableC3: 'School System',
+        classroomTableC4: 'Grade',
+        classroomTableC5: 'Student Number',
+        personalClassroomTitle: 'Create a personal classroom',
         invitationCode: 'classroom invitation code',
-        classroomName: 'classroom name',
-        closeChoose: 'close the selected classroom',
-        btnChoose: 'select classroom',
-        joinCode: 'QR code of joining course',
-        schoolPlan: 'classroom plan information',
-        studentCountLabel: 'number of students',
-        groupCountLabel: 'number of groups',
-        groupTypeLabel: 'grouping method',
-        groupType1: 'random grouping',
-        groupType2: 'group by seat number',
-        groupType3: 'group by seat order S'
+        classroomName: 'Classroom Name',
+        closeChoose: 'Close the selected classroom',
+        btnChoose: 'Select classroom',
+        joinCode: 'QR code for joining course',
+        schoolPlan: 'Classroom plan information',
+        studentCountLabel: 'Student Number',
+        groupCountLabel: 'Group Number',
+        groupTypeLabel: 'Grouping Method',
+        groupType1: 'Random Grouping',
+        groupType2: 'Group by seat number',
+        groupType3: 'S-shaped grouping by seat number'
     },
-    tips1: 'modify information'
+    tips1: 'Modify Information'
 }

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

@@ -1,259 +1,257 @@
 export default {
     // ManageCourse.vue
-    searchHolder:'搜索',
-    delBatch:'批量删除',
-    delCus:'删除课程',
-    addCus:'新增课程',
-    editCus:'编辑课程',
-    noTeacher:'暂无',
-    cusName:'课程名称',
-    cNameHolder:'请输入课程名称',
-    cusCode:'课程编码',
-    codeHolder:'请输入课程编码',
-    cusPd:'课程学段',
-    pdHolder:'请选择学段',
-    cusSubject:'课程学科',
-    sjHolder:'请选择学科',
-    cusTeachers:'授课教师',
-    teacherHolder:'请选择授课教师',
-    delContent:'是否确认删除',
-    codeErr1:'课程编码不能为空',
-    codeErr2:'课程编码只能由字母和数字组成',
-    tableCol1:'序号',
-    tableCol2:'课程名称',
-    tableCol3:'课程编码',
-    tableCol4:'学段',
-    tableCol5:'学科',
-    tableCol6:'教师人数',
-    tableCol7:'授课教师',
-    delOk:'删除成功！',
-    delErr:'删除失败！',
-    addOk:'添加成功！',
-    addErr:'添加成功！',
-    editOk:'修改成功！',
-    editErr:'修改失败！',
-    formTips:'请先完善信息，再保存!',
-    noSchool:'尚未加入学校，没有学校数据',
-    sltCusTips:'请选择课程',
+    searchHolder:'Search',
+    delBatch:'Batch delete',
+    delCus:'Delete Course',
+    addCus:'Add Course',
+    editCus:'Edit Course',
+    noTeacher:'None yet',
+    cusName:'Course Name',
+    nameHolder:'Please enter course name',
+    cusCode:'Course Code',
+    codeHolder:'Please enter course code',
+    cusPd:"Course's School System",
+    pdHolder:'Please choose school system',
+    cusSubject:"Course's School System",
+    sjHolder:'Please choose subject',
+    cusTeachers:'Instructor',
+    teacherHolder:'Please choose instructor',
+    delContent:'Are you sure to delete?',
+    codeErr1:'Course code cannot be empty',
+    codeErr2:'Course code can only consist of English letters and numbers',
+    tableCol1:'Serial number',
+    tableCol2:'Course Name',
+    tableCol3:'Course Code',
+    tableCol4:'School system',
+    tableCol5:'Subject',
+    tableCol6:'Number of teachers',
+    tableCol7:'Instructor',
+    delOk:'Deleted successfully！',
+    delErr:'Failed to delete！',
+    addOk:'Added successfully！',
+    addErr:'Failed to add！',
+    editOk:'Modified successfully！',
+    editErr:'Failure to modify！',
+    formTips:'Please complete the information first, then save!',
+    noSchool:'Not yet joined any schools, no school data available',
+    sltCusTips:'Please enter course',
 
     //NewCoursePlan.vue
-    spClass:'专科教室',
-    cusPlan:'课程安排',
-    importPlan:'导入安排',
-    course:'课程',
-    addCusPlan:'添加课程安排',
-    saveTips:'保存提醒',
-    tipsContent:'当前班级排课数据尚未保存。如果离开，修改的数据将不会保存！',
-    leaveText:'离开',
-    fullTips:'请先完成已添加的课程设置！',
-    saveOk:'保存成功',
-    saveErr:'保存失败',
+    spClass:'Dedicated Subject Classroom',
+    cusPlan:'Course Arrangement',
+    importPlan:'Import Arrangement',
+    course:'Course',
+    addCusPlan:'Add course arrangement',
+    saveTips:'Save Reminder',
+    tipsContent:'The current curriculum schedule data has not been saved. If you leave, the modified data will not be saved',
+    leaveText:'Exit',
+    fullTips:'Please complete the settings for the courses you have added first!',
+    saveOk:'Save successfully',
+    saveErr:'Failed to save',
 
     //MyCourse.vue
-    scCus:'标准课程',
-    cusInfo:'课程信息',
-    noScCus:'暂无校本课程',
-    privCus:'个人课程',
-    noPrivCus:'暂未创建课程',
-    noCusClass:'暂未安排课程名单',
-    delStu:'删除学生',
-    addStu:'添加学生',
-    noGroup:'未分组',
-    noNotice:'暂无课程公告！',
-    edit:'编辑',
-    save:'保存',
-    className:'班级',
-    editClassInfo:'修改班级信息',
-    dyClass:'动态名单',
-    scClass:'常规教室',
-    delStuContent:'是否确认删除',
-    delStuTips:'请先选择需要删除的学生！',
-    delClassTitle:'删除班级',
-    stuClassCol1:'姓名',
-    stuClassCol2:'账号',
-    stuClassCol3:'座号',
-    stuClassCol4:'组别',
-    stuClassCol5:'组名',
-    noClassList:'暂无上课名单',
-    cusRecord:'课堂记录',
-    acRecord:'活动记录',
-    acType:'活动类型：',
-    socrateReport:'苏格拉底报告',
-    socrateMv:'苏格拉底影片/桌面',
-    elNotes:'电子笔记',
-    lessonContent:'课例教材',
-    share:'分享到频道',
-    noAc:'暂无记录',
-    pdLabel:'学段：',
-    noClassCus:'课程未安排班级：',
-    noTImeCus:'课程未设时间：',
-    listMode:'列表模式',
-    ev:'评测',
-    vote:'投票',
-    qu:'问卷',
-    hw:'作业',
-    sl:'自主学习',
-    acTime:'活动时间',
-    private:'个人',
-    school:'校本',
-    noRecord:'暂无课堂记录',
-    groupTips:'溫馨提示：當前分組信息為行政班分組，任課教師可前往HiTeach端自定義分組。 ',
+    scCus:'School Course',
+    cusInfo:'Course Information',
+    noScCus:'No school course yet',
+    privCus:'Personal Course',
+    noPrivCus:'No course created yet',
+    noCusClass:'Not yet arranged course name list',
+    delStu:'Delete student',
+    addStu:'Add student',
+    noGroup:'Not grouped',
+    noNotice:'No course announcement yet！',
+    edit:'Edit',
+    save:'Save',
+    className:'Class',
+    editClassInfo:'Edit Class Information',
+    dyClass:'Dynamic List',
+    scClass:'Regular Classroom',
+    delStuContent:'Are you sure to delete?',
+    delStuTips:'Please select the students to be deleted first',
+    delClassTitle:'Delete class',
+    stuClassCol1:'Name',
+    stuClassCol2:'Account',
+    stuClassCol3:'Seat Number',
+    stuClassCol4:'Group',
+    stuClassCol5:'Group Name',
+    noClassList:'No course list yet',
+    cusRecord:'Lesson Record',
+    acRecord:'Activity Record',
+    acType:'Activity：Type',
+    socrateReport:'Sokrates Report',
+    socrateMv:'Sokrates Video/Screen Clips',
+    elNotes:'E-Note',
+    lessonContent:'Teaching Material',
+    share:'Share to Sokrates Channel',
+    noAc:'No record yet',
+    pdLabel:'School system：',
+    noClassCus:'Course not scheduled a classroom：',
+    noTImeCus:'Course time not scheduled：',
+    listMode:'List Mode',
+    ev:'Assessment',
+    vote:'Poll',
+    qu:'Survey',
+    hw:'Assignment',
+    sl:'Self-directed learning',
+    acTime:'Activity Time',
+    private:'Personal',
+    school:'School',
+    noRecord:'No lesson records yet',
+    groupTips:'Friendly reminder：The current grouping information is of administrative grouping, teachers can go to HiTeach to define their own grouping. ',
 
     //ManageClass.vue
-    classLabel:'班级：',
-    stuCount:'学生人数：',
-    autoGroup:'自动分组',
-    exportStu:'导出名单',
-    viewport1:'分组视图',
-    viewport2:'列表视图',
-    noStu:'暂无学生',
-    resetPw:'重置密码',
-    resetPwContent1:'确认重置',
-    resetPwContent2:'的密码',
-    resetPwContent3:'确认批量重置',
-    resetPwContent4:'个学生的密码',
-    resetPwOk:'重置成功',
-    noMgtClass1:'暂未加入学校',
-    noMgtClass2:'学校暂未设置您为班主任',
-    toJoin:'前往申请加入学校',
-    groupNameHolder:'请设置组名',
-    edtiGroupName:'修改组名',
-    addGroup:'新增组别',
-    peopleUnit:'人',
-    studentCountLabel: '学生人数',
-    groupCountLabel: '组别数量',
-    groupTypeLabel: '分组方式',
-    groupType1: '随机分组',
-    groupType2: '依座号分组',
-    groupType3: '依座顺序S形分组',
-    action:'操作',
-    atLeast:'至少保留一组',
-    checkName:'请先输入组名再创建组别',
-    noStuTips:'暂无学生可以进行分组',
-    groupCount:'分组数量最少为1',
-    groupTypeTips:'请设置分组方式',
-    groupUnit:'组',
-    stuNameList:'学生名单',
-    saveGroup:'保存分组',
+    classLabel:'Class：',
+    stuCount:'Student Number：',
+    autoGroup:'Auto Grouping',
+    exportStu:'Export List',
+    viewport1:'View by group',
+    viewport2:'View by list',
+    noStu:'No students yet',
+    resetPw:'Reset Password',
+    resetPwContent1:'Confirm Passqord',
+    resetPwContent2:'Password',
+    resetPwContent3:'Confirm batch reset',
+    resetPwContent4:"students' password",
+    resetPwOk:'Reset successfully',
+    noMgtClass1:'Not yet joined any schools',
+    noMgtClass2:'The school has not yet appointed you as the class teacher',
+    toJoin:'Go to Apply to join the school',
+    groupNameHolder:'Please set the group name',
+    edtiGroupName:'Edit group name',
+    addGroup:'Add new group',
+    peopleUnit:'People',
+    studentCountLabel: 'Student Number',
+    groupCountLabel: 'Group Number',
+    groupTypeLabel: 'Grouping method',
+    groupType1: 'Random grouping',
+    groupType2: 'Group by seat number',
+    groupType3: 'S-shaped grouping by seat number',
+    action:'Operate',
+    atLeast:'Keep at least one group',
+    checkName:'Please enter the group name and then create the group',
+    noStuTips:'No students are available for grouping',
+    groupCount:'Minimum number of groups is 1',
+    groupTypeTips:'Please set the grouping method',
+    groupUnit:'Group',
+    stuNameList:'Student List',
+    saveGroup:'Save Grouping',
     
     //NewCusMgt.vue
-    schdTable:'课表模式',
-    timeSetting:'时段设置',
-    stuListMgt:'自定义名单',
-    teaLabel:'教师',
-    noTeacher:'暂无授课教师',
-    cusNameList:'课程名单',
-    cusTime:'课程时段',
-    saveLabel:'保存变更',
-    addStuList:'添加名单',
-    removeList:'移除名单',
-    addrLabel:'上课教室:',
-    nameLabel:'班级名单:',
-    defaultList:'默认名单',
-    noSet:'未设置',
-    defaultTips:'默认名单为教室对应的名单，否则需要指定自定义名单。',
-    noStu:'暂无学生',
-    noGroup:'未分组',
-    noListTips:'暂无课程名单，请添加名单',
-    notime1:'暂未设置时段，请先',
-    notime2:'设置时段',
-    notime3:'再安排上课时段。',
-    listType1:'班级名单',
-    listType2:'自定义名单',
-    confirmAdd:'确认添加',
-    cancelAdd:'取消添加',
-    createList:'创建自定义名单',
-    name:'名称:',
-    nameHolder:'请输入名单名称...',
-    timeSetTitle:'时段设置',
-    job:'职位',
-    teaName:'姓名',
-    listName:'名称',
-    stuCount:'学生人数:',
-    code:'编码',
-    nameWarning:'请输入名单名称',
-    updOk:'更新成功',
-    setWarning1:'暂无教师信息，无法完成课程时段设置',
-    setWarning2:'暂无教室信息，无法完成课程时段设置',
-    defaultTitle:'默认名单',
-    defaultContent:'如果使用默认名单将会移除当前自定义名单，您确认要使用默认名单吗？',
-    sltListTips:'请先选择名单或者教室',
-    updateOk:'更新成功',
-    updateErr:'更新失败',
-    remvListTitle:'移除名单',
-    remvListConten:'是否确认移除',
-    remvTeaTitle:'移除授课老师',
-    remvTeaContent:'是否确认移除',
-    gradeLabel:'年级',
+    schdTable:'Schedule Model',
+    timeSetting:'Schedule Setting',
+    stuListMgt:'Self-customized List',
+    teaLabel:'Teacher',
+    noTeacher:'No instructor yet',
+    cusNameList:'Course List',
+    cusTime:'Course Schedule',
+    saveLabel:'Save changes',
+    addStuList:'Add List',
+    removeList:'Remove List',
+    addrLabel:'Classroom:',
+    nameLabel:'Class List:',
+    defaultList:'Default List',
+    noSet:'Not set',
+    defaultTips:'The list corresponding to the classroom is the default list, otherwise you need to select a self-customized list.',
+    noStu:'No students yet',
+    noGroup:'Not grouped',
+    noListTips:'No course list, please add a list',
+    notime1:'Schedule not set yet, please',
+    notime2:'set schedule',
+    notime3:'and arrange class time。',
+    listType1:'Class List',
+    listType2:'Self-customized List',
+    confirmAdd:'Confirm Add',
+    cancelAdd:'Cancel Add',
+    createList:'Create Self-customized List',
+    name:'Name:',
+    nameHolder:'Please enter list name...',
+    timeSetTitle:'Schedule Settings',
+    job:'Title',
+    teaName:'Name',
+    listName:'List Name',
+    stuCount:'Student Number:',
+    code:'Code',
+    nameWarning:'Please enter list name',
+    updOk:'Update successfully',
+    setWarning1:'No teacher information yet, unable to complete the course schedule setting',
+    setWarning2:'No classroom information yet, unable to complete the course schedule setting',
+    defaultTitle:'Default List',
+    defaultContent:'Using the default list will remove the current self-customized list, are you sure you want to use the default list?',
+    sltListTips:'Please select the list or classroom first',
+    updateOk:'Update successfully',
+    updateErr:'Failed to update',
+    remvListTitle:'Remove List',
+    remvListConten:'Are you sure to remove?',
+    remvTeaTitle:'Remove Instructor',
+    remvTeaContent:'Are you sure to remove?',
+    gradeLabel:'Grade',
 
     //MgtStuList.vue
-    nameList:'名单',
-    remvStu:'移除学生',
-    goBack:'返回上级',
-    delListTitle:'删除自定义名单',
+    nameList:'Name list',
+    remvStu:'Remove Student',
+    goBack:'Click to go back',
+    delListTitle:'Delete Self-customized List',
 
     //TeaTable.vue
-    am:'上午',
-    pm:'下午',
-    setCus:'设置课程',
-    modifyCus:'修改课程',
-    cancelCus:'取消课程',
-    repeat:'重复操作',
-    cusClass:'授课教室',
-    noCourseClass:'*暂未添加/设置授课教室',
-    setClassTips:'请设置授课教室',
+    am:'Morning',
+    pm:'Afternoon',
+    setCus:'Course Setting',
+    modifyCus:'Modify Course',
+    cancelCus:'Cancel Course',
+    repeat:'Repeat operation',
+    cusClass:'Teaching Classroom',
+    noCourseClass:'*Not yet added/set up teaching classroom',
+    setClassTips:'Please set teaching classroom',
 
     //TimeSetting.vue
-    addTime:'添加时段',
-    saveSet:'保存设置',
-    edtiTime:'编辑时段',
-    timeHolder:'请输入时段名称...',
-    startLabel:'开始',
-    endLabel:'结束',
-    typeLabel:'类型',
-    lessonTime:'上课时间',
-    restTime:'休息/其他时间',
-    nameTips:'请输入节点名称',
-    typeTips:'请设置节点类型',
-    startTips:'请设置时间',
+    addTime:'Add Schedule',
+    saveSet:'Save Settings',
+    edtiTime:'Editing Schedule',
+    timeHolder:'Please enter the schedulet name...',
+    startLabel:'Start',
+    endLabel:'End',
+    typeLabel:'Type',
+    lessonTime:'Class time',
+    restTime:'Break / Other Time',
+    nameTips:'Please enter the node name',
+    typeTips:'Please set the node type',
+    startTips:'Please set the time',
 
     //CoursePlan.vue
-    cusTable:'课程表',
-    importLabel:'导入课表',
-    cusMode:'课程模式',
+    cusTable:'Class Schedule',
+    importLabel:'Import Class Schedule',
+    cusMode:'Course Mode',
 
     //ClassTable.vue
-    noAddTea:'当前课程未添加授课老师',
-    sltCusTips:'请先选择课程',
-    setCusWarning:'请设置课程',
-    setTeaWarning:'请设置教师',
-    setClassWarning:'請選擇行政班',
-    setStuListWarning:'請選擇教學班',
-    mon:'星期一',
-    tue:'星期二',
-    wed:'星期三',
-    thu:'星期四',
-    fri:'星期五',
-    sat:'星期六',
-    sun:'星期日',
-    nameListType:'类型',
-    scClass:'行政班',
-    customNameList:'教學班',
+    noAddTea:'No instructor has been added to the current course',
+    sltCusTips:'Please select a course first',
+    setCusWarning:'Please select course',
+    setTeaWarning:'Please select teacher',
+    mon:'Monday',
+    tue:'Tuesday',
+    wed:'Wednesday',
+    thu:'Thursday',
+    fri:'Friday',
+    sat:'Saturday',
+    sun:'Sunday',
+    nameListType:'Type',
+    scClass:'School Class',
+    customNameList:'Self-customized List',
 
     // JoinClass.vue
     join:{
-        title:'加入课程名单',
-        errorInfo:'数据错误，请重新扫码',
-        teacherLabel:'教师：',
-        listLabel:'名单：',
-        joinBtn:'立即加入',
-        errorTile:'信息错误',
-        errorContent:'课程名单获取失败，请重新扫码加入！',
-        joinOk:'加入成功',
-        joinErr:'加入失敗',
-        getListErr:'獲取名單信息失敗',
-        hasJoin:'恭喜您，已經加入成功！ ',
-        getErr:'用戶信息獲取失敗',
-        parseErr:'登錄信息解析失敗'
+        title:'Add Course List',
+        errorInfo:'Data error, please scan the code again',
+        teacherLabel:'Teacher：',
+        listLabel:'List：',
+        joinBtn:'Join Now',
+        errorTile:'Information error',
+        errorContent:'Course list access failed, please scan the code to join again!',
+        joinOk:'Join successfully',
+        joinErr:'Failed to join',
+        getListErr:'Failed to get list information',
+        hasJoin:'Congratulations, you have joined successfully! ',
+        getErr:'Failed to read user information',
+        parseErr:'Failed to parse login information'
     }
 }

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

@@ -1,8 +1,8 @@
 export default {
     el: {
         cascader: {
-            noData:'暂无数据',
-            noMatch:'暂无匹配数据'
+            noData:'No data yet',
+            noMatch:'No matching data yet'
         }
     }
 }

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

@@ -1,14 +1,14 @@
 export default {
     required : 'Required',
     format:{
-        default: 'wrong format',
-        email: 'Wrong Email format',
+        default: 'Wrong Format',
+        email: 'Wrong Email Format',
         numeric: 'Only Numbers',
-        pw: 'Password must be 8-30 characters and contain English and numeric.'
+        pw: 'Password must be 8-30 characters and contain English and numbers.'
     },
-    alphanumeric: 'Only enter English & numbers.',
+    alphanumeric: 'Only enter English and numbers.',
     input:{
-        phone: 'Please enter your Cell Phone',
+        phone: 'Please enter your Cellphone',
         email: 'Please enter your Email',
         countryCode: 'Please select a country or region.',
         pwCheck: 'Please confirm your password again.',
@@ -16,14 +16,14 @@ export default {
     },
     coreApi:{
         error1: {
-            default: 'The mailbox or mobile number does not exist',
-            phone: 'This mobile number does not exist',
-            email: 'This mailbox does not exist'
+            default: 'The email or phone number does not exist',
+            phone: 'This phone number does not exist',
+            email: 'This email does not exist'
         },
         error2: {
-            default: 'This mobile number or email has been registered.',
-            phone: 'This mobile number has been registered.',
-            email: 'This mail has been used.'
+            default: 'This phone number or email has been registered.',
+            phone: 'This phone number has been registered.',
+            email: 'This email has been registered.'
         },
         error3: 'PIN verification failed'
     }

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

@@ -2,21 +2,21 @@ export default {
   title: 'Reset Password',
   btn: {
     sendPinCode:{
-      phone: 'Send code',
-      email: 'Send code'
+      phone: 'Send Code',
+      email: 'Send Code'
     },
     send: 'Send',
     noUsephone: 'Switch to Email verification',
-    noUseemail: 'Switch to Cell Phone verification',
+    noUseemail: 'Switch to Cellphone verification',
   },
   form:{
-    text1: 'Enter code',
+    text1: 'Enter Code',
     text2: 'New Password',
     text3: 'Confirm Password',
     placeholder:{
       phone: 'Cell Phone',
-      email: 'Emaill'
+      email: 'Email'
     },
-    remind: 'The verification email may be received in your spam or it may take 5-10 minutes to receive.'
+    remind: 'Please note that the verification email may be in your junk mail or may take 5-10 minutes to receive'
   }
 }

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

@@ -1,47 +1,47 @@
 export default {
-    examType1: '期中考试',
-    examType2: '期末考试',
-    examType3: '模拟考试',
-    evType1: '正规考',
-    evType2: '模拟考',
-    evType3: '普通考',
-    evMode1: '线上评量',
-    evMode2: '课中评量',
-    evMode3: '阅卷评量',
-    publishType1: '立即发布',
-    publishType2: '定时发布',
+    examType1: 'Midterm Exam',
+    examType2: 'Final Exam',
+    examType3: 'Mock Exam',
+    evType1: 'Summative Test',
+    evType2: 'Mock Test',
+    evType3: 'Quiz',
+    evMode1: 'Online Assessment',
+    evMode2: 'Smarter Classroom Assessment',
+    evMode3: 'OSS Script Assessment',
+    publishType1: 'Start Now',
+    publishType2: 'Scheduled Start Time',
     testType: [
         {
-            label: "Single",
-            value: "single"
+            label: "Single Answer",
+            value: "single Answer"
         },
         {
-            label: "Multiple",
-            value: "multiple"
+            label: "Multiple Answers",
+            value: "multiple Answers"
         },
         {
-            label: "Judge",
-            value: "judge"
+            label: "True-false",
+            value: "True-false"
         },
         {
-            label: "Complete",
-            value: "complete"
+            label: "Cloze",
+            value: "Cloze"
         },
         {
-            label: "Q&A",
-            value: "subjective"
+            label: "Short answer",
+            value: "Short answer"
         },
         {
             label: "Integrated",
-            value: "compose"
+            value: "Integrated"
         },
         {
-            label: "Correction",
-            value: "correct"
+            label: "Correcting",
+            value: "correcting"
         },
         {
-            label: "Connect",
-            value: "connector"
+            label: "Matching",
+            value: "Matching"
         },
     ],
 }

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

@@ -1,41 +1,39 @@
 export default{
-    previewStudy:'课前预习',
-    classData:'课堂数据',
-    recentRecord:'近期课堂记录',
-    acCount:'活动概览',
-    goingList:'进行中的活动列表',
-    scNotice:'学校公告',
-    msg:'消息通知',
-    sysMsg:'小豆助手',
-    avgScore:'平均互动指数',
-    col1:'小组学习',
-    col2:'多元评价',
-    col3:'个人学习',
-    col4:'生本决策',
-    col5:'全班互动',
-    col6:'全班测验',
-    ac1:'评量测验',
-    ac2:'自主学习',
-    ac3:'作业活动',
-    ac4:'投票活动',
-    ac5:'问卷调查',
-    countNum:'数量',
-    verifyPh:'手机号绑定',
-    verifyText:'完成手机号绑定并加入学校，您可以：',
-    verifyText1:'1、免费获得1G系统空间',
-    verifyText2:'2、使用更丰富系统功能',
-    verifyText3:'您尚未加入学校，若您所属学校已经购买专属的智慧学校管理功能，建议您立即向贵校管理员申请加入，使用学校才有的平台资源与功能。假如贵校尚未有管理功能，可推荐给学校行政单位参考喔！请参考：',
-    websiteLink:'IES 5智慧学校管理服务',
-    toPhone:'前往绑定>>>',
-    phoneSuccess:'手机号绑定已完成！',
-    hasBanding:'已绑定',
-    verifySchool:'加入学校',
-    toSchool:'加入学校>>>',
-    schoolSuccess:'您已加入学校！',
-    hasJoin:'已加入',
-    myCourse:'我的課表',
-    tmwCus:'明日課程',
-    course:'課程：',
-    className:'班級：',
-    tmwNoCus:'明天沒有課程安排'
+    previewStudy:'Previews before class',
+    classData:'Lesson Data',
+    recentRecord:'Recent Lesson Record',
+    acCount:'Activities Overview',
+    goingList:'List Of Ongoing Activities',
+    scNotice:'School Announcement',
+    msg:'Notification',
+    sysMsg:'HiTeach Agent',
+    avgScore:'Average Tech Interaction Index',
+    col1:'Group Learning',
+    col2:'Multi-approach Assessment',
+    col3:'Individual Learning',
+    col4:'Student Center Decision',
+    col5:'Whole-Class Interaction',
+    col6:'Whole-class Assessment',
+    ac1:'Assessment',
+    ac2:'Self-directed Learning',
+    ac3:'Assignment',
+    ac4:'Poll',
+    ac5:'Survey',
+    countNum:'Number',
+    verifyPh:'Cell phone number linking',
+    verifyText:'You have not yet joined a school. If your school has purchased the Smarter School Management function, we recommend you apply to your school administrator immediately to use the school platform resources and features available only to school members.',
+    verifyText1:'If your school does not yet have the Smarter School Management function, you can recommend it to the school administration. Please refer to：',
+    verifyText2:'https://www.habook.com/en/cloud.php?act=view&id=13',
+    toPhone:'Go to link>>>',
+    phoneSuccess:'Cell phone number linking has been completed!',
+    hasBanding:'Already linked',
+    verifySchool:'Join School',
+    toSchool:'Join School>>>',
+    schoolSuccess:'You have joined the school！',
+    hasJoin:'Joined',
+    myCourse:'My Class Schedule',
+    tmwCus:'Courses for Tomorrow',
+    course:'Course：',
+    className:'Class：',
+    tmwNoCus:'No classes scheduled for tomorrow'
 }

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

@@ -27,7 +27,6 @@ import home from './home'
 import updModal from './updModal'
 import task from './task'
 import utils from './utils'
-import user from './user'
 
 export default {
   schoolBaseInfo,
@@ -60,7 +59,6 @@ export default {
   updModal,
   task,
   utils,
-  user,
   formConfigP: {
     input: 'Please Enter ',
     select: 'Please Sele',

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

@@ -1,215 +1,215 @@
 export default{
     //MgtSchoolEva.vue
     mgtScEv:{
-        listLabel:'评测列表',
-        period:'学段：',
-        create:'新建',
-        delete:'删除',
-        edit:'编辑',
-        createTime:'施测时间：',
-        pending:'待发布',
-        going:'进行中',
-        finish:'已结束',
-        endTime:'结束时间：',
-        stop:'立即结束',
-        evType:'评测类型:',
-        evMode:'评测模式:',
-        stuCount:'施测人数:',
-        nodata:'暂无评测',
-        tab1:'评测数据',
-        tab2:'评测试卷',
-        autoTips1:'此功能仅用于展示情景快速模拟学生作答数据，且学生作答为随机生成，仅供参考!',
-        autoTips2:'此功能仅用于展示情景快速模拟教师评分数据，且分数为随机生成，仅供参考！',
-        autoScore:'一键评分',
-        autoAnswer:'一键作答',
-        evSubject:'测试学科：',
-        returnTop:'返回顶部',
-        mockOk:'模拟成功',
-        mockErr:'模拟失败',
-        stopTitle:'结束评测',
-        stopContent:'结束后学生将不能继续作答，是否立即结束',
-        stopOk:'评测已结束！',
-        deleteTitle:'删除评测',
-        deleteContent:'是否确认删除',
-        deleteOk:'删除成功',
-        deleteErr:'删除失败',
-        noJoin:'此账号暂未加入任何学校！',
-        myEv:'我发布的评测',
-        teaEv:'任课老师发布的评测',
-        markSetting:'阅卷助手',
-        markData:'阅卷数据',
-        ftStatus:'状态：',
-        ftType:'类型：',
-        ftMode:'模式：',
-        search:'搜索'
+        listLabel:'Assessment List',
+        period:'School System：',
+        create:'Create',
+        delete:'Delete',
+        edit:'Edit',
+        createTime:'Test Duration：',
+        pending:'Scheduled',
+        going:'In progress',
+        finish:'Has ended',
+        endTime:'Ending time：',
+        stop:'End immediately',
+        evType:'Assessment Type:',
+        evMode:'Assessment Method:',
+        stuCount:'Number of participants:',
+        nodata:'No assessment yet',
+        tab1:'Assessment Data',
+        tab2:'Assessment Files',
+        autoTips1:'This function is only used to show the scenario and quickly simulate student response data. Student responses are randomly generated for reference only!',
+        autoTips2:'This function is only used to show the scenario and quickly simulate teacher grading data. Teacher grading are randomly generated for reference only!',
+        autoScore:'One Click Grading',
+        autoAnswer:'One Click Answering',
+        evSubject:'Assessing Subject：',
+        returnTop:'Back to the top',
+        mockOk:'Simulate successfully',
+        mockErr:'Failed to simulate',
+        stopTitle:'End Assessment',
+        stopContent:'Are you sure to end? Students will not be able to continue answering.',
+        stopOk:'The assessment has ended!',
+        deleteTitle:'Delete Assessment',
+        deleteContent:'Are you sure to delete',
+        deleteOk:'Delete successfully',
+        deleteErr:'Failed to delete',
+        noJoin:'This account has not joined any schools yet!',
+        myEv:'Assessment I started',
+        teaEv:'Assessments started by the instructor',
+        markSetting:'Answer sheet scanning settings',
+        markData:'Scanning Data',
+        ftStatus:'Status：',
+        ftType:'Type：',
+        ftMode:'Method：',
+        search:'Search'
     },
 
     //CreateEv
     createEv:{
-        createLabel:'创建评测',
-        publishEv:'发布评测',
-        return:'返回上级',
-        baseInfo:'基础信息',
-        evName:'评测名称',
-        evPeriod:'测试学段',
-        evMode:'评测模式',
-        evType:'评测类型',
-        examType:'考试类别',
-        courseType:'课程类别',
-        cusLabel1:'学校课程',
-        cusLabel2:'个人课程',
-        evTarget:'施测对象',
-        publishType:'发布方式',
-        startTime:'开始时间',
-        sTimeHolder:'请选择开始时间',
-        endTime:'结束时间',
-        eTimeHolder:'请选择结束时间',
-        addSubject:'添加学科',
-        noSubject:'暂无学科，请添加学科',
-        noSubject1:'* 请先选择测试学段',
-        papersLabel:'试卷库',
-        perviewLabel:'试卷预览',
-        importLabel:'导入说明',
-        answerPreview:'作答预览',
-        errTips1:'评测名称不能为空！',
-        errTips2:'测试类型不能为空！',
-        errTips3:'评量模式不能为空！',
-        errTips4:'请设置类别！',
-        errTips5:'请设置测试类型！',
-        errTips6:'请设置测试对象！',
-        errTips7:'请设置发布方式！',
-        errTips8:'请设置发布时间！',
-        errTips9:'请设置结束时间！',
-        errTips10:'请设置测试学段！',
-        stPaperTitle:'挑选试卷',
-        stPaperContent:'是否确认挑选',
-        inDev:'功能正在开发中，敬请期待！',
-        formWarning:'请先完善评测基础信息!',
-        paperWarning:'请挑选或导入试卷!',
-        paperWarning1:'还没有试卷，请挑选或导入试卷!',
-        pdWarning:'请添加测试学科!',
-        publishOk:'评测发布成功！',
-        togglePeriod:'切换学段',
-        togglePdTip1:'您已添加',
-        togglePdTip2:'的测试学科，如果现在切换学段会清空已选学科，确定切换学段吗？',
-        toggleOkText:'切换',
-        delPdTitle:'删除学科',
-        delPdContent:'是否确认删除',
-        delOk:'删除成功',
-        pdTips:'请先选择测试学段！',
-        defaultPaper:'(请先挑选或导入试卷)',
+        createLabel:'Create Assessment',
+        publishEv:'Start Assessment',
+        return:'Click to go back',
+        baseInfo:'Basic Information',
+        evName:'Assessment Name',
+        evPeriod:'School System',
+        evMode:'Method',
+        evType:'Type',
+        examType:'Type (for analysis)',
+        courseType:'Course Type',
+        cusLabel1:'School Course',
+        cusLabel2:'Personal Course',
+        evTarget:'Participant',
+        publishType:'Starting Time',
+        startTime:'Start time',
+        sTimeHolder:'Please select a start time',
+        endTime:'End Time',
+        eTimeHolder:'Please select a end time',
+        addSubject:'Add Subject',
+        noSubject:'No subject yet, please add a subject',
+        noSubject1:'* Please select the school system',
+        papersLabel:'Exam Files Bank',
+        perviewLabel:'Exam Files Preview',
+        importLabel:'Import Instruction',
+        answerPreview:'Answering Preview',
+        errTips1:'Cannot be empty!',
+        errTips2:'Please select type！',
+        errTips3:'Please select type！',
+        errTips4:'Please select type！',
+        errTips5:'Please select type！',
+        errTips6:'Please select participant！',
+        errTips7:'Please select starting time！',
+        errTips8:'Please select start time！',
+        errTips9:'Please select end time！！',
+        errTips10:'Please select school system！',
+        stPaperTitle:'Select exam file',
+        stPaperContent:'Confirm selection?',
+        inDev:'Features are under development, stay tuned!',
+        formWarning:'Please complete the basic information first!',
+        paperWarning:'Please pick or import exam files!',
+        paperWarning1:'No exam files yet, please pick or import them!',
+        pdWarning:'Please add assessment subject!',
+        publishOk:'The assessment was created successfully!',
+        togglePeriod:'Switch academic system',
+        togglePdTip1:'You have added',
+        togglePdTip2:'subject. Switching the school system now will clear the selected subjects. Do you confirm the switch?',
+        toggleOkText:'Switch',
+        delPdTitle:'Delete Subject',
+        delPdContent:'Are you sure to delete?',
+        delOk:'Delete successfully',
+        pdTips:'Please select the school system！',
+        defaultPaper:'(Please pick or import exam files)',
     },
     // ManualPaper.vue
     manual:{
-        source:'来源：',
-        sourceP:'个人试卷库',
-        sourceS:'学校试卷库',
-        pdLabel:'学段：',
-        subjectLabel:'学科：',
-        gradeLabel:'年级：',
-        fitPd:'适用学段：',
-        fitSubject:'适用学科：',
-        quCount:'题量：',
-        useCount:'使用次数：',
-        stdPaper:'已选试卷',
-        stPaper:'选择试卷',
-        previewPaper:'预览试卷',
-        noPaper:'暂无对应的试卷',
-        noPaper1:'暂无试卷'
+        source:'Source：',
+        sourceP:'Personal Exam Files Bank',
+        sourceS:'School Exam Files Bank',
+        pdLabel:'School System：',
+        subjectLabel:'Subject：',
+        gradeLabel:'Grade：',
+        fitPd:'Applicable School System',
+        fitSubject:'Applicable Subjects：',
+        quCount:'Question Number：',
+        useCount:'Number of uses：',
+        stdPaper:'Selected Exam Files',
+        stPaper:'Select Exam Files',
+        previewPaper:'Preview Exam Files',
+        noPaper:'No corresponding exam files yet',
+        noPaper1:'No exam files yet'
     },
     // PaperScore.vue、Scoring.vue
     score:{
-        stuName:'学生姓名：',
-        score:'总分：',
-        scoreUnit:'分',
-        saveScore:'保存打分',
-        showAns:'显示答案',
-        hideAns:'隐藏答案',
-        showQu:'显示题干',
-        hideQu:'隐藏题干',
-        quIndex:'题号：',
-        quIndex1:'题号',
-        fullScore:'满分',
-        zeroScore:'零分',
-        zeroScore1:'0分',
-        stuAns:'【学 生 作 答】',
-        mark:'批注',
-        quAns:'【答ㅤ案】',
-        noAnswer:'未设置答案',
-        anaLabel:'【解ㅤ析】',
-        noAna:'暂无解析',
-        kdLabel:'【知识点】',
-        noKd:'暂未绑定知识点',
-        sQuLabel1:'【小题',
+        stuName:'Student Name：',
+        score:'Total Score：',
+        scoreUnit:'Point',
+        saveScore:'Save Given Points',
+        showAns:'Show Answer',
+        hideAns:'Hide Answer',
+        showQu:'Show Question',
+        hideQu:'Hide Question',
+        quIndex:'Question Number：',
+        quIndex1:'Question Number',
+        fullScore:'Perfect Score',
+        zeroScore:'0 point',
+        zeroScore1:'0 point',
+        stuAns:'【Student Responses】',
+        mark:'Annotate',
+        quAns:'【Answer】',
+        noAnswer:'No answer set',
+        anaLabel:'【Explanation】',
+        noAna:'No explanation yet',
+        kdLabel:'【Key Concept】',
+        noKd:'No Key Concept bound yet',
+        sQuLabel1:'【Question',
         sQuLabel2:'】',
-        quIndexLabel:'【题号',
-        nextStu:'下一位学生>>>',
-        markOk:'批注成功！',
-        markErr:'批注失败！',
-        isFullTips:'已经是小题满分了',
-        isZeroTips:'已经是零分了',
-        saveScoreOk:'成绩保存成功！',
-        saveSocreErr:'成绩保存失败！',
-        zero:'零',
-        one:'一',
-        two:'二',
-        three:'三',
-        four:'四',
-        five:'五',
-        six:'六',
-        seven:'七',
-        eight:'八',
-        nine:'九',
-        ten:'十',
-        hundred:'百',
-        thousand:'千',
-        tenThd:'万',
-        hMillion:'亿',
-        noStuAns:'未作答',
-        noStuAns1:'暂未作答',
-        trueAns:'正确',
-        falseAns:'错误',
+        quIndexLabel:'【Question Number',
+        nextStu:'Next Student>>>',
+        markOk:'Annotate successfully！',
+        markErr:'Failed to annotate！',
+        isFullTips:'Already full score for the question',
+        isZeroTips:'It is already zero points',
+        saveScoreOk:'Results saved successfully！',
+        saveSocreErr:'Failed to save results！',
+        zero:'Zero',
+        one:'One',
+        two:'Two',
+        three:'Three',
+        four:'Four',
+        five:'Five',
+        six:'Six',
+        seven:'Seven',
+        eight:'Eight',
+        nine:'Nine',
+        ten:'Ten',
+        hundred:'Hundred',
+        thousand:'Thousand',
+        tenThd:'Ten thousand',
+        hMillion:'One hundred million',
+        noStuAns:'Not answered',
+        noStuAns1:'Not answered yet',
+        trueAns:'Correct',
+        falseAns:'Incorrect',
         //Scoring.vue
-        subjectLabel:'学科：',
-        gradeLabel:'年级：',
-        classLabel:'班级：',
-        stuLabel:'学生：',
-        scoreView:'分数概览',
-        scoring:'试卷评分',
-        classNoStu:'班级暂无学生',
-        status1:'暂未作答',
-        status2:'前往评分',
-        status3:'查看分数',
-        column1:'姓名',
-        column2:'总分',
-        column3:'状态',
-        finishScore:'已完成所有学生作答的评分！',
-        unableScore:'学生尚未作答，无法评分',
-        stStuWarning: '请先选择学生！',
-        lastQu: '上一题',
-        nextQu: '下一题',
+        subjectLabel:'Subject：',
+        gradeLabel:'Grade：',
+        classLabel:'Class：',
+        stuLabel:'Student：',
+        scoreView:'Score Overview',
+        scoring:'Exam File Grading',
+        classNoStu:'No students in the class yet',
+        status1:'Not answered yet',
+        status2:'Go to grading',
+        status3:'View Score',
+        column1:'Name',
+        column2:'Total Score',
+        column3:'Status',
+        finishScore:'Grading of all student responses was completed！',
+        unableScore:'Students have not answered, cannot be graded',
+        stStuWarning: 'Please select a student first！',
+        lastQu: 'Previous Question',
+        nextQu: 'Next Question',
     },
 
     //SimpleAnalysis.vue
     simple:{
-        totalPeople:'总人数',
-        missExam:'缺考数',
-        classLabel:'班级',
-        sjLabel:'学科',
-        avgScore:'平均分',
-        classStuCount:'班级人数',
-        answered:'已作答',
-        unanswer:'未作答',
-        scored:'已评分',
-        unscore:'未评分',
-        noPublish:'评测尚未发布，暂无统计数据',
-        calcing:'成绩数据结算中，',
-        clickFresh:'点此刷新',
-        inCalc:'数据结算中，请稍后查看',
-        total:'总分',
-        avgScore:'均分统计',
-        totalLabel:'总量',
-        scoreMat:'分数段统计'
+        totalPeople:'Total number of people',
+        missExam:'Number of absentee',
+        classLabel:'Class',
+        sjLabel:'Subject',
+        avgScore:'Average Statistics',
+        classStuCount:'Number of student in class',
+        answered:'Answered',
+        unanswer:'Not answered',
+        scored:'Graded',
+        unscore:'Not Graded',
+        noPublish:'Assessment not yet started, no statistics yet',
+        calcing:'Result data are being processed now.，',
+        clickFresh:'Click here to refresh',
+        inCalc:'The data is being processed, please check later',
+        total:'Total Score',
+        avgScore:'Average Statistics',
+        totalLabel:'Total Quantity',
+        scoreMat:'Score segment statistics'
     },
 
     mark:{
@@ -272,7 +272,7 @@ export default{
         no:'否',
         allQu:'所有題目',
         noSet:'暫未設置',
-        quNoSet:'題塊設置',
+        quNoSet:'題號設置',
         startErr:'請設置閱卷開始時間',
         endErr:'請設置閱卷結束時間',
         typeErr:'請設置分配方式',
@@ -285,9 +285,6 @@ export default{
         teacherErr:'閱捲和相關老師設置',
         saveOk:'保存成功！ ',
         saveErr:'保存失敗！ ',
-        byStuTips:'批閱整份試卷',
-        byQuTips:'批閱指定題目',
-        quBlock:'題目劃塊',
         //ByqU.vue & ByStu.vue
         quit:'退出阅卷',
         examName:'考试名称：',
@@ -311,7 +308,7 @@ export default{
         unmark:'未阅',
         fullScore:'满分',
         zeroScore:'零分',
-        submit:'提交分数/批注',
+        submit:'提交分数',
         setting1:'打分自动切换学生',
         setting2:'完成批阅自动弹出切换',
         setting3:'打分自动切换题目',

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

@@ -1,86 +1,86 @@
 export default {
     title: {
-        ser: '數據中心位置',
-        IDLogin: '醍摩豆帳號登入',
-        QRLogin: 'QRCode 掃瑪登入',
-        schoolLogin: '校內帳號登入',
-        ies5: '醍摩豆雲平台'
+        ser: 'Data Center Location',
+        IDLogin: 'TEAM Model Account Login',
+        QRLogin: 'Scan QRCode login',
+        schoolLogin: 'School Account Login',
+        ies5: 'TEAM Model Cloud Platform'
     },
     subTitle: {
-        IDLogin: '登入IES智慧教學服務，即刻存取雲端服務',
-        QRLogin: '使用HiTA5掃描進行登入',
-        schoolLogin: '由學校统一分配給學生使用的帳號登入口',
-        selectType: '請選擇您的身份進行登入',
-        studentIDLogin: '由學生自主申請的醍摩豆帳號登入口'
+        IDLogin: 'Log in to IES Smarter Teaching Service and access the cloud services instantly',
+        QRLogin: 'Use HiTA5 to scan for login',
+        schoolLogin: 'Log in with accounts assigned to students by the school',
+        selectType: 'Please select your identity to login',
+        studentIDLogin: 'Log in with TEAM Model accounts self-applied by students'
     },
     serAdress: {
-        China: '大陸',
-        Global: '全球'
+        China: 'China',
+        Global: 'Global'
     },
     tooltip: {
-        text1: '藉由完整的醍摩豆帳號體驗教師的多校教學資源與課程串聯，以及學生的在升學過程中產生的完整學習歷程。',
-        text2: '使用學校提供的學生專屬帳號與密碼登入本校，體驗本校提供的活動、繳交作業或參與考試等任務。'
+        text1: "Through the complete TEAM Model account experience teachers' multi-school teaching resources and course connections, as well as the students' complete learning portfolio during the transition to higher education.",
+        text2: 'Login to the school using the student exclusive account and password, and experience the activities, assignments, and exams offered by the school'
     },
     placeholder: {
-        id : 'Email / 手機號碼 / 用戶編號',
-        psw: '密碼',
-        schoolMenu: '選擇學校',
-        schoolID : '帳號',
-        schoolPsw: '密碼'
+        id : 'Email / Phone / ID',
+        psw: 'Password',
+        schoolMenu: 'Select School',
+        schoolID : 'Account',
+        schoolPsw: 'Password'
     },
     link: {
-        QRLogin: 'QRCode登入',
-        IDLogin: '帳號登入',
-        regist: '免費註冊',
-        forgetPsw: '忘記密碼',
-        if: '還沒有帳號嗎?',
-        click: '點此'
+        QRLogin: 'QR Code',
+        IDLogin: 'Login',
+        regist: 'Register',
+        forgetPsw: 'Forget password?',
+        if: "Don't have an account yet?",
+        click: 'Click here'
     },
     communy:{
-        title: '或下列方式登入',
+        title: 'More options',
         fb: 'Facebook',
         google: 'Google',
         wechat: 'WeChat',
     },
     apiError:{
-        text1: '您的 帳號 或 密碼 不正確'
+        text1: ' User name or password incorrect'
     },
     sse:{
         error:{
-            text1: '快速登入code 無效'
+            text1: 'Quick login code invalid'
         },
-        text1: 'IES5智慧服務平台'
+        text1: 'IES 5 Smarter Service Platform'
     },
     modal: {
-        title: '选择身份',
-        btn1: '老师',
-        btn2: '学生'
+        title: 'Select Identity',
+        btn1: 'Teacher',
+        btn2: 'Student'
     },
-    china: '中國',
-    global: '全球',
-    chooseTips: '請選擇您的身份進行登入',
-    welcome1: '歡迎來到醍摩豆 5',
-    welcome2: '新時代智慧教育之旅 就此展開',
-    subtitle1: 'HiTeach 5 智慧教學系統',
-    teachText1: '實踐差異化教學，現代化因材施教',
-    teachText2: '線上線下，混和式教學系統首選',
-    teachText3: '合作學習，素養導向教學的全面應用',
-    teachText4: '看見每個學生思考',
-    subtitle2: '醍摩豆雲平台 IES 5',
-    iesText1: '新架構與新技術，速度升級更有感',
-    iesText2: '兼容各式媒體與檔案，雲端資源庫隨取即用',
-    iesText3: '題庫組卷、閱卷系統，評量應用更多元',
-    iesText4: '博拉圖學情分析，學生成績精準提升',
-    toOfficial: '了解更多關於醍摩豆 5',
-    teacherIden:'教師身份',
-    teacherText:'以教師身份登入IES 5智慧教學服務，即刻存取雲端服務',
-    studentIden:'學生身份',
-    studText:'以學生身份登入AClass ONE智慧學伴服務，完成學習任務與測驗',
-    noAccout:'還沒有賬號嗎？ ',
-    freeReg:'免費註冊',
-    teaCli:'教師端',
-    stuCli:'學生端',
+    china: 'China ',
+    global: 'Global',
+    chooseTips: 'Please select your identity to login',
+    welcome1: 'Welcome to TEAM Model 5',
+    welcome2: 'New Era Smarter Education Journey Begins Here',
+    subtitle1: 'HiTeach 5 Smarter Teaching System',
+    teachText1: 'Implementing differentiated teaching and modernized teaching according to student aptitude',
+    teachText2: 'Online and offline, the number one blended teaching system',
+    teachText3: 'Comprehensive application of cooperative learning and competence-oriented teaching',
+    teachText4: 'See students thinking',
+    subtitle2: 'TEAM Model Cloud Platform IES 5',
+    iesText1: 'New stucture and new technology, speed upgrade is especially felt',
+    iesText2: 'Compatible with all kinds of media and files, the cloud resource library is ready to use',
+    iesText3: 'Question bank, test paper design, answer sheet scanning system, more diversified assessment applications',
+    iesText4: 'PLAYTOL Dynamic Assessment Analytics, accurate enhancement of student performance',
+    toOfficial: 'Learn more about TEAM Model 5',
+    teacherIden:'Teacher',
+    teacherText:'Login to IES 5 Smarter Teaching Service as a teacher and access cloud services instantly',
+    studentIden:'Student',
+    studText:'Log in to AClass ONE Learning Companion as a student to complete learning tasks and assessments',
+    noAccout:"Don't have an account yet?",
+    freeReg:'Register for free',
+    teaCli:'For Teacher',
+    stuCli:'For Student',
     beian1:'',
     beian2:'',
-    copyright:'2021 HABOOK Group TeamModel'
+    copyright:'2021 HABOOK Group Team Model'
 }

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

@@ -1,7 +1,7 @@
 export default {
   breadcrumbs: 'Menu/Smarter IoT Dashboard',
-  menu1: 'Smarter City',
-  menu2: 'Teaching Source',
-  menu3: 'Leaerning Activity',
+  menu1: 'Smarter City Management',
+  menu2: 'Teaching Resource Management',
+  menu3: 'Learning Activity Service',
   menu4: 'Inter-Class Service'
 }

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

@@ -1,13 +1,13 @@
 export default {
     title: 'Create Account',
     form:{
-        text1: 'Verification',
+        text1: 'Verification Method',
         text2: 'Cellphone',
         text3: 'Email',
         text4: 'Name',
         text5: 'Password',
-        text6: 'Confirm',
-        remind: 'The verification email may be received in your spam or it may take 5-10 minutes to receive.',
+        text6: 'Confirm Password',
+        remind: 'Please note that the verification email may be in your junk mail or may take 5-10 minutes to receive',
         text8: 'Registration means that you have read and agreed to the',
         text9: ' terms of service',
         text10: ' and',
@@ -15,13 +15,13 @@ export default {
         placeholder:{
             phone: 'Please enter your phone',
             email: 'Please enter your email',
-            pindCode: 'Please enter pin code'
+            pindCode: 'Please enter verification code'
         }        
     },
     btn:{
-        signUp: 'Regist',
-        sendphone: 'Send code',
-        sendemail: 'Send Mail'
+        signUp: 'Register',
+        sendphone: 'Send verification code',
+        sendemail: 'Send verification mail'
     }
   }
   

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

@@ -7,14 +7,14 @@ export default {
         city: 'City'
     },
     btn:{
-        apply: 'Application',
+        apply: 'Apply to join',
         pending: 'Pending',
         logout: 'Sign out'
     },
     columns:{
         name: 'School Name',
         area: 'Area',
-        PRVN: 'PRVN',
+        PRVN: 'Province, County and City',
         shortCode: 'Short code',
         code: 'Code',
         address: 'Address'

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

@@ -2,13 +2,13 @@ export default {
   //ServiceList.vue
   AEGMCPLY: 'AClass ONE',
   RYGVCPLY: 'AClass ONE',
-  IPALYEIY: 'Smart Teaching Service Space',
+  IPALYEIY: 'Smarter Teaching Service Space',
   '6BOPC6MD': 'Teaching and learning big data management services',
-  ON6MBDOP: 'Smart School Big Data Management Service',
+  ON6MBDOP: 'Smarter School Big Data Management Service',
   服務授權列表: 'Service authorization list',
-  智慧教室授權管理: 'Smart classroom authorization management',
-  未購買: 'not purchased',
-  已購買: 'purchased',
+  智慧教室授權管理: 'Smarter classroom authorization management',
+  未購買: 'Not Purchased',
+  已購買: 'Purchased',
   '服務啟用 / 到期日:': 'Service activation / expiration date:',
   剩餘: 'Remaining',
   天: 'days',
@@ -16,20 +16,20 @@ export default {
   有週期授權數量: 'Periodic authorization quantity',
   固定分配數: 'Fixed allocation',
   動態分配數: 'Dynamic allocation number',
-  剩餘分配數: 'Remain allocation',
-  總使用率: 'Total usage',
+  剩餘分配數: 'Remain allocation number',
+  總使用率: 'Total usage rate',
   詳細服務內容: 'Detailed service content',
-  管理AClassOne授權: 'Manage AClassOne authorization',
+  管理AClassOne授權: 'Manage AClass One authorization',
 
   //HiteachAuthList.vue
   確定解除授權: 'Confirm deauthorization',
   當前您所選中的PC: 'The currently selected PC',
   '，確定解除授權?': ', are you sure to deauthorize?',
-  '解除授權後，可在教室中的電腦再次進行綁定授權。': 'After the authorization is cancelled, the binding authorization can be performed again on the computer in the classroom.',
+  '解除授權後，可在教室中的電腦再次進行綁定授權。': 'After the deauthorization, the binding authorization can be done again on the computer in the classroom.',
   取消: 'Cancel',
   確定: 'OK',
   Hiteach序號數: 'HiTeach serial number',
-  大量: 'Multi',
+  大量: 'Mass',
   單一: 'Single',
   授權: 'Authorization',
   可啟用裝置數: 'Number of devices that can be activated',
@@ -40,44 +40,44 @@ export default {
   無到期日: 'No expiration date',
   已到期: 'Expired',
   序號使用狀況: 'Serial number usage status: ',
-  未命名機台: 'Unnamed machine',
+  未命名機台: 'Unnamed device',
   解除授權: 'Deauthorize',
   顯示全部: 'Show all serial numbers',
   '僅顯示HiTeach STD序號': 'Display HiTeach STD serial number only',
   '僅顯示HiTeach PRO序號': 'Display HiTeach PRO serial number only',
   '僅顯示HiTeach TBL序號': 'Display HiTeach TBL serial number only',
-  僅顯示已完成綁定的序號: 'Only display the serial number of the completed binding',
+  僅顯示已完成綁定的序號: 'Only display the serial numbers that completed binding',
   僅顯示已到期序號: 'Show only expired serial numbers',
   已成功解除授權: 'Successfully deauthorized',
 
   //SpaceStatus.vue
-  智慧教學服務空間狀態: 'Space status',
+  智慧教學服務空間狀態: 'Smarter Teaching Service Space status',
   分配教學空間: 'Allocate teaching space',
   空間總數: 'Total space',
   已使用空間總數: 'Total used space',
   空間使用狀況: 'Space usage status',
   未使用空間數: 'Unused space',
-  未使用空間比率: 'Ratio',
-  可使用空間數: 'Usable spaces',
-  可使用空間比率: 'Ratio',
+  未使用空間比率: 'Unused space ratio',
+  可使用空間數: 'Usable space',
+  可使用空間比率: 'Usable space ratio',
   當前空間到期日: 'Expiration date: ',
-  '基本 1GB 永久授權': 'Basic 1GB perpetual license',
-  '到期後將變更為IES基本空間，超出基本空間值將被收回': 'After the expiration, it will be changed to the IES basic space.',
+  '基本 1GB 永久授權': 'Basic 1GB permanent authorization',
+  '到期後將變更為IES基本空間，超出基本空間值將被收回': 'After the expiration, it will be changed to the IES basic space and the value beyond the basic space will be withdrawn.',
   購買記錄: 'Purchase record',
-  醍摩豆智慧教學服務空間: 'TeamModel Space',
+  醍摩豆智慧教學服務空間: 'Team Model Smarter Teaching Service Space',
   訂單日期: 'Order Date: ',
   到期日: 'Expiry date:',
   添購其他服務: 'Add other services',
-  '空間已到期，超過僅供檢視': 'Space has expired, more than is only for viewing',
+  '空間已到期，超過僅供檢視': 'Space has expired, excess space is available for viewing only',
 
   //SpaceChart.vue
   文件: 'File',
   永久授權: 'Permanent authorization',
   影片: 'Video',
   圖片: 'Image',
-  題目與試卷: 'Questions and examinations',
+  題目與試卷: 'Questions and exam files',
   其他: 'Others',
-  學生使用: 'Student use',
+  學生使用: 'Used for Student',
   已分配至教師: 'Assigned to teacher',
   未使用: 'Unused',
   空間: ' Space',
@@ -85,18 +85,18 @@ export default {
   空間比率: ' Ratio',
 
   //學生帳號頁面的授權管理控件 student-account / AclassOneAuth.vue
-  確定收回所有授權: 'Make sure to reclaim all authorizations',
-  '收回授權後使用數會直接設置為0，如欲給予授權可針對目標對象進行套用。': 'After the authorization is withdrawn, the number of uses will be directly set to 0. If you want to grant authorization, you can apply it to the target object.',
+  確定收回所有授權: 'Confirmed withdrawal of all authorizations',
+  '收回授權後使用數會直接設置為0，如欲給予授權可針對目標對象進行套用。': 'After the authorization is withdrawn, the number of uses will be  set to 0 directly. If you want to grant authorization, you can apply it to the target object.',
   服務授權管理: 'Service authorization management',
-  AClassONE智慧學伴服務授權: 'AClassONE Authorization',
-  '賦予持有該服務授權的學生TEAM Modal ID使用AClassONE智慧學伴App的權限': 'Grant the TEAM Modal ID of the student who holds the service authorization to use the AClassONE Smart Learning Companion App',
-  總授權數: 'Total number of authorizations',
-  本次套用數: 'Number of applications this time',
+  AClassONE智慧學伴服務授權: 'AClass ONE Authorization',
+  '賦予持有該服務授權的學生TEAM Modal ID使用AClassONE智慧學伴App的權限': 'Grant permission to use AClass ONE Learning Companion to student TEAM Model IDs that are authorized to use the service',
+  總授權數: 'Total number of authorization',
+  本次套用數: 'Number of application this time',
   已使用數: 'Used number',
   授權總覽: 'Authorization overview',
   授權管理: 'Authorization management',
-  已購授權總數: 'Total Purchased :',
-  note: 'The authorization of fixed allocation is set by the school uniformly. Users should set the authorization object in the authorization management page. The dynamic access authorization will be automatically recycled at 23:59:59 every day, and students can activate it again the next day.',
+  已購授權總數: 'Total Purchased Authorization:',
+  note: 'The authorization of fixed allocation is set by the school uniformly. Users should set the licensees in the Authorization Management page. The dynamic access authorization will be automatically withdrawn at 23:59:59 every day, and students can activate it again the next day.',
   快速套用授權: 'Quickly apply authorization',
   套用至所有當前勾選項目: 'Apply to all checked items',
   套用: 'Apply',
@@ -108,74 +108,74 @@ export default {
   未关联班级: 'Unlinked class',
   套用至全校所有項目: 'Apply to all items in the school',
   共: 'total',
-  個: '',
-  '大於總授權數，無法使用': 'Greater than the total number of authorizations, can not be used',
-  添購其他授權: 'Add other licenses',
-  收回所有授權: 'Recover all authorizations',
+  個: '(s)',
+  '大於總授權數，無法使用': 'Greater than the total number of authorization, can not be used',
+  添購其他授權: 'Add other authorization',
+  收回所有授權: 'Withdraw all authorization',
   保存所有變更: 'Save all changes',
-  選擇班級: 'class',
+  選擇班級: 'Select class',
 
   //下方method區塊
-  固定分配授權數: 'Fixed allocation',
-  今日動態取用數: 'Dynamic access number',
-  今日可用授權數: 'Available',
+  固定分配授權數: 'Fixed allocation authorization number',
+  今日動態取用數: 'Dynamic access authorization number',
+  今日可用授權數: 'Available authorization number today',
   '請先選擇套用，再按保存': 'Please select apply first, then press save',
   '保存成功，本次尚無新增授權數量': 'Save successfully, there is no new authorization number this time',
   '保存成功，本次新增': 'Save successfully, add this time',
   個固定分配: 'Fixed allocation',
-  '保存失敗，超過可用授權數！': 'Save failed, the number of available authorizations exceeded!',
-  全部收回成功: 'All recovered successfully',
-  請先勾選欲授權之學生: 'Please check the students who want to authorize',
+  '保存失敗，超過可用授權數！': 'Failed to save, exceeded the number of available authorization',
+  全部收回成功: 'All withdrawn successfully',
+  請先勾選欲授權之學生: 'Please check the students you want to authorize first',
   '請設定有效的目標項 !': 'Please set a valid target item!',
   '目前所選學制人數為 0 人！': 'The number of students currently selected for the school system is 0!',
   '請先選學制！': 'Please choose the school system first!',
-  '目前所選學級人數為 0 人！': 'The number of students currently selected is 0!',
+  '目前所選學級人數為 0 人！': 'The number of students currently selected for the grade is 0!',
   '請先選學級！': 'Please choose the grade first!',
-  '目前所選班級人數為 0 人！': 'The number of currently selected class is 0!',
+  '目前所選班級人數為 0 人！': 'The number of students currently selected for the class is 0!',
   '請先選班級！': 'Please choose a class first!',
-  '全校人數超過所購買授權數，無法使用': 'The number of people in the school exceeds the number of licenses purchased and cannot be used',
-  全部收回成功: 'All recovered successfully',
+  '全校人數超過所購買授權數，無法使用': 'The number of people in the school exceeds the number of authorization purchased and cannot be used',
+  全部收回成功: 'All withdrawn successfully',
 
   //老師帳號分配空間授權控件  teachermgmt/index.vue 空間欄位部分
-  空間分配: 'Space allocation',
-  確定收回所有空間: 'Confirm to reclaim all space',
+  空間分配: 'Space Allocation',
+  確定收回所有空間: 'Confirm to withdraw all space',
   '確定後全部每位教師都直接設置為0GB。': 'After confirming, all teachers are directly set to 0GB.',
-  保存提醒: 'Save reminder',
-  '当前空間数据尚未保存。如果關閉，修改的数据将不会保存！': 'The current spatial data has not been saved. If closed, the modified data will not be saved!',
-  回收空間: 'Reclaimed space',
-  保存變更: 'Save changes',
+  保存提醒: 'Save Reminder',
+  '当前空間数据尚未保存。如果關閉，修改的数据将不会保存！': 'The current space data has not been saved. If closed, the modified data will not be saved!',
+  回收空間: 'Withdrawn Space',
+  保存變更: 'Save Changes',
   空間分配狀態: 'Space allocation status',
-  總空間量: 'Total space：',
+  總空間量: 'Total Space：',
   單人固定容量分配: 'Single fixed capacity allocation',
   目前可被分配總量: 'The total amount currently available for distribution',
   至: ' to',
   每人分配: 'Allocation per person',
-  當前勾選之教師帳號: 'Teacher account currently checked',
+  當前勾選之教師帳號: 'The currently selected teacher account',
   所有: 'all',
-  進階權限: ' Advanced permissions',
-  一般權限: ' General permissions',
+  進階權限: ' Advanced authorization',
+  一般權限: ' General authorization',
   之教師帳號: ' teacher account',
-  職稱為: 'Job title',
+  職稱為: 'Title',
   的教師帳號: 'teacher account',
   所有教師帳號: 'All teacher accounts',
 
   //下方method區塊
   '請手動輸入數字!': 'Please enter the numbers manually!',
-  '輸入了開頭為0的數字，請重新輸入!': 'Enter a number that starts with 0, please re-enter!',
-  回收成功: 'Successful recovery',
-  更新成功: 'Successful update',
-  超出該校使用空間: 'Exceeding the space used by the school',
-  有不存在老師的ID: 'There is no teacher ID',
-  保存失敗: 'Save failed',
+  '輸入了開頭為0的數字，請重新輸入!': 'Entered a number that starts with 0, please re-enter!',
+  回收成功: 'Withdrawn successfully',
+  更新成功: ' Update successfully',
+  超出該校使用空間: 'Exceeding the space available for school use',
+  有不存在老師的ID: 'There is a non-existent teacher ID',
+  保存失敗: 'Failed to save',
   '您未進行任何個別變更或批次套用，無需保存': 'You have not made any individual changes or batch application, no need to save',
   '超出剩餘空間量，套用失敗': 'Exceeding the amount of remaining space, application failed',
-  '套用完成，記得按保存': 'Apply complete, remember to press save',
+  '套用完成，記得按保存': 'Apply complete, please remember to press save',
   '先輸入有效數字，再進行套用': 'Enter a valid number first, then apply it',
-  套用完成: 'Application complete',
-  '先輸入有效數字，並進行勾選，再套用': 'Enter a valid number first, then check it, then apply',
+  套用完成: 'Application Complete',
+  '先輸入有效數字，並進行勾選，再套用': 'Enter a valid number first and select it, then apply',
 
   //store/spaceAuth.js
   學校已使用空間:'School used space',
-  已分配給教師空間:'Allocated to teacher space',
+  已分配給教師空間:'Space allocated to teachers',
   剩餘空間:'Remaining space'
 }

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

@@ -1,53 +1,52 @@
 export default {
-	setting_title1: '学校管理',
-	setting_title2: '一般设置',
-	setting_title3: '开放平台',
-	schoolList: '已添加或申请学校',
-	langSetting: '网站语言设定',
-	langTips: '请选择网站要用来显示选单、互动页面以及通知信息的语言',
-	langCheck: '使用浏览器语系展示',
-	themeSetting: '网站色彩模式',
-	themeTips: '请选择网站显示的色彩模式，以便提供最佳的用户体验',
-	menuSetting: '菜单显示设置',
-	menuTips: '选择左侧Menu在网站载入时的预设显示模式',
-	menuOpen: '预设展开显示',
-	menuClose: '预设关闭显示',
-	logoSetting: 'Logo显示设置',
-	logoTips: '选择是否隐藏左上角平台Logo',
-	logoOpen: '预设显示',
-	logoHide: '预设隐藏',
-	defaultSchool: '默认学校',
-	curSchool: '当前学校',
-	courseNum: '课程数',
-	activityNum: '活动数',
-	joinStatus: '提出加入请求',
-	requestStatus: '送出添加邀请',
-	goSchool: '前往学校',
-	agreeJoin: '同意加入',
-	cancelAdd: '拒绝加入',
-	undoJoin: '撤销申请',
-	requestJoin: '申请加入',
-	inputSearch: '输入要搜索的学校名称',
-	hasManager: '有管理者',
-	modalTip1: '注意',
-	modalTip2: '此举动将使您离开当前学校的 IES5 站台，并前往',
-	modalTip3: '当前页面未保存的资料将会丢失，是否同意此操作？',
-	columnName: '学校名称',
-	columnArea: '地区',
-	columnId: '校代码',
-	columnTool: '操作',
-	modalTip4: '温馨提示',
-	modalTip5: '确认加入',
-	modalTip6: '确认取消加入',
-	submitSucTips: '提交成功',
-	submitFailTips: '操作失败',
-	joinSucTips: '加入成功！',
-	status1: '已加入',
-	status2: '收到邀请',
-	status3: '申请中',
-	searchTip: '请输入<span>学校名称</span>或者<span>学校代码</span>进行搜索',
-	searchNone: '* 如未搜索到您想要的学校，可点击下方申请建立您的学校',
-	applyBtn: '申请建立学校',
+	setting_title1: 'School Management',
+	setting_title2: 'General Settings',
+	setting_title3: 'Open Platform',
+	schoolList: 'Schools that have joined or applied',
+	langSetting: 'Website Language Settings',
+	langTips: 'Please select the language in which the site will display menus, interactive pages and notifications',
+	langCheck: 'Display using browser language',
+	themeSetting: 'Website Color Mode',
+	themeTips: 'Please select the color mode of the website display in order to provide the best user experience',
+	menuSetting: 'Menu Display Settings',
+	menuTips: 'Select the default display for the Menu on the left when the site is loaded',
+	menuOpen: 'Display by default',
+	menuClose: "Don't display by default",
+	logoSetting: 'Logo Display Settings',
+	logoTips: 'Choose whether to hide the platform logo in the upper left corner',
+	logoOpen: 'Display by default',
+	logoHide: "Don't display by default",
+	defaultSchool: 'Default School',
+	curSchool: 'Current School',
+	courseNum: 'Course Number',
+	activityNum: 'Activity Number',
+	joinStatus: 'Request to join',
+	requestStatus: 'Send an invitation to join',
+	goSchool: 'Go to school',
+	agreeJoin: 'Agree to join',
+	cancelAdd: 'Decline to join',
+	undoJoin: 'Withdrawal request',
+	requestJoin: 'Request to join',
+	inputSearch: 'Enter the name of the school you want to search for',
+	modalTip1: 'Notice',
+	modalTip2: "This action will cause you to leave your current school's IES 5 platform and go to",
+	modalTip3: 'Any unsaved information on the current page will be lost, do you agree to this action?',
+	columnName: 'School Name',
+	columnArea: 'Areal',
+	columnId: 'School Short Code',
+	columnTool: 'Operations',
+	modalTip4: 'Friendly Reminder',
+	modalTip5: 'Confirm joining',
+	modalTip6: 'Confirm cancellation of joining',
+	submitSucTips: 'Submitted successfully',
+	submitFailTips: 'Failed to operate',
+	joinSucTips: 'Join successfully!',
+	status1: 'Joined',
+	status2: 'Receive Invitation',
+	status3: 'Applying',
+	searchTip: 'Please enter <span>school name</span> or <span>school code</span> to search',
+	searchNone: '* If you do not find the school you are looking for, you can click below to request to create your school',
+	applyBtn: 'Apply to create a school',
 	openList: '开放平台应用列表',
 	openInfo: '应用信息',
 	openName: '应用名称',
@@ -87,28 +86,28 @@ export default {
 	openModal1: "应用列表获取失败",
 	openModal2: "api列表获取失败",
 	applyForm: {
-		title: '申请建立AI智慧学校',
-		name: '学校/机构名称',
-		id: '学校/机构简码',
-		code: '学校/机构代码',
-		address: '学校/机构地址',
-		manager: '学校/机构负责人',
-		cellphone: '学校/机构联系电话',
-		content: '备注信息',
-		place1: '选择学校所在地区',
-		place2: '请输入学校详细地址',
-		place3: '请输入您的手机号，邮箱等联系方式',
-		place4: '可填写您的备注信息',
-		place5: '请输入管理员的称呼',
-		place6: '请选择学校所在地区',
-		submit: '提交申请',
-		submitSuc: '已成功提交申请！',
-		errTip1: '请选择正确的地区！',
-		errTip2: '请将信息填写完整！',
-		rule1: '学校名称不能为空',
-		rule2: '管理员信息不能为空',
-		rule3: '联系方式不能为空',
-		rule4: '学校地址不能为空',
-		applyTip: '* 提交申请后，将会于5个工作日内审核完毕，并通知申请人。'
+		title: 'Apply to create an AI Smarter School',
+		name: 'Full Name of School/Institution',
+		id: 'School/Institution Short Code',
+		code: 'School/Institution ID',
+		address: 'School/Institution Address',
+		manager: 'Person in charge of School/Institution',
+		cellphone: 'School/Institution Contact Information',
+		content: 'Remark Information',
+		place1: 'Please enter the full name (not the abbreviation)',
+		place2: 'Please enter the full address',
+		place3: 'Please enter phone number, email address and other contact information',
+		place4: 'You can fill in your remark information',
+		place5: 'Please enter the name of the person in charge',
+		place6: 'Please select the area where the school is located',
+		submit: 'Submit Application',
+		submitSuc: 'Application has been successfully submitted！',
+		errTip1: 'Please select the correct area!',
+		errTip2: 'Please fill in the information completely!',
+		rule1: 'School name cannot be empty',
+		rule2: 'The information of person in charge cannot be empty',
+		rule3: 'Contact information cannot be empty',
+		rule4: 'Address cannot be empty',
+		applyTip: '*After the application is submitted, it will be reviewed within 5 working days and the applicant will be notified.'
 	}
 }

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

@@ -2,34 +2,34 @@ export default {
     home: {
         teacher: 'Teacher',
         student: 'Student',
-        setting: 'Personal setting',
-        logout: 'Logout',
-        joinClass: 'Join class',
-        exam: 'assessment',
-        vote: 'Vote',
-        survey: 'Questionnaire'
+        setting: 'Personal Settings',
+        logout: 'Log out',
+        joinClass: 'Join Course',
+        exam: 'Assessment',
+        vote: 'Poll',
+        survey: 'Survey'
     },
     public: {
-        noData: 'No data temporarily',
+        noData: 'No data yet',
         going: 'In progress',
         finish: 'Ended',
-        schoolExam: 'School-level evaluation',
-        privateExam: 'Personal evaluation',
-        schoolVote: 'School-level voting',
-        privateVote: 'Personal vote',
-        schoolSurvey: 'School Level Questionnaire',
-        privateSurvey: 'Personal Questionnaire',
+        schoolExam: 'School-level Assessment',
+        privateExam: 'Personal Assessment',
+        schoolVote: 'School-level Poll',
+        privateVote: 'Personal Poll',
+        schoolSurvey: 'School-level Survey',
+        privateSurvey: 'Personal Survey',
         search: 'Please enter the query content...',
-        notice: '此功能暂未开放！'
+        notice: 'This feature is not yet available!'
     },
     state: [
         {
-            type: 'all',
-            status: 'All activity '
+            type: 'All',
+            status: 'All Activity Status'
         },
         {
             type: 'going',
-            status: 'Going'
+            status: 'In progress'
         },
         {
             type: 'finish',
@@ -37,37 +37,37 @@ export default {
         }
     ],
     event: {
-        allStatus: 'All activity status',
+        allStatus: 'All Activity Status',
         unFinished: 'Unfinished',
         Fineshed: 'Completed',
-        Timeout: 'Timeout',
-        makeupExam: 'Can make up the exam',
-        makeupHw: 'Can make up',
+        Timeout: 'Overdue',
+        makeupExam: 'Can make up this assessment',
+        makeupHw: 'Can make up this assignment',
         selectActivity: 'Please select an activity from the list',
-        allSubject: 'Comprehensive subjects'
+        allSubject: 'All Subjects'
     },
-    'settingView-title': 'Personal settings',
+    'settingView-title': 'Personal Settings',
     'teammodel-account-management': {
-        'page-title': 'TeamModel account management',
+        'page-title': 'Team Model Account Management',
         name: 'Name',
         account: 'Account',
         password: 'Password',
-        phone: 'Mobile phone number',
+        phone: 'Cell phone number',
         'e-mail': 'E-mail',
         binding: 'Binding Management',
         isbind: 'Bind',
-        unbind: 'Unbind',
-        save: 'Save settings'
+        unbind: 'Unlink',
+        save: 'Save Settings'
     },
     preference: {
-        'page-title': 'Preferences',
-        'UI-theme': 'Interface style settings',
+        'page-title': 'Preference Settings',
+        'UI-theme': 'Interface Style Settings',
         language: 'Language Setting'
     },
     'change-school': {
-        'page-title': 'Switch school',
+        'page-title': 'Switch School',
         'current-data-school': 'Current data source school',
-        'Habook-smart-school': 'Habook Smart School'
+        'Habook-smart-school': 'Habook Smarter School'
     },
     'homeView-title': 'Home page information overview',
     calenderCardTitle: 'Calendar',
@@ -81,29 +81,29 @@ export default {
     newAddCourse: 'The latest addition: Elective Mathematics (2)',
     missionListCardTitle: 'Activity Task List',
     missionListCardLoading: 'Loading',
-    missionListCardReachBottom: 'It the bottom, no activity! ',
+    missionListCardReachBottom: 'Already the bottom, no more activities! ',
     myProgressBar: {
-        tasksCompletionRate: 'Activity task completion rate',
-        selfStudyClickRate: 'Self-study textbook click rate'
+        tasksCompletionRate: 'Activity Task Completion Rate',
+        selfStudyClickRate: 'Self-study Teaching Material Click Rate'
     },
     chartNames: [
         'Average self-study time',
         'Curve of self-study hours per month in this semester',
-        'Last month I compared the number of activities I participated in with my grade',
-        'Comparison of the average daily self-study time and the whole year level',
+        'Comparison of my activity participation with my grade last month',
+        'Comparison of the average daily self-study time and the whole grade',
         'Percentage of participation time of various activities and tasks this month',
-        'Self-study activity'
+        'Self-study Active Degree'
     ],
     studyTimeChart: {
         averageTime: 'minutes/day',
         xAxisData: [
-            'day',
-            'One',
-            'two',
-            'three',
-            'four',
-            'Fives',
-            'six'
+            'Sunday',
+            'Monday',
+            'Tuesday',
+            'Wednesday',
+            'Thursday',
+            'Friday',
+            'Saturday'
         ]
     },
     splineSreaChart: {
@@ -121,135 +121,135 @@ export default {
             'I (third grade)',
             'Third grade',
             'second grade',
-            'Year Grade'
+            'First Grade'
         ],
         stackType: [
-            'operation',
+            'Assignment',
             'Assessment',
             'Pre-class preview',
-            'vote'
+            'Poll'
         ]
     },
     twoLineChart: {
         xAxisData: [
-            'day',
-            'ㄧ',
-            'two',
-            'three',
-            'four',
-            'Fives',
-            'six'
+            'Sunday',
+            'Monday',
+            'Tuesday',
+            'Wednesday',
+            'Thursday',
+            'Friday',
+            'Saturday'
         ]
     },
     eventPieChart: {
         partType: [
-            'operation',
+            'Assignment',
             'Assessment',
             'Pre-class preview',
-            'vote'
+            'Poll'
         ]
     },
     studyHeatMap: {
         xAxisData: [
-            'ㄧ',
-            'two',
-            'three',
-            'four',
-            'Fives'
+            'Monday',
+            'Tuesday',
+            'Wednesday',
+            'Thursday',
+            'Friday'
         ]
     },
-    latestNotification: 'Latest notification',
+    latestNotification: 'Latest Notification',
     postAt: 'Posted on',
     '______________': '______________',
-    'eventView-title': '活动任务',
-    nextTask: '下个活动',
-    allStatus: '所有活动状态',
-    unFinished: '未完成',
-    Fineshed: '已完成',
-    Timeout: '已逾时',
-    makeupExam: '可补考',
-    makeupHW: '可补交',
-    empty: '目前无资料 ~',
+    'eventView-title': 'Activity Task',
+    nextTask: 'Next Activity',
+    allStatus: 'All Activity Status',
+    unFinished: 'Unfinished',
+    Fineshed: 'Completed',
+    Timeout: 'Overdue',
+    makeupExam: 'Can make up this assessment',
+    makeupHW: 'Can make up this assignment',
+    empty: 'No information yet ~',
     baseInfo: {
-        subject: '科目:',
-        teacher: '教师:',
-        period: '活动期限：',
-        postTime: '发布时间：',
-        classTime: '上课时间',
-        unFinished: '未完成',
-        Fineshed: '已完成',
-        Closed: '已结束'
+        subject: 'Subject:',
+        teacher: 'Teacher:',
+        period: 'Activity Duration：',
+        postTime: 'Start Time：',
+        classTime: 'Class time',
+        unFinished: 'Unfinished',
+        Fineshed: 'Completed',
+        Closed: 'Ended'
     },
     billboard: {
-        description: '描述',
-        referlink: '连结资料',
-        attachment: '附件',
-        reference: '参考资料'
+        description: 'Description',
+        referlink: 'Linking information',
+        attachment: 'Annexes',
+        reference: 'References'
     },
     preview: {
-        checkpoint: '活动任务',
-        tutorial: '编序教材',
-        multiQues: '多题闯关模组',
+        checkpoint: 'Activity Task',
+        tutorial: 'Sequential teaching materials',
+        multiQues: 'Multiple-Questions Level Challange Module',
         previewContent: {
-            tutorial: '教材',
-            Des: '内容',
-            Unit: '单元',
-            quiz: '随堂考'
+            tutorial: 'Teaching Material',
+            Des: 'Content',
+            Unit: 'Unit',
+            quiz: 'Quiz'
         },
-        previous: '上一题',
-        next: '下一题',
-        sentAns: '送出答案',
-        tryAgain: '详读教材，再试一次',
-        nextUnit: '下一单元',
-        goHome: '回到首页',
-        quizRetries: '测验重试次数',
-        crossUnitHint: '上个单元测验尚未完成，请先完成方可进行本单元测验',
-        timeoutHint: '课前预习活动时间已结束，仍可进行教材阅读与练习，如于结束时间前未完成，相关成绩可能受到影响。'
+        previous: 'Previous Question',
+        next: 'Next Question',
+        sentAns: 'Send the answers',
+        tryAgain: 'Read the teaching material in detail and try again',
+        nextUnit: 'Next Unit',
+        goHome: 'Back to home page',
+        quizRetries: 'Number of assessment retries',
+        crossUnitHint: 'Please complete the previous unit assessment before taking this unit assessment.',
+        timeoutHint: 'The pre-class preview activity time is over, you can still read and practice the teaching material. If not completed by the end time, the related grade may be affected.'
     },
     vote: {
-        bollotbox: 'Voting area',
-        submit: 'OK to submit',
+        bollotbox: 'Polling Area',
+        submit: 'Confirmed to send',
         reVote: 'Vote again',
-        voteSuccess: 'Vote successful',
-        voteDes: 'After the event is over, you can view everyone vote results',
-        timeoutHint: 'Voting time has passed, no more voting, please pay attention to the teacher release of the voting results! ',
-        voteResult: 'The result of this vote is:',
+        voteSuccess: 'Vote successfully',
+        voteDes: "After the event, you can view the results of everyone's votes",
+        timeoutHint: 'Polling time has passed, no more voting. Please pay attention to the teacher for the results! ',
+        voteResult: 'The result of this poll is:',
         voteDesDefault: 'Please choose a desired plan:',
-        tickets: 'ticket',
+        tickets: 'vote(s)',
         surplusTickets: 'Remaining votes',
         submitBVote: 'Submit to vote',
-        note: 'Please select at least one option before you vote! ',
-        warning: 'Voting failed, please check the voting information! ',
+        note: 'Please select at least one option before voting! ',
+        warning: 'Voting failed, please check the polling information! ',
         warning2: 'The maximum number of votes has been exceeded! ',
-        voteRes: 'Voting results',
-        voteRecord: 'Vote Record',
-        voteTime: '投票时间',
-        noData: '暂无投票结果数据',
-        option: '选项',
+        voteRes: 'Polling Result',
+        voteRecord: 'Poll Record',
+        voteTime: 'Poll Duration',
+        noData: 'No polling result data yet',
+        option: 'Options',
     },
     homework: {
-        homeworkUpload: 'Job upload area',
-        homeworkUoloadBtn: 'Upload job',
+        homeworkUpload: 'Assignment Upload Area',
+        homeworkUoloadBtn: 'Upload Assignment',
         homeworkReUoloadBtn: 'Re-upload',
-        CommentClassmatesHomeworkBtn: 'Classmates homework observation and mutual evaluation',
-        uploadSuccess: 'Upload successful',
-        uploadDes: 'After the activity is over, you can view the homework score comments',
-        timeoutHint: 'The homework upload time has ended. The homework score will be calculated as 0 points, or wait for the teacher to open it up. ',
-        contentPage: 'Job content',
-        scorePage: 'Score Comment',
-        score: 'Teacher score',
-        classmatesComments: 'Classmates give comments',
+        CommentClassmatesHomeworkBtn: "Classmates' assignment observation and mutual evaluation",
+        uploadSuccess: 'Upload successfully',
+        uploadDes: 'After the activity is over, you can view the assignment score and comments',
+        timeoutHint: 'The uploading time for assessment has ended. Thus, the score will be calculated as 0, or wait for the teacher to allow make-ups.',
+        contentPage: 'Assignment Content',
+        scorePage: 'Score and Comment',
+        score: 'Score From Teacher',
+        classmatesComments: 'Score From Classmates',
         comment: 'Give a comment: '
     },
     classmatesComment: {
-        title: 'Classmates homework observation and mutual evaluation',
-        seatNo: 'seat number',
+        title: "Classmates' assignment observation and mutual evaluation",
+        seatNo: 'Seat Number',
         name: 'Name',
-        star: 'star',
+        star: 'Star',
         comment: 'Give a comment',
-        preview: 'Operation preview: file name',
+        preview: 'Assignment Preview: File Name',
         unPreview: 'The format of this file currently does not provide preview',
-        download: 'Download file',
+        download: 'Download File',
         submitted: 'Submit',
         inputSomething: 'Input comments and other suggestions',
         previous: 'Previous',
@@ -257,117 +257,117 @@ export default {
         submitBtn: 'Submit'
     },
     exam: {
-        examLink: 'test paper link',
-        isSubject: 'Subject paper',
-        subjectNow: 'Current subject',
-        examData: 'evaluation content',
-        gradeReport: 'Score report',
+        examLink: 'Exam File Link',
+        isSubject: 'Subject Exam File',
+        subjectNow: 'Current Subject',
+        examData: 'Assessment Content',
+        gradeReport: 'Grade Report',
         gradeAnalyse: 'Score Analysis',
         queType: {
-            single: 'Single choice question',
-            multiply: 'Multiple Choice Questions',
-            judge: 'Judgement question',
-            complete: 'Fill in the blanks',
-            subjective: 'Question and Answer Question',
-            compose: 'Comprehensive questions',
-            correct: 'Correct the wrong question',
-            connector: 'Connection question'
+            single: 'Single Answer Question',
+            multiply: 'Multiple Answers Question',
+            judge: 'True-false Question',
+            complete: 'Cloze Question',
+            subjective: 'Short Answer Question',
+            compose: 'Integrated Questions',
+            correct: 'Correcting Question',
+            connector: 'Matching Question'
         },
         submitSuccess: 'The answer information was submitted successfully! ',
-        submitFail: 'Failed to save the answer information! ',
-        msgWarning: 'The answer message is wrong! ',
+        submitFail: 'Failed to submit the answer information! ',
+        msgWarning: 'Error in answer data! ',
         testpop: {
             title: 'Assessment',
             completion: 'Completion degree',
             practiceMode: 'Practice Mode',
-            all: 'Practice all',
-            onlywrong: 'Only practice the wrong answer',
-            questions: 'The question',
-            submitted: 'Submission of paper',
-            submitted1: "结束练习",
+            all: 'Practice All',
+            onlywrong: 'Only practice the incorrectly answered',
+            questions: 'questions',
+            submitted: 'Submit Answer',
+            submitted1: "End The Practice",
             finish: 'Completed',
-            showAns: 'Show answers',
+            showAns: 'Show the answer',
             hideAns: 'Hide the answer',
-            hint: 'Key hint',
-            previous: 'Previous question',
-            next: 'Next question',
-            myAnswerSheet: 'My Answer Sheet',
-            exitQuizhint: 'Leave Quiz Prompt',
-            exitQuizhintDe: 'The system has detected that you have not yet "turned in", if you choose "OK",',
-            exitQuizhintDes: 'The current answer will not be saved, and the test will need to be re-tested next time',
+            hint: 'Key Hint',
+            previous: 'Previous Question',
+            next: 'Next Question',
+            myAnswerSheet: 'My Answer Card',
+            exitQuizhint: 'Leave Assessment Reminder',
+            exitQuizhintDe: 'The system has detected that you have not yet "submit your answers", if you choose "OK",',
+            exitQuizhintDes: 'the current answer will not be saved, and the assessment will need to be retaken next time.',
             cancel: 'Cancel',
             ok: 'OK',
-            submitQuizhint: 'Reminder for submission of papers',
-            submitQuizhintDes1: 'At present, you have completed the system test. Are you sure to submit the paper? ',
+            submitQuizhint: 'Reminder for submission of answers',
+            submitQuizhintDes1: 'The system has detected that you have completed all questions. Are you sure to submit your answers? ',
             check: 'No, need to check again',
             conAnswer0: 'Currently you have',
-            conAnswer1: 'The question is not answered (check the answer card in detail)',
+            conAnswer1: 'question(s) not answered (check the answer card for detail)',
             conAnswer2: ', please complete the question first! ',
             conAnswer: 'Continue to answer',
-            okSubmit: 'Confirm to submit the paper',
-            exitWrong: "离开错题练习提示",
-            exitWrongDe: "系统检测您尚未「结束练习」，如您选择「确定」,",
-            exitWrongDes: "则目前作答将不保存，下次需重新练习",
-            endPractice: "结束练习提示",
-            endPracticeDe: "是否继续练习？",
-            endPracticeBtn1: "继续练习",
-            endPracticeBtn2: "结束练习",
-            qNo: 'Question number:',
-            correction: 'right',
-            queNo: 'Title:',
-            myAns: 'My answer:'
+            okSubmit: 'Confirm to submit your answers',
+            exitWrong: "Leave Incorrectly Answered Questions Practice Reminder",
+            exitWrongDe: 'The system detects that you have not yet "End practicing", if you select "OK",',
+            exitWrongDes: "the current answer will not be saved, and you need to practice again next time.",
+            endPractice: "End Practice Reminder",
+            endPracticeDe: "Do you want to continue practicing?",
+            endPracticeBtn1: "Continue practicing",
+            endPracticeBtn2: "End practicing",
+            qNo: 'Question Number:',
+            correction: 'Correct Answer',
+            queNo: 'Question:',
+            myAns: 'My Answer:'
         },
         report: {
             anwser: 'Go to answer',
-            noRes: 'Results have not been settled',
-            getScore: 'Number of score questions',
-            answerBack: 'Review of the review and answer',
-            right: 'Answer right',
-            wrong: 'Wrong answer',
-            noScore: 'Not scored',
-            ansRes: 'result of answer',
-            testAns: 'reference answer',
-            testAnalyse: 'Analyze',
-            repairSource: 'remediation resource',
-            noAns: 'No answer',
-            linkSource: 'Network Resources',
-            noSource: 'No resource temporarily',
+            noRes: 'Results are not yet calculated.',
+            getScore: 'Number of scored questions',
+            answerBack: 'Review of answering',
+            right: 'Answer Correctly',
+            wrong: 'Answer Incorrectly',
+            noScore: 'Not Gradedd',
+            ansRes: 'Answering Result',
+            testAns: 'Reference Answer',
+            testAnalyse: 'Explanation',
+            repairSource: 'Remediation Resource',
+            noAns: 'Not Answered',
+            linkSource: 'Internet Resources',
+            noSource: 'No resource yet',
             fileSource: 'File Resource',
-            fileView: 'File Preview',
+            fileView: 'Preview File',
             noReview: 'This file does not support preview, please download and view! ',
-            pdfErr: 'pdf loading failed',
-            noAnalyse: 'No analysis yet',
-            wrongPractice: '错题练习',
+            pdfErr: 'Failed to load PDF',
+            noAnalyse: 'No explanation yet',
+            wrongPractice: 'Incorrectly Answered Questions Practice',
         },
-        timeoutHint: 'The evaluation activity time has ended. Overtime will be calculated as 0 points, or wait for the teacher to open the make-up exam. ',
-        contentPage: 'Review content',
-        scorePage: 'Score report',
-        practiceHint: 'Assessment activity time has ended, you can still click on the test paper link to continue practicing. ',
-        performance: 'Score performance',
+        timeoutHint: 'The assessment activity has ended. Overdue will be calculated as 0 points, or wait for the teacher to allow make-ups.',
+        contentPage: 'Assessment Content',
+        scorePage: 'Grade Report',
+        practiceHint: 'The assessment activity  has ended, you can still click on the exam file link to continue practicing.',
+        performance: 'Score Performance',
         reviewAnswers: 'Review of answering status',
-        Chinese: '国文',
+        Chinese: 'Language',
         Math: 'Mathematics',
         English: 'English',
         score: 'Score',
         difficulty: 'Comprehensive difficulty of exam questions',
-        average: 'Class average score',
-        rightNum: 'The number of my correct answers',
+        average: 'Class Average Score',
+        rightNum: 'My number of correctly answered questions',
         smartComment: 'Smart Comment',
-        keypoint: 'Recommended knowledge points for review:',
+        keypoint: 'Recommended key concepts for review:',
         chart: {
             scoreDistribution: 'Assessment score distribution map',
-            participant: 'Number of candidates:',
-            student: 'person',
-            keyPointPerformance: 'Knowledge point performance radar chart',
-            me: 'personal',
-            participantClass: '全班',
-            participantAverage: 'The whole school',
+            participant: 'Number of examinees:',
+            student: 'people',
+            keyPointPerformance: 'Key Concept performance radar chart',
+            me: 'Personal',
+            participantClass: 'Whole Class',
+            participantAverage: 'Whole School',
             recognizePerformance: 'Cognitive Level Radar Chart'
         },
         studentScore: {
             examName: 'Exam Name',
             examType: 'Exam Type',
-            stableIndex: 'Learning stability coefficient',
+            stableIndex: 'Learning Stability Coefficient',
             name: 'Name',
             stuNo: 'Student ID',
             class: 'Class',
@@ -377,91 +377,90 @@ export default {
             gAverages: 'Grade Average Score',
             aAverages: 'District average score',
             cIndex: 'Class Ranking',
-            gIndex: 'grade ranking',
-            aIndex: 'District rank',
-            onLine: 'Whether to enter the line',
+            gIndex: 'Grade Ranking',
+            aIndex: 'District Ranking',
+            onLine: 'Meet the target or not?',
             subject: 'Subject',
-            score: 'Personal score',
-            cAverage: 'Class average',
+            score: 'Personal Score',
+            cAverage: 'Class Average',
             gAverage: 'Grade Average',
-            aAverage: 'District average',
-            rAns: 'Number of correct answers',
-            wAns: 'Number of wrong answers',
-            comIndex: 'comprehensive difficulty',
+            aAverage: 'District Average',
+            rAns: 'Number of correctly answered questions',
+            wAns: 'Number of incorrectly answered questions',
+            comIndex: 'Comprehensive Difficulty',
             objItem: 'Objective',
             subItem: 'Subjective',
-            subjects: 'Subjects',
-            item: 'Title',
-            objItems: 'Objective questions',
-            subItems: 'Subjective questions',
+            subjects: 'Subject',
+            item: 'Question',
+            objItems: 'Objective Questions',
+            subItems: 'Subjective Questions',
             itemIndex: 'Question Number',
-            standardIndex: 'standard answer/partition points',
-            stuAnsIndex: 'Student answer/score',
-            notice: '【-】--correct answer, 【#】--no answer, 【?】--multiple choice question',
-            gradeErr: 'The grade information is wrong! '
+            standardIndex: 'Standard Answer/Assigned Point(s)',
+            stuAnsIndex: 'Student Answer/Point(s)',
+            notice: '【-】--correctly answered, 【#】--not answered, 【?】--multiple choice question',
+            gradeErr: 'Error in score data!'
         },
-        'correctAnswer': 'correct answer',
-        wrongAnswer: 'Wrong answer',
-        unAnswered: 'Unanswered',
+        'correctAnswer': 'Correctly Answered',
+        wrongAnswer: 'Incorrectly Answered',
+        unAnswered: 'Not Answered',
         solution: 'Solution',
-        analysis: 'Analysis',
-        correctRate: 'correct answer rate',
+        analysis: 'Explanation',
+        correctRate: 'Correctly Answered Rate',
         relatedAQues: 'Related Questions',
-        answer: '作答',
-        inputAnswers: '请输入作答结果',
-        emput: '空'
+        answer: 'Answer',
+        inputAnswers: 'Please enter the answer result',
+        emput: 'Empty'
     },
     queNaire: {
-        submitSuccess: '提交成功',
-        overTime: '不在作答时间范围内！',
-        answerErr: '作答数据错误！',
-        fileErr: '问卷获取失败！'
+        submitSuccess: 'Submitted successfully',
+        overTime: 'Not in the answer duration!',
+        answerErr: 'Error in answer data!',
+        fileErr: 'Failed to obtain the survey!'
     },
-    'informview-title': 'Notification overview',
+    'informview-title': 'Notification Overview',
     view: 'Go to view',
     read: 'Read',
-    'studyview-title': 'self-study',
-    'hiteachview-title': 'HiTeach class record',
+    'studyview-title': 'Self-directed Learning',
+    'hiteachview-title': 'HiTeach Lesson Record',
     hiteachNote: {
-        material: 'Class content',
+        material: 'Lesson Content',
         classInteractionRecord: 'Class Interaction Record',
-        qA: 'Quick and answer',
-        qAMulti: 'Quick and answer (multiple choice)',
-        reference: 'Reference answer',
+        qA: 'Pop Quiz',
+        qAMulti: 'Pop Quiz (multiple answers)',
+        reference: 'Reference Answer',
         correct: 'The answer is correct',
-        groupQAMulti: 'Group QAMulti (multiple choice)',
-        poImg: 'The teacher pushed a picture from Hitach:',
-        link: 'Share link'
+        groupQAMulti: 'Group Pop Quiz (multiple answers)',
+        poImg: 'The teacher send a picture from HiTeach:',
+        link: 'Share Link'
     },
     'courseList-title': 'My Course List',
-    defaultClass: 'standard courses',
-    tempClass: 'temporary class',
+    defaultClass: 'Scheduled Course',
+    tempClass: 'Temporary Course',
     courseContent: {
         baseInfo: 'Basic Information',
         description: 'Course Overview',
         classmates: 'Classmates list',
         classID: 'Course Code',
         classTime: 'Class Time',
-        classroom: 'Classroom',
-        teacher: 'Teaching teacher',
-        'co-teacher': 'co-teacher',
-        addedTime: 'Join the course date',
-        syllabus: 'Syllabus overview',
-        seatNo: 'seat number',
+        classroom: 'Instructor',
+        'co-teacher': 'Co-teacher',
+        addedTime: 'Join Course Date',
+        syllabus: 'Syllabus Overview',
+        seatNo: 'Seat Number',
         name: 'Name',
         group: 'Group'
     },
-    'calendar-title': 'Calendar-Second semester of 109 school year',
+    'calendar-title': 'Calendar-Second semester of 2020 school year',
     today: 'Today',
-    importEvent: 'Campus Class Important Events',
-    deadlineTasks: 'Deadline activity tasks',
-    schedule: 'Schedule scheduled',
+    importEvent: 'Important School/Class Matters',
+    deadlineTasks: 'Ending Activity Tasks',
+    schedule: 'Class Schedule ',
     des: 'Description',
     time: 'Time',
     place: 'Location',
     course: 'Course',
     mockcourses: ['Reading and Writing', 'English Presentation', 'Special Experiments on Electronic Circuits', 'Introduction to Computers', 'Microprocessor Experiments'],
-    importEventTitle: 'Campus Class Important Events',
-    Thatday: 'The day',
-    deadlineTasksTitle: 'Activity tasks are not completed at the end of the day'
+    importEventTitle: 'Important School/Class Matters',
+    Thatday: 'Today',
+    deadlineTasksTitle: 'Incomplete activity tasks ending today'
 }

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

@@ -1,62 +1,62 @@
 export default {
-    preview:'P',
-    title:'TEAM Model Cloud',
-    loading:'加载中',
-    authErr:'权限不足！',
-    development:'功能正在开发中',
+    preview:'Preview',
+    title:'TEAM Model Cloud Platform',
+    loading:'Loading',
+    authErr:'Insufficient authorization!',
+    development:'Features are under development',
     menu:{
-        school:'学校',
-        private:'个人',
-        noSchool1:'学校暂未购买服务',
-        noSchool2:'暂未加入学校',
+        school:'School',
+        private:'Personal',
+        noSchool1:'The school has not purchased the service yet',
+        noSchool2:'Not a member of the school yet',
         copyright:'©2021 HABOOK Group',
-        schoolMgt:'学校管理',
-        schoolRes:'校本资源',
-        baseSetting:'基础设置',
-        teacherMgt:'教师管理',
-        stuMgt:'学生管理',
-        classMgt:'教室管理',
-        cusSetting:'课程设置',
-        cusPlanMgt:'排课管理',
-        authMgt:'授权管理',
-        preview:'预览',
-        scSyllabus:'校本课纲',
-        scContent:'校本内容',
-        scQuBack:'校本题库',
-        kdBack:'知识点库',
-        staAna:'统计分析',
-        evAna:'学情分析',
-        scAna:'校园分析',
-        scAc:'校园活动',
-        scEv:'评量测验',
-        scVote:'投票活动',
-        scQu:'问卷调查',
-        classCus:'班级课程',
-        myClass:'我的班级',
-        myCus:'我的课程',
-        cusContent:'我的资源',
-        prtSyllabus:'个人课纲',
-        prtContent:'个人内容',
-        prtQuBack:'个人题库',
-        stuAc:'我的活动',
-        prtEv:'个人评测',
-        prtVote:'个人投票',
-        prtQu:'个人问卷',
-        selfLearn:'自主学习',
-        homework:'作业活动',
-        acRecord: '活动记录',
-        cusMgt:'课程管理',
-        taskList:'任务列表'
+        schoolMgt:'School Management',
+        schoolRes:'School Resource',
+        baseSetting:'Basic Settings',
+        teacherMgt:'Teacher Management',
+        stuMgt:'Student Management',
+        classMgt:'Classroom Management',
+        cusSetting:'Course Settings',
+        cusPlanMgt:'Scheduling Management',
+        authMgt:'Authorization Management',
+        preview:'Preview',
+        scSyllabus:'School Syllabus',
+        scContent:'School Content',
+        scQuBack:'School Question Bank',
+        kdBack:'Key Concept Bank',
+        staAna:'Statistical Analysis',
+        evAna:'Learning Status Analysis',
+        scAna:'Statistical Data',
+        scAc:'School Activity',
+        scEv:'Assesment',
+        scVote:'Poll',
+        scQu:'Survey',
+        classCus:'Class Course',
+        myClass:'My Class',
+        myCus:'My Course',
+        cusContent:'My Resource',
+        prtSyllabus:'Personal Syllabus',
+        prtContent:'Personal Teaching Material',
+        prtQuBack:'Personal Question Bank',
+        stuAc:'My Activity',
+        prtEv:'Personal Assessment',
+        prtVote:'Personal Poll',
+        prtQu:'Personal Survey',
+        selfLearn:'Self-directed Learning',
+        homework:'Assignmnet',
+        acRecord: 'Activity Record',
+        cusMgt:'Course Management',
+        taskList:'Task List'
     },
     compt: {
-        cusWare: '课件',
-        sizeErr: '文件大小超出限制',
-        typeErr: '文件类型不支持',
-        acRep: '警告 ：未找到指定班级',
-        classErr: '警告 ：未找到指定班级',
-        setErr: '错误：座位号重复',
-        tbColErr1:'导入数据没有',
-        tbColErr2: '，请完善表格数据再导入',
-        fileReadErr:'文件读取失败'
+        cusWare: 'Teaching Material',
+        sizeErr: 'File Size Exceeds Limit',
+        typeErr: 'File type not supported',
+        acRep: 'Warning : Selected specified classes not found',
+        classErr: 'Warning : Selected specified classes not found',
+        setErr: 'Error: Duplicate seat number',
+        tbColErr1:'Data not imported',
+        tbColErr2: '，please complete the form information before importing',
+        fileReadErr:'Failed to read file'
     }
 }

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

@@ -1,35 +1,35 @@
 export default {
-    text1: 'Total  Course(s)',
+    text1: 'Total Course(s)',
     text2: 'Teacher(s)',
     text3: 'Premium  Collection(s)',
     text4: 'Advanced  Collection(s)',
     text5: 'Classic  Collection(s)',
     text6: 'Today',
-    text7: 'Week',
-    text8: 'Month',
-    text9: 'Semester',
+    text7: 'Last 7 days',
+    text8: 'Last 30 days',
+    text9: 'This Semester',
     text10: 'Grade',
     text11: 'Subject',
-    text12: '1st  Grade',
-    text13: '2nd  Grade',
-    text14: '3rd  Grade',
-    text15: '4th  Grade',
-    text16: '5th  Grade',
-    text17: 'Chinese',
+    text12: '1st Grade',
+    text13: '2nd Grade',
+    text14: '3rd Grade',
+    text15: '4th Grade',
+    text16: '5th Grade',
+    text17: 'Language',
     text18: 'Math',
     text19: 'English',
     text20: 'Science',
     text21: 'Art',
-    text22: 'Other',
-    text23: 'Interactive  Technology  (Grade)',
-    text24: 'Interactive  Technology  (Subject)',
+    text22: 'Others',
+    text23: 'Technological Interaction Index Relationship Chart (Grade)',
+    text24: 'Technological Interaction Index Relationship Chart (Subject)',
     text25: 'Music',
-    text26: 'Testing',
-    text27: 'Chinese',
+    text26: 'Doftware Testing',
+    text27: 'Language',
     text28: 'English',
     text29: 'Art',
     text30: 'Scinece',
-    text31: 'Class  Meeting',
+    text31: 'Class Meeting',
     text32: 'Math',
     text33: 'Course(s)',
     text34: 'Other',
@@ -41,22 +41,22 @@ export default {
     text40: 'Pick-out',
     text41: 'Timer',
     text42: 'Buzz-in',
-    text43: 'Show  Chart',
-    text44: 'Pop  Quiz',
-    text45: 'Work  Comparison',
+    text43: 'Show Chart',
+    text44: 'Pop Quiz',
+    text45: 'Work Comparison',
     text46: 'Push',
-    text47: 'Flip  Cards',
-    text48: 'Re-Check  Quiz',
-    text49: 'Teaching Tech Distribution',
+    text47: 'Flip Cards',
+    text48: 'Re-Check Quiz',
+    text49: 'Common Used Tech Distribution',
     text50: 'Total',
     text51: 'English',
-    text52: 'Chinses',
+    text52: 'Language',
     text53: 'English',
     text54: 'Math',
     text55: 'Science',
-    text56: 'GE',
-    text57: 'Teaching  Appilication  (Grade)',
-    text58: 'Teaching  Appilication  (Subject)',
+    text56: 'Others',
+    text57: 'Pedagogical Application Index Relationship Chart (Grade)',
+    text58: 'Pedagogical Application Index Relationship Chart (Subject)',
     text59: 'TII = Technological Interaction Index',
     text60: 'PAI = Pedagogical Application Index',
     text61: 'num. ',

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

@@ -1,63 +1,63 @@
 export default {
-  recent: '最近',
-  recentTips: '临时缓存最近上传的资源，最多保存20条。退出账号或更换电脑缓存记录将会被清空。',
-  filterRes: '教材',
-  filterPicture: '图片',
-  filterVideo: '视频',
-  filterAudio: '音频',
-  filterDoc: '文档',
-  filterOther: '其他',
-  space: '空间：',
-  tableC1: '文件名称',
-  tableC2: '操作',
-  tableC3: '知识点',
-  tableC4: '文件大小',
-  tableC5: '关联数量',
-  tableC6: '上传日期',
-  searchText: '请输入关键字搜索',
-  btnUpload: '上传资源',
-  tips1: '大图',
-  tips2: '列表',
-  tips3: '下载文件',
-  tips4: '预览文件',
-  tips5: '绑定知识点',
-  tips6: '重命名',
-  tips7: '删除文件',
-  tips8: '您的浏览器不支持 video 标签。',
-  props1: '确认删除',
-  props2: '文件删除成功！',
-  props3: '文件删除失败！',
-  props4: '取消删除！',
-  props5: '文件名修改成功！',
-  props6: '文件上传成功！',
-  props7: '存储空间不足！',
-  uploadText: '点击或者拖拽上传',
+  recent: 'Recent',
+  recentTips: 'Temporary cache of up to 20 recently uploaded resources.The cache will be cleared when you exit the account or change computers.',
+  filterRes: 'Teachong Material',
+  filterPicture: 'Image',
+  filterVideo: 'Video',
+  filterAudio: 'Audio',
+  filterDoc: 'File',
+  filterOther: 'Others',
+  space: 'Storage：',
+  tableC1: 'File Name',
+  tableC2: 'Operations',
+  tableC3: 'Key Concept',
+  tableC4: 'File Size',
+  tableC5: 'Number of associations',
+  tableC6: 'Upload Date',
+  searchText: 'Please enter keywords to search',
+  btnUpload: 'Uploading Resources',
+  tips1: 'Large Icons',
+  tips2: 'List',
+  tips3: 'Download File',
+  tips4: 'Preview File',
+  tips5: 'Related Key Concept',
+  tips6: 'Rename',
+  tips7: 'Delete',
+  tips8: 'Your browser does not support the video tag',
+  props1: 'Confirm Deletion',
+  props2: 'File deleted successfully!',
+  props3: 'Failed to delete the file!',
+  props4: 'Cancel Delete!',
+  props5: 'File name change successful!',
+  props6: 'File uploaded successfully!',
+  props7: 'Not enough storage space!',
+  uploadText: 'Tap or drag to upload',
 
-  resTips: 'HiTeach生成的课件，只支持HTEX格式的教材预览',
-  space: '空间：',
-  calcing: '计算中...',
-  blobFull: '（已满）',
-  otherType: '其他类型',
-  appData: '应用数据',
-  delBatch: '批量删除',
-  viewport1: '列表模式',
-  viewport2: '图片模式',
-  bottomTips: '--------我也是有底线的--------',
-  notAudio: '您的浏览器不支持 audio 元素。',
-  nameOk: '名称修改成功',
-  nameErr: '名称修改失败',
-  fullTips: '存储空间已满，无法上传',
-  loadAll: '已经加载全部',
-  authErr: '获取Blob授权失败',
-  sizeErr: '空间计算异常',
-  delBatchTips1: '请在列表模式使用批量删除！',
-  delBatchTips2: '请先选择需要删除的文件！',
-  specialChart: '不能包含特殊字符',
-  noData: '暂无数据',
-  applyPd: '适用学段：',
-  applySub: '适用学科',
-  applyGrade: '适用年级',
-  public: '公共资源',
-  startDown: '開始下載',
-  videoTips:'溫馨提示：視頻只支持MP4格式在線播放！ '
+  resTips: 'HiTeach generates teaching materials that only support HTEX format previews',
+  space: 'Storage：',
+  calcing: 'Calculating...',
+  blobFull: '（Full）',
+  otherType: 'Other types',
+  appData: 'Application Data',
+  delBatch: 'Batch delete',
+  viewport1: 'List Mode',
+  viewport2: 'Icon Mode',
+  bottomTips: '--------I also have a bottom line--------',
+  notAudio: 'Your browser does not support the audio element。',
+  nameOk: 'Rename successful',
+  nameErr: 'Failed to rename',
+  fullTips: "Storage space is full, can't upload",
+  loadAll: 'All downloads have been completed',
+  authErr: 'Failed to obtain Blob authorization',
+  sizeErr: 'The storage calculation encountered an anomaly',
+  delBatchTips1: 'Please use batch delete in list mode!',
+  delBatchTips2: 'Please select the files to be deleted first!',
+  specialChart: 'Cannot contain special characters',
+  noData: 'No data yet',
+  applyPd: 'Applicable School System：',
+  applySub: 'Applicable Subject',
+  applyGrade: 'Applicable Grade',
+  public: 'Public Resources',
+  startDown: 'Start Downloading',
+  videoTips:'Friendly reminder: Only MP4 format is supported for online video playing! '
 }

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

@@ -1,58 +1,58 @@
 export default {
     // EvaluationList.vue
-    text1: 'Summary of previous examinations',
-    text2: 'times',
-    text3: 'More screening',
+    text1: 'Summary of previous assessments',
+    text2: 'Times',
+    text3: 'More filtering',
     text4: 'Enter test name...',
     text5: 'Current filter criteria',
     text6: 'Current quantity',
     text7: 'Participants',
     text8: 'Date',
     text9: 'None',
-    condition1: 'Period',
+    condition1: 'School System',
     condition2: 'Grade',
-    condition3: 'Term',
+    condition3: 'School year/semester',
     condition4: 'Type',
     condition5: 'Range',
-    condition6: 'Origin',
+    condition6: 'Mode',
     condition7: 'Subject',
 
     // totalIndex.vue
     ti_title1: 'Basic Data Statistics',
-    ti_title2: 'Evaluation Data Statistics',
-    ti_title3: 'Discipline Comparative Statistics',
-    ti_title4: 'Statistics of Excellent Student',
-    ti_title5: 'Profile List data',
-    ti_text1: 'number of teachers',
-    ti_text2: 'number of students',
-    ti_text3: 'number of learning segments',
-    ti_text4: 'number of grades',
-    ti_text5: 'number of classes',
-    ti_text12: 'evaluate all',
-    ti_text6: 'formal examination',
-    ti_text7: 'opening examination',
-    ti_text8: 'midterm exam',
-    ti_text9: 'final exam',
-    ti_text10: 'simulation test',
-    ti_text11: 'diagnostic test',
-    echarts_text1: 'highest value',
-    echarts_text2: 'minimum value',
-    echarts_text3: 'average',
-    echarts_text4: 'average class',
-    echarts_text5: 'average grade',
-    echarts_text6: 'total class size',
-    echarts_text7: 'total number of people entering the line',
-    echarts_text8: 'incoming rate',
-    echarts_text9: 'current grade',
-    echarts_text10: 'filter',
-    echarts_text11: 'test time',
-    echarts_text12: 'number of participants',
-    echarts_text13: 'actual number of participants',
-    echarts_text14: 'Participation rate',
-    echarts_text15: 'average score',
-    echarts_text16: 'Achievement index',
-    echarts_text17: 'eugenics rate',
-    echarts_text18: 'number of excellent students',
+    ti_title2: 'Learning Status Analysis',
+    ti_title3: 'Subject Comparison Statistics',
+    ti_title4: 'Excellent Student Ratio Statistics',
+    ti_title5: 'Assessment List data',
+    ti_text1: 'Teacher Number',
+    ti_text2: 'Student Number',
+    ti_text3: 'School System Number',
+    ti_text4: 'Grade Number',
+    ti_text5: 'Class Number',
+    ti_text12: 'All Assessments',
+    ti_text6: 'Summative Examination',
+    ti_text7: 'Mock Examination',
+    ti_text8: 'Quiz',
+    ti_text9: 'Others',
+    ti_text10: 'Simulation Test',
+    ti_text11: 'Diagnostic Test',
+    echarts_text1: 'Highest Value',
+    echarts_text2: 'Minimum Value',
+    echarts_text3: 'Average',
+    echarts_text4: 'Class Average',
+    echarts_text5: 'Grade Average',
+    echarts_text6: 'Total Class Size',
+    echarts_text7: 'Total number of people meeting the target',
+    echarts_text8: 'Meet-the-target Rate',
+    echarts_text9: 'Current Grade',
+    echarts_text10: 'Filter',
+    echarts_text11: 'Test Duration',
+    echarts_text12: 'Participant Number',
+    echarts_text13: 'Actual number of participants',
+    echarts_text14: 'Participation Rate',
+    echarts_text15: 'Average Score',
+    echarts_text16: 'Achievement Index',
+    echarts_text17: 'Eugenics Rate',
+    echarts_text18: 'Excellent Student Number',
 
     // Base Info
     base_name: 'Name',
@@ -62,35 +62,35 @@ export default {
 
     // ExamList.vue
     newest: 'Newest Exams',
-    more: 'View More ',
+    more: 'View More',
 
     // index.vue
     module1: 'Score Analysis',
-    module2: 'Point Analysis',
-    module3: 'Item Analysis',
-    module4: 'Knowledge Point Mastery',
-    module5: 'Cognitive level Mastery',
+    module2: 'Placement Analysis',
+    module3: 'Question Analysis',
+    module4: 'Key Concept Mastery',
+    module5: 'Cognitive Level Mastery',
     exportTable: 'Export Table',
     currentSubject: 'Current Subject',
 
     // AchievementAnalysis.vue
-    ach_title1: 'Pass Rate Statistics',
-    ach_title2: 'Equipartition Analysis',
-    ach_title3: 'Entry Number Statistics',
-    ach_title4: 'Entry State Statistics',
-    ach_title5: 'Entry Rate Statistics',
+    ach_title1: 'Scoring Rate Statistics',
+    ach_title2: 'Average Score Analysis',
+    ach_title3: 'Meet-the-target Number Statistics',
+    ach_title4: 'Meet-the-target State Statistics',
+    ach_title5: 'Each Class Average and Meet-the-target Rate Statistics',
     ach_title6: 'Early Warning Statistics',
     ach_title7: 'Ranking Statistics',
-    ach_title8: 'Equipartition Analysis',
+    ach_title8: 'Average Analysis',
     ach_text1: 'Pass Rate',
     ach_text2: 'Grade',
     ach_text3: 'District',
     ach_text4: 'Class Average',
     ach_text5: 'School Average',
     ach_text6: 'District Average',
-    ach_text7: 'Total Number',
-    ach_text8: 'Entry Number',
-    ach_text9: 'Entry Rate',
+    ach_text7: 'Number Of People',
+    ach_text8: 'Meet-the-target Number',
+    ach_text9: 'Meet-the-target Rate',
     ach_text10: 'Currently Class',
     ach_text11: 'Total Number',
     ach_text12: 'Back',
@@ -99,8 +99,8 @@ export default {
     ach_table_text2: 'Total Score',
     ach_table_text3: 'Average Score',
     ach_table_text4: 'Standard Deviation',
-    ach_table_text5: 'Super Average Rate',
-    ach_table_text6: 'Incoming Line',
+    ach_table_text5: 'Over-average Rate',
+    ach_table_text6: 'Target Line',
     ach_table_text7: 'Planted Line',
     ach_table_text8: 'Class Ranking',
     ach_table_text9: 'Grade Ranking',
@@ -109,54 +109,54 @@ export default {
     ach_table_text12: 'Grade PR Ranking',
     ach_table_text13: 'District PR Ranking',
     ach_table_text14: 'Progressive Class',
-    ach_table_text15: 'Step Back Class',
+    ach_table_text15: 'Regressive Class',
     ach_table_text16: 'Stable Class',
 
     ach_chart_text1: 'Sort by',
-    ach_chart_text2: 'default sort',
-    ach_chart_text3: 'score from high to low',
-    ach_chart_text4: 'score from low to high',
+    ach_chart_text2: 'Default sort',
+    ach_chart_text3: 'Score from high to low',
+    ach_chart_text4: 'Score from low to high',
 
     // ScatterAnalysis.vue
-    sca_title1: 'Learning Ability Distribution',
-    sca_title2: 'Student Stability Table',
-    sca_text1: 'Region',
-    sca_text2: 'Regional Characteristics',
+    sca_title1: 'Student Learning Ability Distribution',
+    sca_title2: 'Student Stability Statistics Table',
+    sca_text1: 'Area',
+    sca_text2: 'Area Characteristics',
     sca_text3: 'Number',
     sca_text4: 'Student',
-    sca_text5: 'good learning, high stability',
-    sca_text6: 'carelessness and carelessness lead to mistakes',
-    sca_text7: 'learning is still stable and requires further study',
-    sca_text8: 'occasional carelessness, insufficient preparation',
-    sca_text9: 'learning is not enough, more efforts are needed',
-    sca_text10: 'learning is very unstable, not fully prepared for the exam',
+    sca_text5: 'Good learning, high stability',
+    sca_text6: 'Carelessness and inattentiveness lead to mistakes',
+    sca_text7: 'Learning is stable, more efforts are needed',
+    sca_text8: 'Occasional carelessness, insufficient preparation',
+    sca_text9: 'Insufficient learning, more efforts are needed',
+    sca_text10: 'Learning is unstable, not fully prepared for the exam',
     sca_chart_text1: 'Pass Rate',
     sca_chart_text2: 'Stability',
-    sca_table_text1: 'Correct Answers Number',
-    sca_table_text2: 'Wrong Answers Number',
-    sca_table_text3: 'Be Tried No.',
-    sca_table_text4: 'Be Careful No.',
+    sca_table_text1: 'Correctly Answered Question Number',
+    sca_table_text2: 'Incorrectly Answered Question Number',
+    sca_table_text3: 'Question Should Work On',
+    sca_table_text4: 'Question Need To Be Careful of',
     sca_table_text5: 'Stability',
-    sca_table_text6: 'Drop Area',
+    sca_table_text6: 'Placement Area',
 
     // TestAnalysis.vue
-    ta_title1: 'Test Scatter Analysis',
-    ta_title2: 'Score Rate of Single Question in Grade',
-    ta_title3: 'Test Analysis Summary Table',
-    ta_title4: 'Test Score Rate Table',
-
-    ta_text1: 'Region',
-    ta_text2: 'Regional Characteristics',
-    ta_text3: 'Number',
+    ta_title1: 'Question Placement Analysis',
+    ta_title2: 'Grade Single-question Scoring Rate Statistics',
+    ta_title3: 'Question Analysis Summary Table',
+    ta_title4: 'Question Score Rate Table',
+
+    ta_text1: 'Area',
+    ta_text2: 'Area Characteristics',
+    ta_text3: 'Number Of Question',
     ta_text4: 'Question No.',
-    ta_text5: 'Selected No.',
+    ta_text5: 'Selected Question No.',
     ta_text6: 'The test questions are quite appropriate, which can be used to distinguish different students',
-    ta_text7: 'The test questions may contain heterogeneous components and need local correction',
+    ta_text7: 'The test questions may contain abnormal components and need partial correction',
     ta_text8: 'The difficulty of test questions is high, which is suitable for distinguishing students with high achievement',
-    ta_text9: 'The test questions contain heterogeneous components, which may be wrong in data or unclear in meaning, and must be modified',
+    ta_text9: 'The test questions contain abnormal components, which may be wrong in data or unclear in meaning, and must be modified',
 
     ta_chart_text1: 'Question',
-    ta_chart_text2: 'Correct Answer Rate',
+    ta_chart_text2: 'Correctly Answered Rate',
     ta_chart_text3: 'Stability',
     ta_chart_text4: 'Class Scoring Rate',
     ta_chart_text5: 'Grade Scoring Rate',
@@ -164,76 +164,76 @@ export default {
 
     ta_table_text1: 'No.',
     ta_table_text2: 'Type',
-    ta_table_text3: 'Knowledge Point',
-    ta_table_text4: 'Score',
+    ta_table_text3: 'Key Concept',
+    ta_table_text4: 'Points',
     ta_table_text5: 'Difficulty',
     ta_table_text6: 'Identification Degree',
     ta_table_text7: 'Class',
     ta_table_text8: 'Scoring Rate',
     ta_table_text9: 'District',
-    ta_table_text10: 'High Grouping',
-    ta_table_text11: 'Low Grouping',
+    ta_table_text10: 'High Group',
+    ta_table_text11: 'Low Group',
 
     ta_table_tip1: '* Unit:Scoring Rate',
     ta_table_tip2: '* R1-R6:Ranking Range',
 
     // KnowledgeAnalysis.vue
-    ka_title1: 'Proportion of Knowledge Points',
-    ka_title2: 'Cognitive Hierarchy Distribution',
-    ka_title3: 'Score Rate Relation Table',
-    ka_title4: 'Statistics of Score Rate of Knowledge Points',
-    ka_title5: 'Knowledge Point Score Details',
-    ka_title6: 'Relation Table of Error Rate',
-
-    ka_text1: 'Current knowledge block',
-    ka_text2: 'Current knowledge point',
-    ka_text3: 'Current cognition level',
-
-    ka_chart_text1: 'Switch histogram',
-    ka_chart_text2: 'Switch radar',
-
-    ka_radar_text1: 'Knowledge',
-    ka_radar_text2: 'Application',
-    ka_radar_text3: 'Analysis',
-    ka_radar_text4: 'Synthesis',
-    ka_radar_text5: 'Evaluation',
-    ka_radar_text6: 'Understanding',
-
-    ka_table_text1: 'Knowledge Point',
+    ka_title1: 'Proportion of Key Concept',
+    ka_title2: 'Cognitive Level Distribution',
+    ka_title3: 'Scoring Rate Relation Table',
+    ka_title4: 'Scoring Rate - Key Concept Statistics',
+    ka_title5: 'Key Concept Scoring Details',
+    ka_title6: 'Incorrectly Answered Question Rate Relation Table',
+
+    ka_text1: 'Current key concept set',
+    ka_text2: 'Current key concept',
+    ka_text3: 'Current cognitive level',
+
+    ka_chart_text1: 'Switch to histogram',
+    ka_chart_text2: 'Switch to radar',
+
+    ka_radar_text1: 'Remember',
+    ka_radar_text2: 'Apply',
+    ka_radar_text3: 'Analyze',
+    ka_radar_text4: 'Create',
+    ka_radar_text5: 'Evaluate',
+    ka_radar_text6: 'Understand',
+
+    ka_table_text1: 'Key Concept',
     ka_table_text2: 'Cognitive Level',
     ka_table_text3: 'Grade Scoring Rate',
     ka_table_text4: 'Score',
     ka_table_text5: 'Score in this section',
-    ka_table_text6: 'Scoring rate',
-    ka_table_text7: 'Question Number Involved',
+    ka_table_text6: 'Scoring Rate',
+    ka_table_text7: 'Question Involved',
     ka_table_text8: 'Average Score Rate',
     ka_table_text9: 'Number of Wrong Questions',
-    ka_table_text10: 'RH Number of Wrong Questions',
-    ka_table_text11: 'RL Number of Wrong Questions',
+    ka_table_text10: 'PH Number of Incorrectly Answered Questions',
+    ka_table_text11: 'PL Number of Incorrectly Answered Questions',
 
-    ka_tip1: '* RH: High partition / RL:Low partition',
+    ka_tip1: '* PH: High Group / LL:Low Group',
 
     // LevelAnalysis.vue
     le_title1: 'Proportion of Cognitive Level',
-    le_title2: 'Cognitive Hierarchy Distribution',
-    le_title3: 'Score Rate Relation Table',
-    le_title4: 'Statistics of Score Rate of cognitive level',
+    le_title2: 'Cognitive Level Distribution',
+    le_title3: 'Scoring Rate Relation Table',
+    le_title4: 'Scoring Rate - Cognitive Level Statistics',
     le_title5: 'Cognitive Level Score Details',
-    le_title6: 'Relation Table of Error Rate',
+    le_title6: 'Incorrectly Answered Question Rate Relation Table',
 
     // QuestionList.vue
     ql_text1: 'Total Score',
-    ql_text2: 'Single Question',
-    ql_text3: 'Multiple Question',
-    ql_text4: 'Judgement Question',
-    ql_text5: 'Complete Question',
-    ql_text6: 'Subjective Question',
-    ql_text7: 'Compose Question',
-    ql_text8: ' points',
-    ql_text9: 'View Answer and Explain',
+    ql_text2: 'Single Answer Question',
+    ql_text3: 'Multiple Answers Question',
+    ql_text4: 'True-false Question',
+    ql_text5: 'Cloze Question',
+    ql_text6: 'Short Answer Question',
+    ql_text7: 'Comprehensive Question',
+    ql_text8: 'points',
+    ql_text9: 'View Answer and Explanation',
     ql_text10: 'View Data Analysis',
-    ql_text11: 'Answer',
-    ql_text12: 'Explain',
-    ql_text13: '      Return'
+    ql_text11: 'Suggested Answer',
+    ql_text12: 'Explanation',
+    ql_text13: 'Return'
 
 }

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

@@ -5,7 +5,7 @@ export default {
     text4: 'time(s)',
     text5: 'min(s)',
     text6: 'msg(s)',
-    text7: 'unit(s)',
+    text7: 'people',
     text8: 'm',
     text9: 'unit'
   }

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

@@ -1,28 +1,28 @@
 export default{
-    uploading:'上传中',
-    complete:'完成',
-    comfirmUpd:'确认上传',
-    cancelUpd:'取消上传',
-    tips1:'* 上传相同名字的文件会自动覆盖',
-    tips2:'您可以为资源设置适用学段、学科和年级',
-    tips3:'支持PPTX文档转换成HTEX教材',
-    fileType1:'教材',
-    fileType2:'图片',
-    fileType3:'视频',
-    fileType4:'音频',
-    fileType5:'转换',
-    fileType6:'文档',
-    fileType7:'其他',
-    resolve:'转成HTEX教材',
-    delOk:'删除成功！',
-    delErr:'删除失败！',
-    sizeErr:'文件大小超出限制',
-    typeErr:'文件类型不支持',
-    cancelErr:'取消失败！',
-    resolveErr:'PPTX解析失败',
-    updErr:'上传失败',
-    compressImgOk:'压缩图上传成功',
-    compressImgErr:'压缩图上传失败',
-    posterOk:'视频封面上传成功',
-    posterErr:'视频封面上传失败'
+    uploading:'Uploading',
+    complete:'Complete',
+    comfirmUpd:'Confirm Upload',
+    cancelUpd:'Cancel Upload',
+    tips1:'* Uploading a file with the same name will automatically overwrite',
+    tips2:'You can set the appropriate school system, subject and grade level for the resource',
+    tips3:'Support for converting PPTX files to HTEX teaching materials',
+    fileType1:'Teaching Material',
+    fileType2:'Image',
+    fileType3:'Video',
+    fileType4:'Audio',
+    fileType5:'Conversion',
+    fileType6:'File',
+    fileType7:'Others',
+    resolve:'Conversion into HTEX teaching materials',
+    delOk:'Deleted successfully!',
+    delErr:'Failed to delete!',
+    sizeErr:'File size exceeds limit',
+    typeErr:'File type not supported',
+    cancelErr:'Failed to cancel!',
+    resolveErr:'Failed to parse PPTX',
+    updErr:'Failed to upload',
+    compressImgOk:'Compressed image uploaded successfully',
+    compressImgErr:'Failed to upload compressed image',
+    posterOk:'Video cover uploaded successfully',
+    posterErr:'Failed to upload video cover'
 }

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

@@ -1,39 +1,39 @@
 export default {
-    uploadVideoLimit:'最多只能上传一个视频！',
-	videoFormatError:'视频格式不正确！请重新选择！',
-	audioFormatError:'音频格式不正确！请重新选择！',
-	fileReadFail:'有试题数据读取失败！',
-	uploadLoading:'上传中...',
-	draw:'绘制',
-	text:'文本输入',
-	clear:'清屏',
-	undo:'撤销',
-	close:'关闭',
-	save:'保存',
-	width:'画笔粗细',
-	color:'画笔颜色',
-	fontSize:'字体大小',
-	fontColor:'字体颜色',
-	newNotice:'新通知',
-	noData:'暂无数据',
-	noJoinSchool:'暂未加入学校',
-	noShoolTip:'用户暂无学校列表数据',
-	getDataFail:'获取数据失败',
-	teacher:'教师',
-	student:'学生',
-	accountManage:'账号管理',
-	courseNum:'任教课程数',
-	activityNum:'发布活动数',
-	classNum:'任教班级数',
-	full:'已满',
-	spaceStatus:'个人空间状态',
-	res:'教材',
-	img:'图片',
-	video:'视频',
-	audio:'音频',
-	doc:'文档',
-	bank:'题库',
-	other:'其他内容',
-	caclErrorL:'空间计算异常',
-	logout:'退出登录',	
+    uploadVideoLimit:'Only one video can be uploaded at most!',
+	videoFormatError:'The video format is incorrect! Please reselect!',
+	audioFormatError:'The audio format is incorrect! Please reselect!',
+	fileReadFail:'There is test data reading failure!',
+	uploadLoading:'Uploading...',
+	draw:'Mark',
+	text:'Text input',
+	clear:'Clear',
+	undo:'Undo',
+	close:'Close',
+	save:'Save',
+	width:'Brush Thickness',
+	color:'Brush Color',
+	fontSize:'Font Size',
+	fontColor:'Font Color',
+	newNotice:'New Notification',
+	noData:'No data yet',
+	noJoinSchool:'Not joining a school yet',
+	noShoolTip:'No school list information is available for users.',
+	getDataFail:'Failed to obtain data',
+	teacher:'Teacher',
+	student:'Student',
+	accountManage:'Account Management',
+	courseNum:'Number of courses teaching',
+	activityNum:'Number of activities started',
+	classNum:'Number of classes teaching',
+	full:'Full',
+	spaceStatus:'Personal Space Status',
+	res:'Teaching Material',
+	img:'Image',
+	video:'Video',
+	audio:'Audio',
+	doc:'File',
+	bank:'Question Bank',
+	other:'Others',
+	caclErrorL:'The storage calculation encountered an anomaly',
+	logout:'Logout',	
 }

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

@@ -73,7 +73,7 @@ export default {
     selfpace: '測驗模式',
     blankPageAdd: '新增檔案',
     pptImport: '匯入.pptx',
-    powerclick: 'PowerClick',
+    powerclick: 'Power Click',
     hteOpen: '開啟.hte',
     ActIrsMode: '互動模式',
     edit: '編輯模式',

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

@@ -7,7 +7,7 @@ export default {
     editCus: '編輯課程',
     noTeacher: '暫無',
     cusName: '課程名稱',
-    cNameHolder: '請輸入課程名稱',
+    nameHolder: '請輸入課程名稱',
     cusCode: '課程編碼',
     codeHolder: '請輸入課程編碼',
     cusPd: '課程學制',
@@ -85,7 +85,7 @@ export default {
     share: '分享到頻道',
     noAc: '暫無記錄',
     pdLabel: '學制：',
-    noClassCus: '課程未安排班級：',
+    noClassCus: '課程未安排教室：',
     noTImeCus: '課程未設定時間：',
     listMode: '清單模式',
     ev: '評量',
@@ -227,8 +227,6 @@ export default {
     sltCusTips: '請先選擇課程',
     setCusWarning: '請設定課程',
     setTeaWarning: '請設定教師',
-    setClassWarning:'請選擇行政班',
-    setStuListWarning:'請選擇教學班',
     mon: '星期一',
     tue: '星期二',
     wed: '星期三',
@@ -237,8 +235,8 @@ export default {
     sat: '星期六',
     sun: '星期日',
     nameListType:'類型',
-    scClass:'行政班',
-    customNameList:'教學班',
+    scClass:'學校班級',
+    customNameList:'自定義名單',
 
     // JoinClass.vue
     join:{

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

@@ -184,10 +184,7 @@ export default {
 		paperDetails: '試卷詳情',
 		paperAnalysis: '試卷分析',
 		setPaperScore: '設定試卷總分',
-		goAnswerSheet: '列印答題卡',
-		choosePaper:'選擇試卷',
-		choosed:'已選擇',
-		searchPaper:'輸入試卷名稱進行搜索…'
+		goAnswerSheet: '預覽答題卡'
 	},
 	importFile: {
 		uploadSuc: '試卷檔案上傳解析成功！',
@@ -269,7 +266,7 @@ export default {
 		type: '資源類型',
 		place1: '請輸入資源描述',
 		tip1: '（輸入後按Enter即可新增成功）',
-		place2: '請輸入資源網址',
+		place2: '請輸入資源網址,按Enter即可新增',
 		confirm: '確認',
 		isExistTip: '已存在相同連結網址！',
 		formatErrorTip: '請輸入正確格式的網址！',
@@ -282,7 +279,7 @@ export default {
 	addTip4: '至少保留兩個選項！',
 	addTip5: '沒有査詢到題目！',
 	checkList: {
-		title: '試卷雙向細目分析表',
+		title: '試卷雙向細目分析錶',
 		tip: '提示：a（b）a-配分,b-數量',
 		sum: '合計',
 		none: '無'

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

@@ -21,11 +21,9 @@ export default {
     ac5: '問卷調查',
     countNum:'數量',
     verifyPh:'手機號綁定',
-    verifyText:'完成手機號綁定並加入學校，您可以：',
-    verifyText1:'1、免費獲得1G系統空間',
-    verifyText2:'2、使用更豐富系統功能',
-    verifyText3:'您尚未加入學校，若您所屬學校已經購買專屬的智慧學校管理功能，建議您立即向貴校管理員申請加入，使用學校才有的平台資源與功能。假如貴校尚未有管理功能，可推薦給學校行政單位參考喔！請參考：',
-    websiteLink:'IES 5智慧學校管理服務',
+    verifyText:'您尚未加入學校，若您所屬學校已經購買專屬的智慧學校管理功能，',
+    verifyText1:'建議您立即向貴校管理員申請加入，使用學校才有的平台資源與功能，',
+    verifyText2:'假如貴校尚未有管理功能，可推薦給學校行政單位參考喔！',
     toPhone:'前往綁定>>>',
     phoneSuccess:'手機號綁定已完成！ ',
     hasBanding:'已綁定',

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

@@ -3,6 +3,5 @@ export default {
 	error401: '登入狀態已過期！請重新登入！',
 	error404: '未呼叫到API地址！',
 	error: 'API異常！',
-	loading:'處理中',
-	error403:'授權過期或授權异常，請稍後重試！'
+	loading:'處理中'
 }

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

@@ -33,9 +33,6 @@ import utils from './utils'
 import knowledge from './knowledge'
 import task from './task'
 import syllabus from './syllabus'
-import user from './user'
-import notice from './notice'
-import answerSheet from './answerSheet'
 export default {
   
   schoolBaseInfo,
@@ -73,9 +70,6 @@ export default {
   knowledge,
   task,
   syllabus,
-  user,
-  notice,
-  answerSheet,
   test: '測試',
   formConfigP: {
     input: '請輸入',

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

@@ -1,5 +1,4 @@
 export default {
-	colorTip:'*綠色背景代表所選知識點，藍色背景代表知識塊關聯的知識點',
     subject: '學科',
     label: '名稱',
     blockP: '請輸入知識塊名稱',

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

@@ -36,7 +36,7 @@ export default {
         noJoin: '此帳號暫未加入任何學校！',
         myEv: '我發佈的評量',
         teaEv: '任課老師發佈的評量',
-        markSetting: '閱卷助手',
+        markSetting: '閱卷配寘',
         markData: '閱卷數據',
         ftStatus: '狀態：',
         ftType: '類型：',
@@ -272,7 +272,7 @@ export default {
         no:'否',
         allQu:'所有題目',
         noSet:'暫未設置',
-        quNoSet:'題塊設置',
+        quNoSet:'題號設置',
         startErr:'請設置閱卷開始時間',
         endErr:'請設置閱卷結束時間',
         typeErr:'請設置分配方式',
@@ -285,9 +285,6 @@ export default {
         teacherErr:'閱捲和相關老師設置',
         saveOk:'保存成功！ ',
         saveErr:'保存失敗！ ',
-        byStuTips:'批閱整份試卷',
-        byQuTips:'批閱指定題目',
-        quBlock:'題目劃塊',
         //ByqU.vue & ByStu.vue
         quit:'退出閱卷',
         examName:'考試名稱：',
@@ -311,7 +308,7 @@ export default {
         unmark:'未閱',
         fullScore:'滿分',
         zeroScore:'零分',
-        submit:'提交分數/批註',
+        submit:'提交分數',
         setting1:'打分自動切換學生',
         setting2:'完成批閱自動彈出切換',
         setting3:'打分自動切換題目',

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

@@ -40,7 +40,7 @@ export default {
         title: '或下列方式登入',
         fb: 'Facebook',
         google: 'Google',
-        wechat: '微信',
+        wechat: 'WeChat',
     },
     apiError:{
         text1: '您的 帳號 或 密碼 不正確'

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

@@ -27,13 +27,13 @@ export default {
     cancelAdd: '拒絕加入',
     undoJoin: '撤銷申請',
     requestJoin: '申請加入',
-    inputSearch: '輸入要檢索的學校名稱',
+    inputSearch: '輸入要搜尋的學校名稱',
     modalTip1: '注意',
-    modalTip2: '此舉動將使您離開當前學校的IES5網站,並前往',
+    modalTip2: '此舉動將使您離開當前學校的IES 5網站,並前往',
     modalTip3: '當前頁面未儲存的資料將會遺失,是否同意此操作？',
     columnName: '學校名稱',
     columnArea: '地區',
-    columnId: '校程式碼',
+    columnId: '學校簡碼',
     columnTool: '操作',
     modalTip4: '溫馨提示',
     modalTip5: '確認加入',
@@ -44,8 +44,8 @@ export default {
     status1: '已加入',
     status2: '收到邀請',
     status3: '申請中',
-    searchTip: '請輸入<span>學校名稱</span>或者<span>學校代碼</span>進行搜尋',
-    searchNone: '*如未搜尋到您想要的學校，可點擊下方申請建立 您的學校',
+    searchTip: '請輸入<span>學校名稱</span>或者<span>學校程式碼</span>進行搜尋',
+    searchNone: '*如未搜尋到您想要的學校，可點擊下方申請建立您的學校',
     applyBtn: '申請建立學校',
     openList: '開放平臺清單',
     openInfo: '平臺資訊',
@@ -87,28 +87,27 @@ export default {
     openModal2: 'api列表取得失敗',
     applyForm: {
         title: '申請建立學校',
-        name: '學校/機構名稱',
+        name: '學校/機構完整名稱',
         id: '學校/機構簡碼',
-        code: '學校/機構程式碼',
+        code: '學校/機構代碼',
         address: '學校/機構地址',
         manager: '學校/機構負責人',
-        cellphone: '學校/機構聯繫電話或郵箱',
+        cellphone: '學校/機構聯繫方式',
         content: '備註資訊',
-		place0:'請輸入完整名稱（不能是簡稱）',
-        place1: '選擇學校所在地區',
-        place2: '請輸入學校詳細地址',
-        place3: '請輸入您的手機號,郵箱等聯繫方式',
+        place1: '請輸入完整名稱(不能是簡稱)',
+        place2: '請輸入詳細地址',
+        place3: '請輸入電話號碼,Email等聯繫方式',
         place4: '可填寫您的備註資訊',
         place5: '請輸入負責人姓名',
-        place6: '請選擇學校所在地區',
+        place6: '請選擇所在地區',
         submit: '提交申請',
         submitSuc: '已成功提交申請！',
         errTip1: '請選擇正確的地區！',
         errTip2: '請將資訊填寫完整！',
-        rule1: '學校名稱不能為空',
-        rule2: '管理員資訊不能為空',
+        rule1: '名稱不能為空',
+        rule2: '負責人資訊不能為空',
         rule3: '聯繫方式不能為空',
-        rule4: '學校地址不能為空',
+        rule4: '地址不能為空',
         applyTip: '* 提交申請後，將會於5個工作日內審核完畢，並通知申請人。'
     }
 }

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

@@ -330,7 +330,7 @@ export default {
             testAnalyse: '解析',
             repairSource: '補救資源',
             noAns: '未作答',
-            linkSource: '網絡資源',
+            linkSource: '網路資源',
             noSource: '暫無資源',
             fileSource: '檔案資源',
             fileView: '檔案預覽',
@@ -434,8 +434,8 @@ export default {
         link: '分享連結'
     },
     'courseList-title': '我的課程清單',
-    defaultClass: '標準課程',
-    tempClass: '個人課程',
+    defaultClass: '表定課程',
+    tempClass: '臨時課程',
     courseContent: {
         baseInfo: '基本資訊',
         description: '課程概述',

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

@@ -31,8 +31,8 @@ export default {
 		name: '問卷名稱',
 		namePlace: '請輸入問卷名稱',
 		target: '問卷對象',
-		privateClass: '個人課程',
-		schoolClass: '學校課程',
+		privateClass: '個人班級',
+		schoolClass: '學校班級',
 		targetPlace: '請選擇問卷發佈對象',
 		noFoundText: '暫未建立班級',
 		time: '起迄時間',

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

@@ -1,7 +1,4 @@
 export default {
-	noShareMyself:'無法分享給自己',
-	from:'來自',
-	share:'分享',
 	noPreview:'該類型檔案不支持預覽！',
 	praviteSyllabus: '個人課綱',
 	fromCreate: '我創建的課綱',
@@ -14,10 +11,10 @@ export default {
 	add: '新建册別',
 	place1: '輸入册別名稱…',
 	isDel: '已失效',
-	deleteDelV: '忽略分享册別',
+	deleteDelV: '删除失效册別',
 	syllabusMenu: '課綱目錄',
 	relate: '關聯資源',
-	addResource: '新增資源',
+	addResource: '添加資源',
 	type1: '內容資源',
 	type2: '試題資源',
 	type3: '試卷資源',
@@ -31,17 +28,10 @@ export default {
 	grade: '年級',
 	semester: '學期',
 	name: '名稱',
-	canEdit:'可共編',
-	authorsTitle:'授權教師',
-	noAuth:'暫無授權教師資訊',
-	latestId:'最近修改人',
-	latestTime:'最近修改時間',
-	authors:'授權教師（多選）',
-	place4:'選擇授權册別管理許可權的教師…',
 	place2: '非必填,默認由年級+科目+學期組成…',
 	place3: '填寫册別名稱',
 	confirm: '確認',
-	addLink: '新增超連結',
+	addLink: '添加超連結',
 	linkName: '超連結標題',
 	linkUrl: '超連結地址',
 	chooseCoTeacher: '選擇共編教師',
@@ -50,7 +40,7 @@ export default {
 	count: '題數',
 	deleteVolume: '删除册別',
 	deleteConfirm: '確認删除該册別？',
-	deleteIsDelConfirm: '確認忽略該册別？',
+	deleteIsDelConfirm: '確認删除該失效册別？',
 	deleteSuc: '删除成功',
 	deleteFail: '删除失敗',
 	isDelTip: '該册別已被創建者移除',
@@ -66,7 +56,7 @@ export default {
 		hasResource: '有關聯資源',
 		hasCoEdit: '有共編許可權',
 		edit: '編輯',
-		add: '新增',
+		add: '添加',
 		remove: '删除',
 		coEdit: '共編該章節',
 		share: '分享該章節',
@@ -82,7 +72,7 @@ export default {
 		removeSucTip: '删除成功',
 		nodeNameTip: '節點名稱不能為空',
 		editSucTip: '編輯成功',
-		addSucTip: '新增成功',
+		addSucTip: '添加成功',
 		copyNode: '複製節點',
 		curChapter: '當前章節',
 		targetV: '目標册別',

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

@@ -4,7 +4,7 @@
     comfirmUpd:'確認上傳',
     cancelUpd:'取消上傳',
     tips1:'*上傳相同名字的檔案會自動覆蓋',
-    tips2:'您可以为资源设置适用学段、学科和年级',
+    tips2:'您可以為資源設置適用學段、學科和年級',
     tips3:'支援PPTX檔案轉換成HTEX教材',
     fileType1:'教材',
     fileType2:'圖片',