From 8e65391ab8d48285f9049f2747fb420f3ad1b852 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 三月 2023 13:25:31 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch

---
 HDL-ON_Android/Assets/Language.ini |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 3825dbf..5be477b 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -566,6 +566,11 @@
 579=Cancellation
 580=Are you sure to delete this combined dimming?
 581=
+582=Are you sure to delete this device?
+583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
+586=Sort
 
 
 2532=Visitor Invitation Record
@@ -1113,6 +1118,12 @@
 7162=Face to open the door
 7163=Video call
 7164=Manipulator
+7165=Area intrusion alarm
+7166=camera
+7167=main switch
+7168=PM10
+
+
 
 
 
@@ -1796,7 +1807,11 @@
 579=绔嬪嵆娉ㄩ攢
 580=纭畾鍒犻櫎璇ョ粍鍚堣皟鍏夊悧锛�
 581=
-
+582=纭畾鍒犻櫎璇ヨ澶囧悧?
+583=钀ょ煶鎽勫儚澶�
+584=甯冮槻鐘舵��
+585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
+586=鎺掑簭
 
 
 2532=璁垮閭�璇疯褰�
@@ -2329,6 +2344,11 @@
 7162=浜鸿劯寮�闂�
 7163=瑙嗛閫氳瘽鍛煎彨
 7164=鏈烘鎵�
+7165=鍖哄煙鍏ヤ镜鍛婅
+7166=鎽勫儚澶�
+7167=鎬绘帶寮�鍏�
+7168=PM10
+
 
 
  
@@ -3004,6 +3024,11 @@
 579=Cancellation
 580=Are you sure to delete this combined dimming?
 581=
+582=Are you sure to delete this device?
+583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
+586=Sort
 
 
 2532=Visitor Invitation Record
@@ -4219,6 +4244,11 @@
 579=Cancellation
 580=Are you sure to delete this combined dimming?
 581=
+582=Are you sure to delete this device?
+583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
+586=Sort
 
 
 
@@ -5420,6 +5450,11 @@
 579=Cancellation
 580=Are you sure to delete this combined dimming?
 581=
+582=Are you sure to delete this device?
+583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
+586=Sort
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪

--
Gitblit v1.8.0