From 07c647861d549a4c61f615dba9c008c29ad57f43 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 15:57:58 +0800
Subject: [PATCH] 2020-09-02-1

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini |  202 ++++++++++++++++----------------------------------
 1 files changed, 65 insertions(+), 137 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 8a4cfed..568a03f 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -206,8 +206,8 @@
 200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
 201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
 202=涓�妤�
-203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
-204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+203=缃戝叧鍥炲瓒呮椂
+204=浜戞湇鍔″櫒鍥炲鏃�
 205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
 206=鍐荤粨澶辫触
 207=瑙e喕澶辫触
@@ -329,6 +329,25 @@
 325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
 326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
 327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+328=鏈�澶氬彲娣诲姞{0}涓�
+329=缁戝畾
+330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜
+331=璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏�
+332=绌鸿皟鐩爣
+333=涓嶇粦瀹氫换浣曠洰鏍�
+334= 鐫$湢鏃堕棿
+335=璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞¢敊涔�
+336=鍚屾
+337=鍚屾澶辫触
+338=鏁版嵁鏍℃
+339=鐭娓╁害澶辫触
+340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
+341=璇疯緭鍏ユ纭殑鏁板��
+342=璇疯緭鍏ユ纭殑娓╁害鍊�
+343=璇疯緭鍏ユ纭殑婀垮害鍊�
+344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+345=鐩爣鍚嶇О澶暱
+346=鐭ラ亾浜�
 
 5097=鍙栨秷
 5098=纭畾
@@ -624,7 +643,7 @@
 
 
 
-10000=HDL Home
+10000=Evoyo Home
 10001=甯哥敤
 
 10100=鎵嬫満鍙�
@@ -1606,7 +1625,7 @@
 15873=鎷嶇収
 15874=浠庣浉鍐屼腑閫夋嫨
 15875=鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
-15876=璇疯緭鍏ユ墜鍔縜
+15876=璇疯緭鍏ユ墜鍔�
 15877=璇峰啀娆¤緭鍏ユ墜鍔�
 15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
 15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
@@ -1789,7 +1808,7 @@
 16058=鎴戠殑瀹�
 16059=闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹�
 16060=鍔炲叕瀹�
-16061=鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+16061=鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
 16062=鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
 16063=璁剧疆绌鸿皟鎽嗛澶辫触
 16064=鎸変綇姝ゆ寜閿�
@@ -1853,13 +1872,40 @@
 16122=璇ュ唴瀹逛笉鑳界渷鐣�
 16123=Mini缃戝叧
 16124=娣诲姞Mini缃戝叧
-16125=鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+16125=鎻掔數鍚�,闀挎寜缃戝叧寮�鍏抽敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
 16128=鑹叉俯
 16129=Mini澶滅伅
 16130=鐕冩皵娉勯湶
 16131=蹇界暐
 16132=铚傞福鍣ㄥ紑鍏�
 16133=灏忓鐏紑鍏�
+16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+16135=鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+16136=闇�閲嶆柊缁戝畾
+16137=鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+16138=鐑熼浘浼犳劅鍣�
+16139=姘翠镜浼犳劅鍣�
+16140=鐕冩皵浼犳劅鍣�
+16141=绱ф�ユ寜閽�
+16142=闂ㄧ獥浼犳劅鍣�
+16143=閽ュ寵鎵�
+16144=鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
+16145=闀挎寜姝ゆ寜閿�
+16146=Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
+16147=寮�鍏抽敭
+16148=杩囨埛
+16149=浣忓畢杩囨埛
+16150=杞Щ浣忓畢鍒板叾浠朎voyo
+16151=Home璐﹀彿
+16152=璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+16153=1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+16154=2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+16155=3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+16156=杩囨埛璐﹀彿
+16157=璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+16158=鏌ョ湅
+16159=瀹氭椂鑷姩鍏抽棴
+16160=涓嶅叧闂�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1941,141 +1987,22 @@
 ;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
 21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
 ;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
-21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+21021=鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
 ;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
 21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
 ;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
 21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-30000=绱ф�ユ寜閽�
-30001=鐕冩皵浼犳劅鍣�
-30002=鐑熼浘浼犳劅鍣�
-30003=姘翠镜浼犳劅鍣�
-30004=閽ュ寵鎵�
-30005=闂ㄧ獥浼犳劅鍣�
-30006=鏅鸿兘绌哄紑
-30007=Zigbee鏅鸿兘寮�鍚堝笜鐢垫満
-30008=4鎸夐敭瑙︽懜闈㈡澘(4璺户鐢靛櫒搴曞骇)
-30009=220Pir浼犳劅鍣�
-30010=1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
-30011=3鎸夐敭瑙︽懜闈㈡澘(3璺户鐢靛櫒搴曞骇)
-30012=2鎸夐敭瑙︽懜闈㈡澘(2璺户鐢靛櫒搴曞骇)
-30013=3璺户鐢靛櫒灏忔ā鍧�
-30014=1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
-30015=璋冭瘯璁惧
-30016=Zigbee鏅鸿兘绠$姸鐢垫満
-30017=Zigbee涓户鍣�
-30018=12鎸夐敭瑙︽懜闈㈡澘(1璺户鐢靛櫒搴曞骇)
-30019=4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
-30020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
-30021=1璺皟鍏夊櫒灏忔ā鍧�
-30022=Zigbee杞珺uspro鍗忚杞崲鍣�
-30023=Zigbee杞�485鍗忚杞崲鍣�
-30024=Zigbee绌鸿皟缃戝叧妯″潡
-30025=H06C
-30026=绠�绾�4鎸夐敭闈㈡澘
-30027=绠�绾�3鎸夐敭闈㈡澘
-30028=绠�绾�2鎸夐敭闈㈡澘
-30029=鏂规偊鍗曞紑鍙屾帶闈㈡澘
-30030=鏂规偊鍙屽紑鍥涙帶闈㈡澘
-30031=鏂规偊鍥涘紑鍏帶闈㈡澘
-30032=鏂规偊鏂伴闈㈡澘
-30033=鏂规偊鐜闈㈡澘
-30034=绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
-30035=绠�绾�2璺獥甯橀潰鏉�
-30036=鏂规偊/2璺獥甯橀潰鏉�-Z
-30037=S-one
-30038=鏂规偊鏂伴灏忔ā鍧�
-30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
-30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
-30041=绠�绾﹀鍔熻兘闈㈡澘
-30042=绠�绾︾幆澧冮潰鏉�
-30043=Mini缃戝叧
-30044=鑹叉俯鐏�
+;鐞冨瀷绉诲姩浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21024=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
 
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮� 娉細杩欎簺鎵�灞濱D宸茬粡涓嶅啀缁存姢鈽呪槄鈽呪槄
 40000=閬槼
 40001=鎸夐敭闈㈡澘
-40002=浼犳劅鍣�
-40003=缁х數鍣�
-40004=璋冨厜鍣�
-40005=闂ㄩ攣
 40006=绌鸿皟
-40007=涓户鍣�
-40008=鏅鸿兘绌哄紑
-40009=杞崲鍣�
-40010=褰╃伅
-40011=娓╂箍搴︿紶鎰熷櫒
-40012=娓╁害浼犳劅鍣�
-40013=婀垮害浼犳劅鍣�
 40014=寮�鍏�
 40015=鎻掑骇
 40016=鐏厜
-40017=骞叉帴鐐�
 40018=鏂伴
-40019=绌烘皵璐ㄩ噺
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
-50000=绱ф�ユ寜閽�
-50001=Zigbee鐕冩皵浼犳劅鍣�
-50002=Zigbee鐑熼浘浼犳劅鍣�
-50003=Zigbee姘存蹈浼犳劅鍣�
-50004=閽ュ寵鎵�
-50005=Zigbee闂ㄧ獥浼犳劅鍣�
-50006=Zigbee鏅鸿兘绌哄紑
-50007=Zigbee寮�鍚堝笜鐢垫満
-50008=Zigbee 4鎸夐敭闈㈡澘
-50009=Zigbee鍚搁《寮忎汉浣撶Щ鍔ㄤ紶鎰熷櫒
-50010=Zigbee澧欒缃戝叧
-50011=Zigbee 3鎸夐敭闈㈡澘
-50012=Zigbee 2鎸夐敭闈㈡澘
-50013=Zigbee 3璺�10A缁х數鍣�
-50014=Zigbee妗岄潰缃戝叧
-50015=璋冭瘯璁惧
-50016=Zigbee鍗峰笜鐢垫満
-50017=Zigbee涓户鍣�
-50018=Zigbee 12鎸夐敭闈㈡澘
-50019=Zigbee 4鎸夐敭闈㈡澘
-50020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
-50021=Zigbee 1璺�1.5A璋冨厜鍣�
-50022=Zigbee杞珺uspro鍗忚杞崲鍣�
-50023=Zigbee杞�485鍗忚杞崲鍣�
-50024=Zigbee绌鸿皟缃戝叧妯″潡
-50025=Zigbee鏅鸿兘闂ㄩ攣
-50026=Zigbee绠�绾�4鎸夐敭闈㈡澘
-50027=Zigbee绠�绾�3鎸夐敭闈㈡澘
-50028=Zigbee绠�绾�2鎸夐敭闈㈡澘
-50029=Zigbee鏂规偊鍗曞紑鍙屾帶闈㈡澘
-50030=Zigbee鏂规偊鍙屽紑鍥涙帶闈㈡澘
-50031=Zigbee鏂规偊鍥涘紑鍏帶闈㈡澘
-50032=Zigbee鏂规偊鏂伴闈㈡澘
-50033=Zigbee鏂规偊鐜闈㈡澘
-50034=Zigbee绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
-50035=Zigbee绠�绾�2璺獥甯橀潰鏉�
-50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
-50037=Zigbee鏅鸿兘闂ㄩ攣
-50038=鏂伴鎺у埗灏忔ā鍧�
-50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
-50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
-50041=绠�绾﹀鍔熻兘闈㈡澘
-50042=绠�绾︾幆澧冮潰鏉�
-50043=Mini缃戝叧
-50044=鑹叉俯鐏�
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
-60000=浼犳劅鍣�
-60001=寮�鍏虫ā鍧�
-60002=閬槼妯″潡
-60003=鏅鸿兘闈㈡澘
-60004=鏅鸿兘缃戝叧
-60005=璋冭瘯璁惧
-60006=绯荤粺璁惧
-60007=璋冨厜妯″潡
-60008=杞崲鍣�
-60009=绌鸿皟妯″潡
-60010=鏅鸿兘闂ㄩ攣
-60011=鏂伴妯″潡
 
 ;//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭i噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
 70000=2鎸夐敭闈㈡澘
@@ -2088,22 +2015,23 @@
 70007=鏂规偊鏂伴闈㈡澘
 70008=鏂规偊鐜闈㈡澘
 70009=绐楀笜闈㈡澘
-70010=3璺户鐢靛櫒
-70011=1璺皟鍏夊櫒
+70010=3璺紑鍏冲皬妯″潡
+70011=1璺皟鍏夊櫒灏忔ā鍧�
 70012=绐楀笜鐢垫満
 70013=鍗峰笜鐢垫満
-70014=绌鸿皟缃戝叧
+70014=CoolBox 涓ぎ绌鸿皟缃戝叧
 70015=闂ㄩ攣
-70016=PIR浼犳劅鍣�
-70017=绾㈠浼犳劅鍣�
-70018=鐕冩皵浼犳劅鍣�
+70016=鍚搁《寮忎汉浣撲紶鎰熷櫒
+70017=浜轰綋浼犳劅鍣�
+70018=鐕冩皵浼犳劅鍣�(閫傞厤鍣�)
 70019=鐑熼浘浼犳劅鍣�
 70020=姘存蹈浼犳劅鍣�
 70021=闂ㄧ獥浼犳劅鍣�
 70022=娓╂箍搴︿紶鎰熷櫒
 70023=涓户鍣�
 70024=鏅鸿兘绌哄紑
-70025=鍚搁《鐕冩皵浼犳劅鍣�
+70025=鍚搁《寮忕噧姘斾紶鎰熷櫒
 70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
 70027=绠�绾﹀鍔熻兘闈㈡澘
-70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file
+70028=绠�绾︾幆澧冮潰鏉�
+70029=鐞冨瀷绉诲姩浼犳劅鍣�
\ No newline at end of file

--
Gitblit v1.8.0