From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 104 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index e7c080d..60f105c 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -144,7 +144,7 @@
139=IC鍗″綍鍏ュけ璐�
140=瀹屾垚
141=纭畾瑕佸垹闄よ寮�閿佹柟寮�
-142=涓存椂寮�閿佹潈闄�
+142=杩滅▼寮�閿佹潈闄�
143=寮�閿佽姹�
144=纭畾瑕佹墦寮�闂ㄩ攣锛�
145=Touch ID 寮�閿�
@@ -348,7 +348,67 @@
344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
345=鐩爣鍚嶇О澶暱
346=鐭ラ亾浜�
-
+347=鏅捐。鏋�
+348=鐜
+349=钃濊壊鎸囩ず鐏揩閫熼棯鐑�
+350=鍚屾椂闀挎寜{0}鈥滀笂琛屸�濆拰鈥滀笅琛屸�濋敭5-10绉�
+351=鏅捐。鏋朵笂鐢靛悗锛屽彂鍑鸿渹楦ｅ０鏃讹紝{0}鍚屾椂鎸夆�滀笂琛屸�濆拰鈥滀笅琛屸�濋敭5-10绉掋��
+352=缁胯壊鎸囩ず鐏揩閫熼棯鐑�
+353=闀挎寜5绉抺0}(鎸夐敭)
+354=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+355=鍋滄
+356=涓嬮檷
+357=鐑樺共
+358=椋庡共
+359=娑堟瘨
+360=鐓ф槑
+361=涓婂崌
+362=鏂板闈欒剦绾�
+363=鏂板浜鸿劯璇嗗埆
+364=闈欒剦绾瑰紑閿�
+365=浜鸿劯璇嗗埆寮�閿�
+366=璇锋瀵归棬閿佹憚鍍忓ご杩涜
+367=浜鸿劯鎵弿褰曞叆寮�閿佹柟寮�
+368=璇锋瀵归棬閿佹憚鍍忓ご杩涜浜鸿劯鎵弿
+369=褰曞叆寮�閿佹柟寮�
+370=褰曞叆闈欒剦鎸囩汗
+371=褰曞叆浜鸿劯璇嗗埆鎴愬姛
+372=褰曞叆闈欒剦鎸囩汗鎴愬姛
+373=浜鸿劯璇嗗埆澶囨敞锛�
+374=闈欒剦绾瑰娉細
+375=浜鸿劯璇嗗埆
+376=闈欒剦绾�
+377=1. 闀挎寜{0}鈥滅収鏄庨敭鈥�5绉�
+378= 2. 鍐嶆寜{0}涓�涓嬧�濅笂鍗囬敭鈥�
+379=閬ユ帶鍣ㄦ甯哥殑鐘舵�佷笅锛岄暱鎸夆�濈収鏄庨敭鈥�5绉掞紝{0}鍐嶆寜涓�涓嬧�濅笂鍗囬敭鈥滐紝铚傞福鍣ㄥ揩鍝�3澹帮紝钃濊壊閰嶇綉{0}鎸囩ず鐏揩闂紝杩涘叆閰嶇綉妯″紡銆�
+380=鐑樺共鏃堕棿
+381=椋庡共鏃堕棿
+382=娑堟瘨鏃堕棿
+383=榛樿
+384=灏忔椂
+385=鍒嗛挓
+386=鏅捐。
+387=璁剧疆鏅捐。鏋剁儤骞叉椂闂村け璐�
+388=璁剧疆鏅捐。鏋堕骞叉椂闂村け璐�
+389=璁剧疆鏅捐。鏋舵秷姣掓椂闂村け璐�
+390=PM 2.5浼犳劅鍣�
+391=CO鈧備紶鎰熷櫒
+392=璁剧疆LED鐏�
+393=鏌ョ湅鍘嗗彶璁板綍
+394=姹℃煋
+395=LED璁剧疆
+396=璁惧LED鐏�
+397=璁剧疆鏃堕棿
+398=涓婂崍
+399=涓嬪崍
+400=璇锋眰鍒楄〃鏁版嵁瓒呮椂锛岃鍒锋柊閲嶆柊鑾峰彇
+401=LED鐏叧闂�
+402=璇疯缃紑濮嬫椂闂�
+403=璇疯缃粨鏉熸椂闂�
+404=鏈�澶氬彲璁剧疆5鏉″け鏁堟椂闂存
+405=寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�
+406=缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�
+
5097=鍙栨秷
5098=纭畾
5099=鎻愮ず
@@ -1449,7 +1509,7 @@
15558=閰嶇疆鍏变韩
15560=鑾峰彇鍏变韩鏁版嵁澶辫触
15561=涓婁紶鍏变韩鏁版嵁澶辫触
-15562=鍐呴儴銆佸懆鐣屻�佸嚭鍏ラ槻鍖洪噷閮芥病鏈夐厤缃湁浼犳劅鍣ㄨ澶�
+15562=鍏朵粬闃插尯閲屾病鏈夐厤缃紶鎰熷櫒璁惧
15563=褰撳墠姝ｅ浜庡竷闃叉ā寮�,鏃犳硶鍒犻櫎璁惧
15564=宸插叡浜唴瀹�
15565=鍒涘缓鏂板叡浜�
@@ -2043,17 +2103,29 @@
16168=鏇挎崲
16169=鏇挎崲缃戝叧
16170=璇烽�夋嫨琚浛鎹㈢殑缃戝叧
-16171=鐧婚檰Token宸茬粡杩囨湡,璇烽噸鏂扮櫥闄�
-16172=閲嶇疆瀵嗙爜澶辫触
-16173=淇敼瀵嗙爜澶辫触
-16174=缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�
-16175=缁戝畾缃戝叧澶辫触,璇烽噸鏂版搷浣�
-16176=浜鸿劯璇嗗埆
-16177=闈欒剦绾�
-16178=闈欒剦绾瑰紑閿佹垚鍔�
-16179=闈欒剦绾瑰紑閿佸け璐�
-16180=浜鸿劯璇嗗埆寮�閿佹垚鍔�
-16181=浜鸿劯璇嗗埆寮�閿佸け璐�
+16171=浜鸿劯璇嗗埆
+16172=闈欒剦绾�
+16173=闈欒剦绾瑰紑閿佹垚鍔�
+16174=闈欒剦绾瑰紑閿佸け璐�
+16175=浜鸿劯璇嗗埆寮�閿佹垚鍔�
+16176=浜鸿劯璇嗗埆寮�閿佸け璐�
+16177=纭鏇挎崲鎺夌綉鍏�:{0}?
+16178=姝ｅ湪鑾峰彇閰嶇疆鏁版嵁
+16179=鐩爣缃戝叧妫�娴嬩笉鍒板浠芥暟鎹�,鏃犳硶鎵ц鏇挎崲鎿嶄綔
+16180=姝ｅ湪鍙樻洿鏈湴閰嶇疆
+16181=鏇挎崲缃戝叧鎴愬姛
+16182=閫夋嫨浣跨敤鐨勫浠�
+16183=鏄惁浣跨敤澶囦唤:{0}?
+16184=鏈�楂樺
+16185=鏈�浣庡
+16186=鎵撳紑鐑樺共
+16187=鍏抽棴鐑樺共
+16188=鎵撳紑娑堟瘨
+16189=鍏抽棴娑堟瘨
+16190=鎵撳紑鐓ф槑
+16191=鍏抽棴鐓ф槑
+16192=鎵撳紑椋庡共
+16193=鍏抽棴椋庡共
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -2182,4 +2254,6 @@
70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
70027=绠�绾﹀鍔熻兘闈㈡澘
70028=绠�绾︾幆澧冮潰鏉�
-70029=鐞冨瀷绉诲姩浼犳劅鍣�
\ No newline at end of file
+70029=鐞冨瀷绉诲姩浼犳劅鍣�
+70030=鏅捐。鏋�
+70031=绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
--
Gitblit v1.8.0