From 1dade03e0e71076af3a3de1bf10ba6cad61ac216 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 01 二月 2021 19:22:38 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into NewFilePath

---
 HDL-ON_iOS/Resources/Language.ini |   79 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 9d4699e..969bc4e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -103,7 +103,7 @@
 102=Uunassigned
 103=Delete the room or not?
 104=Transition time
-105=Indoor temp. 
+105=Indoor temp.
 106=AC
 107=Video intercom
 108=Sensor
@@ -390,9 +390,6 @@
 405=Cozy
 406=Meeting
 407=Reading
-408=Comfirm
-409=Function brand
-410=You haven't added any platform devices yet
 	
 5000=Music
 5001=Group
@@ -605,7 +602,7 @@
 9049=Incorrect password for many times, the account number is locked!
 9050=Verify the face ID
 9051=Fail to save the user's face ID
-
+'
 9052=The push notification of registration is available.
 9053=The push notification of registration is abnormal.
 9054=Numeric password verification
@@ -1037,6 +1034,7 @@
 378=鍙樺寲鏃堕棿
 379=鍙樺寲閫熷害
 380=姝ゅ鍔熻兘鏆傛湭寮�鏀撅綖
+381=閲嶆柊鍔犺浇
 400=娆㈣繋鍥炲
 401=浜岀淮鐮佸け鏁堬紝璇烽噸璇�
 402=閲嶈瘯
@@ -1046,10 +1044,57 @@
 406=浼氬
 407=闃呰
 408=纭娣诲姞
-409=鍔熻兘鍝佺墝
-410=浣犲綋鍓嶈繕鏈坊鍔犱换浣曞钩鍙拌澶�
-411=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
-412=娣诲姞
+
+1000=瀹ゅ唴婀垮害
+1001=绔ラ攣
+1002=璐熺瀛�
+1003=鏉�鑿�
+1004=鍔犳箍
+1005=婊よ姱澶嶄綅
+1006=鐏厜
+1007=鑷姩妯″紡
+1008=鎵嬪姩妯″紡
+1009=寮哄姴妯″紡
+1010=鐫＄湢妯″紡
+1011=瀹氭椂
+1012=閫夋嫨椋庨��
+1013=妗�
+1014=璇风‘璁ゆ槸鍚﹀凡瀹為檯閲嶇疆婊よ姱骞舵寜{0}鐓ц鏄庝功瑕佹眰鎿嶄綔璁惧杩涜婊よ姱{0}瀵垮懡閲嶆柊璁℃椂
+1015=浣庢。
+1016=涓。
+1017=楂樻。
+1018=瀹氭椂璁剧疆
+1019=灏忔椂
+1020=婊よ姱浣跨敤锛�
+1021=绌烘皵鍑�鍖栧櫒
+1022=褰撳墠椋庨��
+1023=鍙栨秷瀹氭椂
+1024=鎵湴鏈哄櫒浜�
+1025=鍚稿姏璋冭妭
+1026=鍚稿姏1妗�
+1027=鍚稿姏2妗�
+1028=鍚稿姏3妗�
+1029=鍏呯數
+1030=澹伴煶
+1031=闈欓煶
+1032=娓呮壂妯″紡
+1033=鑰楁潗绠＄悊
+1034=鍘嗗彶璁板綍
+1035=鑷姩娓呮壂
+1036=瀹氱偣娓呮壂
+1037=娌垮娓呮壂
+1038=鍖哄煙娓呮壂
+1039=鎬绘竻娲侀潰绉�
+1040=鎬绘竻娲佹椂闂�
+1041=杈瑰埛鍓╀綑瀵垮懡
+1042=婊氬埛鍓╀綑瀵垮懡
+1043=婊ょ綉鍓╀綑瀵垮懡
+1044=閲嶇疆杈瑰埛
+1045=閲嶇疆婊氬埛
+1046=閲嶇疆婊ょ綉
+1047=鏄惁閲嶇疆杈瑰埛
+1048=鏄惁閲嶇疆婊氬埛
+1049=鏄惁閲嶇疆婊ょ綉
 
 5000=闊充箰
 5001=缁勫悎
@@ -1209,7 +1254,21 @@
 7105=杞诲害姹℃煋:75~115ug/m鲁
 7106=涓害姹℃煋:115~150ug/m鲁
 7107=閲嶅害姹℃煋:>150ug/m鲁
-
+7108=娉勬紡/鏃犳硠婕�
+7109=娉勬紡
+7110=鏃犳硠婕�
+7111=婕忔按/鏃犳紡姘�
+7112=婕忔按
+7113=鏃犳紡姘�
+7114=鏈変汉/鏃犱汉
+7115=鏈変汉
+7116=鏃犱汉
+7117=寮�鍚�/闂悎
+7118=寮�鍚�
+7119=闂悎
+7120=闃叉媶鍔熻兘
+7121=鍦ㄧ嚎
+7122=涓嶅湪绾�
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP

--
Gitblit v1.8.0