From c877bc16eb02df246e48377101af0fa5ec626c14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 八月 2021 10:00:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c52cafd..79c733d 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -486,6 +486,7 @@
 498=Trigger delay
 499=Add defense function
 500=Add alarm target
+501=Security alarm: {0} is triggered.
 
  
 1000=Room Humidity
@@ -991,6 +992,8 @@
 7144=excellence
 7145=Security
 7146=Add security
+7147=Arm
+7148=Disarm
 
 
     
@@ -1586,6 +1589,7 @@
 498=瑙﹀彂寤舵椂
 499=娣诲姞甯冮槻鍔熻兘
 500=娣诲姞鍛婅鐩爣
+501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -2073,6 +2077,8 @@
 7144=浼樼
 7145=瀹夐槻
 7146=娣诲姞瀹夐槻
+7147=甯冮槻
+7148=鎾ら槻
 
  
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP

--
Gitblit v1.8.0