From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

---
 HDL-ON_Android/Assets/Language.ini |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 1ad65a9..b97f9f8 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -423,11 +423,11 @@
 437=Device List
 438=humidity:{0}%    air:{1}    wind:{2}
 
-1000=Indoor Humidity
+1000=Room Humidity
 1001=V-chip
 1002=Anion
 1003=Sterilization
-1004=Humidification
+1004=Humidify
 1005=Filter Element Reset
 1006=Lighting
 1007=Automatic
@@ -499,7 +499,18 @@
 1073=Please turn on Bluetooth
 1074=Location information(GBS) unavailable
 1075=Network unavailable
-1076=Select infrared remote control	
+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
 
 5000=Music
 5001=Group
@@ -1264,6 +1275,17 @@
 1074=浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
 1075=缃戠粶涓嶅彲鐢�
 1076=閫夋嫨绾㈠閬ユ帶鍣�
+1077=鏂伴
+1078=褰撳墠婊ょ綉鍓╀綑
+1079=鑺傝兘
+1080=閫氶
+1081=1妗�
+1082=2妗�
+1083=3妗�
+1084=椋庨��1妗�
+1085=椋庨��2妗�
+1086=椋庨��3妗�
+
 
 5000=闊充箰
 5001=缁勫悎
@@ -1393,7 +1415,7 @@
 6077=鐗堟湰鍗囩骇
 6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
 6079=鑾峰彇鏁版嵁澶辫触
-
+6080=鏆傛椂涓嶆敮鎸佽鍔熻兘
 
 7000=鏂板缓鑷姩鍖�
 7001=缂栬緫鑷姩鍖�

--
Gitblit v1.8.0