From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"

---
 HDL-ON_iOS/Resources/Language.ini |  100 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 88aa357..b52d360 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -402,11 +402,20 @@
 417=Water Leakage
 418=In Alarm
 419=Normal
-420=Hot Dry
-421=Air Dry
+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
+429=h
+430=m
 
+
+1002=Anion 
 	
 5000=Music
 5001=Group
@@ -1077,6 +1086,13 @@
 421=椋庡共
 422=娑堟瘨
 423=鐓ф槑
+424=鏃堕棿
+425=鐑樺共鏃堕棿
+426=椋庡共鏃堕棿
+427=娑堟瘨鏃堕棿
+428=璐熺瀛愭椂闂�
+429=灏忔椂
+430=鍒嗛挓
 
 
 1000=瀹ゅ唴婀垮害
@@ -1180,6 +1196,84 @@
 5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
 
 
+6000=姝ｅ父
+6001=璁惧鐘舵��
+6002=涓�
+6003=褰撳墠绾㈠閬ユ帶璁惧
+6004=宸叉坊鍔犻仴鎺у櫒
+6005=绌鸿皟
+6006=鐢佃
+6007=椋庢墖
+6008=鏈洪《鐩�
+6009=DVD/EVD/VCD
+6010=鎶曞奖浠�
+6011=鑷畾涔�
+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=閲嶈瘯
+6061=鍖归厤閬ユ帶鍣�
+6062=璇风偣鍑讳互涓嬫寜閽�
+6063=纭璁惧鏄惁鏈夊搷搴�
+6064=鎺у埗澶辫触
+6065=鎺у埗鎴愬姛
+6066=鐢垫簮寮�
+6067=妯″紡鍒跺喎
+6068=椋庨�熶腑椋�
+6069=娓╁害26鈩�
+6070=鍒犻櫎璁惧
+6071=淇敼鍚嶅瓧
+6072=纭鍒犻櫎
+6073=鍙栨秷
+6074=閬ユ帶鍣ㄤ笉鑳借秴杩�10涓紵
+6075=閬ユ帶鍣ㄦ墍灞炲尯鍩�:
+6076=缂栬緫淇℃伅
+
+
+
 7000=鏂板缓鑷姩鍖�
 7001=缂栬緫鑷姩鍖�
 7002=濡傛灉
@@ -1228,7 +1322,7 @@
 7045=璁剧疆
 7046=鍚嶇О
 7047=淇敼鍚嶇О
-7048=鑷姩鍖栧悕绉板凡瀛樺湪
+7048=鍚嶇О宸插瓨鍦�
 7049=鏄惁瑕佸垹闄よ嚜鍔ㄥ寲锛�
 7050=娣诲姞鍦烘櫙
 7051=寤舵椂

--
Gitblit v1.8.0