From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

---
 HDL-ON_iOS/Resources/Language.ini |   61 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 98e2f4c..01ffbc4 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,6 +465,22 @@
 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
 
 
  
@@ -521,7 +537,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...
@@ -640,7 +656,7 @@
  
 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
@@ -800,6 +816,7 @@
 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
@@ -981,10 +998,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
@@ -1539,7 +1556,22 @@
 477=鎽嗗姩
 478=妯″紡
 479=椋庨��
- 
+480=鐜浼犳劅鍣�
+481=鍙互寮�濮嬩娇鐢ㄧ幆澧冧紶鎰熷櫒浜�
+482=鐕冩皵浼犳劅鍣�
+483=璇疯緭鍏ヨ澶囩殑MAC鐮�
+484=寮�鍚�
+485=鏌ョ湅/淇敼
+486=甯冮槻鍔熻兘/鎶ヨ鐘舵��
+487=瑙﹀彂鍚庡憡璀︾洰鏍�
+488=浜鸿劯閫氳
+489=灏嗛潰瀹笽D搴旂敤浜�:
+490=绀惧尯闂ㄧ閫氳
+491=鍏充簬闈㈠ID涓庨殣绉�
+492=鎶规帀鏁版嵁
+493=閲嶇疆闈㈠
+494=璁剧疆闈㈠
+495=浜鸿劯閫氳璁剧疆
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -1594,7 +1626,7 @@
 1050=娣诲姞璁惧
 1051=mini鏅鸿兘閬ユ帶鍣�
 1052=娣诲姞绾㈠閬ユ帶
-1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
+1053=闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�3绉掞紝鎸囩ず鐏摑鑹插揩闂�
 1054=璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
 1055=涓嬩竴姝�
 1056=璁惧鎼滅储涓�...
@@ -1703,7 +1735,7 @@
 1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
 1153=缁堟
 1154=姝e湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
-1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢鏂扮鐞嗗憳
 1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
 1157=杩囨埛澶辫触
 1158=璇烽噸鏂板皾璇�
@@ -1719,7 +1751,7 @@
  
 4000=鍙瀵硅
 4001=閫氳瘽璁板綍
-4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4002=*浜戠璁板綍鍙繚鐣�30澶�
 4003=闂ㄥ彛鏈哄懠鍙�
 4004=宸叉帴鍚�
 4005=宸插紑閿�
@@ -1802,7 +1834,7 @@
 6016=绂荤嚎
 6017=鐗堟湰鍙�
 6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被锛屾煡鎵句娇鐢�
 6020=鎺ㄨ崘鎸夐敭
 6021=璇疯緭鍏ユ寜閿悕绉�
 6022=涓嬩竴姝�
@@ -1876,6 +1908,7 @@
 6092=璁惧涓嶅瓨鍦�
 6093=璁惧涓嶅湪绾�
 6094=缃戝叧璁惧涓嶅瓨鍦�
+6095=娣诲姞鎸夐挳瓒呭嚭30涓�
  
  
  
@@ -2038,10 +2071,10 @@
 9010=鏂板瘑鐮�
 9011=鍐嶆杈撳叆鏂板瘑鐮�
 9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
+9013=鏈嶅姟鍗忚
+9014=鐢ㄦ埛淇℃伅淇濇姢瑙勫畾
 9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9016=璇峰厛闃呰骞跺悓鎰忋�婃湇鍔″崗璁�嬪拰銆婄敤鎴蜂俊鎭繚鎶よ瀹氥��
 9017=纭閫�鍑虹櫥褰曪紵
 9018=璇烽�夋嫨鍥藉/鍖哄煙
 9019=绔嬪嵆鏇存柊

--
Gitblit v1.8.0