From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index da9b215..1a96c53 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -620,7 +620,7 @@
5376=搴旂敤
5377=娌℃湁鑷姩鍖杮\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
-5379=鏆傛棤闂ㄩ攣鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+5379=鏆傛棤鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
@@ -707,7 +707,7 @@
11010=娌℃湁鍔熻兘 {\r\n} 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
11011=缂栬緫
-11012=璁剧疆鍔熻兘
+11012=鍔熻兘璁剧疆
11013=淇℃伅缂栬緫
11014=鍔熻兘鍚嶇О
11015=鎵�灞炲尯鍩�
@@ -732,7 +732,7 @@
11034=纭畾瑕佺Щ闄よ鍔熻兘锛�
11035=娣诲姞鍔熻兘
11036=娣诲姞寤舵椂
-
+11037=绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
12100=鏈煡璁惧
@@ -1817,6 +1817,18 @@
16058=鎴戠殑瀹�
16059=闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹�
16060=鍔炲叕瀹�
+16061=鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+16062=鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+16063=璁剧疆绌鸿皟鎽嗛澶辫触
+16064=鎸変綇姝ゆ寜閿�
+16065=鎸夐敭鎸囩ず鐏寒璧�
+16066=鎺ヨ繎鎰熷簲
+16067=绌鸿皟鐩爣
+16068=鍦版殩鐩爣
+16069=鏂伴鐩爣
+16070=灞忓箷浜害绾у埆
+16071=绾�
+16072=鑳屽厜鐏寒搴�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1891,6 +1903,14 @@
21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
+;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21018=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21019=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21020=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
+21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
@@ -1922,6 +1942,11 @@
30026=绠�绾�4鎸夐敭闈㈡澘
30027=绠�绾�3鎸夐敭闈㈡澘
30028=绠�绾�2鎸夐敭闈㈡澘
+30029=鏂规偊2鎸夐敭杞昏Е寮忛潰鏉�
+30030=鏂规偊4鎸夐敭杞昏Е寮忛潰鏉�
+30031=鏂规偊8鎸夐敭杞昏Е寮忛潰鏉�
+30032=鏂规偊鏂伴闈㈡澘
+30033=鏂规偊鐜闈㈡澘
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
--
Gitblit v1.8.0