From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_iOS/Resources/Language.ini | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 853795f..43c06ef 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -487,6 +487,12 @@
499=Add defense function
500=Add alarm target
501=Security alarm: {0} is triggered.
+502=Clear the security alarm?
+503=Exceeding standard
+504=Class I standard
+505=Secondary standard
+506=Face input succeeded
+506=Face input failed
1000=Room Humidity
@@ -992,6 +998,10 @@
7144=excellence
7145=Security
7146=Add security
+7147=Arm
+7148=Disarm
+7149=Manually
+7150=Smart
@@ -1588,6 +1598,12 @@
499=娣诲姞甯冮槻鍔熻兘
500=娣诲姞鍛婅鐩爣
501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=涓�绾�
+505=浜岀骇
+506=浜鸿劯褰曞叆鎴愬姛
+506=浜鸿劯褰曞叆澶辫触
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -2075,6 +2091,10 @@
7144=浼樼
7145=瀹夐槻
7146=娣诲姞瀹夐槻
+7147=甯冮槻
+7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
--
Gitblit v1.8.0