From fdbcb1f7463cb766f90bd29dd715485ba9d88524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 06 九月 2023 17:55:03 +0800
Subject: [PATCH] Merge branch 'wxr-2.0' into Dev-Branch

---
 HDL-ON_iOS/Resources/Language.ini |  280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 270 insertions(+), 10 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 6871f5f..eb68283 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -666,7 +666,25 @@
 679=Group control
 680=Colorful switch
 681=Test
-682=Automatic coloring
+682=Group
+683=The time is invalid
+684=Length out of range
+685=note: User management can only manage added users. If you need to add a new user, please go to the lock end for relevant operations.
+686=Total
+687=A-phase electricity data
+688=B-phase electricity data
+689=C-phase electricity data
+690=Voltage
+691=Current
+692=Real-time power
+693=Total electricity consumption (KW路h)
+694=Hourly electricity consumption in the past 24 hours
+695=Daily data of the past month
+696=Monthly data of the past year
+697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+
+
+
 
 
 
@@ -1207,6 +1225,10 @@
 7170=Human presence detection
 7171=continue
 7172=Rgb color plate
+7173=Illuminance
+7174=Exceed
+7175=Under
+7176=HV
 
 8501=Video door lock
 8502=Electric quantity
@@ -1221,6 +1243,39 @@
 8511=Door opener
 8512=Serial number
 8513=Model
+
+8701=Home theatre
+8702=Player 
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting 
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
+
 
 
 
@@ -2007,7 +2062,27 @@
 679=缁勬帶
 680=鐐僵寮�鍏�
 681=鑷姩鐐僵娴嬭瘯
-682=鑷姩鐐僵
+682=缇ょ粍
+683=璇ユ椂闂存棤鏁�
+684=闀垮害瓒呭嚭鑼冨洿
+685=娉細鐢ㄦ埛绠＄悊浠呭彲瀵瑰凡娣诲姞鐢ㄦ埛杩涜绠＄悊銆傚闇�娣诲姞鏂扮敤鎴凤紝璇峰墠寰�閿佺杩涜鐩稿叧鎿嶄綔銆�
+686=鎬昏
+687=A鐩稿疄鏃剁敤鐢垫暟鎹�
+688=B鐩稿疄鏃剁敤鐢垫暟鎹�
+689=C鐩稿疄鏃剁敤鐢垫暟鎹�
+690=鐢靛帇
+691=鐢垫祦
+692=瀹炴椂鍔熺巼
+693=鎬荤敤鐢甸噺锛圞W路h锛�
+694=杩囧幓24灏忔椂鐨勬瘡灏忔椂鐢ㄧ數閲�
+695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
+696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
+697=鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
+
+
+
+
+
 
 
 
@@ -2549,6 +2624,10 @@
 7170=浜轰綋瀛樺湪妫�娴�
 7171=鎸佺画
 7172=RGB鑹茬洏
+7173=鐓ф槑搴�
+7174=鐓ф槑搴﹂珮浜�
+7175=鐓ф槑搴︿綆浜�
+7176=鍏夌収
 
 
 
@@ -2566,9 +2645,37 @@
 8512=搴忓垪鍙�
 8513=鍨嬪彿
 
+8701=瀹跺涵褰遍櫌
+8702=鎾斁鍣�
+8703=鍔熸斁
+8704=铏氭嫙閬ユ帶鍣�
+8705=褰卞簱
+8706=鏃跺簭鍣�
+8707=寮�
+8708=鍏�
+8709=澹伴亾
+8710=涓婁竴閮�
+8711=杩涘嚭浠�
+8712=瀛楀箷
+8713=宸叉敹钘�
+8714=鏈敹钘�
+8715=缁煎悎
+8716=褰辩墖浠嬬粛
+8717=璇勫垎
+8718=绔嬪嵆鎾斁
+8719=涓嬩竴閮�
+8720=棰戦亾
+8721=鎺у埗
 
-
-
+8801=棣栭〉
+8802=鍏虫満
+8803=闊抽噺
+8804=璁剧疆
+8805=瑙ｉ櫎闈欓煶
+8806=淇″彿婧�
+8807=宸插叧鏈�
+8808=寮�鏈�
+8809=瑙ｇ粦璁惧
 
 
 
@@ -3347,7 +3454,23 @@
 679=Group control
 680=Colorful switch
 681=Test
-682=Automatic Coloring
+682=Group
+683=The time is invalid
+684=Length out of range
+685=note: User management can only manage added users. If you need to add a new user, please go to the lock end for relevant operations.
+686=Total
+687=A-phase electricity data
+688=B-phase electricity data
+689=C-phase electricity data
+690=Voltage
+691=Current
+692=Real-time power
+693=Total electricity consumption (KW路h)
+694=Hourly electricity consumption in the past 24 hours
+695=Daily data of the past month
+696=Monthly data of the past year
+697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+
 
 
 
@@ -3888,6 +4011,10 @@
 7170=Human presence detection
 7171=continue
 7172=Rgb color plate
+7173=Illuminance
+7174=Exceed
+7175=Under
+7176=HV
 
 8501=Video door lock
 8502=Electric quantity
@@ -3902,6 +4029,38 @@
 8511=Door opener
 8512=Serial number
 8513=Model
+
+8701=Home theatre
+8702=Player 
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting 
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
 
 
 
@@ -4683,10 +4842,22 @@
 679=Group control
 680=Colorful switch
 681=Test
-682=Automatic Coloring
-
-
-
+682=Group
+683=The time is invalid
+684=Length out of range
+685=note: User management can only manage added users. If you need to add a new user, please go to the lock end for relevant operations.
+686=Total
+687=A-phase electricity data
+688=B-phase electricity data
+689=C-phase electricity data
+690=Voltage
+691=Current
+692=Real-time power
+693=Total electricity consumption (KW路h)
+694=Hourly electricity consumption in the past 24 hours
+695=Daily data of the past month
+696=Monthly data of the past year
+697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
 
 
 
@@ -5220,6 +5391,10 @@
 7170=Human presence detection
 7171=continue
 7172=Rgb color plate
+7173=Illuminance
+7174=Exceed
+7175=Under
+7176=HV
 
 8501=Video door lock
 8502=Electric quantity
@@ -5234,6 +5409,38 @@
 8511=Door opener
 8512=Serial number
 8513=Model
+
+8701=Home theatre
+8702=Player 
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting 
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
 
 9000=Inicio sesi贸n con un nuevo n煤mero de tel茅fono celular 
 9001=Inicie sesi贸n con una nueva direcci贸n de correo el茅ctr贸nico 
@@ -6008,7 +6215,22 @@
 679=Group control
 680=Colorful switch
 681=Test
-682=Automatic Coloring
+682=Group
+683=The time is invalid
+684=Length out of range
+685=note: User management can only manage added users. If you need to add a new user, please go to the lock end for relevant operations.
+686=Total
+687=A-phase electricity data
+688=B-phase electricity data
+689=C-phase electricity data
+690=Voltage
+691=Current
+692=Real-time power
+693=Total electricity consumption (KW路h)
+694=Hourly electricity consumption in the past 24 hours
+695=Daily data of the past month
+696=Monthly data of the past year
+697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
 
 
 
@@ -6555,6 +6777,10 @@
 7170=Human presence detection
 7171=continue
 7172=Rgb color plate
+7173=Illuminance
+7174=Exceed
+7175=Under
+7176=HV
 
 8501=Video door lock
 8502=Electric quantity
@@ -6570,6 +6796,40 @@
 8512=Serial number
 8513=Model
 
+8701=Home theatre
+8702=Player 
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
+8801=Home page
+8802=Power off
+8803=Volume
+8804=Setting 
+8805=Unmute
+8806=Signal source
+8807=Power off
+8808=Power on
+8809=Stripping equipment
+
+
+
 
 
 

--
Gitblit v1.8.0