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 |  104 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index a2c3ac7..43c06ef 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -486,6 +486,13 @@
 498=Trigger delay
 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
@@ -823,43 +830,7 @@
 6095=More than 30 add buttons
  
  
-7108=Leak/No Leak
-7109=Leak
-7110=No leak
-7111=Water leaking/no water leaking
-7112=Water leaking
-7113=No water leaking
-7114=Someone/Nobody
-7115=Someone
-7116=Nobody
-7117=Open/Close
-7118=On
-7119=Close
-7120=Anti-dismantling function
-7121=Online
-7122=Not online
-7123=Air quality
-7124=Excellent
-7125=Good
-7126=Poor
-7127=Send notification
-7128=Notification content
-7129=(within 100 characters)
-7130=Account selection
-7131=App push
-7132=Automation
-7133=Executed
-7134=Target State
-7135=Tumble
-7136=Temperature
-7137=Humidity
-7138=PM2.5
-7139=CO2
-7140=TVOC
-7141=Exceeding
-7142=Serious
-7143=High
-7144=excellence
+
  
  
 6000=Rename
@@ -988,6 +959,51 @@
 7105=Light pollution: 75 ~ 115ug/m3
 7106=Moderate pollution: 115 ~ 150ug/m3
 7107=Heavy pollution: > 150ug/m3
+7108=Leak/No Leak
+7109=Leak
+7110=No leak
+7111=Water leaking/no water leaking
+7112=Water leaking
+7113=No water leaking
+7114=Someone/Nobody
+7115=Someone
+7116=Nobody
+7117=Open/Close
+7118=On
+7119=Close
+7120=Anti-dismantling function
+7121=Online
+7122=Not online
+7123=Air quality
+7124=Excellent
+7125=Good
+7126=Poor
+7127=Send notification
+7128=Notification content
+7129=(within 100 characters)
+7130=Account selection
+7131=App push
+7132=Automation
+7133=Executed
+7134=Target State
+7135=Tumble
+7136=Temperature
+7137=Humidity
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=Exceeding
+7142=Serious
+7143=High
+7144=excellence
+7145=Security
+7146=Add security
+7147=Arm
+7148=Disarm
+7149=Manually
+7150=Smart
+
+
     
 9000=Please sign in with new cell phone number.
 9001=Please sign in with new email address.
@@ -1581,6 +1597,13 @@
 498=瑙﹀彂寤舵椂
 499=娣诲姞甯冮槻鍔熻兘
 500=娣诲姞鍛婅鐩爣
+501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=涓�绾�
+505=浜岀骇
+506=浜鸿劯褰曞叆鎴愬姛
+506=浜鸿劯褰曞叆澶辫触
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -2066,6 +2089,13 @@
 7142=涓ラ噸
 7143=鍋忛珮
 7144=浼樼
+7145=瀹夐槻
+7146=娣诲姞瀹夐槻
+7147=甯冮槻
+7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
+
  
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP

--
Gitblit v1.8.0