From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期一, 12 四月 2021 15:44:53 +0800 Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua --- src/main/resources/static/i18n/messages_en_US.properties | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/resources/static/i18n/messages_en_US.properties b/src/main/resources/static/i18n/messages_en_US.properties index e20c2c9..c8b2ed6 100644 --- a/src/main/resources/static/i18n/messages_en_US.properties +++ b/src/main/resources/static/i18n/messages_en_US.properties @@ -20,7 +20,7 @@ basis.pleasechoose=Please choose basis.save=Save basis.close=Close -basis.createTime=Create Time +basis.createTime=Creating Time basis.createName=Creator basis.createBy=CreatorID basis.languageVersion=Language Version @@ -120,6 +120,7 @@ menu.system.user.manager.view=Manager List menu.exam.distributor.view=Distributor List menu.exam.enterprise.view=Client List +menu.exam.enterprise.view1=Search distributors/clients menu.questionbank.manager=Testbank Management menu.testbackage.manager=Test Pakcage Management menu.param.manager=Paramater Management @@ -182,7 +183,7 @@ menu.exam.user.extend.list=List User Extension menu.exam.user.extend.add=Add User Extenstion menu.exam.user.extend.edit=Edit User Extension -menu.exam.testMember.list=View Testtaker +menu.exam.testMember.list=Search test-takers menu.exam.testMember.add=Add Testtaker menu.exam.testMember.edit=Edit Testtaker menu.exam.testMember.remove=Delete Testtaker @@ -316,8 +317,8 @@ jsp.exam.report.003=Data is being exported, please wait\u2026 jsp.exam.report.004=Some complete reports are not allowed to be downloaded. Please select again. jsp.exam.report.005=Under construction -jsp.exam.report.006=Test package Name -jsp.exam.report.007=Product Name +jsp.exam.report.006=Test package +jsp.exam.report.007=Test Product jsp.exam.report.008=User Name jsp.exam.report.009=Client Name jsp.exam.report.010=Distributor User @@ -346,7 +347,7 @@ jsp.exam.test_package.006=recycle jsp.exam.test_package.007=Report jsp.exam.test_package.008=Client code -jsp.exam.test_package.009=Testtakers +jsp.exam.test_package.009=Assigned # of Tests jsp.exam.test_package.010=# of Tests Completed jsp.exam.test_package.0101=# of Tests Incomplete jsp.exam.test_package.011=# of Tests Not Started @@ -384,7 +385,7 @@ jsp.system.config.004=System Imbed jsp.system.config.005=Parameter Key Name Already Existing jsp.system.dept.001=Superior Dept -jsp.system.dept.002=Dept Name +jsp.system.dept.002=Dept jsp.system.dept.003=Show Ordering jsp.system.dept.004=Contact Person jsp.system.dept.005=Telephone @@ -579,7 +580,7 @@ dict.ic124=Chinese dict.ic125=English dict.ic126=\u0E44\u0E17\u0E22 -dict.ic127=Start +dict.ic127=In Use dict.ic128=Pause dict.ic129=End dict.ic130=Expire @@ -712,7 +713,7 @@ basis.content=Content basis.testPackageName=Test Package Nme basis.testProducts=Product Name -basis.area=Area +basis.area=Region jsp.monitor.operlog.systemModule=System Module jsp.monitor.operlog.logNumber=Log Number jsp.monitor.operlog.operator=Operator @@ -753,7 +754,7 @@ basis.freelogin=Direct Login jsp.system.user.profile.029=Return to Main Account jsp.exam.test_package.startTime=Test Start time -jsp.exam.test_package.endTime=Test End time +jsp.exam.test_package.endTime=Test Ending time jsp.exam.test_package.testinfo=View Progress jsp.exam.test_package.testtoken=token jsp.exam.test_package.timeSpent=Time Spent @@ -943,11 +944,11 @@ whether.to.update.existing.data=Whether to update existing data dataFormatError=Data format error the.name.cannot.contain.special.characters=Special characters not allowed -test.user.name=User Name +test.user.name=Test-taker language.used.in.the.test=Test Language current.time=DateTime -enterprise.customer.name=Company Name -test.product.name=Product Package Name +enterprise.customer.name=Client/Distributor +test.product.name=Test Product test.user.name.dict1=Search by Test-Taker Name test.user.name.dict2=Search by Test-Taker Email test.user.name.dict3=Search by Test-Taker Cell# @@ -955,6 +956,8 @@ jsp.main.other.001=Recently Completed Tests jsp.main.other.002=Recently Abandoned Tests or Tests Being Completed jsp.main.other.003=Recently Created Test Packages +jsp.main.other.004=Most Recent Status Time +jsp.main.other.005=Product Type menu.exam.test_package.search=Search Test Package jsp.exam.package.langtype=Mail Language Type jsp.exam.test_package.memberEmailContent=Tester Report Message Content -- Gitblit v1.9.1