From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 22 十一月 2023 11:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/i18n/messages_en_US.properties |  225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 225 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
index 82fc0f4..c7a163f 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -40,3 +40,228 @@
 operation.failed=Operation failed
 operation.success=Operation successful
 
+##\u83DC\u5355
+menu.system=system
+menu.monitor=monitor
+menu.tool=tool
+menu.user=user
+menu.role=role
+menu.menu=menu
+menu.dept=dept
+menu.post=post
+menu.dict=dict
+menu.config=config
+menu.notice=notice
+menu.log=log
+menu.online=online
+menu.job=job
+menu.druid=druid
+menu.server=server
+menu.cache=cache
+menu.cacheList=cacheList
+menu.build=build
+menu.gen=gen
+menu.operlog=operlog
+menu.logininfor=logininfor
+menu.management3d=management3d
+menu.device=device
+menu.camera=camera
+menu.radar=radar
+menu.external=external
+menu.videoFusion=videoFusion
+menu.tower=tower
+menu.alarmpoints=alarmpoints
+menu.elecFence=elecFence
+menu.tube=tube
+menu.policeStation=policeStation
+menu.peopleAndCar=peopleAndCar
+menu.inspect=inspect
+menu.inspectTask=inspectTask
+menu.inspectRecord=inspectRecord
+menu.vtdu=vtdu
+menu.vtduConfig=vtduConfig
+menu.vtduPullStream=vtduPullStream
+menu.vtduPushStream=vtduPushStream
+menu.test=test
+menu.sdkTest=sdkTest
+menu.vtduTest=vtduTest
+menu.mqQueue=mqQueue
+menu.minio=minio
+menu.minioEvent=minioEvent
+menu.sysApi=sysApi
+menu.tiles3d=tiles3d
+
+menu.alarmPermission=alarmPermission
+menu.appPermission=appPermission
+menu.noGuideZone=noGuideZone
+menu.userResetPwd=userResetPwd
+menu.accountUnlock=accountUnlock
+menu.batchForceOut=batchForceOut
+menu.singleForceOut=singleForceOut
+menu.codePreview=preview
+menu.codeGen=generator
+menu.query=query
+menu.add=add
+menu.edit=edit
+menu.remove=remove
+menu.export=export
+menu.import=import
+
+
+##\u5B57\u5178\u7C7B\u578B
+dic.type.sys.user.sex=userSex
+dic.type.sys.show.hide=menuStatus
+dic.type.sys.normal.disable=systemSwitches
+dic.type.sys.job.status=jobStatus
+dic.type.sys.job.group=jobGroup
+dic.type.sys.yes.no=systemY/N
+dic.type.sys.notice.type=noticeType
+dic.type.sys.notice.status=noticeStatus
+dic.type.sys.oper.type=operType
+dic.type.sys.common.status=commonStatus
+dic.type.camera.type=cameraType
+dic.type.well.type=wellType
+dic.type.work.state=workState
+dic.type.factory=factory
+dic.type.tube.type=tubeType
+dic.type.radar.type=radarType
+dic.type.equip.type=equipType
+dic.type.cameras.priority=camerasPriority
+dic.type.inspect.mode=inspectMode
+dic.type.on.off=switch
+dic.type.repeat.period=repeatPeriod
+dic.type.alarm.type=alarmType
+dic.type.storage.operate.type=storageOperateType
+dic.type.wall.type=wallType
+dic.type.code.enabled=codeSwitch
+dic.type.change.code.mode=codeMode
+##\u5B57\u5178
+dic.data.sys.user.sex.male=male
+dic.data.sys.user.sex.female=female
+dic.data.sys.user.sex.other=other
+dic.data.sys.show=show
+dic.data.sys.hide=hide
+dic.data.sys.normal=normal
+dic.data.sys.disable=disabled
+dic.data.sys.job.status.normal=normal
+dic.data.sys.job.status.pause=pause
+dic.data.sys.job.group.default=default
+dic.data.sys.job.group.system=system
+dic.data.sys.yes=yes
+dic.data.sys.no=no
+dic.data.sys.notice=notice
+dic.data.sys.announcement=announcement
+dic.data.sys.notice.status.normal=normal
+dic.data.sys.notice.status.close=close
+dic.data.sys.oper.type.other=other
+dic.data.sys.oper.type.add=add
+dic.data.sys.oper.type.edit=edit
+dic.data.sys.oper.type.remove=remove
+dic.data.sys.oper.type.authorization=authorization
+dic.data.sys.oper.type.export=export
+dic.data.sys.oper.type.import=import
+dic.data.sys.oper.type.force.out=forceLogout
+dic.data.sys.oper.type.gen=genCode
+dic.data.sys.oper.type.clear=clear
+dic.data.sys.common.status.success=success
+dic.data.sys.common.status.fail=fail
+dic.data.camera.type.samll.camera=samll
+dic.data.camera.type.big.camera=big
+dic.data.camera.type.nvr=nvr
+dic.data.well.type.pump=pump
+dic.data.well.type.ketou=ketou
+dic.data.work.state.normal=normal
+dic.data.work.state.exception=exception
+dic.data.equip.type.alarm=alarmHost
+dic.data.equip.type.GPS=GPS
+dic.data.equip.type.gycgq=gycgq
+dic.data.equip.type.person.position=personPosition
+dic.data.equip.type.personandcar=personandcar
+dic.data.equip.type.access=accessHost
+dic.data.equip.type.jcj=jcj
+dic.data.equip.type.tube.alarm=tubeAlarm
+dic.data.equip.type.uav.platform=uavPlatform
+dic.data.tube.type.oil.pipe=oilPipe
+dic.data.tube.type.water.pipe=waterPipe
+dic.data.tube.type.gas.pipe=gasPipe
+dic.data.radar.type.h=H
+dic.data.radar.type.f=F
+dic.data.alarm.type=Warning
+dic.data.cameras.priority.user1=userLevel1
+dic.data.cameras.priority.user2=userLevel2
+dic.data.cameras.priority.user3=userLevel3
+dic.data.cameras.priority.user4=userLevel4
+dic.data.cameras.priority.sys.app.onekey=sys_app_onekey
+dic.data.cameras.priority.sys.access.control=sys_access_control
+dic.data.cameras.priority.sys.external=sys_external
+dic.data.cameras.priority.sys.radar.pump=sys_radar_pump
+dic.data.cameras.priority.sys.tube.leak=sys_tube_leak
+dic.data.cameras.priority.sys.radar.move=sys_radar_move
+dic.data.cameras.priority.sys.radar.fire=sys_radar_fire
+dic.data.cameras.priority.sys.radar.force=sys_radar_force
+dic.data.cameras.priority.sys.manual.inspection=sys_manual_inspection
+dic.data.cameras.priority.sys.auto.inspection=sys_auto_inspection
+
+dic.data.inspect.mode.auto=auto
+dic.data.inspect.mode.manual=manual
+dic.data.on=on
+dic.data.off=off
+dic.data.repeat.period.week=week
+dic.data.repeat.period.day=day
+dic.data.repeat.period.hour=hour
+dic.data.repeat.period.min=min
+dic.data.alarm.type.elec.steal=elecSteal
+dic.data.alarm.type.radar=radarAlarm
+dic.data.alarm.type.camera=camera
+dic.data.alarm.type.radar.fire=fireAlarm
+dic.data.alarm.type.external=externalAlarm
+dic.data.alarm.type.access=accessAlarm
+dic.data.alarm.type.tube=tubeLeak
+dic.data.alarm.type.elec.fencee=elecFencee
+dic.data.storage.operate.type.add=add
+dic.data.storage.operate.type.remove=remove
+dic.data.factory.hikvision=hikvision
+dic.data.factory.dahua=dahua
+dic.data.wall.type.no.entry=noEntry
+dic.data.wall.type.no.exit=noExit
+dic.data.code.enabled.on=transcoding
+dic.data.code.enabled.off=noTranscoding
+dic.data.change.code.mode.gpu=GPUHardwareDecoding
+dic.data.change.code.mode.cpu=CPUSoftwareDecoding
+
+##\u7CFB\u7EDF\u914D\u7F6E
+config.sys.index.skinName=skinName
+config.sys.user.initPassword=initPassword
+config.sys.index.sideTheme=sideTheme
+config.sys.account.registerUser=registerUser
+config.sys.account.captchaEnabled=captchaEnabled
+config.uav=uav
+config.HIKSuperBrain=HIKSuperBrain
+config.origin=origin
+config.CompanyMURL=CompanyMURL
+config.serverCode=serverCode
+config.PneumaticLockIPAndPort=PneumaticLockIPAndPort
+config.shVideo=shVideo
+config.appAlarmPointsDistance=appAlarmPointsDistance
+config.dblocal=dblocal
+config.31distance=31distance
+config.31time=31time
+config.radarUrl=radarUrl
+config.uavOriginPosition=uavOriginPosition
+config.stealElecUrl=stealElecUrl
+config.ws=ws
+config.RongCloudAppSecret=RongCloudAppSecret
+config.minioOut=minioOut
+config.minioIn=minioIn
+config.webrtcIP=webrtcIP
+config.indexIp=indexIp
+config.gis=gis
+config.eqHealthPassword=eqHealthPassword
+config.eqHealthAccount=eqHealthAccount
+config.eqHealthUrl=eqHealthUrl
+config.health=health
+config.refreshTime=refreshTime
+config.dayNightTime=dayNightTime
+config.rongyun=rongyun
+config.RongCloudAppKey=RongCloudAppKey
+config.syCarPT=syCarPT

--
Gitblit v1.9.3