合并冲突

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

@@ -54,17 +54,17 @@ export default {
     cancel:'Cancel',
     select:'Select',
     hasSelected:'Selected',
-    sltTips:'請選擇序號',
+    sltTips:'Please select serial number',
     band:'Bind',
     attr1:'Sokrates Lesson Observation',
     attr2:'Distance Classroom Service',
     attr3:'Recording System',
     unbandTitle:'Unbound Serial No.',
     unbandCont:'Are you sure to unbind the serial no. of the current classroom?',
-    scaleLabel: '學校規模授權',
-    scaleInfo: '學校可上線人數。',
-    recordTitle: '產品購買記錄',
-    backPage: '返回',
-    noRecord: '暫無購買記錄',
-    noSerail:'暫無序號'
+    scaleLabel: 'School Scale Authorization',
+    scaleInfo: 'The number of people who can go online in the school.',
+    recordTitle: 'Product Purchase Record',
+    backPage: 'Go back',
+    noRecord: 'No purchase history yet',
+    noSerail: 'No serail history yet'
 }

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

@@ -337,45 +337,45 @@ export default {
         parseErr: 'Failed to parse login information',
         cusLabel: 'Course：',
         toTeammodel: 'Go to TEAM Model Cloud now!>>>',
-        repJoin: '您已經加入課程名單，無需重複加入！',
-        joinPErr: '參數异常'
+        repJoin: 'You are already on the course list, no need to join again！',
+        joinPErr: 'Parameter Abnormal'
     },
 
     //ClassRecord.vue
     rcd: {
-        ctime: '上課時間：',
-        rtn: '返回',
-        rcdLabel: '互動記錄',
-        enote: '電子筆記',
-        sokrateRpt: '蘇格拉底報告',
-        dataCount: '數據統計',
-        allRcd: '所有記錄',
-        qustion: '即問即答',
-        message: '飛訊',
-        image: '圖片',
-        file: '附件',
-        link: '超鏈接',
-        cw: '課件第',
-        page: '頁',
-        pageNoRcd: '此頁沒有互動數據',
-        di: '第',
-        dataErr: '獲取數據失敗',
-        noNote: '暫無電子筆記',
-        crtRate: '正確率',
-        correct: '正確',
-        wrong: '錯誤',
-        attendCount: '出席人數',
-        gCount: '小組數',
-        taskCount: '任務總數',
-        colctCount: '作品總數',
-        pushCount: '推送總數',
-        totalScore: '總計分',
-        examCount: '測驗總數',
-        quCount: '互動題數',
-        scoreRate: '測驗得分率',
-        interactionCount: '學生互動總數',
-        intUnit: '次/人',
-        optionCount: '選項分佈',
-        tPushLabel: '教師推送了一張圖：'
+        ctime: 'Class time：',
+        rtn: 'Click to go back',
+        rcdLabel: 'Interaction Records',
+        enote: 'E-Note',
+        sokrateRpt: 'Sokrates Report',
+        dataCount: 'Data Statistics',
+        allRcd: 'All Records',
+        qustion: 'Pop Quiz',
+        message: 'HiMessage',
+        image: 'Image',
+        file: 'File',
+        link: 'Link',
+        cw: 'Page ',
+        page: '',
+        pageNoRcd: 'No interactive data on this page',
+        di: 'Group ',
+        dataErr: 'Failed to obtain data',
+        noNote: 'No E-Note yet',
+        crtRate: 'Correct Rate',
+        correct: 'Correct',
+        wrong: 'Incorrect',
+        attendCount: 'Attendees No.',
+        gCount: 'Group No.',
+        taskCount: 'Task No.',
+        colctCount: 'Work No.',
+        pushCount: 'Push Time',
+        totalScore: 'Total Points',
+        examCount: 'No. of Test',
+        quCount: 'IRS Question No.',
+        scoreRate: 'Test Score Rate',
+        interactionCount: 'Student Interaction No.',
+        intUnit: 'time/person',
+        optionCount: 'Option Distribution',
+        tPushLabel: 'The teacher pushed a picture：'
     }
 }

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

@@ -276,10 +276,10 @@ export default {
 		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?',
-		tip11:'檢測到當前試卷已存在答題卡，是否繼續使用？',
-		tip12:'繼續使用',
-		tip13:'抹除答題卡數據',
-		unSaveTip:'確認放棄修改的試題數據並退出？'
+		tip11:'The current exam file already has an answer card, do you want to continue using it?',
+		tip12:'Continue using it',
+		tip13:'Erase the answer card data',
+		unSaveTip:'Are you sure you want to discard the modified test question data and exit?？'
 	},
 	points:{
 		addPoint:'Create Key Concept',

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

@@ -115,8 +115,8 @@ export default {
         ansTime:'Answering Time:',
         ansTimeTips:'(Default is 0, which means unlimited time)',
         sheetErr:'Failed to process the answer card',
-        noAuth:'未授權',
-        noSchool:'未加入學校'
+        noAuth:'Not authorized',
+        noSchool:'Not joined a school'
     },
     // ManualPaper.vue
     manual: {

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

@@ -1,5 +1,5 @@
 export default {
-	noMatchTerm:'無匹配學期',
+	noMatchTerm:'No Match Semester',
 	emptyTip: 'Empty books are not available for sharing！',
 	chooseChapterTip: 'Please select the topic you want to save first！',
 	chooseVolumeTip: 'Please select an existing book or create a new one！',

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

@@ -89,7 +89,7 @@ export default {
     versionLog:'The updated logs of the TEAM Model Cloud',
     updTitle:'Platform Update Notification',
     iKnow:'I understand',
-    basic: '基礎版',
-    advanced: '專業版',
-    flagship: '旗艦版'
+    basic: 'Basic Version',
+    advanced: 'Advanced Version',
+    flagship: 'Ultimate Version'
 }

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

@@ -338,7 +338,7 @@ export default {
         cusLabel: '課程：',
         toTeammodel: '即刻前往醍摩豆雲平台>>>',
         repJoin: '您已經加入課程名單，無需重複加入！',
-        joinPErr: '參數异常'
+        joinPErr: '參數異常'
     },
 
     //ClassRecord.vue

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

@@ -7,7 +7,7 @@ export default {
     evType3: '小考',
     evMode1: '線上自主評量',
     evMode2: '智慧教室評量',
-    evMode3: '閱卷評量',
+    evMode3: '卷卡合一評量',
     publishType1: '立即發佈',
     publishType2: '定時發佈',
     testType: [

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

@@ -5,5 +5,5 @@ export default {
 	error400:'請求異常，請稍後重試！',
 	error: '網絡異常，請稍後重試！',
 	loading: '處理中',
-	error403: '授權過期或授權异常，請稍後重試！'
+	error403: '授權過期或授權異常，請稍後重試！'
 }