From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码

---
 HDL-ON_Android/Assets/Language.ini |   76 ++++++++++++++++++++++++++++++-------
 1 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 2f45ea8..6a316d9 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/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
@@ -328,7 +328,7 @@
 324=Scene delay
 325=Delay setting
 326=Delay
-327=Capture the scene
+327=Catch Scene
 328=Film scene
 329=General
 330=Automatic mode
@@ -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.
@@ -459,6 +459,15 @@
 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
@@ -618,13 +627,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
@@ -777,7 +790,7 @@
 6081=Select IR brand
 6082=Shaking
 6083=Low speed
-6084=Medium speed
+6084=Wind Speed Switch 
 6085=High speed
 6086=Auto
 6087=Temperature+
@@ -818,6 +831,15 @@
 7133=Executed
 7134=Target State
 7135=Tumble
+7136=Temperature
+7137=Humidity
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=Exceeding
+7142=Serious
+7143=High
+7144=excellence
  
  
 6000=Rename
@@ -1382,7 +1404,7 @@
 324=鍦烘櫙寤舵椂
 325=寤舵椂璁剧疆
 326=寤舵椂
-327=鎹曟崏鍦烘櫙
+327=鎹曡幏鍦烘櫙
 328=鐢靛奖鍦烘櫙
 329=鏅��
 330=鑷姩妯″紡
@@ -1511,6 +1533,13 @@
 470=闃叉姢涓�
 471=姣背娉紶鎰熷櫒
 472=瀹ゅ
+473=鎵
+474=涓婁笅鎵
+475=宸﹀彸鎵
+476=娣诲姞浣忓畢
+477=鎽嗗姩
+478=妯″紡
+479=椋庨��
  
  
 1000=瀹ゅ唴婀垮害
@@ -1675,12 +1704,19 @@
 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=閫氳瘽璁板綍
@@ -1830,7 +1866,7 @@
 6081=閫夋嫨绾㈠鍝佺墝
 6082=鎽囧ご
 6083=浣庨��
-6084=涓��
+6084=椋庨�熷垏鎹�
 6085=楂橀��
 6086=鑷姩
 6087=娓╁害+
@@ -1980,6 +2016,16 @@
 7133=宸叉墽琛�
 7134=鐩爣鐘舵��
 7135=璺屽��
+7136=娓╁害
+7137=婀垮害
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=瓒呮爣
+7142=涓ラ噸
+7143=鍋忛珮
+7144=浼樼
+
  
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP

--
Gitblit v1.8.0