字串變更

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

@@ -70,9 +70,7 @@ export default {
   grade12: '12th Grade',
   smartClass: 'Smarter Classroom',
   sokratesClass: 'Observation Classroom',
-  unauthorization: 'unauthorized',
-  blankPageAdd: 'Open File',
-  selfpace: 'Q&A',
+  selfpace: 'SelfPace Test',
   blankPageAdd: 'Open File',
   pptImport: '.pptx',
   powerclick: 'PowerClick',
@@ -85,7 +83,7 @@ export default {
   ActSelfPaceMode: 'SelfPace Mode',
   ActDscMode: 'DSC Mode',
   ActElimitedMode: 'Knockout Game',
-  Other: 'Whiteboard',
+
   today: 'Today',
   lastweek: '7 days ago',
   unauthorization: 'unauthorized',

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

@@ -57,7 +57,8 @@ export default {
         classroomName: 'Classroom Name',
         classroomAttr: 'Classroom Attribute',
         classroomType: 'Classroom Type',
-        classroomTeacher: 'Instructor',
+        classroomTeacher: 'Class Teacher',
+        classroomTeacher1: 'Instructor',
         classroomNotice: 'Remarks',
         deleteStudent: 'Delete the selected student',
         deleteStuBtn: 'Delete',

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

@@ -216,7 +216,7 @@ export default {
     setClassTips:'Please set teaching classroom',
 
     //TimeSetting.vue
-    addTime:'Add Schedule',
+    addTime:'Please Add Schedule',
     saveSet:'Save Settings',
     edtiTime:'Editing Schedule',
     timeHolder:'Please enter the schedule name...',

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

@@ -1,4 +1,5 @@
 export default {
+	completeTip:'Please complete the subject, grade and semester data for the current school system first!',
 	editor:{
 		uploadVideo:'Upload Local Video',
 		uploadAudio:'Upload Local Audio',
@@ -178,7 +179,8 @@ export default {
 		saveItemsFailTip:'Exam file data save failed!',
 		emptyNameTip:'The name of the exam file cannot be empty!',
 		noSpaceTip:'Storage space is full!',
-		noItemTip:'No test question selected！',
+		noItemTip: 'No test question selected！',
+		regTip: 'The exam file name cannot contain special characters!',
 		isExistPaperTip:'Exam file with the same name already exist in the exam file bank, do you want to overwrite it?',
 		cancelSaveTip:'Cancel saving exam file!',
 		hasNoScoreTip:'There are questions that are not allocated points, please allocate points and then save!',
@@ -236,8 +238,9 @@ export default {
 		tip5:'please check and retry!',
 		tip6:'Switching the designing method will clear the currently selected question, do you want to continue?',
 		tip7:'The current exam file is detected to have unlisted questions in the question bank, do you want to sync to the question bank?',
-		tip8:'Synchronized to question bank',
+		tip8:'Synchronize to question bank',
 		tip9:'Do not synchronize',
+		tip10:'The number of eligible questions in the question bank is less than the number you expected, do you want to continue?'
 	},
 	points:{
 		addPoint:'Create Key Concept',

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

@@ -56,5 +56,12 @@ export default {
     content9: '',
     moveFail: 'Failed to remove',
     saveSuccess: 'Save data successfully!',
-    saveFail: 'Failed to save data!'
+    saveFail: 'Failed to save data!',
+    import: {
+        title: 'Batch Import Key Concepts',
+        sucTip: 'File parsed successfully!',
+        tip1: 'Select or drag files to this area for uploading',
+        tip2: 'Supported Format',
+        tip3: 'Confirm Upload'
+    }
 }

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

@@ -27,7 +27,7 @@ export default {
         mockOk: 'Simulate successfully',
         mockErr: 'Failed to simulate',
         stopTitle: 'End Assessment',
-        stopContent: 'Are you sure to end? Students will not be able to continue answering.',
+        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 ',
@@ -189,6 +189,7 @@ export default {
         stStuWarning: 'Please select a student first！',
         lastQu: 'Previous Question',
         nextQu: 'Next Question',
+        view: 'View',
         requesting: 'Data request in progress, please wait ...',
         dataError: 'Data request abnormal, please refresh the page and try again'
     },
@@ -319,14 +320,14 @@ export default {
         curQu: '當前題號：',
         quProg: '題目進度',
         exception: '異常申報',
-        move: '移動',
-        text: '文字',
-        brush: '畫筆',
-        arrow: '箭頭',
-        oval: '橢圓',
-        rect: '方框',
-        seal: '印章',
-        clear: '清除批註',
+        move: 'Move',
+        text: 'Text',
+        brush: 'Pen',
+        arrow: 'Arrow',
+        oval: 'Ellipse',
+        rect: 'Quadrilateral',
+        seal: 'Stamp',
+        clear: 'Clear Annotation',
         marked: '已閱',
         unmark: '未閱',
         fullScore: '滿分',

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

@@ -4,7 +4,7 @@ export default {
 	type2:'Invitation Notification',
 	type3:'Removal Notification',
 	type4:'Syllabus Notification',
-	tip1:'apply to join',
+	tip1:'applies to join',
 	tip2:'has invited you to join',
 	tip3:'has granted your request to join',
 	tip4:'has accepted the invitation to join',

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

@@ -1,26 +1,26 @@
 export default {
   // SystemSetting.vue
-  commonset:'General Settings',
-  pdMgt:'School System Settings',
-  cgMgt:'College Management',
-  updBadge:'Upload School Logo',
-  scType:'School Type：',
-  scType1:'K–12',
-  scType2:'Higher Education Institutions (HEIs)',
-  proSetting:'Professional Subject',
-  curSemSta:'Current Status：',
+  commonset: 'General Settings',
+  pdMgt: 'School System Settings',
+  cgMgt: 'College Management',
+  updBadge: 'Upload School Logo',
+  scType: 'School Type：',
+  scType1: 'K–12',
+  scType2: 'Higher Education Institutions (HEIs)',
+  proSetting: 'Professional Subject',
+  curSemSta: 'Current Status：',
   schoolNameLabel: 'School Name：',
-  addSubject:'Add Subject',
-  subType:'Type',
-  subType1:'General',
-  subType2:'Subject',
-  subType3:'Professional',
-  acType:'Operation Type',
-  acType1:'Select an existing general subject',
-  acType2:'Add General Subject',
-  sltSubect:'Select Subject',
-  subName:'Name',
-  applyPd:'Applied School System',
+  addSubject: 'Add Subject',
+  subType: 'Type',
+  subType1: 'General',
+  subType2: 'Subject',
+  subType3: 'Professional',
+  acType: 'Operation Type',
+  acType1: 'Select an existing general subject',
+  acType2: 'Add General Subject',
+  sltSubect: 'Select Subject',
+  subName: 'Name',
+  applyPd: 'Applied School System',
   periodSettingLabel: 'School System',
   order: 'Sort by creation time',
   semesterSetting: 'Semester (Quarter) Setting',
@@ -63,6 +63,7 @@ export default {
   setCampus: 'Please set your campus',
   smHolder: 'Set semester...',
   subjectHolder: 'Set subject...',
+  profsHolder: 'Set subject...',
   noSubject: 'No subject yet',
   anaLabel: 'Learning Status Settings',
   exTypeLabel: 'Test Type：',
@@ -77,7 +78,7 @@ export default {
   scoreUnit: ' Points',
   delExamTitle: 'Delete Test Type',
   delGradeTitle: 'Delete Grade',
-  delMajorTitle: 'Delete Grade',
+  delMajorTitle: 'Delete Professional',
   delSubjectTitle: 'Delete Subject',
   delPdTitle: 'Delete School System',
   delCampusTitle: 'Delete Campus',
@@ -88,16 +89,16 @@ export default {
   saveErr: 'Failed to save!',
   saveWarning: 'Save Reminder',
   leaveText: 'Exit',
-  pdWarning:'School system names cannot be repeated',
-  semWarning:'Semester names cannot be repeated',
-  gdNameWarning:'Grade names cannot be repeated',
-  subWarning:'Subject names cannot be repeated',
-  exWarning:'Test type names cannot be repeated',
-  majorWarning:'Professional subject names cannot be repeated',
-  addSemester:'Add Semester',
-  semesterName:'Name',
-  semStartAt:'Started on',
-  admission:'Enrollment Semester',
+  pdWarning: 'School system names cannot be repeated',
+  semWarning: 'Semester names cannot be repeated',
+  gdNameWarning: 'Grade names cannot be repeated',
+  subWarning: 'Subject names cannot be repeated',
+  exWarning: 'Test type names cannot be repeated',
+  majorWarning: 'Professional subject names cannot be repeated',
+  addSemester: 'Add Semester',
+  semesterName: 'Name',
+  semStartAt: 'Started on',
+  admission: 'Enrollment Semester',
 
   // ClassroomSetting.vue
   classroomList: 'Classroom List',
@@ -116,7 +117,7 @@ export default {
   schoolPlan: 'School floor plan and classroom location settings',
   uploadPlan: 'Upload Floor Plan',
   hiteachList: 'HiTeach Serial Number List',
-  codeSearchHolder: 'Please enter keywords to search',
+  codeSearchHolder: 'Search',
   classroomCodeHolder: 'eg: 1',
   classroomNameHolder: 'eg: 101',
   headmasterHolder: 'Can search by name...',
@@ -150,7 +151,8 @@ export default {
   'J223IZAM': 'HiTeach PRO',
   tmdClass: 'TEAM Model Smarter Classroom',
   normalClass: 'General Classroom',
-  dClass: 'Dedicated Subject Classroom',
+  roomType1: 'Regular Classroom',
+  roomType2: 'Dedicated Subject Classroom',
   tab1: 'Basic Information',
   tab2: 'Student List',
   tab3: 'Location Settings',
@@ -169,6 +171,9 @@ export default {
   onClassStu: 'There is no fixed student list in a dedicated subject classrooms!',
   classNoErr: 'The class ID cannot be empty!',
   classNoErr1: 'Class ID can only contain numbers！',
+  roomNoErr: 'The classroom ID cannot be empty!',
+  roomNoErr1: 'Classroom ID can only be numbers or letters！',
+  roomNoErr2: 'This Classroom ID repeated',
   classAttr1: 'Regular Classroom（with fixed students）',
   classAttr2: 'Dedicated Subject Classroom (without fixed students)',
   nameWarning: 'Please enter the name',
@@ -193,10 +198,10 @@ export default {
   link: 'Link',
   confirmDelink: 'Are you sure to delink?',
   noStu: 'No student yet',
-  addOk:'Add successfully',
-  addErr:'Failed to add',
-  cusTabel:'Class Schedule',
-  setCusTable:'Set Class Schedule',
+  addOk: 'Add successfully',
+  addErr: 'Failed to add',
+  cusTabel: 'Class Schedule',
+  setCusTable: 'Set Class Schedule',
 
   //ClassMgt.vue
   className:'Name',

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

@@ -80,7 +80,6 @@ export default {
   學生使用: 'Used For Student',
   已分配至教師: 'Assigned To Teacher',
   未使用: 'Unused',
-  空間比率: 'Space Ratio',
   空間: ' Space',
   空間數: ' Space',
   空間比率: ' Ratio',

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

@@ -86,7 +86,7 @@ export default {
   importInfo4: 'No corresponding classroom：',
   importInfo5: 'The account already exists in the system：',
   importInfo6: 'Can be imported：',
-  passwordTips: '* Items with no password found will default to the same password as the account/student ID',
+  passwordTips: 'Items with no password found will default to the same password as the account/student ID',
   submitList: 'Create Account',
   lackAttr:'Incomplete Excel Column：',
   noSetNo:'No Seat Number：',
@@ -99,6 +99,8 @@ export default {
   setNoErr:"Error: Seat number has been repeated within the school",
   downloadText:'(Download List Sample)',
   idRepErr:'Account already exists, will overwrite the original account',
+  stuYearErr:"Student's academic year Data is incorrect",
+  classYearErr:"Class's grade level is incorrect",
 
   // Authorization.vue
   authTitle: 'Service Authorization Management',

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

@@ -62,7 +62,7 @@ export default{
 	doSuc:'Operate successfully',
 	saveFailTip:'Failed to save',
 	isExistVolume:'The same book name already exists',
-	unSaveTip:'You have not saved the changes to the current book, do you confirm to ignore the changes and continue to operate?',
+	unSaveTip:'You have not saved the changes, are you sure to leave?',
     tree:{
 		hasResource:'Related Resource',
 		hasCoEdit:'With co-editing authorization',

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

@@ -18,6 +18,7 @@ export default {
         classMgt:'Classroom',
         cusSetting:'Course Settings',
         cusPlanMgt:'Scheduling Management',
+        schoolNotify: 'Announcement',
         authMgt:'Authorization',
         preview:'Preview',
         scSyllabus:'Syllabus',
@@ -46,7 +47,18 @@ export default {
         homework:'Assignmnet',
         acRecord: 'Activity Record',
         cusMgt:'Course',
-        taskList:'Task List'
+        taskList:'Task List',
+        train:'Seminar Center',
+        trainData:'Seminar Data',
+        abilityPoint:'Micro Capability Points',
+        scTrain:'School Seminar',
+        appAbility:'Application Capabilities',
+        classRecord:'Lesson Recordings',
+        resourceCenter:'Resource Center',
+        trainCount:'Seminar Statistics',
+        onlineTrain:'Online Seminar',
+        appAssassment:'Application Appraisal',
+        discuss:'Discussion Center'
     },
     compt: {
         cusWare: 'Teaching Material',

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

@@ -49,7 +49,6 @@ export default {
     text48: 'Re-Check Quiz',
     text49: 'Common Used Tech Distribution',
     text50: 'Total',
-    text51: 'English',
     text52: 'Language',
     text53: 'English',
     text54: 'Math',

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

@@ -5,12 +5,12 @@ export default {
     markStatus3:'Has ended',    
     markMode1:'Mark by question',    
     markMode2:'Mark by people',    
-    mLabel1:'人數',    
+    mLabel1:'No. Of People',
     mLabel2:'已閱',    
     mLabel3:'未閱',    
     mLabel4:'In progress',    
     mLabel5:'Question Number',    
-    mLabel6:'人數',    
+    mLabel6:'No. Of People',
     markProg:'Marking Progress',    
     mark:'批閱',
     objectiveQu:'客觀題已由系統自動完成評分。 ',

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

@@ -3,7 +3,7 @@ export default {
         text1: 'Teacher Account Management',
         text2: 'Add New Teacher Account'
     },
-    blurryFilter: 'Please enter ID or Name...',
+    blurryFilter: 'Please enter ID or Name to search',
     mulitSet: 'Batch Authorization Management',
     table:{
         text1: 'Basic',
@@ -16,7 +16,6 @@ export default {
     authSet:{
         title:'Authorization Settings',
         subTitle: 'The account you want to change the authorization',
-        jobTitle: 'Add Title',
         area1:{
             title:'District, class and school management page',
             read: 'Allow viewing of district, class and school management pages',
@@ -56,7 +55,10 @@ export default {
         info16: 'Approve Teacher Application',
         info17: 'Are you sure to approve',
         info18: "'s application",
-        info19: "Can't find this teacher's information"
+        info19: "Can't find this teacher's information",
+        info20: 'This user has already been invited!',
+        info21: 'The invited user has already joined the school!',
+        noIdCol: 'There is no id column in the imported form, please check the form data! '
     },
     job: {
         'jobTitle': 'Add Title',

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

@@ -1,7 +1,6 @@
 export default {
 	typeScoreTip:'The minimum allocated point for each question is 0.5',
 	importPaper: 'You can use convert your MS Word files into system exam files for Smarter Classroom, Online, and OSS Script Assessments.',
-	searchTeacher:'To ensure the security of  personal information, please enter the complete information to search.',
 	volumeList: 'Manage the syllabus list according to the subject and create each topic of the syllabus.',
 	addVolumeResource: 'After creating a syllabus topic, you can add syllabus materials from various resources.',
 	knowledge: 'Create school-based key concept according to subjects and use them in the question bank to facilitate learning status analysis. The online questions created by the teachers must follow the criteria defined in this key concept bank.',
@@ -13,7 +12,7 @@ export default {
 	cusType: 'School Course: Courses assigned by the school, no addition, modification or deletion by yourself \nPersonal Course: Courses that you create yourself and can be modified and adjusted as needed.',
 	semester: "You can set the school's semester, semester span and current semester status.",
 	time: 'You can set the school hours for class schedule generation. If you do not set this, you will not be able to generate and use the schedule.',
-	stuModel:"Id: Student ID\npw: Password(If not entered, the default is equal to the Student ID)\nname: Student Name\nstuYear: Enrollment Year, ex:2020\nclassName: Student's Class, ex:101\nclassYear: Class Year. Usually the same year as the student's enrollment, ex：2020\nclassId: Class ID, ex:20200101",
+	stuModel:"id: Student ID\npw: Password(If not entered, the default is equal to the Student ID)\nname: Student Name\nstuYear: Enrollment Year, ex:2020\nclassName: Student's Class, ex:101\nclassYear: Class Year. Usually the same year as the student's enrollment, ex：2020\nclassId: Class ID, ex:20200101",
 	cusInfo:'Create a curriculum based on the subjects defined by the school. Ex: "Reading Comprehension" under the subject "Language"',
 	cusTea:'Add all instructors responsible for teaching the course',
 	sCusClass:'Add the class for which the teacher is responsible for the course',

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

@@ -13,7 +13,8 @@ export default {
 	noKnowPointTip: 'No key concept data was collected under this subject',
 	lostStu: 'Absentee Number',
 	showAnalysis: 'Data Analysis',
-	allSubjects: 'All Subject',
+    allSubjects: 'All Subject',
+    noData: 'No valid data yet!',
 	allClasses: 'All Class',
 	all: 'All',
 	classBaseInfo: 'Class Basic Data',
@@ -36,7 +37,6 @@ export default {
     condition6: 'Mode',
     condition7: 'Subject',
     condition8: 'Academic Year',
-
     // totalIndex.vue
     ti_title1: 'Basic Data Statistics',
     ti_title2: 'Learning Status Analysis',

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

@@ -11,5 +11,6 @@ export default {
     text10: ' question(s)',
     text11: 'point(s)',
     text12: 'total',
+    text13:'No. Of People',
     gradeYear:'',
   }

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

@@ -35,6 +35,7 @@ export default{
     confirm:'Confirm',
     cancel:'Cancel',
     toStudent:'Switching to Student',
+    toArea:'Go To District Platform',
     schoolMgt:'School Management',
     systemSet:'System Settings',
 }

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

@@ -182,7 +182,7 @@ export default {
     teaName:'姓名',
     listName:'名称',
     stuCount:'学生人数:',
-    code:'编码',
+    code:'班级',
     nameWarning:'请输入名单名称',
     updOk:'更新成功',
     setWarning1:'暂无教师信息，无法完成课程时段设置',
@@ -216,7 +216,7 @@ export default {
     setClassTips:'请设置授课教室',
 
     //TimeSetting.vue
-    addTime:'添加时段',
+    addTime:'暂未添加时段',
     saveSet:'保存设置',
     edtiTime:'编辑时段',
     timeHolder:'请输入时段名称...',

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

@@ -1,4 +1,5 @@
 export default {
+	completeTip:'请先完善当前学段的科目、年级及学期数据！',
 	editor:{
 		uploadVideo:'上传本地视频',
 		uploadAudio:'上传本地音频',
@@ -179,6 +180,7 @@ export default {
 		emptyNameTip:'试卷名称不能为空！',
 		noSpaceTip:'空间已满！',
 		noItemTip:'未选择任何试题！',
+		regTip:'试卷名称不能包含特殊字符！',
 		isExistPaperTip:'试卷库已存在重复名称试卷，是否继续保存覆盖原试卷？',
 		cancelSaveTip:'取消保存试卷！',
 		hasNoScoreTip:'存在未配分的题目，请配分后再保存！',
@@ -238,6 +240,7 @@ export default {
 		tip7:'检测到当前试卷存在未入库的试题，是否需要同步到试题库？',
 		tip8:'同步入库',
 		tip9:'不同步',
+		tip10:'题库符合条件的题目数量少于您的预期数量，是否继续？'
 	},
 	points:{
 		addPoint:'新增知识点',
@@ -285,7 +288,7 @@ export default {
 		confirm:'确认',
 		isExistTip:'已存在相同链接！',
 		formatErrorTip:'请输入正确格式的网址地址！',
-		noCompleteTip:'请填写完整',
+		noCompleteTip:'描述与网址不能为空！',
 	},
 	completeCount:'填空数量',
 	addTip1:'当前配分超过试卷总分，请重新分配!',

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

@@ -50,11 +50,18 @@ export default {
     delBlock: '确认删除该知识块?',
     delSuccess: '删除成功',
     delFail: '删除失败',
-    delPoint: '确认删除该知识点?',
+    delPoint: '确认删除所选知识点?',
     content7: '确定将知识点',
     content8: '从知识块',
     content9: '中移出',
     moveFail: '移出失败',
     saveSuccess: '保存数据成功！',
-    saveFail: '保存数据失败！'
-}
+    saveFail: '保存数据失败！',
+	import:{
+		title:'批量导入知识点',
+		sucTip:'文件解析成功！',
+		tip1:'选择或者拖拽文件到该区域进行上传',
+		tip2:'支持格式',
+		tip3:'确认上传'
+	}
+} 

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

@@ -37,7 +37,7 @@ export default {
         click: '点此'
     },
     communy:{
-        title: '或下列方式登入',
+        title: '或下列方式登录',
         fb: 'Facebook',
         google: 'Google',
         wechat: '微信',

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

@@ -63,6 +63,7 @@ export default {
   setCampus: '请设置校区',
   smHolder: '设置学期...',
   subjectHolder: '设置学科...',
+  profsHolder: '设置专业...',
   noSubject: '暂无学科',
   anaLabel: '学情设置',
   exTypeLabel: '考试类型：',
@@ -77,7 +78,7 @@ export default {
   scoreUnit: '分',
   delExamTitle: '删除考试类型',
   delGradeTitle: '删除年级',
-  delMajorTitle: '删除年级',
+  delMajorTitle: '删除专业',
   delSubjectTitle: '删除学科',
   delPdTitle: '删除学段',
   delCampusTitle: '删除校区',
@@ -91,7 +92,7 @@ export default {
   pdWarning: '学段名称不能重复',
   semWarning: '学期名称不能重复',
   gdNameWarning: '年级名称不能重复',
-  subWarning: '学科名称不能重复',
+  subWarning: '学科/专业名称不能重复',
   exWarning: '考试名称不能重复',
   majorWarning: '专业名称不能重复',
   addSemester: '添加学期',
@@ -150,7 +151,8 @@ export default {
   'J223IZAM': 'HiTeach PRO',
   tmdClass: 'TEAM Model 智慧教室',
   normalClass: '普通教室',
-  dClass: '专科教室',
+  roomType1:'常规教室',
+  roomType2:'专科教室',
   tab1: '基础信息',
   tab2: '学生名单',
   tab3: '位置设定',
@@ -169,6 +171,9 @@ export default {
   onClassStu: '专科教室没有固定学生名单！',
   classNoErr: '班级不能为空',
   classNoErr1: '班级只能是数字',
+  roomNoErr: '教室编码不能为空',
+  roomNoErr1: '教室编码只能是数字或字母',
+  roomNoErr2: '教室编码重复',
   classAttr1: '常规教室（有固定学生）',
   classAttr2: '专科教室（无固定学生）',
   nameWarning: '请输入名称',

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

@@ -125,7 +125,7 @@ export default {
 		p1:'小学',
 		p2:'初中',
 		p3:'高中（职）',
-		p4:'大专',
+		p4:'大学（专）',
 		p5:'企业/其他'
 	}
 }

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

@@ -86,7 +86,7 @@ export default {
   importInfo4: '没有对应教室：',
   importInfo5: '系统已存在账号：',
   importInfo6: '可导入：',
-  passwordTips: '*未找到密码的项目将默认密码与账号相同',
+  passwordTips: '未导入密码的学生将默认密码与账号相同',
   submitList: '建立账号',
   lackAttr:'Excel栏位有缺：',
   noSetNo:'沒有座号：',
@@ -99,6 +99,8 @@ export default {
   setNoErr:"错误：座位号已在校內重复",
   downloadText:'(下载名单模板)',
   idRepErr:'账号已存在，将覆盖原有账号',
+  stuYearErr:'学生学级数据错误',
+  classYearErr:'班级年级错误',
 
   // Authorization.vue
   authTitle: '服务授权管理',

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

@@ -47,7 +47,18 @@ export default {
         homework:'作业活动',
         acRecord: '活动记录',
         cusMgt:'课程管理',
-        taskList:'任务列表'
+        taskList:'任务列表',
+        train:'研修中心',
+        trainData:'研修数据',
+        abilityPoint:'微能力点',
+        scTrain:'校本研修',
+        appAbility:'应用能力',
+        classRecord:'课堂实录',
+        resourceCenter:'资源中心',
+        trainCount:'研修统计',
+        onlineTrain:'线上研修',
+        appAssassment:'应用考核',
+        discuss:'讨论中心'
     },
     compt: {
         cusWare: '课件',

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

@@ -55,7 +55,10 @@ export default {
         info16: '批准教师申请',
         info17: '请问您确定要批准',
         info18: '的教师申请',
-        info19: '找不到此教师的资料'
+        info19: '找不到此教师的资料',
+        info20: '用户已被邀请，请勿重复邀请！',
+        info21: '邀请对象已加入学校！无法再次邀请！',
+        noIdCol:'导入表格没有id栏位，请检查表格数据！'
     },
     job: {
         'jobTitle': '添加职称',
@@ -129,7 +132,7 @@ export default {
             sendInvite:'发送邀请',
             backHome: '重新检索'
         },
-        content: '<span>请输入<span class="point">手机号</span>、<span class="point">醍摩豆Id</span>或<span class="point">电子信箱</span >等资讯进行搜寻</span>',
+        content: '<span>请输入<span class="point">手机号</span>、<span class="point">用户编号</span>或<span class="point">电子信箱</span >等资讯进行搜寻</span>',
         skyBox:{
             text1: '本次搜寻结果',
             text2: '档案资料数',

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

@@ -11,5 +11,6 @@ export default {
   text10:'道',
   text11:'分',
   text12:'共',
+  text13:'人数',
   gradeYear:'级',
 }

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

@@ -35,6 +35,7 @@ export default{
     confirm:'确认',
     cancel:'取消',
     toStudent:'切换为学生',
+    toArea:'前往区级平台',
     schoolMgt:'学校管理',
     systemSet:'系统设置'
 }

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

@@ -75,13 +75,15 @@ export default {
     pptImport: '匯入.pptx',
     powerclick: 'Power Click',
     hteOpen: '開啟.hte',
+    Other: '白板',
+
     ActIrsMode: '互動模式',
     edit: '編輯模式',
     ActPowerClickMode: 'Power Click',
     ActSelfPaceMode: '測驗模式',
     ActDscMode: '遠距模式',
     ActElimitedMode: '挑戰賽模式',
-    Other: '白板',
+
     today: '今日',
     lastweek: '前七日',
     unauthorization: '未授權',

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

@@ -57,7 +57,8 @@ export default {
         classroomName: '教室名稱',
         classroomAttr: '教室內容',
         classroomType: '教室類型',
-        classroomTeacher: '授課教師',
+        classroomTeacher: '班導師',
+        classroomTeacher1: '授課教師',
         classroomNotice: '備註',
         deleteStudent: '刪除所選學生',
         deleteStuBtn: '刪除',

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

@@ -97,7 +97,7 @@ export default {
     private:'個人',
     school:'學校',     
     noRecord:'暫無課堂記錄',
-    groupTips:'溫馨提示：當前分組信息為編制班分組，任課教師可前往HiTeach端自定義分組。 ',
+    groupTips:'溫馨提示：當前分組為編制班分組，任課教師可前往HiTeach端自定義分組。 ',
     noSchoolStu:'暫未加入學校無法新增學校學生，可以建立自定義名單，學生通過掃碼加入名單！',
     qrCodeLabel:'掃碼加入名單',
     hasDelClass:'(此班已被刪除)',
@@ -201,7 +201,7 @@ export default {
     //MgtStuList.vue
     nameList: '名單',
     remvStu: '移除學生',
-    goBack: '返回上級',
+    goBack: '回上一頁',
     delListTitle:'刪除自定義名單',
 
     //TeaTable.vue
@@ -216,7 +216,7 @@ export default {
     setClassTips: '請設定授課教室',
 
     //TimeSetting.vue
-    addTime: '新增時段',
+    addTime: '暫未新增時段',
     saveSet: '儲存設定',
     edtiTime: '編輯時段',
     timeHolder: '請輸入時段名稱…',

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

@@ -1,4 +1,5 @@
 export default {
+	completeTip:'請先完善當前學段的科目、年級及學期數據！',
 	editor: {
 		uploadVideo: '上傳本機影片',
 		uploadAudio: '上傳本機音訊',
@@ -179,6 +180,7 @@ export default {
 		emptyNameTip: '試卷名稱不能為空！',
 		noSpaceTip: '空間已滿！',
 		noItemTip: '未選擇任何試題！',
+		regTip:'試卷名稱不能包含特殊字符！',
 		isExistPaperTip: '試卷庫已存在相同名稱試卷,是否覆蓋原試卷？',
 		cancelSaveTip: '取消儲存試卷！',
 		hasNoScoreTip: '存在尚未配分的題目,請配分後再儲存！',
@@ -238,6 +240,7 @@ export default {
 		tip7:'檢測到當前試卷存在未入庫的試題，是否需要同步到試題庫？',
 		tip8:'同步入庫',
 		tip9:'不同步',
+		tip10:'題庫符合條件的題目數量少於您的預期數量，是否繼續？'
 	},
 	points: {
 		addPoint: '新增知識點',
@@ -285,7 +288,7 @@ export default {
 		confirm: '確認',
 		isExistTip: '已存在相同連結網址！',
 		formatErrorTip: '請輸入正確格式的網址！',
-		noCompleteTip: '請填寫完整',
+		noCompleteTip: '描述與網址不能為空！',
 	},
 	completeCount: '填空數量',
 	addTip1: '當前配分超過試卷總分,請重新分配！',

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

@@ -39,12 +39,11 @@ import answerSheet from './answerSheet'
 import tip from './tip'
 import selflearn from './selflearn'
 export default {
-  
   schoolBaseInfo,
-  schoolMgmt,
-  totalAnalysis,
-  stuAccount,
   classMgmt,
+  stuAccount,
+  totalAnalysis,
+  schoolMgmt,
   talMgmt,
   menu,
   courseManage,

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

@@ -1,60 +1,67 @@
 export default {
-    colorTip: '*綠色背景代表所選知識點，藍色背景代表知識塊關聯的知識點',
-    subject: '學科',
-    label: '名稱',
-    blockP: '請輸入知識塊名稱',
-    confirm: '確認',
-    blockWarning: '知識塊名稱不能為空!',
-    block: '知識塊',
-    knowledgeP: '請輸入知識點名稱，必填項',
-    knowledgeWarning: '知識點名稱不能為空！ ',
-	knowledgeRepeat:'已存在相同名稱知識點，請勿重覆添加！',
-    newBlock: '新增知識塊',
-    addBlock: '新增知識塊',
-    inputBlock: '輸入知識塊名稱',
-    nowBlock: '現有知識塊',
-    nowBlockN: '選擇知識塊 ( *若所選知識塊內已存在新增的知識點則會覆蓋 )',
-    selectPoint: '已選知識點',
-    blockWarning2: '已存在相同名稱知識塊，請修改名稱！ ',
-    blockWarning3: '知識塊名稱不能為空',
-    blockWarning4: '無現有知識塊選擇',
-    period: '當前學制',
-    searchSubject: '搜尋學科...',
-    blockCount: '知識塊數',
-    point: '知識點',
-    searchPoint: '搜尋知識點...',
-    makeBlock: '組成知識塊',
-    edit: '編輯',
-    delete: '刪除',
-    moveBlock: '移出知識塊',
-    searchBlock: '搜尋知識塊',
-    buildBlock: '新建知識塊',
-    pointCount: '知識點數：',
-    editBlock: '編輯知識塊',
-    addPoint: '新增知識點',
-    editPoint: '編輯知識點',
-    cancel: '取消',
-    notice: '提示',
-    content0: '確定將',
-    content2: '等',
-    content3: '個知識點移入到知識塊',
-    content1: '中(*已存在的知識點會自動忽略)',
-    notice1: '所選的知識點已存在該知識塊中',
-    notice2: '該知識塊裡已存在當前知識點',
-    content4: '確定將知識點',
-    content5: '移入到知識塊',
-    content6: '中？ ',
-    success: '操作成功！ ',
-    fail: '操作失敗！ ',
-    warn: '知識塊資料讀取失敗',
-    delBlock: '確認刪除該知識塊?',
-    delSuccess: '刪除成功',
-    delFail: '刪除失敗',
-    delPoint: '確認刪除該知識點?',
-    content7: '確定將知識點',
-    content8: '從知識塊',
-    content9: '中移出',
-    moveFail: '移出失敗',
-    saveSuccess: '儲存資料成功！ ',
-    saveFail: '儲存資料失敗！ '
-}
+	colorTip: '*綠色背景代表所選知識點，藍色背景代表知識塊關聯的知識點',
+	subject: '學科',
+	label: '名稱',
+	blockP: '請輸入知識塊名稱',
+	confirm: '確認',
+	blockWarning: '知識塊名稱不能為空!',
+	block: '知識塊',
+	knowledgeP: '請輸入知識點名稱，必填項',
+	knowledgeWarning: '知識點名稱不能為空！ ',
+	knowledgeRepeat: '已存在相同名稱知識點，請勿重覆添加！',
+	newBlock: '新增知識塊',
+	addBlock: '新增知識塊',
+	inputBlock: '輸入知識塊名稱',
+	nowBlock: '現有知識塊',
+	nowBlockN: '選擇知識塊 ( *若所選知識塊內已存在新增的知識點則會覆蓋 )',
+	selectPoint: '已選知識點',
+	blockWarning2: '已存在相同名稱知識塊，請修改名稱！ ',
+	blockWarning3: '知識塊名稱不能為空',
+	blockWarning4: '無現有知識塊選擇',
+	period: '當前學制',
+	searchSubject: '搜尋學科...',
+	blockCount: '知識塊數',
+	point: '知識點',
+	searchPoint: '搜尋知識點...',
+	makeBlock: '組成知識塊',
+	edit: '編輯',
+	delete: '刪除',
+	moveBlock: '移出知識塊',
+	searchBlock: '搜尋知識塊',
+	buildBlock: '新建知識塊',
+	pointCount: '知識點數：',
+	editBlock: '編輯知識塊',
+	addPoint: '新增知識點',
+	editPoint: '編輯知識點',
+	cancel: '取消',
+	notice: '提示',
+	content0: '確定將',
+	content2: '等',
+	content3: '個知識點移入到知識塊',
+	content1: '中(*已存在的知識點會自動忽略)',
+	notice1: '所選的知識點已存在該知識塊中',
+	notice2: '該知識塊裡已存在當前知識點',
+	content4: '確定將知識點',
+	content5: '移入到知識塊',
+	content6: '中？ ',
+	success: '操作成功！ ',
+	fail: '操作失敗！ ',
+	warn: '知識塊資料讀取失敗',
+	delBlock: '確認刪除該知識塊?',
+	delSuccess: '刪除成功',
+	delFail: '刪除失敗',
+	delPoint: '確認刪除所選知識點?',
+	content7: '確定將知識點',
+	content8: '從知識塊',
+	content9: '中移出',
+	moveFail: '移出失敗',
+	saveSuccess: '儲存資料成功！ ',
+	saveFail: '儲存資料失敗！ ',
+	import: {
+		title: '批量導入知識點',
+		sucTip: '文件解析成功！',
+		tip1: '選擇或者拖移文件到該區域進行上傳',
+		tip2: '支持格式',
+		tip3: '確認上傳'
+	}
+}

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

@@ -189,6 +189,7 @@ export default {
         stStuWarning: '請先選擇學生！',
         lastQu: '上一題',
         nextQu: '下一題',
+        view: '查看',
         requesting: '數據請求中，請稍後……',
         dataError: '數據請求异常，請刷新頁面再試'
     },

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

@@ -63,6 +63,7 @@ export default {
   setCampus: '請設定校區',
   smHolder: '設定學期…',
   subjectHolder: '設定學科…',
+  profsHolder: '設置專業...',
   noSubject: '暫無學科',
   anaLabel: '學情設定',
   exTypeLabel: '考試類型：',
@@ -77,7 +78,7 @@ export default {
   scoreUnit: '分',
   delExamTitle: '刪除考試類型',
   delGradeTitle: '刪除年級',
-  delMajorTitle: '刪除年級',
+  delMajorTitle: '刪除專業',
   delSubjectTitle: '刪除學科',
   delPdTitle: '刪除學制',
   delCampusTitle: '刪除校區',
@@ -91,7 +92,7 @@ export default {
   pdWarning: '學制名稱不能重複',
   semWarning: '學期名稱不能重複',
   gdNameWarning: '年級名稱不能重複',
-  subWarning: '學科名稱不能重複',
+  subWarning: '學科/專業名稱不能重複',
   exWarning: '考試名稱不能重複',
   majorWarning: '專業名稱不能重複',
   addSemester: '新增學期',
@@ -150,7 +151,8 @@ export default {
   'J223IZAM': 'HiTeach PRO',
   tmdClass: 'TEAM Model智慧教室',
   normalClass: '普通教室',
-  dClass: '專科教室',
+  roomType1:'常規教室',
+  roomType2:'專科教室',
   tab1: '基礎資訊',
   tab2: '學生名單',
   tab3: '位置設定',
@@ -169,6 +171,9 @@ export default {
   onClassStu: '專科教室沒有固定學生名單！',
   classNoErr: '班级不能為空！',
   classNoErr1: '班级只能是數字！',
+  roomNoErr: '教室編碼不能為空！',
+  roomNoErr1: '教室編碼只能是數字或字母！',
+  roomNoErr2: '教室編碼重複',
   classAttr1: '常規教室（有固定學生）',
   classAttr2: '專科教室（無固定學生）',
   nameWarning: '請輸入名稱',

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

@@ -80,7 +80,6 @@ export default {
   學生使用: '學生使用',
   已分配至教師: '已分配至教師',
   未使用: '未使用',
-  空間比率: '空間比率',
   空間: '空間',
   空間數: '空間數:',
   空間比率: '空間比率:',
@@ -142,7 +141,7 @@ export default {
   確定收回所有空間: '確定收回所有空間',
   '確定後全部每位教師都直接設置為0GB。': '確定後全部每位教師都直接設置為0GB。',
   儲存提醒: '儲存提醒',
-  '当前空間数据尚未儲存。如果關閉，修改的数据将不会儲存！': '當前空間數據尚未儲存。如果關閉，修改的數據將不會儲存！',
+  '當前空間數據尚未儲存。如果關閉，修改的數據將不會儲存！': '當前空間數據尚未儲存。如果關閉，修改的數據將不會儲存！',
   回收空間: '回收空間',
   儲存變更: '儲存變更',
   空間分配狀態: '空間分配狀態',
@@ -150,7 +149,6 @@ export default {
   單人固定容量分配: '單人固定容量分配',
   目前可被分配總量: '目前可被分配總量',
   至: '至',
-
   每人分配: '每人分配',
   當前勾選之教師帳號: '當前勾選之教師帳號',
   所有: '所有',

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

@@ -125,7 +125,7 @@ export default {
 		p1:'小學',
 		p2:'初中',
 		p3:'高中（職）',
-		p4:'大專',
+		p4:'大學（專）',
 		p5:'企業/其他'
     }
 }

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

@@ -86,7 +86,7 @@ export default {
   importInfo4: '沒有對應教室：',
   importInfo5: '系統已存在帳號：',
   importInfo6: '可匯入：',
-  passwordTips: '*未找到密碼的項目將預設密碼與帳號相同',
+  passwordTips: '未導入密碼的學生將默認密碼與賬號相同',
   submitList: '建立帳號',
   lackAttr:'Excel欄位有缺：',
   noSetNo:'沒有座號：',
@@ -99,6 +99,8 @@ export default {
   setNoErr:"錯誤：座位號已在校內重複",
   downloadText:'(下載名單模板)',
   idRepErr:'帳號已存在，將覆蓋原有帳號',
+  stuYearErr:'學生學級數據錯誤',
+  classYearErr:'班級年級錯誤',
 
   //Authorization.vue
   authTitle: '服務授權管理',

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

@@ -252,10 +252,10 @@ export default {
         option: '選項',
         haveNum: "可投票數",
         excessNum: "投票數已超出",
-        delTitle: "投票已被删除，是否删除此條記錄？",
-        delOk: "删除",
+        delTitle: "投票已被刪除，是否刪除此條記錄？",
+        delOk: "刪除",
         delCancel: "取消",
-        delSuccess: "删除成功",
+        delSuccess: "刪除成功",
         type: {
             once: "單次",
             day: "每日",

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

@@ -18,6 +18,7 @@ export default {
         classMgt: '教室管理',
         cusSetting: '課程設置',
         cusPlanMgt: '排課管理',
+        schoolNotify: '學校公告',
         authMgt: '授權管理',
         preview: '預覽',
         scSyllabus: '學校課綱',
@@ -46,7 +47,18 @@ export default {
         homework: '工作活動',
         acRecord: '活動記錄',
         cusMgt: '課程管理',
-        taskList: '任務清單'
+        taskList: '任務清單',
+        train:'研修中心',
+        trainData:'研修數據',
+        abilityPoint:'微能力點',
+        scTrain:'校本研修',
+        appAbility:'應用能力',
+        classRecord:'課堂實錄',
+        resourceCenter:'資源中心',
+        trainCount:'研修統計',
+        onlineTrain:'線上研修',
+        appAssassment:'應用考核',
+        discuss:'討論中心'
     },
     compt: {
         cusWare: '教材',

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

@@ -55,7 +55,10 @@ export default {
         info16: '核准教師申請',
         info17: '請問您確定要核准',
         info18: '的教師申請',
-        info19: '找不到此教師的資料'
+        info19: '找不到此教師的資料',
+        info20: '用戶已被邀請，請勿重複邀請！',
+        info21: '邀請對象已加入學校！無法再次邀請！',
+        noIdCol:'導入表格沒有id欄位，請檢查表格數據！ '
     },
     job: {
         'jobTitle': '加入職稱',

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

@@ -1,7 +1,6 @@
 export default {
 	typeScoreTip:'每道題的最低配分為0.5分',
     importPaper:'您可將設置好的試卷 Word 檔案透過此功能轉換成系統試卷運用於課堂測驗、學生線上測驗或是閱卷考試運用',
-	searchTeacher:'為確保個資安全，請輸入完整資訊進行搜尋',
 	volumeList:'依照學科管理課綱清單，並建立該課綱的各個目錄',
 	addVolumeResource:'建立課綱目錄後依照各種資源來新增課綱教材',
 	knowledge:'依據學科建立對應的校本知識點，於題庫中使用以利學情分析數據確實。教師所建立的線上試題，需遵循此知識點庫所定義的知識點規範。',
@@ -18,5 +17,5 @@ export default {
 	cusTea:'加入負責該類課程授課的所有授課教師',
 	sCusClass:'加入教師於該課程所負責的學生班級',
 	examMode:'進行評量的方式有三種：\n1.線上自主評量，具備授權的學生可直接登入醍摩豆雲平台學生帳號，直接於平台上選擇評量活動進行測驗。\n2.智慧教室評量，教師於課堂上使用HiTeach智慧教學系統的測驗模式直接進行評測。\n3.	卷卡合一評量，透過紙本考試的方式進行測驗，作答紙本透過閱卷方式導入平台運用。',
-	targetTips:'溫馨提示：\n1.班級類型：行政班和教學班只能選其一； \n2.課程數量：只能選擇一個課程； \n3.班級數量：同一個課程的班級可以多選。 '
+	targetTips:'溫馨提示：\n1.班級類型：編制班和選課班只能選其一； \n2.課程數量：只能選擇一個課程； \n3.班級數量：同一個課程的班級可以多選。 '
 }

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

@@ -14,6 +14,7 @@ export default {
 	lostStu: '缺考人數',
 	showAnalysis: '資料分析',
 	allSubjects: '全科',
+	noData: '暫無有效數據返回！',
 	allClasses: '所有班級',
 	all: '全部',
 	classBaseInfo: '班級基本數據',
@@ -36,7 +37,6 @@ export default {
 	condition6: '評測模式',
 	condition7: '評測學科',
 	condition8: '發佈年份',
-
 	// totalIndex.vue
 	ti_title1: '基本資料統計',
 	ti_title2: '學情分析',

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

@@ -11,5 +11,6 @@ export default {
   text10: '道',
   text11: '分',
   text12: '共',
+  text13:'人數',
   gradeYear: '級',
 }

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

@@ -35,6 +35,7 @@ export default{
     confirm:'確認',
     cancel:'取消',
     toStudent:'切換為學生',
+    toArea:'前往區級平台',
     schoolMgt:'學校管理',
     systemSet:'系統設置'
 }