From 6c5398cef0d718eec08a1f56b1a9f00e79a85d67 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 十一月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_Android/Assets/Language.ini | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index c27f087..df14822 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -489,14 +489,17 @@
501=Security alarm: {0} is triggered.
502=Clear the security alarm?
503=Exceeding standard
-504=Secondary standard
-505=Class I standard
+504=Good
+505=Excellent
506=Face input succeeded
507=Face input failed
508=Formaldehyde
509=Please enter security name.
510=Please select the deployment target.
-
+511=Combined dimming
+512=Message push is not enabled, please go to settings.
+513=Please enter the pairing code
+514=Gateway location information is not configured
1000=Room Humidity
1001=V-chip
@@ -998,7 +1001,7 @@
7141=Exceeding
7142=Serious
7143=High
-7144=excellence
+7144=Excellence
7145=Security
7146=Add security
7147=Arm
@@ -1080,6 +1083,7 @@
9066=Remarks
9067=Remarks cannot be blank.
9068=Do you want to unbind?
+9069=Property notice
10000=Invalid password, please log in again.
10001=Fail to request server, please try again later.
@@ -1605,14 +1609,17 @@
501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
503=瓒呮爣
-504=浜岀骇
-505=涓�绾�
+504=鑹ソ
+505=浼樼
506=浜鸿劯褰曞叆鎴愬姛
507=浜鸿劯褰曞叆澶辫触
508=鐢查啗
509=璇疯緭鍏ュ畨闃插悕绉般��
510=璇烽�夋嫨甯冮槻鐩爣銆�
-
+511=缁勫悎璋冨厜
+512=娑堟伅鎺ㄩ�佹湭寮�鍚紝璇峰墠寰�璁剧疆銆�
+513=璇疯緭鍏ラ厤瀵圭爜
+514=鏈厤缃綉鍏充綅缃俊鎭�
1000=瀹ゅ唴婀垮害
@@ -2178,6 +2185,7 @@
9066=澶囨敞
9067=澶囨敞涓嶈兘涓虹┖
9068=鏄惁瑙ｉ櫎缁戝畾锛�
+9069=鐗╀笟閫氱煡
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
--
Gitblit v1.8.0