From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并
---
HDL-ON_iOS/Resources/Language.ini | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 7cbdacb..5bbb86e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -489,11 +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.
+
1000=Room Humidity
1001=V-chip
@@ -955,9 +958,9 @@
7101=*Please set the value in this range (1 ~ 100).
7102=No set value.
7103=Excellent: 0 ~ 35ug/m3
-7104=Good: 35 ~ 75ug/m3
-7105=Light pollution: 75 ~ 115ug/m3
-7106=Moderate pollution: 115 ~ 150ug/m3
+7104=Good: 36 ~ 75ug/m3
+7105=Light pollution: 76 ~ 115ug/m3
+7106=Moderate pollution: 116 ~ 150ug/m3
7107=Heavy pollution: > 150ug/m3
7108=Leak/No Leak
7109=Leak
@@ -995,13 +998,15 @@
7141=Exceeding
7142=Serious
7143=High
-7144=excellence
+7144=Excellence
7145=Security
7146=Add security
7147=Arm
7148=Disarm
7149=Manually
7150=Smart
+7151=Good
+
@@ -1600,11 +1605,15 @@
501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
503=瓒呮爣
-504=浜岀骇
-505=涓�绾�
+504=鑹ソ
+505=浼樼
506=浜鸿劯褰曞叆鎴愬姛
507=浜鸿劯褰曞叆澶辫触
508=鐢查啗
+509=璇疯緭鍏ュ畨闃插悕绉般��
+510=璇烽�夋嫨甯冮槻鐩爣銆�
+
+
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -2049,9 +2058,9 @@
7101=*璇峰湪杩欎釜鑼冨洿(1~100)璁剧疆鍊笺��
7102=杩樻病鏈夎缃�笺��
7103=浼�:0~35ug/m鲁
-7104=鑹�:35~75ug/m鲁
-7105=杞诲害姹℃煋:75~115ug/m鲁
-7106=涓害姹℃煋:115~150ug/m鲁
+7104=鑹�:36~75ug/m鲁
+7105=杞诲害姹℃煋:76~115ug/m鲁
+7106=涓害姹℃煋:116~150ug/m鲁
7107=閲嶅害姹℃煋:>150ug/m鲁
7108=娉勬紡/鏃犳硠婕�
7109=娉勬紡
@@ -2096,6 +2105,8 @@
7148=鎾ら槻
7149=鎵嬪姩
7150=鏅鸿兘
+7151=鑹ソ
+
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
--
Gitblit v1.8.0