From 0b5b6ec781a8cb3400ad34693792bad07e97a00c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 09:32:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc

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

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index c11cb59..4bd96bc 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -40,7 +40,7 @@
 39=Individual
 40=Log-in failed, incorrect account number or password
 41=Fail to send the verification code
-42=Network error
+42=Disconnected from gateway
 43=Fail to sign up, please try again.
 44=Confirm resetting
 45=The account number does not exist, please make sure it is registered.
@@ -529,6 +529,7 @@
 541=Monitoring
 542=Wandering alarm
 543=Get more
+544=Angle
 
 
 1000=Room Humidity
@@ -1209,7 +1210,7 @@
 39=涓汉
 40=鐧诲綍澶辫触锛岃处鍙锋垨瀵嗙爜閿欒銆�
 41=楠岃瘉鐮佸彂閫佸け璐ャ��
-42=缃戠粶寮傚父
+42=涓庣綉鍏虫柇寮�浜嗚繛鎺�
 43=娉ㄥ唽澶辫触锛岃閲嶈瘯銆�
 44=纭閲嶇疆
 45=璐﹀彿涓嶅瓨鍦�,璇风‘璁よ处鍙锋槸鍚︽敞鍐屻��
@@ -1694,6 +1695,7 @@
 541=鐩戞帶涓�
 542=寰樺緤鎶ヨ
 543=鑾峰彇鏇村
+544=瑙掑害
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -2350,7 +2352,7 @@
 39=袠薪写懈胁懈写褍邪谢褜薪褘泄
 40=袧械褍褋锌械褕薪邪褟 邪胁褌芯褉懈蟹邪褑懈褟, 薪械胁械褉薪邪 褍褔械褌薪邪褟 蟹邪锌懈褋褜 懈谢懈 锌邪褉芯谢褜
 41=袧械 褍写邪谢芯褋褜 芯褌锌褉邪胁懈褌褜 锌褉芯胁械褉芯褔薪褘泄 泻芯写
-42=袨褕懈斜泻邪 褋械褌懈
+42=Disconnected from gateway
 43=袧械 褍写邪谢芯褋褜 蟹邪褉械谐懈褋褌褉懈褉芯胁邪褌褜褋褟
 44=袩芯写褌胁械褉写懈褌械 褋斜褉芯褋
 45=校褔械褌薪邪褟 蟹邪锌懈褋褜 薪械 褋褍褖械褋褌胁褍械褌, 锌褉芯胁械褉褜褌械 褔褌芯 芯薪邪 蟹邪褉械谐懈褋褌褉懈褉芯胁邪薪邪
@@ -2834,6 +2836,7 @@
 541=Monitoring
 542=Wandering alarm
 543=Get more
+544=Angle
 
 
 1000=袙谢邪卸薪芯褋褌褜 胁 袩芯屑械褖械薪懈懈
@@ -3500,7 +3503,7 @@
 39=Individual
 40=Inicio de sesi贸n fallido, n煤mero de cuenta o contrase帽a incorrectos
 41=Error al enviar el codigo de verificaci贸n
-42=Error de red
+42=Disconnected from gateway
 43=Error en el registo, int茅ntelo de nuevo
 44=Confirmar reinicio
 45=El numero de cuenta no existe, por favor aseg煤rese de estar registrado
@@ -3990,6 +3993,7 @@
 541=Monitoring
 542=Wandering alarm
 543=Get more
+544=Angle
 
 1000=Humedad de ambiente
 1001=V-chip

--
Gitblit v1.8.0