From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index ee0462f..a5fa4b3 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -496,7 +496,9 @@
 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
  
 1000=Room Humidity
 1001=V-chip
@@ -1613,7 +1615,9 @@
 508=鐢查啗
 509=璇疯緭鍏ュ畨闃插悕绉般��
 510=璇烽�夋嫨甯冮槻鐩爣銆�
-
+511=缁勫悎璋冨厜
+512=娑堟伅鎺ㄩ�佹湭寮�鍚紝璇峰墠寰�璁剧疆銆�
+513=璇疯緭鍏ラ厤瀵圭爜
 
  
 1000=瀹ゅ唴婀垮害

--
Gitblit v1.8.0