From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini |  343 ++++++++++++++++++++++++--------------------------------
 1 files changed, 146 insertions(+), 197 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index d3acaa0..7a1094d 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -121,7 +121,7 @@
 116=瀵嗙爜閿欒
 117=鍓╀綑
 118=娆℃満浼�
-119=杩滅▼寮�閿佹垚鍔燂紝璇疯缃簩娆″畨鍏ㄩ獙璇佹柟寮忋��
+119=杩滅▼寮�閿佺粦瀹氭垚鍔燂紝璇疯缃簩娆″畨鍏ㄩ獙璇佹柟寮忋��
 120=褰撳墠鏃ユ湡
 121=褰撳墠鏃跺埢
 122=闂ㄩ攣鏃堕棿
@@ -174,7 +174,20 @@
 168=褰撳墠鎸夐敭瀛樺湪鍦烘櫙锛岀‘瀹氳绉婚櫎褰撳墠鍦烘櫙閲嶆柊娣诲姞鏂板満鏅悧锛�
 169=褰撳墠鎸夐敭瀛樺湪鍦烘櫙锛岀‘瀹氳绉婚櫎褰撳墠鍦烘櫙閲嶆柊娣诲姞寮�鍏冲悧锛�
 170=褰撳墠鎸夐敭瀛樺湪鍦烘櫙锛岀‘瀹氳绉婚櫎褰撳墠鍦烘櫙閲嶆柊娣诲姞璋冨厜鍚楋紵
-171=褰撳墠鎸夐敭瀛樺湪鍦烘櫙锛岀‘瀹氳绉婚櫎褰撳墠鍦烘櫙閲嶆柊娣诲姞閬槼鍚楋紵   
+171=褰撳墠鎸夐敭瀛樺湪鍦烘櫙锛岀‘瀹氳绉婚櫎褰撳墠鍦烘櫙閲嶆柊娣诲姞閬槼鍚楋紵  
+172=IC鍗�
+173=瀵嗙爜
+174=鎸囩汗 
+175=淇敼澶辫触
+176=璇ョ敤鎴峰彧鑳藉湪璁惧绔垹闄�
+177=鏈垎閰�
+178=楠岃瘉棰戠箒锛岃30绉掑悗鍐嶈瘯
+179=鎿嶄綔澶辫触 
+180=杩滅▼寮�閿佺粦瀹氭垚鍔�
+181=璇疯缃簩娆″畨鍏ㄩ獙璇佹柟寮� 
+182=宸插叧闂�
+183=姝ｅ湪寮�閿�
+184=宸叉墦寮�
 
 548=鎻愰啋璁剧疆
 550=鏂板鐢ㄦ埛
@@ -520,214 +533,125 @@
 5304=鏄惁瑕佸垹闄�?
 
 
-10000=鍠滅埍
-10003=璇锋眰鏈嶅姟鍣ㄥけ璐�
-10005=OK
-10006=璐﹀彿鎴栬�呭瘑鐮佷笉鑳戒负绌�
-10007=璐﹀彿宸茬粡娉ㄥ唽
-10008=閭鏍煎紡涓嶆纭�
-10009=瀵嗙爜闀垮害灏忎簬鍏�
-10010=涓ゆ瀵嗙爜杈撳叆涓嶄竴鑷�
-
-10011=瀵嗙爜涓嶈兘涓虹┖锛�
-10012=璇峰幓閭婵�娲昏处鍙�
-10013=璇疯緭鍏ユ纭殑鎵嬫満鍙�
-10014=璇疯緭鍏ユ纭獙璇佺爜
-10015=璇烽�夋嫨鍖哄彿
-10016=鐭俊鐧诲綍
-10017=璇ユ墜鏈哄彿杩樻病娉ㄥ唽锛岃鍏堟敞鍐�
-10018=楠岃瘉鐮侀敊璇�
-10019=璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
-10020=璇峰幓閭纭淇敼瀵嗙爜
-
-10021=閭欢鍙戦�佸け璐ワ紝璇烽噸璇�
-10022=璇ヨ处鍙锋棤鏉冮檺
-10023=鐗堟湰
-10024=纭畾閫�鍑哄綋鍓嶈处鍙峰悧
-10025=璇疯缃笉灏戜簬6浣嶇殑鏂板瘑鐮�
-10026=褰撳墠鐢ㄦ埛浣忓畢涓虹┖锛岃鍏堟柊寤轰綇瀹�
-10027=浣忓畢鍚嶇О涓嶈兘涓虹┖
-10028=璇ヤ綇瀹呭悕绉板凡缁忓瓨鍦紝璇锋敼鎹㈠啀璇�
-10029=鍒犻櫎浣忓畢
-10030=瀵嗙爜涓嶈兘涓虹┖
-10031=鎴块棿鑳屾櫙鍥�
-10032=鎴块棿鍚嶅瓧涓嶈兘涓虹┖
-10033=鏃�
-11000=璇疯緭鍏ユ墜鏈�/閭
-11001=璇疯緭鍏ヤ笉灏戜簬6浣嶇殑瀵嗙爜
-11002=蹇樿瀵嗙爜
-11003=鐧诲綍
-11004=娉ㄥ唽
-11005=璐﹀彿
-11006=鎵嬫満鍙锋敞鍐�
-11007=閭娉ㄥ唽
-11008=宸叉湁璐﹀彿锛熺櫥褰�
-11009=璇疯緭鍏ユ墜鏈哄彿
-11010=璇峰啀娆＄‘璁ゅ瘑鐮�
-11011=璇疯緭鍏ラ獙璇佺爜
-11012=鍙戦�侀獙璇佺爜
-11013=鎻愮ず
-11014=鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹
-11015=杩斿洖鐧诲綍鐣岄潰
-11016=璇疯緭鍏ラ偖绠�
-11017=閫氳繃鎵嬫満鍙锋壘鍥�
-11018=閫氳繃閭鎵惧洖
-11019=璇疯緭鍏ョ粦瀹氱殑鎵嬫満鍙凤紝浣犲皢浼氭敹鍒伴獙璇佺爜
-11020=璇疯緭鍏ョ粦瀹氱殑閭锛屼綘灏嗕細鏀跺埌楠岃瘉鐮�
-11021=閲嶇疆瀵嗙爜
-11022=淇敼瀵嗙爜鎴愬姛锛岃閲嶆柊鐧诲綍
-11023=璐﹀彿瀵嗙爜鐧诲綍
-11024=鐧诲綍涓�...
-11025=鎴块棿鍒楄〃
-11026=娣诲姞鎴块棿
-11027=鎴块棿鍚嶇О
-11028=鍙栨秷
-11029=纭畾
-11030=瀹屾垚
-11031=璁剧疆鍐呭
-11032=璇疯缃埧闂村悕
-11033=鏈湴鍥惧簱
-11034=鎷嶇収
-11035=绯荤粺鐩稿唽
-11036=閫夋嫨鍥剧墖
-11037=鎴块棿宸插瓨鍦�
-11038=鍔熻兘
-11039=鍦烘櫙
-11040=淇敼鎴块棿
-11041=鍒犻櫎
-11042=娣诲姞鍔熻兘
-11043=娣诲姞鍦烘櫙
-11044=鐏厜
-11045=娣诲姞鐏厜
-11046=鍚婄伅
-11047=绛掔伅
-11048=灏勭伅
-11049=璁惧鍚嶇О
-11050=鎵�灞炲尯鍩�
-11051=鍒嗕韩鐨�
-11052=纭畾娣诲姞
-11053=鎵�灞炴ā鍧�
-11054=娣诲姞
-11055=璁惧璁剧疆
-11056=璇疯緭鍏ュ満鏅悕绉�
-11057=娣诲姞鎵ц鐩爣
-11058=娣诲姞璁惧鎴愬姛
-11059=鍏抽棴
-11060=璁惧
-11061=杩樻病娣诲姞鍔熻兘
-11062=纭畾鍒犻櫎璇ユ埧闂村悧锛�
-11063=纭畾鍒犻櫎鍚楋紵
-11064=杩樻病娣诲姞鍦烘櫙
-11065=鑷姩鍖�
 
 
+10000=HDL Home
 
+10100=鎵嬫満鍙�
+10101=閭
+10102=璇疯緭鍏ユ墜鏈哄彿
+10103=璇疯緭鍏ヤ笉灏戜簬6浣嶇殑瀵嗙爜
+10104=鐧诲綍
+10105=楠岃瘉鐮佺櫥褰�
+10106=娉ㄥ唽鐢ㄦ埛
+10107=璇疯緭鍏ラ偖绠�
+10108=鎼滅储
+10109=瀹屾垚
+10110=璐﹀彿鐧诲綍
+10111=鍙戦�侀獙璇佺爜
+10112=鍚庨噸鍙�
+10113=璇峰啀娆¤緭鍏ュ瘑鐮�
+10114=鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹
+10115=纭畾
+10116=璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
+10117=鎻愪緵鐨勫弬鏁伴敊璇�
+10118=涓ゆ瀵嗙爜涓嶄竴鑷�
+10119=楠岃瘉鐮侀敊璇�
+10120=璇锋眰鏈嶅姟鍣ㄥけ璐�
+10121=鎭枩娉ㄥ唽鎴愬姛锛�
+10122=鍗冲皢鑷姩鐧诲綍
+10123=蹇樿瀵嗙爜
+10124=纭閲嶇疆
+10125=淇敼鎴愬姛
+10126=浣犵殑瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍
 
+11000=鍔熻兘
+11001=鍦烘櫙
+11002=鑷姩鍖�
 
-11071=涓嬩竴姝�
-11072=閫夋嫨鍖哄煙
-11073=閫夋嫨鎵ц璁惧
-11074=寮�
-11075=璋冨厜
-11076=璇ヨ澶囧凡缁忔坊鍔犲埌璇ュ満鏅腑
-11077=鍦烘櫙鍚嶄笉鑳戒负绌�
-11078=淇敼鍦烘櫙
-11079=鍦烘櫙鍚嶇О
-11080=鍒囨崲浣忓畢
-11081=鏈縺娲�
-11082=璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
-11083=鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
-11084=璐﹀彿鎴栧瘑鐮侀敊璇�
-11085=璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
-11086=鎻愪緵鐨勫弬鏁伴敊璇�
-11087=楠岃瘉鐮侀敊璇�
-11088=浣犵殑瀵嗙爜杩囦簬绠�鍗�
-11089=璇疯緭鍏ユ纭殑閭
-11090=鎿嶄綔澶辫触
-11091=楠岃瘉鐮佸彂閫佸け璐�
-11092=璇锋眰缃戝叧鏁版嵁澶辫触锛岃妫�鏌ョ綉鍏炽�佽澶囩綉缁滆繛鎺ユ槸鍚︽甯�
-11093=鏃堕棿闂撮殧
-11094=鍦烘櫙宸茬粡瀛樺湪
-11095=娣诲姞鍦烘櫙澶辫触
-11096=绉�
-11097=鍒嗛挓
-11098=鑷畾涔�
-
-11100=寤舵椂
-11101=鍙栨秷鏀惰棌
-11102=淇敼淇℃伅
-11103=鐧惧垎姣�
-11104=鎴愬姛
-11105=鏈煡
-11106=鍐嶆杈撳叆瀵嗙爜
-11107=楠岃瘉鐮佸け鏁�
-
-12000=涓荤綉鍏充笉鍦ㄧ嚎
-12001=澶辫触锛岃閲嶈瘯
-12002=鍒犻櫎澶辫触锛屽満鏅负绌�
-12003=璇ュ満鏅腑娌℃湁璁惧
-12004=褰撳墠APP鐗堟湰宸茬粡鏄渶鏂扮殑浜�
-12005=鏇存柊
-12006=鏇存柊鍐呭
-12007=鏇存柊APP澶辫触锛岃閲嶈瘯
-12008=鎺у埗鍦烘櫙澶辫触锛岃閲嶈瘯
-12009=鍒犻櫎鍦烘櫙澶辫触锛岃閲嶈瘯
-12010=鏄惁淇濆瓨褰撳墠鏂板缓鎴块棿锛�
-12011=鏇存柊涓�...
-12012=鍙栨秷鏇存柊锛�
-12013=鏂瑰悜涓庨檺浣�
-12014=缁存姢妯″紡
-12015=鍚姩/绂佹鎵嬫媺寮�鍏�
-12016=璧峰鏂瑰悜
-12017=姝ｅ悜
-12018=鍙嶅悜
-12019=闄愪綅
-12020=寮�濮�
-12021=缁撴潫
-12022=鎭㈠琛岀▼璁剧疆
-12023=鎭㈠琛岀▼璁剧疆鍚庯紝褰撳墠璁剧疆灏嗚鍒濆鍖栵紝纭畾缁х画鍚楋紵
-12024=鍒囨崲缁存姢妯″紡澶辫触
-12025=鏄惁璁剧疆褰撳墠浣嶇疆涓哄紑濮嬮檺浣嶏紵
-12026=鏄惁璁剧疆褰撳墠浣嶇疆涓虹粨鏉熼檺浣嶏紵
-12027=璁剧疆寮�濮嬮檺浣�
-12028=璁剧疆缁撴潫闄愪綅
-12029=瀵艰建绉诲姩涓紝璇风瓑寰呫�傘�傘��
-12030=鎮ㄧ殑璐﹀彿宸插湪鍙︿竴鍙拌澶囩櫥褰曪紝鎮ㄥ凡琚己鍒朵笅绾�
-12031=缂栬緫
-12032=鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
-12033=褰撳墠娌℃悳绱㈠埌缃戝叧锛岃鍏堟坊鍔犵綉鍏�
-12034=褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
-
-12035=閫夋嫨椋庨��
-12036=浣庨
-12037=涓
-12038=楂橀
-12039=閫夋嫨妯″紡
-12040=鑷姩
-12041=鍒跺喎
-12042=鍒剁儹
-12043=闄ゆ箍
-12044=閫侀
-12045=瀹ゆ俯
-
-12046=绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
-12047=璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
-
+11010=娌℃湁鍔熻兘 {\r\n} 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
+11011=缂栬緫
+11012=璁剧疆鍔熻兘
+11013=淇℃伅缂栬緫
+11014=鍔熻兘鍚嶇О
+11015=鎵�灞炲尯鍩�
+11016=鎵�灞炴ā鍧�
+11017=鏈煡
+11018=鍒嗕韩
+11019=鍒嗕韩鐨�
+11020=閫夋嫨鍥炬爣
+11021=淇濆瓨
+11022=鎻愮ず
+11023=鍙栨秷
+11024=娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+11025=璁剧疆
+11026=寤舵椂
+11027=纭畾鍒犻櫎鍚楋紵
+11028=娣诲姞鍦烘櫙
+11029=鍦烘櫙鍚嶇О
+11030=璇疯緭鍏ュ満鏅悕绉�
+11031=娣诲姞鎵ц鐩爣
+11032=閫夋嫨鍖哄煙
+11033=閫夋嫨鍦烘櫙鍥剧墖
 
 12100=鏈煡璁惧
 12101=鎺у埗闈㈡澘
-12102=鐏厜
+12102=缁х數鍣�
 12103=璋冨厜鐏�
 12104=绐楀笜
 12105=绌鸿皟
 12106=浼犳劅鍣�
 12107=绌烘皵寮�鍏�
-12108=璋冨厜鐏�
+12108=褰╃伅
 12109=涓户鍣�
 
-12500=褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
-12501=寰�涓婄Щ鍔ㄩ檺浣�
-12502=寰�涓嬬Щ鍔ㄩ檺浣�
+
+13100=鎴块棿鍒楄〃
+13101=閫夋嫨妤煎眰
+13102=閫夋嫨浣忓畢
+13103=鏂扮敤鎴风櫥褰曪紝璇峰厛缁戝畾缃戝叧
+13104=娣诲姞鏅鸿兘缃戝叧
+13105=缂栬緫鎴块棿
+13106=鎴块棿鍚嶇О
+13107=鎵�灞炴ゼ灞�
+13108=娓╁害
+13109=婀垮害
+13110=褰撳墠
+13111=寮�
+13112=鍏抽棴
+13113=涓嶅紑鍚�
+13114=绉�
+13115=鍒嗛挓
+13116=灏忔椂
+13117=鏈垎閰�
+13118=鍏ㄩ��
+13119=娣诲姞鍒�
+13120=璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
+13121=杩樻病閫夋嫨鎴块棿锛岃鍏堥�夋嫨
+13122=涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
+13123=鍚�
+13124=鍒犻櫎
+13125=鍏�
+13126=閫夋嫨椋庨��
+13127=浣庨
+13128=涓
+13129=楂橀
+13130=閫夋嫨妯″紡
+13131=鑷姩
+13132=鍒跺喎
+13133=鍒剁儹
+13134=闄ゆ箍
+13135=閫侀
+13136=瀹ゆ俯
+13137=绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
+13138=娣诲姞鍦烘櫙澶辫触
+13139=璇ュ満鏅凡瀛樺湪
+13140=缂栬緫
+13141=缂栬緫鍦烘櫙
+
+
+
+
 
 
 
@@ -925,7 +849,7 @@
 15197=纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵
 15198=鍒锋柊
 15199=鏈垎閰嶅尯鍩�
-15200=娣诲姞浣忓畢
+15200=鍒涘缓浣忓畢
 15201=缂栬緫浣忓畢
 15202=璇疯緭鍏ヤ綇瀹呭悕绉�
 15203=涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹�
@@ -1417,6 +1341,28 @@
 15749=淇敼瀵嗙爜锛岃杈撳叆鏂板瘑鐮�
 15750=纭瀵嗙爜閿欒锛岃閲嶆柊璁剧疆
 15751=娌℃湁璁剧疆瀵嗙爜楠岃瘉
+15752=褰撳墠浣忓畢
+15753=鍒囨崲
+15754=鏇存敼
+15755=鏇存敼鍚嶇О
+15756=纭鍒囨崲褰撳墠浣忓畢鍒般�寋0}銆�?
+15757=妤煎眰
+15758=鍒涘缓妤煎眰
+15759=璇疯緭鍏ユゼ灞傚悕绉�
+15760=妤煎眰鍚嶇О宸茬粡瀛樺湪
+15761=纭鍒犻櫎妤煎眰鍙婂叾鎵�鏈夋埧闂�?
+15762=鍒犻櫎浣忓畢
+15763=纭鍒犻櫎浣忓畢鍙婃墍鏈夋ゼ灞傘�佹埧闂�?
+15764=纭鍒犻櫎鎴块棿?
+15765=鍒涘缓鎴块棿
+15766=鎴块棿鍚嶇О
+15767=鎵�灞炴ゼ灞�
+15768=娓╁害
+15769=婀垮害
+15770=璇疯緭鍏ユ埧闂村悕绉�
+15771=缂栬緫鎴块棿
+15772=鑾峰彇涓�...
+15773=瀛樺湪闈炴硶瀛楃銆寋0}銆�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1506,4 +1452,7 @@
 40007=涓户鍣�
 40008=鏅鸿兘绌烘皵寮�鍏�
 40009=杞崲鍣�
-40010=褰╃伅
\ No newline at end of file
+40010=褰╃伅
+40011=娓╂箍搴︿紶鎰熷櫒
+40012=娓╁害浼犳劅鍣�
+40013=婀垮害浼犳劅鍣�
\ No newline at end of file

--
Gitblit v1.8.0