From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL-ON_Android/Assets/Language.ini | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 5bfb36b..2ec7e95 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/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
@@ -423,10 +423,25 @@
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
@@ -772,7 +787,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
@@ -796,6 +811,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.
@@ -1161,7 +1181,7 @@
324=鍦烘櫙寤舵椂
325=寤舵椂璁剧疆
326=寤舵椂
-327=鎹曡幏鍦烘櫙
+327=鎹曟崏鍦烘櫙
328=鐢靛奖鍦烘櫙
329=鏅��
330=鑷姩妯″紡
@@ -1257,6 +1277,23 @@
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=绔ラ攣
@@ -1409,7 +1446,6 @@
1141=澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
1142=甯稿紑妯″紡鍏抽棴璁剧疆澶辨晥锛岃閲嶈瘯
-
4000=鍙瀵硅
4001=閫氳瘽璁板綍
4002=*浜戠鐓х墖鍙繚鐣�30澶�
@@ -1425,7 +1461,6 @@
4012=閰嶇疆鍙傛暟鏈夊紓甯�!
4013=闂ㄧ浜岀淮鐮�
4014=涓存椂瀵嗙爜
-
5000=闊充箰
5001=缁勫悎
@@ -1689,7 +1724,8 @@
7129=(100瀛楀唴)
7130=璐﹀彿閫夋嫨
7131=App鎺ㄩ��
-
+7132=鑷姩鍖�
+7133=宸叉墽琛�
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -1755,6 +1791,11 @@
9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
9062=鏌ョ湅
9063=杩樻湁{0}娆℃満浼氥��
+9064=鏅鸿兘闊崇
+9065=鏁版嵁绠＄悊
+9066=澶囨敞
+9067=澶囨敞涓嶈兘涓虹┖
+9068=鏄惁瑙ｉ櫎缁戝畾锛�
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
--
Gitblit v1.8.0