From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL-ON_Android/Assets/Language.ini | 104 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index ba81005..b23332d 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -467,7 +467,12 @@
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
@@ -805,43 +810,7 @@
6095=More than 30 add buttons
-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
-7136=Temperature
-7137=Humidity
-7138=PM2.5
-7139=CO2
-7140=TVOC
-7141=Exceeding
-7142=Serious
-7143=High
-7144=excellence
+
6000=Rename
@@ -970,6 +939,46 @@
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
+7136=Temperature
+7137=Humidity
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=Exceeding
+7142=Serious
+7143=High
+7144=excellence
+7145=Security
+7146=Add security
+7146=娣诲姞瀹夐槻
9000=Please sign in with new cell phone number.
9001=Please sign in with new email address.
@@ -984,10 +993,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
@@ -1544,6 +1553,12 @@
479=椋庨��
480=鐜浼犳劅鍣�
481=鍙互寮�濮嬩娇鐢ㄧ幆澧冧紶鎰熷櫒浜�
+482=鐕冩皵浼犳劅鍣�
+483=璇疯緭鍏ヨ澶囩殑MAC鐮�
+484=寮�鍚�
+485=鏌ョ湅/淇敼
+486=甯冮槻鍔熻兘/鎶ヨ鐘舵��
+487=瑙﹀彂鍚庡憡璀︾洰鏍�
1000=瀹ゅ唴婀垮害
@@ -2030,6 +2045,7 @@
7142=涓ラ噸
7143=鍋忛珮
7144=浼樼
+7145=瀹夐槻
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -2044,10 +2060,10 @@
9010=鏂板瘑鐮�
9011=鍐嶆杈撳叆鏂板瘑鐮�
9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
+9013=鏈嶅姟鍗忚
+9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾
9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��
9017=纭閫�鍑虹櫥褰曪紵
9018=璇烽�夋嫨鍥藉/鍖哄煙
9019=绔嬪嵆鏇存柊
--
Gitblit v1.8.0