From 57c036644fae5019385829edbd72be9a7e00fa7d Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 10:18:03 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into jpush_tst
---
HDL-ON_iOS/Resources/Language.ini | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 7cbdacb..c27f087 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -494,6 +494,9 @@
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
@@ -1002,6 +1005,8 @@
7148=Disarm
7149=Manually
7150=Smart
+7151=Good
+
@@ -1605,6 +1610,10 @@
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