From 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch

---
 HDL-ON_iOS/Resources/Language.ini |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 74688a6..78daf8e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -528,6 +528,7 @@
 540=In Alarm
 541=Monitoring
 542=Wandering alarm
+543=Get more
 
 
 1000=Room Humidity
@@ -1042,6 +1043,8 @@
 7154=Arrive
 7155=Distress/Normal
 7156=Distress
+7157=whether to unlock
+7158=is
 
 
 
@@ -1683,6 +1686,7 @@
 540=鎶ヨ涓�
 541=鐩戞帶涓�
 542=寰樺緤鎶ヨ
+543=鑾峰彇鏇村
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -2179,6 +2183,8 @@
 7154=鍒拌揪
 7155=姹傛晳/姝ｅ父
 7156=姹傛晳
+7157=鏄惁寮�閿佹椂
+7158=鏄�
 
 
  
@@ -2816,7 +2822,7 @@
 540=袧芯褉屑邪谢褜薪褘泄
 541=Monitoring
 542=Wandering alarm
-
+543=Get more
 
 
 1000=袙谢邪卸薪芯褋褌褜 胁 袩芯屑械褖械薪懈懈
@@ -3972,7 +3978,7 @@
 540=En alarma
 541=Monitoring
 542=Wandering alarm
-
+543=Get more
 
 1000=Humedad de ambiente
 1001=V-chip

--
Gitblit v1.8.0