From 692a20fc80688bfa4b20eaca513470f2c3135ec9 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 10:47:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy

---
 HDL-ON_iOS/Resources/Language.ini |  423 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 243 insertions(+), 180 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c3ba37f..61be5a1 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -70,14 +70,14 @@
 69=All
 70=Curtain
 71=Name
-72=The address of the residence
+72=Address
 73=Floor Management
 74=Room Management
-75=Admin Migration
+75=Administrator migration
 76=Privilege Migration
 77=Debugging privilege
 78=The administrator is migrated to other user.
-79=All residence data are migrated to new user.
+79=All of the data for the residence is migrated to new user.
 80=Allow the staff to visit your home remotely
 81=Floor
 82=Add floor
@@ -188,8 +188,8 @@
 187=Fan
 188=Socket
 189=Level
-190=Channel
-191=Volume
+190=Chl
+191=Vol
 192=TV
 193=The room has existed, fail to change.
 194=Environment
@@ -382,6 +382,7 @@
 378=Transition time
 379=Transition speed
 380=This function is not available!
+381=Reload
 400=Welcome home
 401=Invalid barcode, please try again
 402=Try again
@@ -411,8 +412,6 @@
 426=Air dry time
 427=Disinfect time
 428=Anion Time
-429=Real time power consumption: {0}kw
-
 429=H
 430=Min
 431=You are currently adding any platform devices to
@@ -423,7 +422,7 @@
 436=Added Devices
 437=Device List
 438=humidity:{0}%    air:{1}    wind:{2}
-439=Real time power consumption: {0} kw
+439=Real time: {0} kw
 440=Next step
 441=Please select all areas of capture status
 442=Generate Scene
@@ -440,7 +439,25 @@
 453=Alarm mute
 454=Deployment information
 455=The name can not be blank.
-
+456=Canvas
+457=Energy consumption
+458=Date
+459=Real time energy consumption
+460=Energy consumption of this month
+461=Outdoor/Indoor
+462=You haven't added any devices yet
+'
+463=Please input the SN code of the device
+464=Can start using Zhaoguan millimeter wave
+465=Delete device
+466=STB
+467=Projector
+468=Someone fell
+469=Someone's in
+'
+470=Under protection
+471=Millimeter wave sensor
+ 
 1000=Room Humidity
 1001=V-chip
 1002=Anion
@@ -529,79 +546,31 @@
 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
-
+ 
+ 
+ 
+ 
+ 
+4000=Video intercom
+4001=Call record
+4002=*Cloud photos are only kept for 30 days
+4003=Door phone call
+4004=Answered
+4005=Unlocked
+4006=year
+4007=From
+4008=Call
+4009=Unlocked
+4010=Missed
+4011=Rejected
+4012=The configuration parameters are abnormal!
+4013=Access Control QR Code
+4014=Temporary password
+ 
+ 
+ 
+ 
+ 
 5000=Music
 5001=Group
 5002=Setting
@@ -650,8 +619,148 @@
 5045=General volume
 5046=Adjust volume
 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
+ 
+ 
+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
@@ -760,7 +869,7 @@
 7105=Light pollution: 75 ~ 115ug/m3
 7106=Moderate pollution: 115 ~ 150ug/m3
 7107=Heavy pollution: > 150ug/m3
-	
+    
 9000=Please sign in with new cell phone number.
 9001=Please sign in with new email address.
 9002=New cell phone number is revised.
@@ -831,7 +940,7 @@
 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.
 10002=System maintaining, please try again later.
@@ -866,9 +975,9 @@
 10031=The device should not be blank.
 10032=The user does not have permission.
 10033=The device does not exist.
-
-
-
+ 
+ 
+ 
 [Chinese]
 1=鐧诲綍
 2=鎵嬫満鍙风櫥褰�
@@ -1260,7 +1369,7 @@
 406=浼氬
 407=闃呰
 408=纭娣诲姞
-
+ 
 409=鍔熻兘鍝佺墝
 410=浣犲綋鍓嶈繕鏈坊鍔犱换浣曞钩鍙拌澶�
 411=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
@@ -1308,8 +1417,24 @@
 453=鎶ヨ闈欓煶
 454=甯冮槻淇℃伅
 455=鍚嶇О涓嶈兘涓虹┖銆�
-
-
+456=鐢诲竷
+457=鑳借��
+458=鏃ユ湡
+459=瀹炴椂鑳借��
+460=鏈湀鑳借��
+461=瀹ゅ/瀹ゅ唴
+462=鎮ㄥ綋鍓嶈繕鏈坊鍔犱换浣曡澶�
+463=璇疯緭鍏ヨ澶囨満涓婄殑sn鐮�
+464=鍙互寮�濮嬩娇鐢ㄥ厗瑙傛绫虫尝浜�
+465=鍒犻櫎璁惧
+466=鏈洪《鐩�
+467=鎶曞奖浠�
+468=鏈変汉璺屽��
+469=鏈変汉杩涘叆
+470=闃叉姢涓�
+471=姣背娉紶鎰熷櫒
+ 
+ 
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
 1002=璐熺瀛�
@@ -1397,86 +1522,8 @@
 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澶�
@@ -1492,7 +1539,7 @@
 4012=閰嶇疆鍙傛暟鏈夊紓甯�!
 4013=闂ㄧ浜岀淮鐮�
 4014=涓存椂瀵嗙爜
-
+ 
 5000=闊充箰
 5001=缁勫悎
 5002=璁剧疆
@@ -1541,8 +1588,8 @@
 5045=鎬婚煶閲�
 5046=璋冭妭闊抽噺
 5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
-
-
+ 
+ 
 6000=姝ｅ父
 6001=璁惧鐘舵��
 6002=涓�
@@ -1552,7 +1599,7 @@
 6006=鐢佃
 6007=椋庢墖
 6008=鏈洪《鐩�
-6009=DVD/EVD/VCD
+6009=DVD
 6010=鎶曞奖浠�
 6011=鑷畾涔�
 6012=绾㈠閬ユ帶
@@ -1622,7 +1669,23 @@
 6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
 6079=鑾峰彇鏁版嵁澶辫触
 6080=鏆傛椂涓嶆敮鎸佽鍔熻兘
-
+6081=閫夋嫨绾㈠鍝佺墝
+6082=鎽囧ご
+6083=浣庨��
+6084=涓��
+6085=楂橀��
+6086=鑷姩
+6087=娓╁害+
+6088=娓╁害-
+6089=绌烘皵鍑�鍖栧櫒
+6090=鐑按鍣�
+6091=涓嶅瓨鍦ㄧ殑浜у搧
+6092=璁惧涓嶅瓨鍦�
+6093=璁惧涓嶅湪绾�
+6094=缃戝叧璁惧涓嶅瓨鍦�
+ 
+ 
+ 
 7000=鏂板缓鑷姩鍖�
 7001=缂栬緫鑷姩鍖�
 7002=濡傛灉
@@ -1757,7 +1820,7 @@
 7131=App鎺ㄩ��
 7132=鑷姩鍖�
 7133=宸叉墽琛�
-
+ 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
 9002=鐧诲綍鎵嬫満淇敼瀹屾垚
@@ -1827,7 +1890,7 @@
 9066=澶囨敞
 9067=澶囨敞涓嶈兘涓虹┖
 9068=鏄惁瑙ｉ櫎缁戝畾锛�
-
+ 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
 10002=绯荤粺缁存姢涓�,璇风◢鍚庡啀璇�!
@@ -1861,4 +1924,4 @@
 10030=娌℃湁杩滅▼鎺у埗鏉冮檺
 10031=璁惧涓嶈兘涓虹┖
 10032=鐢ㄦ埛娌℃湁璁惧鐨勬潈闄�
-10033=璁惧涓嶅瓨鍦�
\ No newline at end of file
+10033=璁惧涓嶅瓨鍦�

--
Gitblit v1.8.0