From 299f4b1218c0d3721aa92bf091950d6708942583 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 5650c30..7cbdacb 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -487,7 +487,13 @@
 499=Add defense function
 500=Add alarm target
 501=Security alarm: {0} is triggered.
-
+502=Clear the security alarm?
+503=Exceeding standard
+504=Secondary standard
+505=Class I standard
+506=Face input succeeded
+507=Face input failed
+508=Formaldehyde
  
 1000=Room Humidity
 1001=V-chip
@@ -1592,6 +1598,13 @@
 499=娣诲姞甯冮槻鍔熻兘
 500=娣诲姞鍛婅鐩爣
 501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙i櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=浜岀骇
+505=涓�绾�
+506=浜鸿劯褰曞叆鎴愬姛
+507=浜鸿劯褰曞叆澶辫触
+508=鐢查啗
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣

--
Gitblit v1.8.0