From 79133766997cb86b2e463671b50137588ded6588 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 08 三月 2021 10:07:55 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC

---
 HDL-ON_Android/Assets/Language.ini |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index f78a909..ec7ad2d 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,6 +1207,8 @@
 6012=绾㈠閬ユ帶
 6013=璁惧绠＄悊
 6014=娣诲姞閬ユ帶鍣�
+
+
 6015=鍦ㄧ嚎
 6016=绂荤嚎
 6017=鐗堟湰鍙�

--
Gitblit v1.8.0