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 | 166 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 118 insertions(+), 48 deletions(-) diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini index 4d6e2f9..43c06ef 100644 --- a/HDL-ON_iOS/Resources/Language.ini +++ b/HDL-ON_iOS/Resources/Language.ini @@ -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 @@ -465,7 +465,34 @@ 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 @@ -521,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... @@ -803,43 +830,7 @@ 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 -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 @@ -968,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. @@ -982,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 @@ -1540,7 +1576,34 @@ 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=鏄惁瑙i櫎瀹夐槻璀︽姤锛� +503=瓒呮爣 +504=涓�绾� +505=浜岀骇 +506=浜鸿劯褰曞叆鎴愬姛 +506=浜鸿劯褰曞叆澶辫触 1000=瀹ゅ唴婀垮害 1001=绔ラ攣 @@ -1595,7 +1658,7 @@ 1050=娣诲姞璁惧 1051=mini鏅鸿兘閬ユ帶鍣� 1052=娣诲姞绾㈠閬ユ帶 -1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂� +1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�3绉掞紝鎸囩ず鐏摑鑹插揩闂� 1054=璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬� 1055=涓嬩竴姝� 1056=璁惧鎼滅储涓�... @@ -2026,6 +2089,13 @@ 7142=涓ラ噸 7143=鍋忛珮 7144=浼樼 +7145=瀹夐槻 +7146=娣诲姞瀹夐槻 +7147=甯冮槻 +7148=鎾ら槻 +7149=鎵嬪姩 +7150=鏅鸿兘 + 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP @@ -2040,10 +2110,10 @@ 9010=鏂板瘑鐮� 9011=鍐嶆杈撳叆鏂板瘑鐮� 9012=鍚屾剰 -9013=鐢ㄦ埛鍗忚 -9014=闅愮鏀跨瓥 +9013=鏈嶅姟鍗忚 +9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾 9015=鍜� -9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�� +9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥�� 9017=纭閫�鍑虹櫥褰曪紵 9018=璇烽�夋嫨鍥藉/鍖哄煙 9019=绔嬪嵆鏇存柊 -- Gitblit v1.8.0