From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index b5e988c..518f02b 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -400,7 +400,7 @@
414=Controller on
415=Someone
416=Log
-417=Water Leakage
+417=Water leakage
418=In Alarm
419=Normal
420=Hot dry
@@ -473,6 +473,26 @@
485=Check/Modify
486=Defense function / Alarm status
487=Alarm target after triggering
+488=Face passage
+489=Apply face ID to:
+490=Community access control
+491=About face ID and privacy
+492=Erase data
+493=Reset face ID
+494=Set face ID
+495=Face passage settings
+496=There is no associated task deployment status
+497=Custom
+498=Trigger delay
+499=Add defense function
+500=Add alarm target
+501=Security alarm: {0} is triggered.
+502=Clear the security alarm?
+503=Exceeding standard
+504=Class I standard
+505=Secondary standard
+506=Face input succeeded
+506=Face input failed
1000=Room Humidity
@@ -980,6 +1000,9 @@
7146=Add security
7147=Arm
7148=Disarm
+7149=Manually
+7150=Smart
+
9000=Please sign in with new cell phone number.
@@ -1561,7 +1584,26 @@
485=鏌ョ湅/淇敼
486=甯冮槻鍔熻兘/鎶ヨ鐘舵��
487=瑙﹀彂鍚庡憡璀︾洰鏍�
-
+488=浜鸿劯閫氳
+489=灏嗛潰瀹笽D搴旂敤浜�:
+490=绀惧尯闂ㄧ閫氳
+491=鍏充簬闈㈠ID涓庨殣绉�
+492=鎶规帀鏁版嵁
+493=閲嶇疆闈㈠
+494=璁剧疆闈㈠
+495=浜鸿劯閫氳璁剧疆
+496=杩樻病鏈夊叧鑱斾换浣曞竷闃茬姸鎬�
+497=鑷畾涔�
+498=瑙﹀彂寤舵椂
+499=娣诲姞甯冮槻鍔熻兘
+500=娣诲姞鍛婅鐩爣
+501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=涓�绾�
+505=浜岀骇
+506=浜鸿劯褰曞叆鎴愬姛
+506=浜鸿劯褰曞叆澶辫触
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -2051,6 +2093,10 @@
7146=娣诲姞瀹夐槻
7147=甯冮槻
7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
+
+
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
--
Gitblit v1.8.0