From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_iOS/Resources/Language.ini | 376 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 326 insertions(+), 50 deletions(-)
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 61be5a1..43c06ef 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
@@ -73,11 +73,11 @@
72=Address
73=Floor Management
74=Room Management
-75=Administrator migration
+75=Admin Migration
76=Privilege Migration
77=Debugging privilege
78=The administrator is migrated to other user.
-79=All of the data for the residence is migrated to new user.
+79=All residence data are migrated to new user.
80=Allow the staff to visit your home remotely
81=Floor
82=Add floor
@@ -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.
@@ -400,7 +400,7 @@
414=Controller on
415=Someone
416=Log
-417=Water Leakage
+417=Water leakage
418=In Alarm
419=Normal
420=Hot dry
@@ -457,6 +457,43 @@
'
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
+480=Environmental sensor
+481=Can start using environmental sensor
+482=Gas sensor
+483=Please enter the MAC code of the device
+484=Open
+485=Check/Modify
+486=Defense function / Alarm status
+487=Alarm target after triggering
+488=Face passage
+489=Apply face ID to:
+490=Community access control
+491=About face ID and privacy
+492=Erase data
+493=Reset face ID
+494=Set face ID
+495=Face passage settings
+496=There is no associated task deployment status
+497=Custom
+498=Trigger delay
+499=Add defense function
+500=Add alarm target
+501=Security alarm: {0} is triggered.
+502=Clear the security alarm?
+503=Exceeding standard
+504=Class I standard
+505=Secondary standard
+506=Face input succeeded
+506=Face input failed
+
1000=Room Humidity
1001=V-chip
@@ -511,7 +548,7 @@
1050=Add Device
1051=Mini Intelligent Remote Control
1052=Add Infrared Remote Control
-1053=Press the infrared remote control button{0}for 10 seconds and the indicator light{0}flashes blue quickly
+1053=Press the infrared remote control button{0}for 3 seconds and the indicator light{0}flashes blue quickly
1054=Please make sure your Bluetooth{0}is on and searchable
1055=Next Step
1056=Device searching...
@@ -546,14 +583,91 @@
1084=1st Gear
1085=2nd Gear
1086=3rd Gear
-
-
-
-
+1087=Unlock
+1088=Temp. Password
+1089=Connected
+1090=Disconnected
+1091=Generate
+1092=Effective time
+1093=Expire time
+1094=Select time
+1095=Select Date
+1096=Generate
+1097=Temporary password has been copied
+1098=Clear Password?
+1099=The expire time must be later than the effective time
+1100=Unlock Method
+1101=It'll synchronize with actual lock, confirm to delete?
+1102=Delete
+1103=Remark
+1104=The remark can not be blank.
+1105=Assign to
+1106=Target Scene Not Exist
+1107=Select Scene
+1108=Unlock
+1109=Always On
+1110=Setting
+1111=Automation
+1112=Turn on "Always On" Mode
+1113=Turn off "Always On" Mode
+1114=Edit
+1115=Always On will be off at {0}
+1116=Condition
+1117=Motion
+1118=Always On
+1119=Lock
+1120=User
+1121=Unlock Method
+1122=Fingerprint
+1123=Card
+1124=Key
+1125=Information
+1126=Unlock
+1127=Alarm
+1128=Offline
+1129=For first user, Please bind lock password
+1130=Please enter admin password
+1131=Bind Successfully
+1132=Skip to personal password for unlock
+1133=Skip
+1134=Please draw your pattern
+1135=Lock will be always on after setting, confirm to proceed
+1136=Confirm
+1137=Expire
+1138=Always On will expire after {0} hours
+1139=Please enter expire time
+1140=Expire time should not be more than 72 hours
+1141=Expire time should not be less than 1 hour
+1142=Fail to set, please try again
+1143=Fail to verify administrator ID, please log in again account
+1144=Your residence is being migrated to other HDL
+1145=Note:
+1146=1. All of your residence data will be migrate to new user.{0}2. After migration, original member will be{0}automatically unbound from this residence.{0}3. The new account is a valid HDL one.{0}4. The account from receiver cannot be the same{0}as that from migration side.
+1147=Confirm
+1148=Input receiver's account
+1149=Profile
+1150=Confirm admin migration from {0} to {1}
+1151=The account does not exist.
+1152=Fail to Transfer Ownership to Yourself
+1153=Terminate
+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 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
@@ -702,7 +816,7 @@
6081=Select IR brand
6082=Shaking
6083=Low speed
-6084=Medium speed
+6084=Wind Speed Switch
6085=High speed
6086=Auto
6087=Temperature+
@@ -713,34 +827,10 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
+6095=More than 30 add buttons
-7108=Leak/No Leak
-7109=Leak
-7110=No leak
-7111=Water leaking/no water leaking
-7112=Water leaking
-7113=No water leaking
-7114=Someone/Nobody
-7115=Someone
-7116=Nobody
-7117=Open/Close
-7118=On
-7119=Close
-7120=Anti-dismantling function
-7121=Online
-7122=Not online
-7123=Air quality
-7124=Excellent
-7125=Good
-7126=Poor
-7127=Send notification
-7128=Notification content
-7129=(within 100 characters)
-7130=Account selection
-7131=App push
-7132=Automation
-7133=Executed
+
6000=Rename
@@ -869,6 +959,51 @@
7105=Light pollution: 75 ~ 115ug/m3
7106=Moderate pollution: 115 ~ 150ug/m3
7107=Heavy pollution: > 150ug/m3
+7108=Leak/No Leak
+7109=Leak
+7110=No leak
+7111=Water leaking/no water leaking
+7112=Water leaking
+7113=No water leaking
+7114=Someone/Nobody
+7115=Someone
+7116=Nobody
+7117=Open/Close
+7118=On
+7119=Close
+7120=Anti-dismantling function
+7121=Online
+7122=Not online
+7123=Air quality
+7124=Excellent
+7125=Good
+7126=Poor
+7127=Send notification
+7128=Notification content
+7129=(within 100 characters)
+7130=Account selection
+7131=App push
+7132=Automation
+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
+7145=Security
+7146=Add security
+7147=Arm
+7148=Disarm
+7149=Manually
+7150=Smart
+
+
9000=Please sign in with new cell phone number.
9001=Please sign in with new email address.
@@ -883,10 +1018,10 @@
9010=New password
9011=Enter new password again
9012=Agree
-9013=User agreement
-9014=Privacy agreement
+9013=Service Agreement
+9014=User information protection regulations
9015=and
-9016=Please read and agree on User Agreement and Privacy Agreement.
+9016=Please read and agree on User Service Agreement and User information protection regulations.
9017=Are you sure to log out?
9018=Please select country/region.
9019=Update now
@@ -1433,7 +1568,42 @@
469=鏈変汉杩涘叆
470=闃叉姢涓�
471=姣背娉紶鎰熷櫒
-
+472=瀹ゅ
+473=鎵
+474=涓婁笅鎵
+475=宸﹀彸鎵
+476=娣诲姞浣忓畢
+477=鎽嗗姩
+478=妯″紡
+479=椋庨��
+480=鐜浼犳劅鍣�
+481=鍙互寮�濮嬩娇鐢ㄧ幆澧冧紶鎰熷櫒浜�
+482=鐕冩皵浼犳劅鍣�
+483=璇疯緭鍏ヨ澶囩殑MAC鐮�
+484=寮�鍚�
+485=鏌ョ湅/淇敼
+486=甯冮槻鍔熻兘/鎶ヨ鐘舵��
+487=瑙﹀彂鍚庡憡璀︾洰鏍�
+488=浜鸿劯閫氳
+489=灏嗛潰瀹笽D搴旂敤浜�:
+490=绀惧尯闂ㄧ閫氳
+491=鍏充簬闈㈠ID涓庨殣绉�
+492=鎶规帀鏁版嵁
+493=閲嶇疆闈㈠
+494=璁剧疆闈㈠
+495=浜鸿劯閫氳璁剧疆
+496=杩樻病鏈夊叧鑱斾换浣曞竷闃茬姸鎬�
+497=鑷畾涔�
+498=瑙﹀彂寤舵椂
+499=娣诲姞甯冮槻鍔熻兘
+500=娣诲姞鍛婅鐩爣
+501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=涓�绾�
+505=浜岀骇
+506=浜鸿劯褰曞叆鎴愬姛
+506=浜鸿劯褰曞叆澶辫触
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -1488,7 +1658,7 @@
1050=娣诲姞璁惧
1051=mini鏅鸿兘閬ユ帶鍣�
1052=娣诲姞绾㈠閬ユ帶
-1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
+1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�3绉掞紝鎸囩ず鐏摑鑹插揩闂�
1054=璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
1055=涓嬩竴姝�
1056=璁惧鎼滅储涓�...
@@ -1522,11 +1692,98 @@
1084=椋庨��1妗�
1085=椋庨��2妗�
1086=椋庨��3妗�
-
+1087=涓�閿紑閿�
+1087=Unlock
+1088=涓存椂瀵嗙爜寮�閿�
+1088=Temp. Password
+1089=宸茶繛鎺�
+1089=Connected
+1090=鏈繛鎺�
+1090=Disconnected
+1091=鐢熸垚涓存椂瀵嗙爜
+1091=Generate
+1092=鐢熸晥鏃堕棿
+1092=Effective time
+1093=澶辨晥鏃堕棿
+1093=
+1094=閫夋嫨鏃堕棿
+1095=閫夋嫨鏃ユ湡
+1096=Generate
+1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
+1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
+1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
+1100=寮�閿佹柟寮忕鐞�
+1101=鍒犻櫎鎿嶄綔灏嗚鍚屾浜庡疄浣撻攣涓妠0}鏄惁杩橀渶瑕佸垹闄わ紵
+1102=纭鍒犻櫎
+1103=淇敼澶囨敞鍚嶇О
+1104=澶囨敞鍚嶇О涓嶈兘涓虹┖
+1105=鍒嗛厤鑷�
+1106=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勫満鏅�
+1107=閫夋嫨鍦烘櫙
+1108=閿佸凡鎵撳紑
+1109=甯稿紑
+1110=鏃舵晥鎬у父寮�璁剧疆
+1111=甯稿紑鑷姩鍖�
+1112=鎵撳紑甯稿紑妯″紡
+1113=鍏抽棴甯稿紑妯″紡
+1114=缂栬緫
+1115=甯稿紑妯″紡灏嗕簬{0}鍏抽棴
+1116=鏉′欢
+1117=鍔ㄤ綔
+1118=甯稿紑妯″紡
+1119=閿�
+1120=鐢ㄦ埛
+1121=寮�閿佹柟寮�
+1122=鎸囩汗
+1123=鍗�
+1124=閽ュ寵
+1125=淇℃伅绫诲瀷
+1126=寮�閿佷俊鎭�
+1127=鎶ヨ绫讳俊鎭�
+1128=璁惧涓嶅湪绾�
+1129=绗竴娆′娇鐢紝璇峰厛缁戝畾闂ㄩ攣瀵嗙爜
+1130=璇疯緭鍏ラ棬閿佺鐞嗗憳瀵嗙爜
+1131=闂ㄩ攣缁戝畾鎴愬姛
+1132=涓轰簡瀹夊叏锛岃璺宠浆鑷充釜浜轰腑蹇儃0}璁剧疆涓汉瀵嗙爜锛屽苟搴旂敤浜庨棬閿佸紑閿�
+1133=璺宠浆
+1134=璇风粯鍒跺浘妗�
+1135=璁剧疆甯稿紑妯″紡鍚巤0}鎮ㄧ殑闂ㄩ攣灏嗗浜庢墦寮�鐘舵�亄0}鏄惁缁х画寮�鍚�
+1136=纭寮�鍚�
+1137=澶辨晥璁剧疆
+1138=甯稿紑妯″紡灏嗕簬{0}灏忔椂鍚庡け鏁�
+1139=璇疯緭鍏ュけ鏁堟椂闂�
+1140=澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
+1141=澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+1142=甯稿紑妯″紡鍏抽棴璁剧疆澶辨晥锛岃閲嶈瘯
+1143=绠＄悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
+1144=鎮ㄧ殑浣忓畢灏嗚繃鎴风粰鍏朵粬HDL璐﹀彿
+1145=璇锋敞鎰忥細
+1146=1.璇ヤ綇瀹呮偍鐨勬暟鎹紙浜戠鏁版嵁锛夊皢鍏ㄩ儴杞Щ缁欐柊鐨勬埛涓粄0}2.杩囨埛鍚庯紝鍘熸湁鐨勬垚鍛樺皢鑷姩瑙ｇ粦璇ヤ綇瀹厈0}3.鏂版埛涓昏处鍙蜂负鏈夋晥鐨凥DL璐﹀彿{0}4.鎺ユ敹鏂硅处鍙蜂笌杞Щ鏂硅处鍙蜂笉鍙负鍚屼竴涓处鍙�
+1147=纭杩囨埛
+1148=璇疯緭鍏ユ帴鏀舵柟璐﹀彿
+1149=涓汉璧勬枡
+1150=纭杩囨埛{0}鐨勭鐞嗗憳璐﹀彿缁欒处鍙穥1}
+1151=鐩爣璐﹀彿骞朵笉瀛樺湪
+1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+1153=缁堟
+1154=姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
+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=宸插紑閿�
@@ -1609,7 +1866,7 @@
6016=绂荤嚎
6017=鐗堟湰鍙�
6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被锛屾煡鎵句娇鐢�
6020=鎺ㄨ崘鎸夐敭
6021=璇疯緭鍏ユ寜閿悕绉�
6022=涓嬩竴姝�
@@ -1672,7 +1929,7 @@
6081=閫夋嫨绾㈠鍝佺墝
6082=鎽囧ご
6083=浣庨��
-6084=涓��
+6084=椋庨�熷垏鎹�
6085=楂橀��
6086=鑷姩
6087=娓╁害+
@@ -1683,6 +1940,7 @@
6092=璁惧涓嶅瓨鍦�
6093=璁惧涓嶅湪绾�
6094=缃戝叧璁惧涓嶅瓨鍦�
+6095=娣诲姞鎸夐挳瓒呭嚭30涓�
@@ -1820,6 +2078,24 @@
7131=App鎺ㄩ��
7132=鑷姩鍖�
7133=宸叉墽琛�
+7134=鐩爣鐘舵��
+7135=璺屽��
+7136=娓╁害
+7137=婀垮害
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=瓒呮爣
+7142=涓ラ噸
+7143=鍋忛珮
+7144=浼樼
+7145=瀹夐槻
+7146=娣诲姞瀹夐槻
+7147=甯冮槻
+7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
+
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -1834,10 +2110,10 @@
9010=鏂板瘑鐮�
9011=鍐嶆杈撳叆鏂板瘑鐮�
9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
+9013=鏈嶅姟鍗忚
+9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾
9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��
9017=纭閫�鍑虹櫥褰曪紵
9018=璇烽�夋嫨鍥藉/鍖哄煙
9019=绔嬪嵆鏇存柊
--
Gitblit v1.8.0