From 0bf9e65bc3ba98391e7835c922b15baab3c77876 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 01 六月 2020 14:59:39 +0800
Subject: [PATCH] 上传一个合并的版本

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index cd9328d..90368fb 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -253,7 +253,7 @@
 249=鎮ㄧ殑甯稿紑妯″紡灏嗚鍙栨秷
 250=淇濇寔甯稿紑
 251=纭鍙栨秷
-252=(鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛岃嚜鍔ㄥ寲锛岃閫夋嫨鍒嗙被-鑷姩鍖栬繘琛岃缃�)
+252=(鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛岃嚜鍔ㄥ寲锛岃鍒板父寮�鑷姩鍖栬缃�)
 253=鑾峰彇闂ㄩ攣甯稿紑妯″紡澶辫触
 254=鎵撳紑闂ㄩ攣甯稿紑妯″紡鎴愬姛
 255=鎵撳紑闂ㄩ攣甯稿紑妯″紡澶辫触
@@ -323,6 +323,12 @@
 320=涓害姹℃煋
 321=閲嶅害姹℃煋
 322=涓ラ噸姹℃煋 
+323=鑷姩鍖栧叧闂�愰棬閿佸父寮�妯″紡銆戯紝闂ㄩ攣宸插叧
+324=鍏ョ綉
+;娉ㄦ剰鈥滃叆缃戔�濈殑鑻辨枃鈥淐onnection",鍥犱负灞忓箷涓婃槸杩欐牱鏄剧ず鐨�
+325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
 
 5097=鍙栨秷
 5098=纭畾
@@ -603,8 +609,7 @@
 5402=鏃舵晥鎬у父寮�灏嗚
 5403=鍒嗗叧闂�
 5404=鏃�
-
-
+5405=绫�
 
 10000=HDL Home
 10001=甯哥敤
@@ -1163,7 +1168,7 @@
 15391=鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
 15392=鍥炶矾
 15393=鐕冩皵娉勬紡
-15394=鏈変笉鏄庣墿浣撶粡杩�
+15394=鏈変汉缁忚繃
 15395=绱ф�ユ寜閽鎸変笅
 15396=瑙﹀彂浼犳劅鍣ㄦ姤璀�
 15397=缂栬緫缃戝叧淇℃伅
@@ -1719,7 +1724,7 @@
 15978=閫氫俊閾炬帴澶辫触
 15979=鑾峰彇缃戠粶SSID澶辫触
 15980=瀵嗙爜鍙戦�佸け璐�
-15981=閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15981=璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
 15982=璇疯繛鎺ュ搴璚iFi
 15983=姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
 15984=璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
@@ -1860,6 +1865,14 @@
 16119=DATA缁胯壊鎸囩ず鐏棯鐑�
 16120=鑱旂郴鏂瑰紡
 16121=璇疯緭鍏ユ偍鐨勮仈绯绘柟寮�
+16122=璇ュ唴瀹逛笉鑳界渷鐣�
+16123=Mini缃戝叧
+16124=娣诲姞Mini缃戝叧
+16125=鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+16126=璇烽�夋嫨widora-xxxx缃戠粶
+16127=鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}閫夋嫨widora-xxxx缃戠粶
+16128=鑹叉俯
+16129=Mini澶滅伅
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1989,6 +2002,9 @@
 30038=鏂规偊鏂伴灏忔ā鍧�
 30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
 30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+30041=绠�绾﹀鍔熻兘闈㈡澘
+30042=绠�绾︾幆澧冮潰鏉�
+30043=Mini缃戝叧
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
 40000=閬槼
@@ -2054,6 +2070,9 @@
 50038=鏂伴鎺у埗灏忔ā鍧�
 50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
 50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+50041=绠�绾﹀鍔熻兘闈㈡澘
+50042=绠�绾︾幆澧冮潰鏉�
+50043=Mini缃戝叧
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
 60000=浼犳劅鍣�
@@ -2096,4 +2115,6 @@
 70023=涓户鍣�
 70024=鏅鸿兘绌哄紑
 70025=鍚搁《鐕冩皵浼犳劅鍣�
-70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+70027=绠�绾﹀鍔熻兘闈㈡澘
+70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file

--
Gitblit v1.8.0