From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini |   88 +++++++++++++++++++++++++-------------------
 1 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 6c4e455..e4643f9 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=鎵撳紑闂ㄩ攣甯稿紑妯″紡澶辫触
@@ -315,6 +315,20 @@
 312= 鑳屽厜鐏鑹�
 313=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
 314=鑷姩妯″紡涓嶆敮鎸佹搷浣�
+315=绌烘皵璐ㄩ噺
+316=绌烘皵璐ㄩ噺浼犳劅鍣�
+317=浼�
+318=鑹�
+319=杞诲害姹℃煋
+320=涓害姹℃煋
+321=閲嶅害姹℃煋
+322=涓ラ噸姹℃煋 
+323=鑷姩鍖栧叧闂�愰棬閿佸父寮�妯″紡銆戯紝闂ㄩ攣宸插叧
+324=鍏ョ綉
+;娉ㄦ剰鈥滃叆缃戔�濈殑鑻辨枃鈥淐onnection",鍥犱负灞忓箷涓婃槸杩欐牱鏄剧ず鐨�
+325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
 
 5097=鍙栨秷
 5098=纭畾
@@ -590,10 +604,12 @@
 5398=鍙敮鎸佹暟瀛楄緭鍏�
 
 5399=鍏抽棴澶辫触
-5400=寮�鍚け璐�
-5401=娣诲姞澶辫触
-5402=鏃舵晥鎬у父寮�璁剧疆
-5403=鏃跺叧闂�
+5400=寮�鍚父寮�妯″紡澶辫触
+5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
+5402=鏃舵晥鎬у父寮�灏嗚
+5403=鍒嗗叧闂�
+5404=鏃�
+5405=绫�
 
 10000=HDL Home
 10001=甯哥敤
@@ -632,50 +648,32 @@
 10131=璐﹀彿鎴栧瘑鐮侀敊璇�
 10132=璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
 10133=璇疯緭鍏ラ獙璇佺爜
-10134=鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
 10135=鐧诲綍涓�...
 10136=褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
-10137=浣忓畢鍚嶇О涓虹┖
 10138=閭閿欒锛岃閲嶆柊杈撳叆
 10139=鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
 10140=璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
-10141=浣犲凡琚己鍒朵笅绾匡紒
 10142=鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
 10143=璇峰厛鑾峰彇楠岃瘉鐮�
 10144=蹇樿瀵嗙爜锛�
 10145=宸叉湁璐﹀彿锛熺櫥褰�
-
-
-
 10150=鎴块棿鍚嶇О宸插瓨鍦�
 10151=鍦烘櫙鍚嶄笉鑳戒负绌�
 10152=鎺у埗鍦烘櫙澶辫触
-10153=鍦烘櫙涓虹┖
-10154=璇ュ満鏅腑娌℃湁鎵ц鐩爣
 10155=鎿嶄綔澶辫触
 10156=鍙戦�侀獙璇佺爜澶辫触
-10157=缃戝叧涓嶅湪绾�
-10158=涓嬩竴姝�
-
 
 10160=宸叉槸鏈�鏂扮増鏈�
 10161=鏇存柊鏈�鏂扮増
-10162=鏇存柊鍐呭
 10163=鏇存柊澶辫触
 10164=姝e湪鏇存柊涓�...
-10165=鍙栨秷鏇存柊
 10166=鐗堟湰鍙�
 10167=鏈嶅姟鍗忚
 10168=鐗堟湰鏇存柊
-10169=鍗忚鏂囨湰淇℃伅鍐呭
-10170=鍙兘鐢变簬褰撳墠缃戠粶杈冨樊鎴栬澶囧凡琚粬浜虹粦瀹氥�倇\r\n}1.璇风‘淇濇墜鏈轰笌璁惧涔嬮棿鐨勮窛绂昏冻澶熻繎锛屽苟涓斿懆鍥寸綉缁滅幆澧冩病鏈夊己骞叉壈銆倇\r\n}2.鍚屾椂闇�纭搴旂敤鐨勫畾浣嶆潈闄愭湭琚叧闂�傝嫢鎵嬪姩鍏抽棴浜嗗簲鐢ㄥ畾浣嶆潈闄愬彲鑳藉鑷存棤娉曞彂鐜拌澶囥�倇\r\n}3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆� 濡傛灉浣犲苟涓嶆竻妤氭槸璋佽繛鎺ヤ簡璁惧锛屽彲浠ヨ繘琛岄噸缃紝閲嶇疆鏂瑰紡璇� 鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆�
-
-
 
 11000=鍔熻兘
 11001=鍦烘櫙
 11002=鑷姩鍖�
-
 11010=娌℃湁鍔熻兘{0}璇峰湪涓汉涓績--璁惧绠$悊澶勬坊鍔�
 11011=缂栬緫
 11012=鍔熻兘璁剧疆
@@ -707,18 +705,8 @@
 
 
 12100=鏈煡璁惧
-12101=鎺у埗闈㈡澘
-12102=缁х數鍣�
-12103=璋冨厜鐏�
-12104=绐楀笜
-12105=绌鸿皟
-12106=浼犳劅鍣�
-12107=绌烘皵寮�鍏�
-12108=褰╃伅
-12109=涓户鍣�
 12110=娓╁害浼犳劅鍣�
 12111=婀垮害浼犳劅鍣�
-12112=娓╂箍搴︿紶鎰熷櫒
 
 12500=鏈変汉
 12501=鏃犱汉
@@ -1152,7 +1140,7 @@
 15391=鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
 15392=鍥炶矾
 15393=鐕冩皵娉勬紡
-15394=鏈変笉鏄庣墿浣撶粡杩�
+15394=鏈変汉缁忚繃
 15395=绱ф�ユ寜閽鎸変笅
 15396=瑙﹀彂浼犳劅鍣ㄦ姤璀�
 15397=缂栬緫缃戝叧淇℃伅
@@ -1708,7 +1696,7 @@
 15978=閫氫俊閾炬帴澶辫触
 15979=鑾峰彇缃戠粶SSID澶辫触
 15980=瀵嗙爜鍙戦�佸け璐�
-15981=閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15981=璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
 15982=璇疯繛鎺ュ搴璚iFi
 15983=姝e湪鑾峰彇鍒嗕韩鏁版嵁
 15984=璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
@@ -1844,6 +1832,19 @@
 16114=鐏叏鍏�
 16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
 16116=娓稿浣撻獙
+16117=鏅鸿兘鏀瑰彉鐢熸椿 | Enjoy smart life
+16118=缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
+16119=DATA缁胯壊鎸囩ず鐏棯鐑�
+16120=鑱旂郴鏂瑰紡
+16121=璇疯緭鍏ユ偍鐨勮仈绯绘柟寮�
+16122=璇ュ唴瀹逛笉鑳界渷鐣�
+16123=Mini缃戝叧
+16124=娣诲姞Mini缃戝叧
+16125=鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+16128=鑹叉俯
+16129=Mini澶滅伅
+16130=鐕冩皵娉勯湶
+16131=蹇界暐
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1913,7 +1914,7 @@
 ;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
 21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
 ;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
-21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+21015=闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
 ;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
 21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
 ;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
@@ -1973,6 +1974,10 @@
 30038=鏂规偊鏂伴灏忔ā鍧�
 30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
 30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+30041=绠�绾﹀鍔熻兘闈㈡澘
+30042=绠�绾︾幆澧冮潰鏉�
+30043=Mini缃戝叧
+30044=鑹叉俯鐏�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
 40000=閬槼
@@ -1994,11 +1999,12 @@
 40016=鐏厜
 40017=骞叉帴鐐�
 40018=鏂伴
+40019=绌烘皵璐ㄩ噺
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
 50000=绱ф�ユ寜閽�
 50001=Zigbee鐕冩皵浼犳劅鍣�
-50002=Zigbee鐕冩皵浼犳劅鍣�
+50002=Zigbee鐑熼浘浼犳劅鍣�
 50003=Zigbee姘存蹈浼犳劅鍣�
 50004=閽ュ寵鎵�
 50005=Zigbee闂ㄧ獥浼犳劅鍣�
@@ -2037,6 +2043,10 @@
 50038=鏂伴鎺у埗灏忔ā鍧�
 50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
 50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+50041=绠�绾﹀鍔熻兘闈㈡澘
+50042=绠�绾︾幆澧冮潰鏉�
+50043=Mini缃戝叧
+50044=鑹叉俯鐏�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
 60000=浼犳劅鍣�
@@ -2079,4 +2089,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