From 27141af3b38f65eb62e89872fc1fddc97ab08671 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:51:33 +0800
Subject: [PATCH] Merge branch 'wxr4' into wxr6

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

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 80b5676..a6b6b7e 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
@@ -73,11 +73,11 @@
 72=The address of the residence
 73=Floor Management
 74=Room Management
-75=Administrator migration
-76=Administrator privilege migration
+75=Admin 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.
+79=All residence data are migrated to new user.
 80=Allow the staff to visit your home remotely
 81=Floor
 82=Add floor
@@ -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,6 +423,23 @@
 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=Room Humidity
 1001=V-chip
@@ -511,6 +529,78 @@
 1084=1st Gear
 1085=2nd Gear
 1086=3rd Gear
+1087=Unlock
+1088=Temp. Password
+1089=Connected
+1090=Disconnected
+1091=Generate
+1092=Effective time
+1093=Expire time
+1094=Select time
+1095=Select Date
+1096=Generate
+1097=Temporary password has been copied
+1098=Clear Password?
+1099=The expire time must be later than the effective time
+1100=Unlock Method
+1101=It'll synchronize with actual lock, confirm to delete?
+1102=Delete
+1103=Remark
+1104=The remark can not be blank.
+1105=Assign to
+1106=Target Scene Not Exist
+1107=Select Scene
+1108=Unlock
+1109=Always On
+1110=Setting
+1111=Automation
+1112=Turn on "Always On" Mode
+1113=Turn off "Always On" Mode
+1114=Edit
+1115=Always On will be off at {0}
+1116=Condition
+1117=Motion
+1118=Always On
+1119=Lock
+1120=User
+1121=Unlock Method
+1122=Fingerprint
+1123=Card
+1124=Key
+1125=Information
+1126=Unlock
+1127=Alarm
+1128=Offline
+1129=For first user, Please bind lock password
+1130=Please enter admin password
+1131=Bind Successfully
+1132=Skip to personal password for unlock
+1133=Skip
+1134=Please draw your pattern
+1135=Lock will be always on after setting, confirm to proceed
+1136=Confirm
+1137=Expire
+1138=Always On will expire after {0} hours
+1139=Please enter expire time
+1140=Expire time should not be more than 72 hours
+1141=Expire time should not be less than 1 hour
+1142=Fail to set, please try again
+1143=Fail to verify administrator ID, please log in again account
+1144=Your residence is being migrated to other HDL 
+1145=Note:
+1146=1. All of your residence data will be migrate to new user.{0}2. After migration, original member will be{0}automatically unbound from this residence.{0}3. The new account is a valid HDL one.{0}4. The account from receiver cannot be the same{0}as that from migration side.
+1147=Confirm
+1148=Input receiver's account
+1149=Profile
+1150=Confirm admin migration from {0} to {1}
+1151=The account does not exist.
+1152=Fail to Transfer Ownership to Yourself
+1153=Terminate
+1154=Transferring to User, Please Wait鈥�
+1155={0} has become a residential administrator
+1156=The residence data will be deleted from your account
+1157=Fail to transfer
+1158=Please try again
 
 5000=Music
 5001=Group
@@ -562,6 +652,150 @@
 5047="QQ music" has not installed in your cell phone, please proceed in App center.
 	
 	
+ 
+6000=normal
+6001=Device status
+6002=pcs
+6003=Current IR control device
+6004=Remote controller has been added
+6005=AC
+6006=TV
+6007=Fan
+6008=Set-top box
+6009=DVD
+6010=Projector
+6011=Custom
+6012=IR control
+6013=Device Management
+6014=Add remote controller
+6015=Online
+6016=Offline
+6017=Version number
+6018=Please enter the name of the remote controller
+6019=Reminder: After the remote controller is created, it can be found and used in Function-Electrical Category{\r\n}
+6020=Recommended button
+6021=Please enter the button name
+6022=Next
+6023=Power
+6024=Volume+
+6025=Volume-
+6026=channel+
+6027=Channel-
+6028=up
+6029=down
+6030=Left
+6031=right
+6032=Mute
+6034=Confirm
+6035=Play
+6037=Exit
+6038=Menu
+6039=Pause
+6040=Back
+6041=Stop
+6042=Homepage
+6043=Fast forward
+6044=Rewind
+6045=Timing
+6046=Copy remote control function
+6047=Aim at the center of the remote controller and press the same button
+6048=Smart remote controller
+6049=Add button
+6050=*Long press for custom sorting
+6051=Done
+6052=Added successfully
+6053=Can be classified-function-electrical operation and use
+6054=Classification
+6055=Remote controller name
+6056=Region
+6057=Continue to add
+6058=Electrical
+6059=Failed to add
+6060=Retry
+6061=Match the remote control
+6062=Please click the button below
+6063=Confirm whether the device is responding
+6064=Control failed
+6065=Control success
+6066=Power on
+6067=Mode cooling
+6068=Wind speed stroke
+6069=Temperature 26鈩�
+6070=Delete device
+6071=Modify name
+6072=Confirm deletion
+6073=Cancel
+6074=The remote controller cannot exceed 10 pcs
+6075=The area where the remote control belongs:
+6076=Edit information
+6077=Version upgrade
+6078=System is under maintenance~Please try again later~
+6079=Failed to get data
+6080=This function is temporarily not supported
+6081=Select IR brand
+6082=Shaking
+6083=Low speed
+6084=Medium speed
+6085=High speed
+6086=Auto
+6087=Temperature+
+6088=Temperature-
+6089=Air purifier
+6090=Water heater
+6091=Product that does not exist
+6092=The device does not exist
+6093=The device is not online
+6094=The gateway device does not exist
+ 
+ 
+7108=Leak/No Leak
+7109=Leak
+7110=No leak
+7111=Water leaking/no water leaking
+7112=Water leaking
+7113=No water leaking
+7114=Someone/Nobody
+7115=Someone
+7116=Nobody
+7117=Open/Close
+7118=On
+7119=Close
+7120=Anti-dismantling function
+7121=Online
+7122=Not online
+7123=Air quality
+7124=Excellent
+7125=Good
+7126=Poor
+7127=Send notification
+7128=Notification content
+7129=(within 100 characters)
+7130=Account selection
+7131=App push
+7132=Automation
+7133=Executed
+7134=Target State
+7135=Tumble
+ 
+ 
+6000=Rename
+6001=Please enter a name
+6002=Xiaodu
+6003=aispeech
+6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP"
+6005=Unbind
+6006=Smart speaker
+6007=Control content
+6008=Failed to upload data
+6009=Failed to configure data
+6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker."
+6011=Modification of remarks is unsuccessful!
+6012=Do you want to unbind?
+6013=Unbinding...
+6014=transfer to third-party APP
+6015=Add speakers
+ 
+    
 7000=Create automation
 7001=Edit automation
 7002=If
@@ -712,7 +946,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
@@ -736,6 +970,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.
@@ -1101,7 +1340,7 @@
 324=鍦烘櫙寤舵椂
 325=寤舵椂璁剧疆
 326=寤舵椂
-327=鎹曡幏鍦烘櫙
+327=鎹曟崏鍦烘櫙
 328=鐢靛奖鍦烘櫙
 329=鏅��
 330=鑷姩妯″紡
@@ -1196,6 +1435,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=绔ラ攣
@@ -1284,7 +1541,101 @@
 1084=椋庨��1妗�
 1085=椋庨��2妗�
 1086=椋庨��3妗�
+1087=涓�閿紑閿�
+1087=Unlock
+1088=涓存椂瀵嗙爜寮�閿�
+1088=Temp. Password
+1089=宸茶繛鎺�
+1089=Connected
+1090=鏈繛鎺�
+1090=Disconnected
+1091=鐢熸垚涓存椂瀵嗙爜
+1091=Generate
+1092=鐢熸晥鏃堕棿
+1092=Effective time
+1093=澶辨晥鏃堕棿
+1093=
+1094=閫夋嫨鏃堕棿
+1095=閫夋嫨鏃ユ湡
+1096=Generate
+1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
+1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
+1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
+1100=寮�閿佹柟寮忕鐞�
+1101=鍒犻櫎鎿嶄綔灏嗚鍚屾浜庡疄浣撻攣涓妠0}鏄惁杩橀渶瑕佸垹闄わ紵
+1102=纭鍒犻櫎
+1103=淇敼澶囨敞鍚嶇О
+1104=澶囨敞鍚嶇О涓嶈兘涓虹┖
+1105=鍒嗛厤鑷�
+1106=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勫満鏅�
+1107=閫夋嫨鍦烘櫙
+1108=閿佸凡鎵撳紑
+1109=甯稿紑
+1110=鏃舵晥鎬у父寮�璁剧疆
+1111=甯稿紑鑷姩鍖�
+1112=鎵撳紑甯稿紑妯″紡
+1113=鍏抽棴甯稿紑妯″紡
+1114=缂栬緫
+1115=甯稿紑妯″紡灏嗕簬{0}鍏抽棴
+1116=鏉′欢
+1117=鍔ㄤ綔
+1118=甯稿紑妯″紡
+1119=閿�
+1120=鐢ㄦ埛
+1121=寮�閿佹柟寮�
+1122=鎸囩汗
+1123=鍗�
+1124=閽ュ寵
+1125=淇℃伅绫诲瀷
+1126=寮�閿佷俊鎭�
+1127=鎶ヨ绫讳俊鎭�
+1128=璁惧涓嶅湪绾�
+1129=绗竴娆′娇鐢紝璇峰厛缁戝畾闂ㄩ攣瀵嗙爜
+1130=璇疯緭鍏ラ棬閿佺鐞嗗憳瀵嗙爜
+1131=闂ㄩ攣缁戝畾鎴愬姛
+1132=涓轰簡瀹夊叏锛岃璺宠浆鑷充釜浜轰腑蹇儃0}璁剧疆涓汉瀵嗙爜锛屽苟搴旂敤浜庨棬閿佸紑閿�
+1133=璺宠浆
+1134=璇风粯鍒跺浘妗�
+1135=璁剧疆甯稿紑妯″紡鍚巤0}鎮ㄧ殑闂ㄩ攣灏嗗浜庢墦寮�鐘舵�亄0}鏄惁缁х画寮�鍚�
+1136=纭寮�鍚�
+1137=澶辨晥璁剧疆
+1138=甯稿紑妯″紡灏嗕簬{0}灏忔椂鍚庡け鏁�
+1139=璇疯緭鍏ュけ鏁堟椂闂�
+1140=澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
+1141=澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+1142=甯稿紑妯″紡鍏抽棴璁剧疆澶辨晥锛岃閲嶈瘯
+1143=绠＄悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
+1144=鎮ㄧ殑浣忓畢灏嗚繃鎴风粰鍏朵粬HDL璐﹀彿
+1145=璇锋敞鎰忥細
+1146=1.璇ヤ綇瀹呮偍鐨勬暟鎹紙浜戠鏁版嵁锛夊皢鍏ㄩ儴杞Щ缁欐柊鐨勬埛涓粄0}2.杩囨埛鍚庯紝鍘熸湁鐨勬垚鍛樺皢鑷姩瑙ｇ粦璇ヤ綇瀹厈0}3.鏂版埛涓昏处鍙蜂负鏈夋晥鐨凥DL璐﹀彿{0}4.鎺ユ敹鏂硅处鍙蜂笌杞Щ鏂硅处鍙蜂笉鍙负鍚屼竴涓处鍙�
+1147=纭杩囨埛
+1148=璇疯緭鍏ユ帴鏀舵柟璐﹀彿
+1149=涓汉璧勬枡
+1150=纭杩囨埛{0}鐨勭鐞嗗憳璐﹀彿缁欒处鍙穥1}
+1151=鐩爣璐﹀彿骞朵笉瀛樺湪
+1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+1153=缁堟
+1154=姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
+1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
+1157=杩囨埛澶辫触
+1158=璇烽噸鏂板皾璇�
 
+4000=鍙瀵硅
+4001=閫氳瘽璁板綍
+4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4003=闂ㄥ彛鏈哄懠鍙�
+4004=宸叉帴鍚�
+4005=宸插紑閿�
+4006=骞�
+4007=鏉ヨ嚜
+4008=鍛煎彨
+4009=鏈紑閿�
+4010=鏈帴鍚�
+4011=宸叉嫆缁�
+4012=閰嶇疆鍙傛暟鏈夊紓甯�!
+4013=闂ㄧ浜岀淮鐮�
+4014=涓存椂瀵嗙爜
 
 5000=闊充箰
 5001=缁勫悎
@@ -1539,7 +1890,20 @@
 7120=闃叉媶鍔熻兘
 7121=鍦ㄧ嚎
 7122=涓嶅湪绾�
-
+7123=绌烘皵璐ㄩ噺
+7124=浼�
+7125=鑹�
+7126=宸�
+7127=鍙戦�侀�氱煡
+7128=閫氱煡鍐呭
+7129=(100瀛楀唴)
+7130=璐﹀彿閫夋嫨
+7131=App鎺ㄩ��
+7132=鑷姩鍖�
+7133=宸叉墽琛�
+7134=鐩爣鐘舵��
+7135=璺屽��
+ 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
 9002=鐧诲綍鎵嬫満淇敼瀹屾垚
@@ -1604,6 +1968,11 @@
 9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
 9062=鏌ョ湅
 9063=杩樻湁{0}娆℃満浼氥��
+9064=鏅鸿兘闊崇
+9065=鏁版嵁绠＄悊
+9066=澶囨敞
+9067=澶囨敞涓嶈兘涓虹┖
+9068=鏄惁瑙ｉ櫎缁戝畾锛�
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒

--
Gitblit v1.8.0