From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL-ON_Android/Assets/Language.ini | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index d565ef1..895b1a4 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -466,7 +466,13 @@
478=Pattern
479=Speed
480=Environmental sensor
-
+481=Can start using environmental sensor
+482=Gas sensor
+483=Please enter the MAC code of the device
+484=Open
+485=Check/Modify
+486=Defense function / Alarm status
+487=Alarm target after triggering
1000=Room Humidity
@@ -522,7 +528,7 @@
1050=Add Device
1051=Mini Intelligent Remote Control
1052=Add Infrared Remote Control
-1053=Press the infrared remote control button{0}for 10 seconds and the indicator light{0}flashes blue quickly
+1053=Press the infrared remote control button{0}for 3 seconds and the indicator light{0}flashes blue quickly
1054=Please make sure your Bluetooth{0}is on and searchable
1055=Next Step
1056=Device searching...
@@ -983,10 +989,10 @@
9010=New password
9011=Enter new password again
9012=Agree
-9013=User agreement
-9014=Privacy agreement
+9013=Service Agreement
+9014=User information protection regulations
9015=and
-9016=Please read and agree on User Agreement and Privacy Agreement.
+9016=Please read and agree on User Service Agreement and User information protection regulations.
9017=Are you sure to log out?
9018=Please select country/region.
9019=Update now
@@ -1542,6 +1548,13 @@
478=妯″紡
479=椋庨��
480=鐜浼犳劅鍣�
+481=鍙互寮�濮嬩娇鐢ㄧ幆澧冧紶鎰熷櫒浜�
+482=鐕冩皵浼犳劅鍣�
+483=璇疯緭鍏ヨ澶囩殑MAC鐮�
+484=寮�鍚�
+485=鏌ョ湅/淇敼
+486=甯冮槻鍔熻兘/鎶ヨ鐘舵��
+487=瑙﹀彂鍚庡憡璀︾洰鏍�
1000=瀹ゅ唴婀垮害
@@ -1597,7 +1610,7 @@
1050=娣诲姞璁惧
1051=mini鏅鸿兘閬ユ帶鍣�
1052=娣诲姞绾㈠閬ユ帶
-1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
+1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�3绉掞紝鎸囩ず鐏摑鑹插揩闂�
1054=璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
1055=涓嬩竴姝�
1056=璁惧鎼滅储涓�...
@@ -2042,10 +2055,10 @@
9010=鏂板瘑鐮�
9011=鍐嶆杈撳叆鏂板瘑鐮�
9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
+9013=鏈嶅姟鍗忚
+9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾
9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��
9017=纭閫�鍑虹櫥褰曪紵
9018=璇烽�夋嫨鍥藉/鍖哄煙
9019=绔嬪嵆鏇存柊
--
Gitblit v1.8.0