From 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:01 +0800
Subject: [PATCH] Merge branch 'wxr6' into newBranch1
---
HDL-ON_iOS/Resources/Language.ini | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index a253aa0..bbdcdd6 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -24,7 +24,7 @@
23=Incorrect verification code, please re-enter.
24=Incorrect account number, please enter the correct email address.
25=Email address
-26=Residentce
+26=Residence
27=Member
28=Disarm
29=Arming
@@ -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
@@ -458,6 +457,16 @@
'
470=Under protection
471=Millimeter wave sensor
+472=Outdoor
+473=Swing
+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
@@ -617,13 +626,17 @@
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
@@ -1509,6 +1522,14 @@
469=鏈変汉杩涘叆
470=闃叉姢涓�
471=姣背娉紶鎰熷櫒
+472=瀹ゅ
+473=鎵
+474=涓婁笅鎵
+475=宸﹀彸鎵
+476=娣诲姞浣忓畢
+477=鎽嗗姩
+478=妯″紡
+479=椋庨��
1000=瀹ゅ唴婀垮害
@@ -1677,8 +1698,15 @@
1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
1157=杩囨埛澶辫触
1158=璇烽噸鏂板皾璇�
-
-
+1159=绠＄悊鍛樻潈闄愯浆绉�
+1160=鎮ㄥ皢杞Щ鎮ㄧ殑绠＄悊鍛樻潈闄愮粰鍏朵粬鎴愬憳
+1161=1.璇ヤ綇瀹呮偍鐨勭鐞嗗憳鏁版嵁锛堜簯绔暟鎹級灏嗗叏閮ㄨ浆绉荤粰鏂扮殑{0}绠＄悊鍛榹0}2.鎮ㄧ殑鏁版嵁灏嗕細涓庣洰鏍囨垚鍛樹簰鎹紝鎮ㄧ殑鏉冮檺灏嗗彉鏇翠负鐩爣{0}鎴愬憳鐨勬潈闄�
+1162=纭杞Щ
+1163=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬垚鍛�
+1164=纭杞Щ{0}鐨勭鐞嗗憳鏉冮檺缁欒处鍙穥1}
+1165=杩佺Щ鎴愬姛
+1166=杩佺Щ澶辫触
+1167=杩佺Щ鎴愬姛锛屾偍鐨勬潈闄愬皢鍙樹负鏅�氭垚鍛�
4000=鍙瀵硅
4001=閫氳瘽璁板綍
--
Gitblit v1.8.0