From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL-ON_Android/Assets/Language.ini | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 061811e..de5912b 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -487,6 +487,7 @@
499=Add defense function
500=Add alarm target
501=Security alarm: {0} is triggered.
+502=Clear the security alarm?
1000=Room Humidity
@@ -992,9 +993,11 @@
7144=excellence
7145=Security
7146=Add security
-
7147=Arm
7148=Disarm
+7149=Manually
+7150=Smart
+
9000=Please sign in with new cell phone number.
@@ -1590,6 +1593,7 @@
499=娣诲姞甯冮槻鍔熻兘
500=娣诲姞鍛婅鐩爣
501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -2077,9 +2081,12 @@
7144=浼樼
7145=瀹夐槻
7146=娣诲姞瀹夐槻
-
7147=甯冮槻
7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
+
+
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
--
Gitblit v1.8.0