From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 765e310..b52d360 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -411,93 +411,12 @@
 426=Air dry time
 427=Disinfect time
 428=Anion Time
+429=h
+430=m
 
-429=H
-430=Min
-431=You are currently adding any platform devices to
-432=Other platform equipment is supported by third party service provider
-433=Water valve
-434=Time switch
-435=Remote control
 
-1000=Indoor Humidity
-1001=V-chip
-1002=Anion
-1003=Sterilization
-1004=Humidification
-1005=Filter Element Reset
-1006=Lighting
-1007=Automatic
-1008=Manual
-1009=Strong
-1010=Sleep
-1011=Timing
-1012=Wind Speed
-1013=Gear
-1014=Please confirm whether the filter element has been reset and operate the equipment according to the instruction manual for the filter element life to be timed again
-1015=Low Gear
-1016=Mid Gear
-1017=High Gear
-1018=Timing Setting
-1019=Hour
-1020=Filter Element Time锛�
-1021=Air Cleaner
-1022=Current wind speed
-1023=Cancel Timing
-1024=Floor Sweeping Robot
-1025=Suction
-1026=1st Gear
-1027=2nd Gear
-1028=3rd Gear
-1029=Charge
-1030=Voice
-1031=Mute
-1032=Cleaning Mode
-1033=Consumables Management
-1034=History
-1035=Automatic
-1036=Random
-1037=Wall
-1038=Spiral
-1039=Total Clean Area
-1040=Total Clean Time
-1041=Remaining life of side brush
-1042=Residual life of roller brush
-1043=Remaining life of filter screen
-1044=Reset edge brush
-1045=Reset roll brush
-1046=Reset screen
-1047=Confirm to Reset edge brush?
-1048=Confirm to Reset roll brush?
-1049=Confirm to Reset screen?
-1050=Add Device
-1051=Mini Intelligent Remote Control
-1052=Add Infrared Remote Control
-1053=Press the infrared remote control button{0}for 10 seconds and the indicator light{0}flashes blue quickly
-1054=Please make sure your Bluetooth{0}is on and searchable
-1055=Next Step
-1056=Device searching...
-1057=No infrared remote control found
-1058=1.Please check whether the device is{0}   powered on normally{0}2.Please check whether the Bluetooth{0}   function is turned on normally{0}3.Please check whether the indicator{0}    light is flashing blue
-1059=Search Again
-1060=Connect WiFi
-1061=At present,it only supports 2.4G WiFi network{0}and does not support WiFi names{0}with Chinese characters
-1062=Password
-1063=Connecting...
-1064=Please make infrared remote control{0}as close as possible to WiFi router
-1065=Network Link
-1066=Upload to cloud
-1067=Connect success
-1068=1.Please check whether the device is{0}   powered on normally{0}2.Please turn on the Bluetooth function{0}3.Press the button for 10s and the indicator{0}   light will be on
-1069=Add Fail
-1070=Add Success
-1071=You can start using the infrared{0}remote control!
-1072=Start using
-1073=Please turn on Bluetooth
-1074=Location information(GBS) unavailable
-1075=Network unavailable
-1076=Select infrared remote control	
-
+1002=Anion 
+	
 5000=Music
 5001=Group
 5002=Setting
@@ -1174,11 +1093,6 @@
 428=璐熺瀛愭椂闂�
 429=灏忔椂
 430=鍒嗛挓
-431=浣犲綋鍓嶈繕涓烘坊鍔犱换浣曞钩鍙拌澶�
-432=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
-433=姘撮榾
-434=瀹氭椂寮�鍏�
-435=閬ユ帶鍣�
 
 
 1000=瀹ゅ唴婀垮害
@@ -1228,36 +1142,9 @@
 1044=閲嶇疆杈瑰埛
 1045=閲嶇疆婊氬埛
 1046=閲嶇疆婊ょ綉
-1047=鏄惁閲嶇疆杈瑰埛?
-1048=鏄惁閲嶇疆婊氬埛?
-1049=鏄惁閲嶇疆婊ょ綉?
-1050=娣诲姞璁惧
-1051=mini鏅鸿兘閬ユ帶鍣�
-1052=娣诲姞绾㈠閬ユ帶
-1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
-1054=璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
-1055=涓嬩竴姝�
-1056=璁惧鎼滅储涓�...
-1057=娌℃湁鍙戠幇绾㈠閬ユ帶鍣�
-1058=1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽妫�鏌ヨ摑鐗欏姛鑳芥槸鍚︽甯稿紑鍚瘂0}3銆佽妫�鏌ユ寚绀虹伅鏄惁钃濊壊蹇棯鐘舵��
-1059=閲嶆柊鎼滅储
-1060=杩炴帴WiFi
-1061=鐩墠鍙敮鎸�2.4G WiFi缃戠粶{0}鏆備笉鏀寔甯︽湁涓枃瀛楃鐨刉iFi鍚嶇О
-1062=瀵嗙爜
-1063=姝ｅ湪杩炴帴涓�...
-1064=璇疯绾㈠閬ユ帶灏介噺鎺ヨ繎WIFI璺敱鍣�
-1065=缃戠粶閾炬帴涓�
-1066=涓婁紶鍒颁簯
-1067=杩炴帴鎴愬姛
-1068=1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽寮�鍚摑鐗欏姛鑳絳0}3銆佸苟闀挎寜鎸夐挳10s锛屾寚绀虹伅甯镐寒
-1069=娣诲姞澶辫触
-1070=娣诲姞鎴愬姛
-1071=鍙互寮�濮嬩娇鐢ㄧ孩澶栭仴鎺у姛鑳斤紒
-1072=寮�濮嬩娇鐢�
-1073=璇锋墦寮�钃濈墮
-1074=浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
-1075=缃戠粶涓嶅彲鐢�
-1076=閫夋嫨绾㈠閬ユ帶鍣�
+1047=鏄惁閲嶇疆杈瑰埛
+1048=鏄惁閲嶇疆婊氬埛
+1049=鏄惁閲嶇疆婊ょ綉
 
 5000=闊充箰
 5001=缁勫悎
@@ -1386,63 +1273,6 @@
 6076=缂栬緫淇℃伅
 
 
-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=鍙栨秷
 
 7000=鏂板缓鑷姩鍖�
 7001=缂栬緫鑷姩鍖�

--
Gitblit v1.8.0