From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr

---
 HDL-ON_Android/Assets/Language.ini |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 18e26c5..bd75aa9 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -546,6 +546,14 @@
 558=Someone is sitting
 559=Bind a third-party account
 560=Bound
+561=Original password
+562=PhotovoltaicEnergyStorage
+563=Normal operation
+564=Working mode:----
+565=Power generation today: --- kW 路 H
+566=Current power generation: --- w
+567=Battery SOC: --%
+568=Running/Total:--/--
 
 
 
@@ -1090,6 +1098,10 @@
 7158=is
 7159=Fall in the alarm
 7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+
 
 
 
@@ -1590,7 +1602,7 @@
 380=姝ゅ鍔熻兘鏆傛湭寮�鏀撅綖
 381=閲嶆柊鍔犺浇
 400=娆㈣繋鍥炲
-401=浜岀淮鐮佸け鏁堬紝璇烽噸璇�
+401=浜岀淮鐮佹棤鏁堬紝璇烽噸璇�
 402=閲嶈瘯
 403=鑹叉俯
 404=蹇嵎璋冭妭
@@ -1600,7 +1612,7 @@
 408=纭娣诲姞
  
 409=鍔熻兘鍝佺墝
-410=浣犲綋鍓嶈繕鏈坊鍔犱换浣曞钩鍙拌澶�
+410=娌℃湁鎮ㄧ殑璁惧
 411=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
 412=娣诲姞
 413=鎺у埗鍣ㄦ湭寮�鍚�
@@ -1621,7 +1633,7 @@
 428=璐熺瀛愭椂闂�
 429=灏忔椂
 430=鍒嗛挓
-431=浣犲綋鍓嶈繕涓烘坊鍔犱换浣曞钩鍙拌澶�
+431=鎮ㄥ綋鍓嶈繕鏈坊鍔犱换浣曞钩鍙拌澶�
 432=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
 433=姘撮榾
 434=瀹氭椂寮�鍏�
@@ -1751,6 +1763,15 @@
 558=鏈変汉鍧愮潃
 559=缁戝畾绗笁鏂硅处鍙�
 560=宸茬粦瀹�
+561=鍘熷瘑鐮�
+562=鍏変紡鍌ㄨ兘
+563=宸ヤ綔姝e父
+564=宸ヤ綔妯″紡: ----
+565=浠婃棩鍙戠數: ----KW路h
+566=鍙戠數鍔熺巼: ----w
+567=鐢垫睜SOC: --%
+568=杩愯鏁伴噺/鎬绘暟閲�: --/--
+569=浜哄眳鐜
 
  
 
@@ -2280,6 +2301,9 @@
 7158=鏄�
 7159=璺屽�掓姤璀�
 7160=鏈変汉鎶ヨ
+7161=鎻愮ず闊�
+7162=浜鸿劯寮�闂�
+7163=瑙嗛閫氳瘽鍛煎彨
 
 
  
@@ -2935,6 +2959,14 @@
 558=Someone is sitting
 559=Bind a third-party account
 560=Bound
+561=Original password
+562=PhotovoltaicEnergyStorage
+563=Normal operation
+564=Working mode:----
+565=Power generation today: --- kW 路 H
+566=Current power generation: --- w
+567=Battery SOC: --%
+568=Running/Total:--/--
 
 
 2532=Visitor Invitation Record
@@ -4130,6 +4162,14 @@
 558=Someone is sitting
 559=Bind a third-party account
 560=Bound
+561=Original password
+562=PhotovoltaicEnergyStorage
+563=Normal operation
+564=Working mode:----
+565=Power generation today: --- kW 路 H
+566=Current power generation: --- w
+567=Battery SOC: --%
+568=Running/Total:--/--
 
 
 2532=Visitor Invitation Record

--
Gitblit v1.8.0