From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL-ON_iOS/Resources/Language.ini | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 79536dc..4d6e2f9 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -337,7 +337,7 @@
333=Floor cooling power
334=Adjust the percentage
335=No delay
-336=No scene
+336=No scene available. Add one!
337=Edit the scene
338=The name of the scene can not be blank.
339=The name of the scene has existed, please revise.
@@ -439,7 +439,6 @@
453=Alarm mute
454=Deployment information
455=The name can not be blank.
-
456=Canvas
457=Energy consumption
458=Date
@@ -463,6 +462,11 @@
474=Swing up and down
475=Swing left and right
476=Add residence
+477=Swing
+478=Pattern
+479=Speed
+
+
1000=Room Humidity
1001=V-chip
@@ -622,17 +626,21 @@
1154=Transferring to User, Please Wait鈥�
1155={0} has become a residential administrator
1156=The residence data will be deleted from your account
-1157=Fail to transfer
+1157=Fail to migrate
1158=Please try again
-
-
-
-
-
+1159=Admin authority migration
+1160=Your admin authority is being migrated to other members
+1161=1.Your data (cloud data) of the residence will be{0}migratedto the new administrator{0}2.Your data will be exchanged with the target member{0}and your permission will be changed to the target{0}member
+1162=Confirm
+1163=No members to choose
+1164=Confirm admin authority migration from {0} to {1}
+1165=Migrate successfully
+1166=Fail to migrate
+1167=Migrate successfully, And your permissions will become normal members
4000=Video intercom
4001=Call record
-4002=*Cloud photos are only kept for 30 days
+4002=*Cloud records are only kept for 30 days
4003=Door phone call
4004=Answered
4005=Unlocked
@@ -1529,6 +1537,9 @@
474=涓婁笅鎵
475=宸﹀彸鎵
476=娣诲姞浣忓畢
+477=鎽嗗姩
+478=妯″紡
+479=椋庨��
1000=瀹ゅ唴婀垮害
@@ -1693,16 +1704,23 @@
1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
1153=缁堟
1154=姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
-1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢鏂扮鐞嗗憳
1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
1157=杩囨埛澶辫触
1158=璇烽噸鏂板皾璇�
-
-
+1159=绠＄悊鍛樻潈闄愯浆绉�
+1160=鎮ㄥ皢杞Щ鎮ㄧ殑绠＄悊鍛樻潈闄愮粰鍏朵粬鎴愬憳
+1161=1.璇ヤ綇瀹呮偍鐨勭鐞嗗憳鏁版嵁锛堜簯绔暟鎹級灏嗗叏閮ㄨ浆绉荤粰鏂扮殑{0}绠＄悊鍛榹0}2.鎮ㄧ殑鏁版嵁灏嗕細涓庣洰鏍囨垚鍛樹簰鎹紝鎮ㄧ殑鏉冮檺灏嗗彉鏇翠负鐩爣{0}鎴愬憳鐨勬潈闄�
+1162=纭杞Щ
+1163=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬垚鍛�
+1164=纭杞Щ{0}鐨勭鐞嗗憳鏉冮檺缁欒处鍙穥1}
+1165=杩佺Щ鎴愬姛
+1166=杩佺Щ澶辫触
+1167=杩佺Щ鎴愬姛锛屾偍鐨勬潈闄愬皢鍙樹负鏅�氭垚鍛�
4000=鍙瀵硅
4001=閫氳瘽璁板綍
-4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4002=*浜戠璁板綍鍙繚鐣�30澶�
4003=闂ㄥ彛鏈哄懠鍙�
4004=宸叉帴鍚�
4005=宸插紑閿�
@@ -1785,7 +1803,7 @@
6016=绂荤嚎
6017=鐗堟湰鍙�
6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被锛屾煡鎵句娇鐢�
6020=鎺ㄨ崘鎸夐敭
6021=璇疯緭鍏ユ寜閿悕绉�
6022=涓嬩竴姝�
--
Gitblit v1.8.0