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 |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 9851c94..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
@@ -422,14 +423,30 @@
 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.
 
 
-
-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
@@ -501,7 +518,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
@@ -703,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
@@ -727,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.
@@ -1092,7 +1125,7 @@
 324=鍦烘櫙寤舵椂
 325=寤舵椂璁剧疆
 326=寤舵椂
-327=鎹曡幏鍦烘櫙
+327=鎹曟崏鍦烘櫙
 328=鐢靛奖鍦烘櫙
 329=鏅��
 330=鑷姩妯″紡
@@ -1187,6 +1220,24 @@
 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=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -1265,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=缁勫悎
@@ -1519,6 +1597,17 @@
 7120=闃叉媶鍔熻兘
 7121=鍦ㄧ嚎
 7122=涓嶅湪绾�
+7123=绌烘皵璐ㄩ噺
+7124=浼�
+7125=鑹�
+7126=宸�
+7127=鍙戦�侀�氱煡
+7128=閫氱煡鍐呭
+7129=(100瀛楀唴)
+7130=璐﹀彿閫夋嫨
+7131=App鎺ㄩ��
+7132=鑷姩鍖�
+7133=宸叉墽琛�
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -1584,6 +1673,11 @@
 9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
 9062=鏌ョ湅
 9063=杩樻湁{0}娆℃満浼氥��
+9064=鏅鸿兘闊崇
+9065=鏁版嵁绠＄悊
+9066=澶囨敞
+9067=澶囨敞涓嶈兘涓虹┖
+9068=鏄惁瑙ｉ櫎缁戝畾锛�
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒

--
Gitblit v1.8.0