From 1dade03e0e71076af3a3de1bf10ba6cad61ac216 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 01 二月 2021 19:22:38 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into NewFilePath

---
 HDL-ON_iOS/Resources/Language.ini |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
old mode 100755
new mode 100644
index 8440e0e..969bc4e
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -103,7 +103,7 @@
 102=Uunassigned
 103=Delete the room or not?
 104=Transition time
-105=Indoor temp. 
+105=Indoor temp.
 106=AC
 107=Video intercom
 108=Sensor
@@ -390,9 +390,6 @@
 405=Cozy
 406=Meeting
 407=Reading
-408=Comfirm
-409=Function brand
-410=You haven't added any platform devices yet
 	
 5000=Music
 5001=Group
@@ -605,7 +602,7 @@
 9049=Incorrect password for many times, the account number is locked!
 9050=Verify the face ID
 9051=Fail to save the user's face ID
-
+'
 9052=The push notification of registration is available.
 9053=The push notification of registration is abnormal.
 9054=Numeric password verification
@@ -1047,10 +1044,6 @@
 406=浼氬
 407=闃呰
 408=纭娣诲姞
-409=鍔熻兘鍝佺墝
-410=浣犲綋鍓嶈繕鏈坊鍔犱换浣曞钩鍙拌澶�
-411=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
-412=娣诲姞
 
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -1087,6 +1080,21 @@
 1032=娓呮壂妯″紡
 1033=鑰楁潗绠＄悊
 1034=鍘嗗彶璁板綍
+1035=鑷姩娓呮壂
+1036=瀹氱偣娓呮壂
+1037=娌垮娓呮壂
+1038=鍖哄煙娓呮壂
+1039=鎬绘竻娲侀潰绉�
+1040=鎬绘竻娲佹椂闂�
+1041=杈瑰埛鍓╀綑瀵垮懡
+1042=婊氬埛鍓╀綑瀵垮懡
+1043=婊ょ綉鍓╀綑瀵垮懡
+1044=閲嶇疆杈瑰埛
+1045=閲嶇疆婊氬埛
+1046=閲嶇疆婊ょ綉
+1047=鏄惁閲嶇疆杈瑰埛
+1048=鏄惁閲嶇疆婊氬埛
+1049=鏄惁閲嶇疆婊ょ綉
 
 5000=闊充箰
 5001=缁勫悎
@@ -1261,9 +1269,6 @@
 7120=闃叉媶鍔熻兘
 7121=鍦ㄧ嚎
 7122=涓嶅湪绾�
-
-
-
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP

--
Gitblit v1.8.0