From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr

---
 HDL-ON_Android/Assets/Language.ini |   66 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index e04a720..4e47611 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -568,6 +568,18 @@
 581=
 582=Are you sure to delete this device?
 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
 
 
 2532=Visitor Invitation Record
@@ -1118,7 +1130,7 @@
 7165=Area intrusion alarm
 7166=camera
 7167=main switch
-7168=pm10
+7168=PM10
 
 
 
@@ -1806,6 +1818,19 @@
 581=
 582=纭畾鍒犻櫎璇ヨ澶囧悧?
 583=钀ょ煶鎽勫儚澶�
+584=甯冮槻鐘舵��
+585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
+586=鎺掑簭
+587=浜鸿劯绠＄悊
+588=浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+589=涓嶅悓鎰�
+590=浣忓畢浜や粯
+591=*鎴愬憳鍚嶇О
+592=鎴愬憳璐﹀彿
+593=浜鸿劯鐓х墖
+594=璇疯緭鍏ユ垚鍛樺悕绉�
+595=鍒犻櫎浜鸿劯鏁版嵁
+
 
 
 2532=璁垮閭�璇疯褰�
@@ -2341,7 +2366,7 @@
 7165=鍖哄煙鍏ヤ镜鍛婅
 7166=鎽勫儚澶�
 7167=鎬绘帶寮�鍏�
-7168=pm10
+7168=PM10
 
 
 
@@ -3020,6 +3045,19 @@
 581=
 582=Are you sure to delete this device?
 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
+
 
 
 2532=Visitor Invitation Record
@@ -4237,6 +4275,18 @@
 581=
 582=Are you sure to delete this device?
 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
 
 
 
@@ -5440,6 +5490,18 @@
 581=
 582=Are you sure to delete this device?
 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
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪

--
Gitblit v1.8.0