From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index ee0462f..ad70402 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -496,7 +496,10 @@
 508=Formaldehyde
 509=Please enter security name.
 510=Please select the deployment target.
-
+511=Combined dimming
+512=Message push is not enabled, please go to settings.
+513=Please enter the pairing code
+514=Gateway location information is not configured
  
 1000=Room Humidity
 1001=V-chip
@@ -1006,6 +1009,9 @@
 7149=Manually
 7150=Smart
 7151=Good
+7152=Leave or arrive at a place
+7153=Leave
+7154=Arrive
 
 
 
@@ -1613,7 +1619,10 @@
 508=鐢查啗
 509=璇疯緭鍏ュ畨闃插悕绉般��
 510=璇烽�夋嫨甯冮槻鐩爣銆�
-
+511=缁勫悎璋冨厜
+512=娑堟伅鎺ㄩ�佹湭寮�鍚紝璇峰墠寰�璁剧疆銆�
+513=璇疯緭鍏ラ厤瀵圭爜
+514=鏈厤缃綉鍏充綅缃俊鎭�
 
  
 1000=瀹ゅ唴婀垮害
@@ -2107,6 +2116,11 @@
 7149=鎵嬪姩
 7150=鏅鸿兘
 7151=鑹ソ
+7152=绂诲紑鎴栧埌杈炬煇鍦�
+7153=绂诲紑
+7154=鍒拌揪
+
+
 
 
  

--
Gitblit v1.8.0