From dc8967247d149e9b0d1f8e75829928db0ea1fe13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 06 六月 2021 16:42:36 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

---
 HDL-ON_iOS/Resources/Language.ini |  182 ++++++++++-----------------------------------
 1 files changed, 42 insertions(+), 140 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c86eddb..327a6a5 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, yo24-hour defenseu can sign in directly.
+22=The user has existed, you 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=Privilege Migration
+76=Administrator 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.
@@ -188,8 +188,8 @@
 187=Fan
 188=Socket
 189=Level
-190=Chl
-191=Vol
+190=Channel
+191=Volume
 192=TV
 193=The room has existed, fail to change.
 194=Environment
@@ -423,43 +423,10 @@
 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.
-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
+
+
+1000=Indoor Humidity
 1001=V-chip
 1002=Anion
 1003=Sterilization
@@ -548,10 +515,6 @@
 1085=2nd Gear
 1086=3rd Gear
 
-
-
-
-
 4000=Video intercom
 4001=Call record
 4002=*Cloud photos are only kept for 30 days
@@ -567,10 +530,6 @@
 4012=The configuration parameters are abnormal!
 4013=Access Control QR Code
 4014=Temporary password
-
-
-
-
 
 5000=Music
 5001=Group
@@ -620,6 +579,7 @@
 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
@@ -714,54 +674,7 @@
 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
@@ -870,6 +783,34 @@
 7105=Light pollution: 75 ~ 115ug/m3
 7106=Moderate pollution: 115 ~ 150ug/m3
 7107=Heavy pollution: > 150ug/m3
+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
 	
 9000=Please sign in with new cell phone number.
 9001=Please sign in with new email address.
@@ -912,7 +853,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
@@ -936,11 +877,6 @@
 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.
@@ -1306,7 +1242,7 @@
 324=鍦烘櫙寤舵椂
 325=寤舵椂璁剧疆
 326=寤舵椂
-327=鎹曟崏鍦烘櫙
+327=鎹曡幏鍦烘櫙
 328=鐢靛奖鍦烘櫙
 329=鏅��
 330=鑷姩妯″紡
@@ -1402,39 +1338,6 @@
 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=鍚嶇О涓嶈兘涓虹┖銆�
-456=鐢诲竷
-457=鑳借��
-458=鏃ユ湡
-459=瀹炴椂鑳借��
-460=鏈湀鑳借��
-461=瀹ゅ/瀹ゅ唴
-462=鎮ㄥ綋鍓嶈繕鏈坊鍔犱换浣曡澶�
-463=璇疯緭鍏ヨ澶囨満涓婄殑sn鐮�
-464=鍙互寮�濮嬩娇鐢ㄥ厗瑙傛绫虫尝浜�
-465=鍒犻櫎璁惧
-466=鏈洪《鐩�
-467=鎶曞奖浠�
-468=鏈変汉璺屽��
-469=鏈変汉杩涘叆
-470=闃叉姢涓�
-471=姣背娉紶鎰熷櫒
-
 
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -1525,6 +1428,7 @@
 1086=椋庨��3妗�
 
 
+
 4000=鍙瀵硅
 4001=閫氳瘽璁板綍
 4002=*浜戠鐓х墖鍙繚鐣�30澶�
@@ -1540,6 +1444,7 @@
 4012=閰嶇疆鍙傛暟鏈夊紓甯�!
 4013=闂ㄧ浜岀淮鐮�
 4014=涓存椂瀵嗙爜
+
 
 5000=闊充箰
 5001=缁勫悎
@@ -1821,6 +1726,8 @@
 7131=App鎺ㄩ��
 7132=鑷姩鍖�
 7133=宸叉墽琛�
+7134=鐩爣鐘舵��
+7135=璺屽��
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -1886,11 +1793,6 @@
 9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
 9062=鏌ョ湅
 9063=杩樻湁{0}娆℃満浼氥��
-9064=鏅鸿兘闊崇
-9065=鏁版嵁绠$悊
-9066=澶囨敞
-9067=澶囨敞涓嶈兘涓虹┖
-9068=鏄惁瑙i櫎缁戝畾锛�
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒

--
Gitblit v1.8.0