From 7ef9d95ad31883e85bf5d5eab85c30f70d601077 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 02 三月 2021 17:31:57 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into NewFilePath
---
HDL-ON_Android/Assets/Language.ini | 81 ++++++++++++++++------------------------
1 files changed, 33 insertions(+), 48 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index dae92a1..1b59f7e 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -399,6 +399,21 @@
414=Controller on
415=Someone
416=Log
+417=Water Leakage
+418=In Alarm
+419=Normal
+420=Hot dry
+421=Air dry
+422=Disinfect
+423=Lighting
+424=Time
+425=Hot dry time
+426=Air dry time
+427=Disinfect time
+428=Anion Time
+
+
+1002=Anion
5000=Music
5001=Group
@@ -1061,7 +1076,20 @@
413=鎺у埗鍣ㄦ湭寮�鍚�
414=鎺у埗鍣ㄥ凡寮�鍚�
415=鏈変汉
-516=鏃ュ織
+416=鏃ュ織
+417=婕忔按
+418=鎶ヨ
+419=姝ｅ父
+420=鐑樺共
+421=椋庡共
+422=娑堟瘨
+423=鐓ф槑
+424=鏃堕棿
+425=鐑樺共鏃堕棿
+426=椋庡共鏃堕棿
+427=娑堟瘨鏃堕棿
+428=璐熺瀛愭椂闂�
+
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -1099,9 +1127,9 @@
1033=鑰楁潗绠＄悊
1034=鍘嗗彶璁板綍
1035=鑷姩娓呮壂
-1036=瀹氱偣娓呮壂
+1036=闅忔満娓呮壂
1037=娌垮娓呮壂
-1038=鍖哄煙娓呮壂
+1038=铻烘棆娓呮壂
1039=鎬绘竻娲侀潰绉�
1040=鎬绘竻娲佹椂闂�
1041=杈瑰埛鍓╀綑瀵垮懡
@@ -1164,7 +1192,6 @@
5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
-
6000=姝ｅ父
6001=璁惧鐘舵��
6002=涓�
@@ -1180,50 +1207,8 @@
6012=绾㈠閬ユ帶
6013=璁惧绠＄悊
6014=娣诲姞閬ユ帶鍣�
-6015=鍦ㄧ嚎
-6016=绂荤嚎
-6017=鐗堟湰鍙�
-6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
-6020=鎺ㄨ崘鎸夐敭
-6021=璇疯緭鍏ユ寜閿悕绉�
-6022=涓嬩竴姝�
-6023=鐢垫簮
-6024=闊抽噺+
-6025=闊抽噺-
-6026=棰戦亾+
-6027=棰戦亾-
-6028=涓�
-6029=涓�
-6030=宸�
-6031=鍙�
-6032=闈欓煶
-6034=纭
-6035=鎾斁
-6037=閫�鍑�
-6038=鑿滃崟
-6039=鏆傚仠
-6040=杩斿洖
-6041=鍋滄
-6042=涓婚〉
-6043=蹇繘
-6044=蹇��
-6045=瀹氭椂
-6046=澶嶅埗閬ユ帶鍔熻兘
-6047=瀵瑰噯閬ユ帶鍣ㄤ腑蹇冩寜涓嬬浉鍚屾寜閿�
-6048=鏅鸿兘閬ユ帶鍣�
-6049=娣诲姞鎸夐敭
-6050=*闀挎寜鍙繘琛岃嚜瀹氫箟鎺掑簭
-6051=瀹屾垚
-6052=娣诲姞鎴愬姛
-6053=鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
-6054=鎵�灞炲垎绫�
-6055=閬ユ帶鍣ㄥ悕绉�
-6056=鎵�灞炲尯鍩�
-6057=缁х画娣诲姞
-6058=鐢靛櫒
-6059=娣诲姞澶辫触
-6060=閲嶈瘯
+
+
7000=鏂板缓鑷姩鍖�
7001=缂栬緫鑷姩鍖�
--
Gitblit v1.8.0