From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c84cc7d..85aeb23 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -20,7 +20,7 @@
 19=The phone number is incorrect. Please re-enter.
 20=The password and confirmation you typed do not match. Please re-enter your password.
 21=The password format does not comply with the requirements, please enter again.
-22=The user has existed, you can sign in directly.
+22=The user has existed, yo24-hour defenseu can sign in directly.
 23=Incorrect verification code, please re-enter.
 24=Incorrect account number, please enter the correct email address.
 25=Email address
@@ -74,7 +74,7 @@
 73=Floor Management
 74=Room Management
 75=Administrator migration
-76=Administrator privilege migration
+76=Privilege Migration
 77=Debugging privilege
 78=The administrator is migrated to other user.
 79=All of the data for the residence is migrated to new user.
@@ -411,6 +411,7 @@
 426=Air dry time
 427=Disinfect time
 428=Anion Time
+429=Real time power consumption: {0}kw
 
 429=H
 430=Min
@@ -419,9 +420,117 @@
 433=Water valve
 434=Time switch
 435=Remote control
+436=Added Devices
+437=Device List
+438=humidity:{0}%    air:{1}    wind:{2}
+439=Real time power consumption: {0} kw
+440=Next step
+441=Please select all areas of capture status
+442=Generate Scene
+443=Custom deployment
+444=SecurityCenter
+445=House Defense
+446=At Home Defense
+447=Vacation Defense
+448=Fixed deployment
+449=*Undo defense does not affect
+450=Disaster defense
+451=24-hour defense
+452=Burglar alarm
+453=Alarm mute
+454=Deployment information
+455=The name can not be blank.
 
-1002=Anion 
-	
+
+1000=Room Humidity
+1001=V-chip
+1002=Anion
+1003=Sterilization
+1004=Humidify
+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
+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
 5002=Setting
@@ -622,7 +731,7 @@
 9038=(Frequently Asked Questions)
 9039=Share and function
 9040=Alerts
-9041=System info.
+9041=System info
 9042=Information Center
 9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately.
 9044=Successfully uploaded
@@ -646,6 +755,11 @@
 9061=Find your password by clicking on "Forgot Password", or try again in {0} minute.
 9062=Check
 9063=You still have {0} times.
+9064=Smart speaker
+9065=Data management
+9066=Remarks
+9067=Remarks cannot be blank.
+9068=Do you want to unbind?
 	
 10000=Invalid password, please log in again.
 10001=Fail to request server, please try again later.
@@ -1011,7 +1125,7 @@
 324=鍦烘櫙寤舵椂
 325=寤舵椂璁剧疆
 326=寤舵椂
-327=鎹曡幏鍦烘櫙
+327=鎹曟崏鍦烘櫙
 328=鐢靛奖鍦烘櫙
 329=鏅��
 330=鑷姩妯″紡
@@ -1103,6 +1217,26 @@
 433=姘撮榾
 434=瀹氭椂寮�鍏�
 435=閬ユ帶鍣�
+436=宸叉坊鍔犲姛鑳�
+437=璁惧鍒楄〃
+438=婀垮害:{0}%    绌烘皵:{1}    椋庨��:{2}绾�
+439=瀹炴椂鍔熻��: {0}kW
+440=涓嬩竴姝�
+441=璇烽�夋嫨鎹曟崏鐘舵�佺殑鍖哄煙
+442=鐢熸垚鍦烘櫙
+443=鑷畾涔夊竷闃�
+444=瀹夐槻涓績
+445=鍏ㄥ畢甯冮槻
+446=鍦ㄥ甯冮槻
+447=鍋囨湡甯冮槻
+448=鍥哄畾甯冮槻
+449=*涓嶅彈鎾ら槻褰卞搷
+450=鐏惧鎶ヨ
+451=24灏忔椂涓嶆挙闃�
+452=闃茬洍鎶ヨ
+453=鎶ヨ闈欓煶
+454=甯冮槻淇℃伅
+455=鍚嶇О涓嶈兘涓虹┖銆�
 
 
 1000=瀹ゅ唴婀垮害
@@ -1152,9 +1286,9 @@
 1044=閲嶇疆杈瑰埛
 1045=閲嶇疆婊氬埛
 1046=閲嶇疆婊ょ綉
-1047=鏄惁閲嶇疆杈瑰埛
-1048=鏄惁閲嶇疆婊氬埛
-1049=鏄惁閲嶇疆婊ょ綉
+1047=鏄惁閲嶇疆杈瑰埛?
+1048=鏄惁閲嶇疆婊氬埛?
+1049=鏄惁閲嶇疆婊ょ綉?
 1050=娣诲姞璁惧
 1051=mini鏅鸿兘閬ユ帶鍣�
 1052=娣诲姞绾㈠閬ユ帶
@@ -1182,6 +1316,33 @@
 1074=浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
 1075=缃戠粶涓嶅彲鐢�
 1076=閫夋嫨绾㈠閬ユ帶鍣�
+1077=鏂伴
+1078=褰撳墠婊ょ綉鍓╀綑
+1079=鑺傝兘
+1080=閫氶
+1081=1妗�
+1082=2妗�
+1083=3妗�
+1084=椋庨��1妗�
+1085=椋庨��2妗�
+1086=椋庨��3妗�
+
+
+4000=鍙瀵硅
+4001=閫氳瘽璁板綍
+4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4003=闂ㄥ彛鏈哄懠鍙�
+4004=宸叉帴鍚�
+4005=宸插紑閿�
+4006=骞�
+4007=鏉ヨ嚜
+4008=鍛煎彨
+4009=鏈紑閿�
+4010=鏈帴鍚�
+4011=宸叉嫆缁�
+4012=閰嶇疆鍙傛暟鏈夊紓甯�!
+4013=闂ㄧ浜岀淮鐮�
+4014=涓存椂瀵嗙爜
 
 5000=闊充箰
 5001=缁勫悎
@@ -1305,68 +1466,13 @@
 6071=淇敼鍚嶅瓧
 6072=纭鍒犻櫎
 6073=鍙栨秷
-6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓紵
+6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓�
 6075=閬ユ帶鍣ㄦ墍灞炲尯鍩�:
 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=鍙栨秷
+6077=鐗堟湰鍗囩骇
+6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
+6079=鑾峰彇鏁版嵁澶辫触
+6080=鏆傛椂涓嶆敮鎸佽鍔熻兘
 
 7000=鏂板缓鑷姩鍖�
 7001=缂栬緫鑷姩鍖�
@@ -1491,6 +1597,17 @@
 7120=闃叉媶鍔熻兘
 7121=鍦ㄧ嚎
 7122=涓嶅湪绾�
+7123=绌烘皵璐ㄩ噺
+7124=浼�
+7125=鑹�
+7126=宸�
+7127=鍙戦�侀�氱煡
+7128=閫氱煡鍐呭
+7129=(100瀛楀唴)
+7130=璐﹀彿閫夋嫨
+7131=App鎺ㄩ��
+7132=鑷姩鍖�
+7133=宸叉墽琛�
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -1556,6 +1673,11 @@
 9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
 9062=鏌ョ湅
 9063=杩樻湁{0}娆℃満浼氥��
+9064=鏅鸿兘闊崇
+9065=鏁版嵁绠$悊
+9066=澶囨敞
+9067=澶囨敞涓嶈兘涓虹┖
+9068=鏄惁瑙i櫎缁戝畾锛�
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒

--
Gitblit v1.8.0