From cae4d4b5b508a666fbd0dff3c2a981fdff841bc8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 三月 2023 13:10:33 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc

---
 HDL-ON_Android/Assets/Language.ini |   84 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 710afb0..6d53d64 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -20,7 +20,7 @@
 19=The phone number is incorrect. Please re-enter.
 20=The password and confirmation you typed do not match. Please re-enter your password.
 21=The password format does not comply with the requirements, please enter again.
-22=The user has existed, yo24-hour defenseu can sign in directly.
+22=The user has existed, you can sign in directly.
 23=Incorrect verification code, please re-enter.
 24=Incorrect account number, please enter the correct email address.
 25=Email address
@@ -434,7 +434,7 @@
 448=Fixed deployment
 449=*Undo defense does not affect
 450=Disaster defense
-451=24-hour defense
+451=24h defense
 452=Burglar alarm
 453=Alarm mute
 454=Deployment information
@@ -570,6 +570,23 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+
+
 
 
 2532=Visitor Invitation Record
@@ -1825,6 +1842,22 @@
 583=钀ょ煶鎽勫儚澶�
 584=甯冮槻鐘舵��
 585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
+586=鎺掑簭
+587=浜鸿劯绠＄悊
+588=浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+589=涓嶅悓鎰�
+590=浣忓畢浜や粯
+591=*鎴愬憳鍚嶇О
+592=鎴愬憳璐﹀彿
+593=浜鸿劯鐓х墖
+594=璇疯緭鍏ユ垚鍛樺悕绉�
+595=鍒犻櫎浜鸿劯鏁版嵁
+596=缁勫悕绉�
+597=璇疯緭鍏�
+598=閫夋嫨缇ゆ帶璁惧
+599=璇疯緭鍏ョ粍鍚嶇О
+600=娣诲姞缁勫悎璋冨厜
+
 
 
 2532=璁垮閭�璇疯褰�
@@ -3061,6 +3094,22 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+
 
 
 2532=Visitor Invitation Record
@@ -4280,7 +4329,21 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
-
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
 
 
 2532=Visitor Invitation Record
@@ -5485,6 +5548,21 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪

--
Gitblit v1.8.0