From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

---
 HDL-ON_iOS/Resources/Language.ini |  227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 223 insertions(+), 4 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 75c5e2b..f2624e1 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -670,6 +670,19 @@
 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.
+
 
 
 
@@ -1226,6 +1239,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
+
 
 
 
@@ -2016,6 +2062,19 @@
 683=璇ユ椂闂存棤鏁�
 684=闀垮害瓒呭嚭鑼冨洿
 685=娉細鐢ㄦ埛绠$悊浠呭彲瀵瑰凡娣诲姞鐢ㄦ埛杩涜绠$悊銆傚闇�娣诲姞鏂扮敤鎴凤紝璇峰墠寰�閿佺杩涜鐩稿叧鎿嶄綔銆�
+686=鎬昏
+687=A鐩稿疄鏃剁敤鐢垫暟鎹�
+688=B鐩稿疄鏃剁敤鐢垫暟鎹�
+689=C鐩稿疄鏃剁敤鐢垫暟鎹�
+690=鐢靛帇
+691=鐢垫祦
+692=瀹炴椂鍔熺巼
+693=鎬荤敤鐢甸噺锛圞W路h锛�
+694=杩囧幓24灏忔椂鐨勬瘡灏忔椂鐢ㄧ數閲�
+695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
+696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
+697=鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
+
 
 
 
@@ -2578,9 +2637,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=瑙i櫎闈欓煶
+8806=淇″彿婧�
+8807=宸插叧鏈�
+8808=寮�鏈�
+8809=瑙g粦璁惧
 
 
 
@@ -3363,6 +3450,18 @@
 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.
 
 
 
@@ -3918,6 +4017,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
 
 
 
@@ -4703,8 +4834,18 @@
 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.
 
 
 
@@ -5252,6 +5393,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 
@@ -6030,6 +6203,18 @@
 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.
 
 
 
@@ -6591,6 +6776,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