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 ce9f48c4b..e024f86e9 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -63,11 +63,9 @@ tenant.expired=sorry,your lessee is outdated,please contact the administrater
-
-#====== app =========
##Login
login.name0=Login
-login.name1=Please enter your account number
+login.name1=Please enter email
login.name2=Please enter your password
login.name3=I have read and gree to sign
login.name4=Register now
@@ -90,7 +88,7 @@ register.name3=Please enter your password
register.name4=Please enter your password again
register.name5=Two different password are entered
##《Register successful》
-registerSuccess.name0= Successfully registered
+registerSuccess.name0=Successfully registered
registerSuccess.name1=Your login account
registerSuccess.name2=Your password
registerSuccess.name3=Log in now
@@ -110,7 +108,7 @@ homepage.name11=All
homepage.name12=No data
homepage.name13=Equipment initialization failed.
##《Close reminder 》
-warningClose.name0= Closing reminder
+warningClose.name0=Closing reminder
warningClose.name1=DeviceName- Open -num- minutes, please remember to close the door
warningClose.name2=Device
warningClose.name3=Open
@@ -189,8 +187,8 @@ log.name14=Hour
log.name15=Minute
log.name16=Second
## Add remote control
-checkcode.name0= Add remote control
-checkcode.name1= Adding
+checkcode.name0=Add remote control
+checkcode.name1=Adding
checkcode.name2=Remote control added successfully
checkcode.name3=Remote control failed to add,please try again
checkcode.name4=Number of remote controllers matched
@@ -235,7 +233,7 @@ set.name19=Model version
set.name20=MCU version
set.name21=Remove devices
set.name22=To start the automatic door closeing function, you need to turn on the infrared protection induction function first
-set.name23=
+set.name23=The device has been deleted successfully, redirecting to the home page…
set.name24=Device version number
set.name25=Confirm upgrade
set.name26=Change WiFi
@@ -259,7 +257,7 @@ setCommon.confirm=Confirm
##Not set details
noinit.name0=Detail
noinit.name1=Stroke not calibrated
-noinit.name2= If the opener has not completed the limit setting, the APP will not be able to operate the door.
+noinit.name2=If the opener has not completed the limit setting, the APP will not be able to operate the door.
noinit.name3=Limit Setting
noinit.name4=Please set the limit on the opener
noinit.name5=Set the door opening position
@@ -352,21 +350,21 @@ logStatus.name114=Door body stop operation alert
logStatus.name500=Offline
logStatus.name501=On line
# Equipment sharing
-deviceShare.name1 = Equipment sharing
-deviceShare.name2 = Please enter the other party login account
-deviceShare.name3 = Friendly reminder
+deviceShare.name1=Equipment sharing
+deviceShare.name2=Please enter the other party login account
+deviceShare.name3=Friendly reminder
deviceShare.name4=After a device is shared, the other party can access and manage all devices with the current account. The other party cannot delete the devices with the current account.
# Mine
-my.name0 =Login ID
-my.name1 = Account management
-my.name2 = Distributed management
-my.name3 =Management
-my.name4 = Device sharing
-my.name5 = Switch the language
-my.name6 =Mine
-my.name7 = Equipment distribution network
-message.fault.device.notfound = Device does not exist
+my.name0=Login ID
+my.name1=Account management
+my.name2=Distributed management
+my.name3=Management
+my.name4=Device sharing
+my.name5=Switch the language
+my.name6=Mine
+my.name7=Equipment distribution network
+message.fault.device.notfound=Device does not exist
#My account number
account.name0=My account number
@@ -416,13 +414,13 @@ accountForm.name24=Upload again
accountForm.name25=Change avatar
# devForm Device sharing
-devForm.name0 = Device sharing
-devForm.name1 = Please enter the other party's login account
-devForm.name2 = Friendly reminder
-devForm.name3 = After a device is shared, the other party can access and manage all devices with the current account. The other party cannot delete the devices with the current account.
-devForm.name4 = Previous page
-devForm.name5 =Add
-devForm.name6 = The device is shared successfully, do you want to continue sharing
+devForm.name0=Device sharing
+devForm.name1=Please enter the other party's login account
+devForm.name2=Friendly reminder
+devForm.name3=After a device is shared, the other party can access and manage all devices with the current account. The other party cannot delete the devices with the current account.
+devForm.name4=Previous page
+devForm.name5=Add
+devForm.name6=The device is shared successfully, do you want to continue sharing
devForm.name7=Please select a device
devForm.name8=Please select a device group
# Distributed management
@@ -473,9 +471,9 @@ ble.name20=Bluetooth device has been connected, please disconnect Bluetooth and
ble.name21=Supplying distribution network data , try again later!
ble.name22=Requires Bluetooth permission ,in order to proceed
ble.name23=Requires Bluetooth permission ,in order to proceed
-ble.name24= No password required, click OK to start networking!
+ble.name24=No password required, click OK to start networking!
ble.name25=Please enter
-ble.name26= Your password for
+ble.name26=Your password for
ble.name27=APP requires location permissions to continue!
ble.name28=APP requires bluetooth permissions to continue!
ble.name29=Need to be handled as prompted
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
index 1f456b00e..c13b3e6da 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@@ -65,7 +65,7 @@ tenant.expired=对不起,您的租户已过期,请联系管理员
##《登录》
login.name0=登录
-login.name1=请输入账号
+login.name1=请输入邮箱
login.name2=请输入密码
login.name3=我已阅读并同意签署
login.name4=立即注册
@@ -79,7 +79,9 @@ login.name11=了解详细信息。如果你同意,请点击下面按钮开始
login.name12=不同意并退出
login.name13=同意
login.name14=请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。你可阅读
-##《注册》register
+
+
+##《注册》
register.name0=注册
register.name1=注册账号
register.name2=请输入账号
diff --git a/ruoyi-admin/src/main/resources/i18n/中文(3).properties b/ruoyi-admin/src/main/resources/i18n/中文.properties
similarity index 97%
rename from ruoyi-admin/src/main/resources/i18n/中文(3).properties
rename to ruoyi-admin/src/main/resources/i18n/中文.properties
index 232ebb637..c13b3e6da 100644
--- a/ruoyi-admin/src/main/resources/i18n/中文(3).properties
+++ b/ruoyi-admin/src/main/resources/i18n/中文.properties
@@ -65,7 +65,7 @@ tenant.expired=对不起,您的租户已过期,请联系管理员
##《登录》
login.name0=登录
-login.name1=请输入账号
+login.name1=请输入邮箱
login.name2=请输入密码
login.name3=我已阅读并同意签署
login.name4=立即注册
@@ -73,16 +73,13 @@ login.name5=支持邮箱登录
login.name6=服务协议
login.name7=隐私政策
login.name8=忘记密码
-"login.name9=请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。你可阅读
-"
+login.name9=请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。你可阅读
login.name10=和
login.name11=了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。
-"login.name12=不同意并退出
-"
-"login.name13=同意
-"
-"login.name14=请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。你可阅读
-"
+login.name12=不同意并退出
+login.name13=同意
+login.name14=请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。你可阅读
+
##《注册》
register.name0=注册
@@ -225,7 +222,7 @@ set.name7=半开门功能开关
set.name8=半开门高度设置
set.name9=提醒关门功能开关
set.name10=提醒关门时间设置
-set.name11=自动关门
+set.name11=自动关门
set.name12=打开此功能,当门开到最大时,在设置的倒计时时间内,门没有被控制,则在倒计时结束后,门会自动关闭。
set.name13=自动关门时间设置
set.name14=运行次数
@@ -354,9 +351,9 @@ logStatus.name114=门体停止运行提醒
logStatus.name500=离线
logStatus.name501=在线
# 设备共享
-deviceShare.name1 = 设备共享
-deviceShare.name2 = 请输入对方登录账号
-deviceShare.name3 = 温馨提示
+deviceShare.name1 = 设备共享
+deviceShare.name2 = 请输入对方登录账号
+deviceShare.name3 = 温馨提示
deviceShare.name4=设备共享后,对方账号也可以访问管理当前账号所有设备,对方不可删除当前账号设备。
# 我的
diff --git a/ruoyi-admin/src/main/resources/i18n/英语(2).properties b/ruoyi-admin/src/main/resources/i18n/英语.properties
similarity index 64%
rename from ruoyi-admin/src/main/resources/i18n/英语(2).properties
rename to ruoyi-admin/src/main/resources/i18n/英语.properties
index 6b9726e54..dce1ce099 100644
--- a/ruoyi-admin/src/main/resources/i18n/英语(2).properties
+++ b/ruoyi-admin/src/main/resources/i18n/英语.properties
@@ -9,18 +9,18 @@ user.password.retry.limit.exceed=Password entered incorrectly {0}times, account
user.password.delete=Sorry, your account: {0} has been deleted
user.blocked=Sorry, your account: {0} has been disabled, please contact the administrator
role.blocked=Character has been banned please contact the administrator
-user.logout.success=Exit successfully
+user.logout.success=Exit successfully
length.not.valid=The length must be between {min} to {max} characters
user.username.not.blank=The username cannot be empty
user.username.not.valid=*2 to 20 Chinese letters,numbers or underline and must be begun with non-number
user.username.length.valid=Account length must between {min}to {max} characters
user.password.not.blank=The user password cannot not be empty
-user.password.length.valid=The user password must be between {min}to {max} characters in length
-user.password.not.valid= 5 to 50 characters
+user.password.length.valid=The user password must be between {min}to {max} characters in length
+user.password.not.valid=5 to 50 characters
user.email.not.valid=Mailbox format error
user.email.not.blank=Mailbox cannot be empty
user.phonenumber.not.blank=The user phone number cannot be empty
-user.mobile.phone.number.not.valid=The phone number format incorrectly
+user.mobile.phone.number.not.valid=The phone number format incorrectly
user.login.success=Login successfully
user.register.success=Registered successfully
user.register.save.error=Failed to save user {0}, the registered account already exists
@@ -28,20 +28,20 @@ user.register.error=Registration failed. Please contact system administrator
user.notfound=Please log in again
user.forcelogout=The administrator forcibly logs out. Please log in again
user.unknown.error=Error unknown ,please log in again
-auth.grant.type.error=Incorrect authentication permission type
+auth.grant.type.error=Incorrect authentication permission type
auth.grant.type.blocked=The Authentication permission type is disabled
auth.grant.type.not.blank=The Authentication permission type cannot be empty
auth.clientid.not.blank=The authentication client ID cannot be empty
##File upload message
upload.exceed.maxSize=The uploaded file size exceeds the limit file size !
The maximum allowed file size is {0}MB!
-upload.filename.exceed.length=The uploaded file name can be up to {0} characters
+upload.filename.exceed.length=The uploaded file name can be up to {0} characters
##Permissions
-no.permission= You do not have permission to access data, please contact the administrator to add permissions [{0}]
-no.create.permission= You do not have permission to create data, please contact the administrator to add permissions [{0}]
-no.update.permission= You do not have permission to modify data, please contact the administrator to add permissions [{0}]
-no.delete.permission= You do not have permission to delete data, please contact the administrator to add permissions [{0}]
-no.export.permission= You do not have permission to export data, please contact the administrator to add permissions [{0}]
-no.view.permission= You do not have permission to view data, please contact the administrator to add permissions [{0}]
+no.permission=You do not have permission to access data, please contact the administrator to add permissions [{0}]
+no.create.permission=You do not have permission to create data, please contact the administrator to add permissions [{0}]
+no.update.permission=You do not have permission to modify data, please contact the administrator to add permissions [{0}]
+no.delete.permission=You do not have permission to delete data, please contact the administrator to add permissions [{0}]
+no.export.permission=You do not have permission to export data, please contact the administrator to add permissions [{0}]
+no.view.permission=You do not have permission to view data, please contact the administrator to add permissions [{0}]
repeat.submit.message=Duplicate 改成repeat submission are not allowed, please try again later
rate.limiter.message=Access is visits are too frequent, please try again later
sms.code.not.blank=The SMS verification code cannot be empty
@@ -65,9 +65,9 @@ tenant.expired=Sorry,your lessee is outdated has expired ,please contact the adm
##Login
login.name0=Login
-login.name1=Please enter your account number
-login.name2=Please enter your password
-login.name3=I have read and gree to sign
+login.name1=Please enter email
+login.name2=Please enter your password
+login.name3=I have read and gree to sign
login.name4=Register now
login.name5=Support email login
login.name6=Service agreement
@@ -84,11 +84,11 @@ login.name14=Please read carefully and fully understand the terms of the "Servic
register.name0=Register
register.name1=Set up an account number
register.name2=Please enter account number
-register.name3=Please enter your password
+register.name3=Please enter your password
register.name4=Please enter your password again
register.name5=Two different password are entered
##《Register successful》
-registerSuccess.name0= Successfully registered
+registerSuccess.name0=Successfully registered
registerSuccess.name1=Your login account
registerSuccess.name2=Your password
registerSuccess.name3=Log in now
@@ -103,14 +103,14 @@ homepage.name6=Reminder suspend
homepage.name7=Closed
homepage.name8=If open the door?
homepage.name9=Suspend or not
-homepage.name10=Please select
+homepage.name10=Please select
homepage.name11=All
homepage.name12=No data
-homepage.name13=Equipment initialization failed.
+homepage.name13=Equipment initialization failed.
##《Close reminder 》
-warningClose.name0= Closing reminder
+warningClose.name0=Closing reminder
warningClose.name1=DeviceName- Open -num- minutes, please remember to close the door
-warningClose.name2=Device
+warningClose.name2=Device
warningClose.name3=Open
warningClose.name4=minute.Please close the door.
warningClose.name5=Close the door
@@ -130,22 +130,22 @@ addSuccess.name1=Back
addSuccess.name2=Keep searching
##Add failure
addFailure.name0=Add fail
-addFailure.name1=Please enter the correct device number and try again
-addFailure.name3=Re-add
+addFailure.name1=Please enter the correct device number and try again
+addFailure.name3=Re-add
##Device details
detail.name0=Details
##(Closed Open 10% Open 100%)
detail.name1=State
detail.name2=Closed
detail.name3=Open
-detail.name4=Running status
-detail.name5=Half open
+detail.name4=Running status
+detail.name5=Half open
detail.name6=Close
detail.name7=Stop
detail.name8=Open
-detail.name9=Half-open the door
-detail.name10=Lamp management
-detail.name11=Settings
+detail.name9=Half-open the door
+detail.name10=Lamp management
+detail.name11=Settings
detail.name12=占位
detail.name13=Countdown reset
detail.name14=Runs number
@@ -179,7 +179,7 @@ log.name6=Wednesday
log.name7=Thursday
log.name8=Friday
log.name9=Saturday
-log.name10=Open door reminders
+log.name10=Open door reminders
log.name11=Year
log.name12=Month
log.name13=Day
@@ -187,14 +187,14 @@ log.name14=Hour
log.name15=Minute
log.name16=Second
## Add remote control
-checkcode.name0= Add remote control
-checkcode.name1= Adding
-checkcode.name2=Remote control added successfully
-checkcode.name3=Remote control failed to add,please try again
+checkcode.name0=Add remote control
+checkcode.name1=Adding
+checkcode.name2=Remote control added successfully
+checkcode.name3=Remote control failed to add,please try again
checkcode.name4=Number of remote controllers matched
checkcode.name5=Please operate near the motor. Press the button of the remote control that needs to be paired twice.
-##Clear the remote
-clearcode.name0=Clear the remote
+##Clear the remote
+clearcode.name0=Clear the remote
clearcode.name1=Enter your login password
clearcode.name2=Enter your login password to clear the remote control
clearcode.name3=Cancel
@@ -205,17 +205,17 @@ clearcode.name7=Please confirm that you want to clear all remote control records
clearcode.name8=Clearing successful
clearcode.name9=Clearing failed
-##Device drop details
+##Device drop details
offDetail.name0=Details
offDetail.name1=Device Offline
##Optimal settings
-set.name0=Settings
+set.name0=Settings
set.name1=Device name
set.name2=Device location
-set.name3=Recoils setting
-set.name4=Infrared sensing
-set.name5=Inferred photo beam function, the door will stop immediately and begin to open when an object in the way while the door is closing.
+set.name3=Recoils setting
+set.name4=Infrared sensing
+set.name5=Inferred photo beam function, the door will stop immediately and begin to open when an object in the way while the door is closing.
set.name6=Travel distance limit
set.name7=Half door function switch
set.name8=Half door height setting
@@ -231,9 +231,9 @@ set.name17=Device type
set.name18=Serial number
set.name19=Model version
set.name20=MCU version
-set.name21=Remove devices
+set.name21=Remove devices
set.name22=To start the automatic door closeing function, you need to turn on the infrared protection induction function first
-set.name23=
+set.name23=The device has been deleted successfully, redirecting to the home page…
set.name24=Device version number
set.name25=Confirm upgrade
set.name26=Change WiFi
@@ -249,15 +249,15 @@ set.name33=Whether to reconfigure the WIFI
setCommon.detail=Details
setCommon.add=Add
setCommon.edit=Edit
-setCommon.delete=Delete
+setCommon.delete=Delete
setCommon.alert=Tips
setCommon.cancel=Cancel
setCommon.confirm=Confirm
-##Not set details
+##Not set details
noinit.name0=Detail
-noinit.name1=Stroke not calibrated
-noinit.name2= If the opener has not completed the limit setting, the APP will not be able to operate the door.
+noinit.name1=Stroke not calibrated
+noinit.name2=If the opener has not completed the limit setting, the APP will not be able to operate the door.
noinit.name3=Limit Setting
noinit.name4=Please set the limit on the opener
noinit.name5=Set the door opening position
@@ -272,38 +272,38 @@ noinit.name13=4. Press “SET” button again
noinit.name14=Watching: the LED shows “2” (steady)
noinit.name15=5. Press and hold on “DOWN” button to the final closing limit position then release the button
noinit.name16=Watching: the door moves toward the closing direction and stops when it arrives at the final closing position
-noinit.name17=Auto check
+noinit.name17=Auto check
noinit.name18=6. Press “SET” button again
noinit.name19=Watching:the door will open and close automatically, when the LED shows “II” the opener goes to standby mode.
noinit.name20=The limit setting is done.
-##Modify Device Name
-setEqname.name0=Modify Device Name
+##Modify Device Name
+setEqname.name0=Modify Device Name
setEqname.name1=Please enter a name
setEqname.name2=Previous page
setEqname.name3=Confirm
-##Modify the device location
-setEqarea.name0=Modify the device location
+##Modify the device location
+setEqarea.name0=Modify the device location
setEqarea.name1=Previous page
setEqarea.name2=Confirm
-##Bounce setting
+##Bounce setting
setRebound.name0=Safety Reverse Force Adjustment
setRebound.name1=Safety reverse force adjustment
-setRebound.name2=When the opener is in the process of opening the door, if the opening force exceeds the set range, the door will stop immediately.
+setRebound.name2=When the opener is in the process of opening the door, if the opening force exceeds the set range, the door will stop immediately.
setRebound.name3=Similarly, if the closing force exceeds the set range, the door will also stop immediately and begin to open. This safety feature can be adjusted to levels 1 through 9.
##Set delete
setDelete.name0=Set delete
setDelete.name1=Remind
setDelete.name2=After a device is deleted, it cannot be managed. Exercise caution when performing this operation.
setDelete.name3=Cancel
-setDelete.name4=Confirm deletion
-##Time zone setting
+setDelete.name4=Confirm deletion
+##Time zone setting
setZone.name0=Time Zone
setZone.name1=Select time format
setZone.name2=Time format
##Wifi Network
setWifi.name0=Wifi Network
setWifi.name1=Tips
-setWifi.name2=The wifi has been connected
+setWifi.name2=The wifi has been connected
setWifi.name3=To replace the network, make sure you are next to the device and click the Reset WiFi button
setWifi.name4=Confirm deletion
setWifi.name5=Cancel
@@ -315,8 +315,8 @@ openStatus.name1=Open
runStatus.name0=Stopping
runStatus.name1=Closing
runStatus.name2=Opening
-runStatus.name11=Infrared fault
-runStatus.name12=Motor running failure
+runStatus.name11=Infrared fault
+runStatus.name12=Motor running failure
runStatus.name13=Maintenance Reminder
runStatus.name14=Equipment Failure
@@ -328,7 +328,7 @@ logStatus.name2=Opening
## Malfuction
logStatus.name10=No abnormalities
logStatus.name11=IR Bean Failure
-logStatus.name12=Abnormal Operation On Motor
+logStatus.name12=Abnormal Operation On Motor
logStatus.name13=Maintenance Reminder
logStatus.name14=Equipment Failure
## Malfuction
@@ -343,38 +343,38 @@ logStatus.name108=Door opening fault alarm
logStatus.name109=Open the door and run the alarm
logStatus.name110=Close the door and run the alarm
logStatus.name111=Forget close the door alarm
-logStatus.name112=Door body manual open reminder
+logStatus.name112=Door body manual open reminder
logStatus.name113=Half-open running reminder
logStatus.name114=Door body stop operation alert
logStatus.name500=Offline
logStatus.name501=On line
# Equipment sharing
-deviceShare.name1 = Equipment sharing
-deviceShare.name2 = Please enter the other party login account
-deviceShare.name3 = Friendly reminder
+deviceShare.name1=Equipment sharing
+deviceShare.name2=Please enter the other party login account
+deviceShare.name3=Friendly reminder
deviceShare.name4=After a device is shared, the other party can access and manage all devices with the current account. The other party cannot delete the devices with the current account.
-# Mine
-my.name0 =Login ID
-my.name1 = Account management
-my.name2 = Distributed management
-my.name3 =Management
-my.name4 = Device sharing
-my.name5 = Switch the language
-my.name6 =Mine
-my.name7 = Equipment distribution network
-message.fault.device.notfound = Device does not exist
+# Mine
+my.name0=Login ID
+my.name1=Account management
+my.name2=Distributed management
+my.name3=Management
+my.name4=Device sharing
+my.name5=Switch the language
+my.name6=Mine
+my.name7=Equipment distribution network
+message.fault.device.notfound=Device does not exist
-#My account number
-account.name0=My account number
+#My account number
+account.name0=My account number
account.name1=Log out
account.name2=Head portrait
account.name3=Nickname
account.name4=E-mail
-account.name5=Set your login password
-account.name6=Changing your password
-account.name7=Logout account
+account.name5=Set your login password
+account.name6=Changing your password
+account.name7=Logout account
account.name8=This operation cannot be restored after you log out. Exercise caution when performing this operation
account.name9=Logout will clear your login information. And cofirm log out?
account.name10=Reslect
@@ -383,29 +383,29 @@ account.name12=Spin
account.name13=Ppreview
account.name14=Upload
account.name15=The account cannot be restored after cancellation. Do you want to cancellation?
-account.name16=Cancel account
+account.name16=Cancel account
# Changing nickname
accountForm.name0=Changing the nickname
accountForm.name1=Changing your login password
-accountForm.name2=Bind mailbox
+accountForm.name2=Bind mailbox
accountForm.name3=Add
accountForm.name4=Family name
accountForm.name5=Please enter a nickname
accountForm.name6=Please enter name
-accountForm.name7=Please enter your old password
-accountForm.name8=Please enter your new password
+accountForm.name7=Please enter your old password
+accountForm.name8=Please enter your new password
accountForm.name9=Please enter your password again
accountForm.name10=Please enter email
accountForm.name11=Please enter the verification code
accountForm.name12=Send verification
accountForm.name13=Hold on ,please …
-accountForm.name14=Seconds later
+accountForm.name14=Seconds later
accountForm.name15=Your current mail is
accountForm.name16=Previous page
accountForm.name17=Confirm
accountForm.name18=Two different password are entered
-accountForm.name19=Please enter the correct email address
+accountForm.name19=Please enter the correct email address
accountForm.name20=Please upload a picture
accountForm.name21=Upload/take a photo
accountForm.name22=Uploading
@@ -414,13 +414,13 @@ accountForm.name24=Upload again
accountForm.name25=Change avatar
# devForm Device sharing
-devForm.name0 = Device sharing
-devForm.name1 = Please enter the other party's login account
-devForm.name2 = Friendly reminder
-devForm.name3 = After a device is shared, the other party can access and manage all devices with the current account. The other party cannot delete the devices with the current account.
-devForm.name4 = Previous page
-devForm.name5 =Add
-devForm.name6 = The device is shared successfully, do you want to continue sharing
+devForm.name0=Device sharing
+devForm.name1=Please enter the other party's login account
+devForm.name2=Friendly reminder
+devForm.name3=After a device is shared, the other party can access and manage all devices with the current account. The other party cannot delete the devices with the current account.
+devForm.name4=Previous page
+devForm.name5=Add
+devForm.name6=The device is shared successfully, do you want to continue sharing
devForm.name7=Please select a device
devForm.name8=Please select a device group
# Distributed management
@@ -469,11 +469,11 @@ ble.name18=Need location permission to proceed!
ble.name19=Connecting Bluetooth device, please allow pairing or try again later!!
ble.name20=Bluetooth device has been connected, please disconnect Bluetooth and try again!
ble.name21=Supplying distribution network data , try again later!
-ble.name22=Requires Bluetooth permission ,in order to proceed
-ble.name23=Requires Bluetooth permission ,in order to proceed
-ble.name24= No password required, click OK to start networking!
+ble.name22=Requires Bluetooth permission ,in order to proceed
+ble.name23=Requires Bluetooth permission ,in order to proceed
+ble.name24=No password required, click OK to start networking!
ble.name25=Please enter
-ble.name26= Your password for
+ble.name26=Your password for
ble.name27=APP requires location permissions to continue!
ble.name28=APP requires bluetooth permissions to continue!
ble.name29=Need to be handled as prompted
@@ -498,7 +498,7 @@ ble.name47=Initialize the distribution network environment
ble.name48=Operating instructions
ble.name49=Step 1
ble.name50=Step 2
-ble.name51=Next
+ble.name51=Next
ble.name52=Scanning Bluetooth devices results
ble.name53=Tip: No Bluetooth device scanned
ble.name54=Tip:Click on the Bluetooth device that needs to be networked to go to the next step
@@ -512,7 +512,7 @@ ble.name61=Click, next, enter the information as prompted, start the network dis
ble.name62=Tip: Enter the WIFI password
ble.name63=Tip: Start networking
ble.name64=2.Press and hold on “SET” button Hold down the device's "SET" key until the display flashes "1"
-ble.name65=Watching: the LED flashes “1”
+ble.name65=Watching: the LED flashes “1”
ble.name66=3.Short Press “UP” button for several times until the LED flashes “9”
ble.name67=Watching: the LED shows from “1” to “9”
ble.name68=4.Press “SET” button
@@ -532,22 +532,4 @@ protocol.user=When you apply for a user, it means that you have agreed to abide
3. It is forbidden to use words related to this site when applying for users, or to register users with insults, defamation, rumors, or various languages with their own meanings, otherwise we will delete them.
4. It is forbidden to carry out various destructive acts against this site in any way.
5. If you violate relevant national laws and regulations, this website will not be responsible. Your login information will be recorded without a doubt. If necessary, we will provide such information to the relevant national management departments."
-protocol.personal=Wuxi Moc Technology Co., Ltd. (hereinafter referred to as ""this application"" or ""we"" or ""MOC"") is committed to protecting your personal privacy.
Please read this privacy statement carefully. By using any of our services, you agree to follow any terms in this privacy agreement.
This application respects and protects the personal privacy of all users of the service. In order to provide you with more accurate and personalized services, this application will use and disclose your personal information in accordance with the provisions of this privacy policy. However, this application will treat this information with a high degree of diligence and prudence. Unless otherwise provided in this privacy policy, this application will not disclose or provide this information to third parties without your prior permission. This application will update this privacy policy from time to time. When you agree to this application service use agreement, you are deemed to have agreed to the entire content of this privacy policy. This privacy policy is an integral part of this application service use agreement.
1. Scope of application
-
a) When you register for this application account, you provide personal registration information according to the requirements of this application;
-
b) When you use the network services of this application or visit the web pages of this application platform, this application automatically receives and records the information on your browser and mobile phone, including but not limited to your IP address, browser type, language used, access date and time, software and hardware feature information, and web page records you need;
-
c) User personal data obtained by this application from business partners through legal means.
You understand and agree that the following information is not subject to this privacy policy:
-
a) Keyword information you enter when using the search service provided by this application platform;
-
b) Information data collected by this application about you published in this application, including but not limited to participation in activities, transaction information and evaluation details;
-
c) Violation of legal provisions or violations of the rules of this application and the measures taken by this application against you.
2. Use of information:
-
a) This application will not provide, sell, rent, share or trade your personal information to any unrelated third party, unless you have obtained your prior permission, or the third party and this application (including this application's affiliates) provide services to you individually or jointly, and after the end of the service, it will be prohibited from accessing all of the information it previously had access to.
-
b) This application also does not allow any third party to collect, edit, sell or disseminate your personal information by any means. If any user of this application platform engages in the above activities, once discovered, this application has the right to immediately terminate the service agreement with the user.
-
c) For the purpose of serving users, this application may use your personal information to provide you with information of interest to you, including but not limited to sending you product and service information, or sharing information with this application's partners so that they can send you information about their products and services (the latter requires your prior consent).
3. Information Disclosure
-
Under the following circumstances, this application will disclose your personal information in whole or in part according to your personal wishes or legal provisions:
-
a) Disclose to a third party with your prior consent;
-
b) Share your personal information with a third party in order to provide the products and services you requested;
c) Disclose to a third party or administrative or judicial institution in accordance with relevant legal provisions or the requirements of administrative or judicial institutions;
-
d) If you violate relevant Chinese laws, regulations or this application service agreement or related rules, you need to disclose to a third party;
-
e) If you are a qualified intellectual property complainant and have filed a complaint, you shall disclose to the respondent at the request of the respondent so that both parties can deal with possible rights disputes;
-
f) In a transaction created on this application platform, if any party to the transaction performs or partially performs the transaction obligations and makes a request for information disclosure, this application has the right to decide to provide the user with the necessary information such as the contact information of the counterparty to facilitate the completion of the transaction or the resolution of disputes.
-
g) Other disclosures that this application deems appropriate in accordance with laws, regulations or website policies.
4. Information storage and exchange
-The information and data collected by this application about you will be stored on the servers of this application and (or) its affiliated companies. Such information and data may be transmitted to your country, region or overseas where this application collects information and data and be accessed, stored and displayed overseas.
5. Use of cookies
a) If you do not refuse to accept cookies, this application will set or access cookies on your computer so that you can log in or use the services or functions of this application platform that rely on cookies. This application uses cookies to provide you with more thoughtful personalized services, including promotional services.
b) You have the right to choose to accept or refuse to accept cookies. You can refuse to accept cookies by modifying your browser settings. However, if you choose to refuse to accept cookies, you may not be able to log in or use the network services or functions of this application that rely on cookies.
-
c) The relevant information obtained through the cookies set by this application will be subject to this policy.
6. Information Security
a) This application account has security protection function, please keep your username and password information properly. This application will ensure that your information is not lost, abused or altered by encrypting user passwords and other security measures. Despite the aforementioned security measures, please also note that there is no ""perfect security measure"" on the information network.
b) When using the network service of this application for online transactions, you will inevitably disclose your personal information, such as contact information or postal address, to the transaction counterparty or potential transaction counterparty. Please properly protect your personal information and provide it to others only when necessary. If you find that your personal information has been leaked, especially the username and password of this application, please contact the customer service of this application immediately so that this application can take appropriate measures.
7. Children's Privacy
Protecting children's privacy is important to us. We will not direct our website or application to children under the age of 13 (or 16, where applicable by law), nor will we knowingly collect any personal data from them. If we learn that a child has provided personally identifiable information to a website or application, we will make reasonable efforts to delete such information from such website or application's files.
8. Data Security
We have implemented certain physical, administrative, and technical measures to protect the information we collect from and about our customers and website and application visitors.While we make every reasonable effort to help ensure the integrity and security of our network and systems, we cannot guarantee our security measures.
9. Contact Information
We hope that this Privacy Statement will answer your questions about our collection, use, and disclosure of your personal data.If you have additional questions about this Privacy Statement or the practices described herein, you can contact us at:
Wuxi Moc Door Technology Co., Ltd.
Tel: +86 0510 88553132
E-mail: aioc-service@mocdoor.com
10. Revisions to This Privacy Statement
This application reserves the right to change, modify, add, delete or otherwise revise portions of this Privacy Statement at any time at its sole discretion. If we do so, we will let you know about the changes to the website or application by including a copy of the old version of the Privacy Statement. The date this Privacy Statement was last revised is indicated at the top of the page. Your continued use of the Site or App following the posting of changes to these terms will constitute your acceptance of those changes. If we change this Privacy Statement in a material way, we will provide you with appropriate notice."
+protocol.personal=Wuxi Moc Technology Co., Ltd. (hereinafter referred to as ""this application"" or ""we"" or ""MOC"") is committed to protecting your personal privacy.
Please read this privacy statement carefully. By using any of our services, you agree to follow any terms in this privacy agreement.
This application respects and protects the personal privacy of all users of the service. In order to provide you with more accurate and personalized services, this application will use and disclose your personal information in accordance with the provisions of this privacy policy. However, this application will treat this information with a high degree of diligence and prudence. Unless otherwise provided in this privacy policy, this application will not disclose or provide this information to third parties without your prior permission. This application will update this privacy policy from time to time. When you agree to this application service use agreement, you are deemed to have agreed to the entire content of this privacy policy. This privacy policy is an integral part of this application service use agreement.
1. Scope of application
a) When you register for this application account, you provide personal registration information according to the requirements of this application;
b) When you use the network services of this application or visit the web pages of this application platform, this application automatically receives and records the information on your browser and mobile phone, including but not limited to your IP address, browser type, language used, access date and time, software and hardware feature information, and web page records you need;
c) User personal data obtained by this application from business partners through legal means.
You understand and agree that the following information is not subject to this privacy policy:
a) Keyword information you enter when using the search service provided by this application platform;
b) Information data collected by this application about you published in this application, including but not limited to participation in activities, transaction information and evaluation details;
c) Violation of legal provisions or violations of the rules of this application and the measures taken by this application against you.
2. Use of information:
a) This application will not provide, sell, rent, share or trade your personal information to any unrelated third party, unless you have obtained your prior permission, or the third party and this application (including this application's affiliates) provide services to you individually or jointly, and after the end of the service, it will be prohibited from accessing all of the information it previously had access to.
b) This application also does not allow any third party to collect, edit, sell or disseminate your personal information by any means. If any user of this application platform engages in the above activities, once discovered, this application has the right to immediately terminate the service agreement with the user.
c) For the purpose of serving users, this application may use your personal information to provide you with information of interest to you, including but not limited to sending you product and service information, or sharing information with this application's partners so that they can send you information about their products and services (the latter requires your prior consent).
3. Information Disclosure
Under the following circumstances, this application will disclose your personal information in whole or in part according to your personal wishes or legal provisions:
a) Disclose to a third party with your prior consent;
b) Share your personal information with a third party in order to provide the products and services you requested;
c) Disclose to a third party or administrative or judicial institution in accordance with relevant legal provisions or the requirements of administrative or judicial institutions;
d) If you violate relevant Chinese laws, regulations or this application service agreement or related rules, you need to disclose to a third party;
e) If you are a qualified intellectual property complainant and have filed a complaint, you shall disclose to the respondent at the request of the respondent so that both parties can deal with possible rights disputes;
f) In a transaction created on this application platform, if any party to the transaction performs or partially performs the transaction obligations and makes a request for information disclosure, this application has the right to decide to provide the user with the necessary information such as the contact information of the counterparty to facilitate the completion of the transaction or the resolution of disputes.
g) Other disclosures that this application deems appropriate in accordance with laws, regulations or website policies.
4. Information storage and exchangeThe information and data collected by this application about you will be stored on the servers of this application and (or) its affiliated companies. Such information and data may be transmitted to your country, region or overseas where this application collects information and data and be accessed, stored and displayed overseas.
5. Use of cookies
a) If you do not refuse to accept cookies, this application will set or access cookies on your computer so that you can log in or use the services or functions of this application platform that rely on cookies. This application uses cookies to provide you with more thoughtful personalized services, including promotional services.
b) You have the right to choose to accept or refuse to accept cookies. You can refuse to accept cookies by modifying your browser settings. However, if you choose to refuse to accept cookies, you may not be able to log in or use the network services or functions of this application that rely on cookies.
c) The relevant information obtained through the cookies set by this application will be subject to this policy.
6. Information Security
a) This application account has security protection function, please keep your username and password information properly. This application will ensure that your information is not lost, abused or altered by encrypting user passwords and other security measures. Despite the aforementioned security measures, please also note that there is no ""perfect security measure"" on the information network.
b) When using the network service of this application for online transactions, you will inevitably disclose your personal information, such as contact information or postal address, to the transaction counterparty or potential transaction counterparty. Please properly protect your personal information and provide it to others only when necessary. If you find that your personal information has been leaked, especially the username and password of this application, please contact the customer service of this application immediately so that this application can take appropriate measures.
7. Children's Privacy
Protecting children's privacy is important to us. We will not direct our website or application to children under the age of 13 (or 16, where applicable by law), nor will we knowingly collect any personal data from them. If we learn that a child has provided personally identifiable information to a website or application, we will make reasonable efforts to delete such information from such website or application's files.
8. Data Security
We have implemented certain physical, administrative, and technical measures to protect the information we collect from and about our customers and website and application visitors.While we make every reasonable effort to help ensure the integrity and security of our network and systems, we cannot guarantee our security measures.
9. Contact Information
We hope that this Privacy Statement will answer your questions about our collection, use, and disclosure of your personal data.If you have additional questions about this Privacy Statement or the practices described herein, you can contact us at:
Wuxi Moc Door Technology Co., Ltd.
Tel: +86 0510 88553132
E-mail: aioc-service@mocdoor.com
10. Revisions to This Privacy Statement
This application reserves the right to change, modify, add, delete or otherwise revise portions of this Privacy Statement at any time at its sole discretion. If we do so, we will let you know about the changes to the website or application by including a copy of the old version of the Privacy Statement. The date this Privacy Statement was last revised is indicated at the top of the page. Your continued use of the Site or App following the posting of changes to these terms will constitute your acceptance of those changes. If we change this Privacy Statement in a material way, we will provide you with appropriate notice."