From bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:36:40 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr

---
 HDL-ON_Android/Assets/Language.ini |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index e5c9d89..20a30e6 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -328,7 +328,7 @@
 324=Scene delay
 325=Delay setting
 326=Delay
-327=Catch Scene
+327=Capture the scene
 328=Film scene
 329=General
 330=Automatic mode
@@ -426,8 +426,7 @@
 439=Real time power consumption: {0} kw
 440=Next step
 441=Please select all areas of capture status
-442=Generate scene
-
+442=Custom deployment
 
 1000=Room Humidity
 1001=V-chip
@@ -1107,7 +1106,7 @@
 324=鍦烘櫙寤舵椂
 325=寤舵椂璁剧疆
 326=寤舵椂
-327=鎹曡幏鍦烘櫙
+327=鎹曟崏鍦烘櫙
 328=鐢靛奖鍦烘櫙
 329=鏅��
 330=鑷姩妯″紡
@@ -1204,8 +1203,8 @@
 438=婀垮害:{0}%    绌烘皵:{1}    椋庨��:{2}绾�
 439=瀹炴椂鍔熻��: {0}kW
 440=涓嬩竴姝�
-441=璇烽�夋嫨鎹曡幏鐘舵�佺殑鍖哄煙
-442=鐢熸垚鍦烘櫙
+441=璇烽�夋嫨鎹曟崏鐘舵�佺殑鍖哄煙
+442=鑷畾涔夊竷闃�
 
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -1565,6 +1564,16 @@
 7120=闃叉媶鍔熻兘
 7121=鍦ㄧ嚎
 7122=涓嶅湪绾�
+7123=绌烘皵璐ㄩ噺
+7124=浼�
+7125=鑹�
+7126=宸�
+7127=鍙戦�侀�氱煡
+7128=閫氱煡鍐呭
+7129=(100瀛楀唴)
+7130=璐﹀彿閫夋嫨
+7131=App鎺ㄩ��
+
 
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP

--
Gitblit v1.8.0