From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc

---
 HDL-ON_Android/Assets/Language.ini |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index b7c1057..3a9497f 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -293,7 +293,7 @@
 289=Remove The Binding
 290=Fail to get the history
 291=No favorites
-292=About ON+
+292=About On Pro
 293=Member
 294=Administrator
 295=Change password
@@ -369,7 +369,7 @@
 365=Can not communicate with the server, fail to edit the scene information
 366=Can not communicate with the server, fail to delete the scene
 367=Can not communicate with the server, fail to delete the floor
-368=Welcome to enjoy ON+
+368=Welcome to enjoy On Pro
 369=Add new residence
 370=Become family member
 371=Can not use the function, please bind the gateway
@@ -422,7 +422,7 @@
 436=Added Devices
 437=Device List
 438=humidity:{0}%    air:{1}    wind:{2}
-439=Real time: {0} kw
+439=Real time: {0} kW
 440=Next step
 441=Please select all areas of capture status
 442=Generate Scene
@@ -511,6 +511,7 @@
 523=Delay alarm
 524=Bypass
 525=Enable
+526=Cancel account
  
 1000=Room Humidity
 1001=V-chip
@@ -1504,7 +1505,7 @@
 365=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙淇℃伅缂栬緫澶辫触銆�
 366=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙鍒犻櫎澶辫触銆�
 367=鏃犳硶涓庢湇鍔″櫒閫氳,妤煎眰鍒犻櫎澶辫触銆�
-368=娆㈣繋浣跨敤ON+
+368=娆㈣繋浣跨敤On Pro
 369=娣诲姞鏂颁綇瀹�
 370=鎴愪负瀹跺涵鎴愬憳
 371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
@@ -1645,6 +1646,7 @@
 523=寤舵椂鎶ヨ
 524=鍋滅敤
 525=鍚敤
+526=娉ㄩ攢璐﹀彿
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -1749,7 +1751,7 @@
 1093=
 1094=閫夋嫨鏃堕棿
 1095=閫夋嫨鏃ユ湡
-1096=Generate
+1096=鐢熸垚
 1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
 1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
 1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿

--
Gitblit v1.8.0