From 95a7e380db583108d9716c56fe6d298ca08f8f23 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 九月 2021 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jpush_tst' into wxr7
---
HDL-ON_iOS/Resources/Language.ini | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c27f087..76f8b23 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -489,13 +489,14 @@
501=Security alarm: {0} is triggered.
502=Clear the security alarm?
503=Exceeding standard
-504=Secondary standard
-505=Class I standard
+504=Good
+505=Excellent
506=Face input succeeded
507=Face input failed
508=Formaldehyde
509=Please enter security name.
510=Please select the deployment target.
+511=Combined dimming
1000=Room Humidity
@@ -998,7 +999,7 @@
7141=Exceeding
7142=Serious
7143=High
-7144=excellence
+7144=Excellence
7145=Security
7146=Add security
7147=Arm
@@ -1605,14 +1606,14 @@
501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
503=瓒呮爣
-504=浜岀骇
-505=涓�绾�
+504=鑹ソ
+505=浼樼
506=浜鸿劯褰曞叆鎴愬姛
507=浜鸿劯褰曞叆澶辫触
508=鐢查啗
509=璇疯緭鍏ュ畨闃插悕绉般��
510=璇烽�夋嫨甯冮槻鐩爣銆�
-
+511=缁勫悎璋冨厜
1000=瀹ゅ唴婀垮害
--
Gitblit v1.8.0