From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

---
 HDL-ON_iOS/Resources/Language.ini |   92 +++------------------------------------------
 1 files changed, 7 insertions(+), 85 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index cd38ac2..3a87da3 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -423,11 +423,11 @@
 437=Device List
 438=humidity:{0}%    air:{1}    wind:{2}
 
-1000=Room Humidity
+1000=Indoor Humidity
 1001=V-chip
 1002=Anion
 1003=Sterilization
-1004=Humidify
+1004=Humidification
 1005=Filter Element Reset
 1006=Lighting
 1007=Automatic
@@ -499,18 +499,7 @@
 1073=Please turn on Bluetooth
 1074=Location information(GBS) unavailable
 1075=Network unavailable
-1076=Select infrared remote control
-1077=Air Fresh
-1078=Residual filter screen
-1079=Energy
-1080=Ventilated
-;鍒湅涓嬮潰閮戒竴鏍�,閮芥槸UI鐗规畩瑕佹眰鏁寸殑,鍐嶅姞涓婅�冭檻鑻辨枃闀垮害
-1081=1st Gear
-1082=2nd Gear
-1083=3rd Gear
-1084=1st Gear
-1085=2nd Gear
-1086=3rd Gear
+1076=Select infrared remote control	
 
 5000=Music
 5001=Group
@@ -1275,17 +1264,6 @@
 1074=浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
 1075=缃戠粶涓嶅彲鐢�
 1076=閫夋嫨绾㈠閬ユ帶鍣�
-1077=鏂伴
-1078=褰撳墠婊ょ綉鍓╀綑
-1079=鑺傝兘
-1080=閫氶
-1081=1妗�
-1082=2妗�
-1083=3妗�
-1084=椋庨��1妗�
-1085=椋庨��2妗�
-1086=椋庨��3妗�
-
 
 5000=闊充箰
 5001=缁勫悎
@@ -1409,69 +1387,13 @@
 6071=淇敼鍚嶅瓧
 6072=纭鍒犻櫎
 6073=鍙栨秷
-6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓紵
+6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓�
 6075=閬ユ帶鍣ㄦ墍灞炲尯鍩�:
 6076=缂栬緫淇℃伅
 6077=鐗堟湰鍗囩骇
-
-
-6015=鍦ㄧ嚎
-6016=绂荤嚎
-6017=鐗堟湰鍙�
-6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
-6020=鎺ㄨ崘鎸夐敭
-6021=璇疯緭鍏ユ寜閿悕绉�
-6022=涓嬩竴姝�
-6023=鐢垫簮
-6024=闊抽噺+
-6025=闊抽噺-
-6026=棰戦亾+
-6027=棰戦亾-
-6028=涓�
-6029=涓�
-6030=宸�
-6031=鍙�
-6032=闈欓煶
-6034=纭
-6035=鎾斁
-6037=閫�鍑�
-6038=鑿滃崟
-6039=鏆傚仠
-6040=杩斿洖
-6041=鍋滄
-6042=涓婚〉
-6043=蹇繘
-6044=蹇��
-6045=瀹氭椂
-6046=澶嶅埗閬ユ帶鍔熻兘
-6047=瀵瑰噯閬ユ帶鍣ㄤ腑蹇冩寜涓嬬浉鍚屾寜閿�
-6048=鏅鸿兘閬ユ帶鍣�
-6049=娣诲姞鎸夐敭
-6050=*闀挎寜鍙繘琛岃嚜瀹氫箟鎺掑簭
-6051=瀹屾垚
-6052=娣诲姞鎴愬姛
-6053=鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
-6054=鎵�灞炲垎绫�
-6055=閬ユ帶鍣ㄥ悕绉�
-6056=鎵�灞炲尯鍩�
-6057=缁х画娣诲姞
-6058=鐢靛櫒
-6059=娣诲姞澶辫触
-6060=閲嶈瘯
-6061=鍖归厤閬ユ帶鍣�
-6062=璇风偣鍑讳互涓嬫寜閽�
-6063=纭璁惧鏄惁鏈夊搷搴�
-6064=鎺у埗澶辫触
-6065=鎺у埗鎴愬姛
-6066=鐢垫簮寮�
-6067=妯″紡鍒跺喎
-6068=椋庨�熶腑椋�
-6069=娓╁害26鈩�
-6070=鍒犻櫎璁惧
-6071=淇敼鍚嶅瓧
-6072=纭鍒犻櫎
-6073=鍙栨秷
+6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
+6079=鑾峰彇鏁版嵁澶辫触
+6080=鏆傛椂涓嶆敮鎸佽鍔熻兘
 
 7000=鏂板缓鑷姩鍖�
 7001=缂栬緫鑷姩鍖�

--
Gitblit v1.8.0