From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/GateWay.Ios/Resources/Language.ini | 287 +++++++++++++-------------------------------------------
1 files changed, 68 insertions(+), 219 deletions(-)
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
index 2969b1f..7fb67bc 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Language.ini
+++ b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
@@ -185,9 +185,18 @@
179=鎿嶄綔澶辫触
180=杩滅▼寮�閿佺粦瀹氭垚鍔�
181=璇疯缃簩娆″畨鍏ㄩ獙璇佹柟寮�
-182=宸插叧闂�
+182=鍏抽棴
183=姝ｅ湪寮�閿�
-184=宸叉墦寮�
+184=鎵撳紑
+185=骞�
+186=鐭鎴愬姛
+187=鐭澶辫触
+188=璇疯缃敓鏁堟椂闂�
+189=璇疯缃敓鏁堟棩鏈�
+190=璇疯缃け鏁堟椂闂�
+191=璇疯缃け鏁堟棩鏈�
+192=璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜
+
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -531,6 +540,32 @@
5302=鎸夐敭涓�
5303=鎸夐敭鍥�
5304=鏄惁瑕佸垹闄�?
+5305=寮�/鍏�
+5306=鏃犱汉绉诲姩鏃堕棿
+5307=鏃犱汉绉诲姩鏃�
+5308=瓒呰繃鏃堕棿鏈叧闂椂
+5309=鏈叧闂椂
+5340=姣忓懆
+5341=璇烽�夋嫨鎵ц鍛ㄦ湡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�
+5342=闂ㄩ攣
+5343=閫夋嫨鐢ㄦ埛
+5344=瀵嗙爜
+5345=鎸囩汗
+5346=IC鍗�
+5347=绌烘皵寮�鍏�
+5348=涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
+5349=娣诲姞寤舵椂
+5350=鍒跺喎
+5351=鍒剁儹
+5352=鑷姩
+5353=闄ゆ箍
+5354=閫侀
+5355=浣庨
+5356=涓
+5357=楂橀
+5358=鎺ㄨ崘妯℃澘
+5359=浜烘潵鐏寒
+5360=浜鸿蛋鐏伃
@@ -546,7 +581,7 @@
10106=娉ㄥ唽鐢ㄦ埛
10107=璇疯緭鍏ラ偖绠�
10108=鎼滅储
-10109=纭畾
+10109=瀹屾垚
10110=璐﹀彿鐧诲綍
10111=鍙戦�侀獙璇佺爜
10112=鍚庨噸鍙�
@@ -585,7 +620,7 @@
11023=鍙栨秷
11024=娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
11025=璁剧疆
-11026=瀹氭椂
+11026=寤舵椂
11027=纭畾鍒犻櫎鍚楋紵
11028=娣诲姞鍦烘櫙
11029=鍦烘櫙鍚嶇О
@@ -612,215 +647,14 @@
13114=绉�
13115=鍒嗛挓
13116=灏忔椂
+13117=鏈垎閰�
+13118=鍏ㄩ��
+13119=娣诲姞鍒�
+13120=璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
+13121=杩樻病閫夋嫨鎴块棿锛岃鍏堥�夋嫨
+13122=涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
-
-
-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=璇疯緭鍏ユ墜鏈哄彿
-
-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=璁惧
-
-11062=纭畾鍒犻櫎璇ユ埧闂村悧锛�
-11063=纭畾鍒犻櫎鍚楋紵
-11064=杩樻病娣诲姞鍦烘櫙
-11065=鑷姩鍖�
-
-
-
-
-
-
-
-
-
-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=璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
-
-
-12100=鏈煡璁惧
-12101=鎺у埗闈㈡澘
-12102=鐏厜
-12103=璋冨厜鐏�
-12104=绐楀笜
-12105=绌鸿皟
-12106=浼犳劅鍣�
-12107=绌烘皵寮�鍏�
-12108=璋冨厜鐏�
-12109=涓户鍣�
-
-12500=褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
-12501=寰�涓婄Щ鍔�
-12502=寰�涓嬬Щ鍔�
@@ -873,9 +707,9 @@
15048=娣诲姞鏈夌嚎缃戝叧
15049=涓嬩竴姝�
15050=鍋滄鎼滅储
-15051=鏅鸿兘缃戝叧姝ｅ湪閰嶇疆缃戠粶涓�
+15051=姝ｅ湪鎼滅储缃戝叧鈥�
15052=璇风◢鍊櫬仿仿�
-15053=璇风‘淇濈綉鍏冲凡鐢ㄧ綉绾胯繛鎺�
+15053=璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
15054=缃戝叧鍚嶇О
15055=浣忓畢鍚嶇О
15056=瀹屾垚
@@ -884,7 +718,7 @@
15059=閿欒
15060=纭
15061=鎻愮ず
-15062=闇�閲嶆柊缁戝畾
+15062=鎹㈢粦
15063=宸茬粦瀹�
15064=鍦ㄧ嚎
15065=绂荤嚎
@@ -1010,7 +844,7 @@
15189=宸茶缃梺璺�
15190=娣诲姞浼犳劅鍣�
15191=甯冮槻
-15192=纭畾瑕佹巿鏉冭璐﹀彿涓轰富璐﹀彿?
+15192=纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
15193=纭畾瑕佹挙閿�璇ユ垚鍛樼鐞嗘潈闄愬悧锛�
15194=鎴愬憳鎺堟潈
15195=鎴愬憳鎺堟潈鎴愬姛
@@ -1185,7 +1019,7 @@
15398=缃戠粶杩炴帴涓�︹��
15399=鑷畾涔夊浠�
15400=鍚屾鏁版嵁
-15401=瀛愮綉鍏�
+15401=浠庣綉鍏�
15402=涓荤綉鍏�
15403=涓婁紶鏁版嵁
15404=纭畾鏄惁涓婁紶鏁版嵁鍒版湇鍔″櫒锛�
@@ -1264,7 +1098,7 @@
15489=鑾峰彇鎸夐敭闈㈡澘鑺傝兘妯″紡淇℃伅澶辫触
15490=璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐�
15491=鑾峰彇缃戝叧瀵硅薄澶辫触
-15492=鏄惁閲嶆柊缁戝畾缃戝叧?
+15492=纭缁戝畾鏃х綉鍏筹紵
15493=缃戝叧瀵硅薄寮傚父,璇烽噸鏂伴�夋嫨缃戝叧
15494=閿欒:缃戝叧瀵硅薄涓㈠け
15495=绗笁鏂硅澶�
@@ -1331,7 +1165,7 @@
15562=鍏朵粬闃插尯閲屾病鏈夐厤缃紶鎰熷櫒璁惧
15563=褰撳墠姝ｅ浜庡竷闃叉ā寮�,鏃犳硶鍒犻櫎璁惧
15564=宸插叡浜唴瀹�
-15565=鏂板鍏变韩
+15565=鍒涘缓鏂板叡浜�
15566=浜у搧鍚嶇О
15567=璇疯緭鍏ヤ骇鍝佸悕绉�
15568=缂栬緫浜у搧鍚嶇О
@@ -1347,7 +1181,7 @@
15580=鍏变韩鏁版嵁鍚屾涓�
15581=璇烽厤缃叡浜澶�
15582=褰撳墠姝ｅ浜庡竷闃叉ā寮�,鏃犳硶娣诲姞璁惧
-15583=鍏ㄩ儴鍖哄煙鏃犲彲鍏变韩鐨勮澶�
+15583=鏃犲彲鍏变韩鐨勬埧闂�
15584=纭畾绉婚櫎閫変腑鐨勫満鏅紵
15585=鍒嗕韩鎴愬姛
15586=璇烽�夋嫨鐩爣鍚庡啀鎵ц鍒嗕韩鎿嶄綔
@@ -1532,6 +1366,21 @@
15771=缂栬緫鎴块棿
15772=鑾峰彇涓�...
15773=瀛樺湪闈炴硶瀛楃銆寋0}銆�
+15774=涓嶅瓨鍦ㄨ璐︽埛锛岃閲嶆柊杈撳叆
+15775=杩斿洖
+15776=杩樻病鏈夊叡浜尯鍩熺粰鎴愬憳{0}鍙偣鍑诲彸涓婅鈥�+鈥濇坊鍔�
+15777=纭鍒犻櫎鍏变韩鎴块棿锛�
+15778=杩樻病缁戝畾缃戝叧鍝�
+15779=瑙ｅ喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
+15780=1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔剓0}鐏悗锛岄噸鏂板叆缃戙��
+15781=2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯{0}5绉掋��
+15782=3.璇烽噸璇曪紝閲嶆柊娣诲姞缃戝叧銆�
+15783=4.杩斿洖缃戝叧绠＄悊銆�
+15784=閲嶈瘯
+15785=杩斿洖缃戝叧绠＄悊
+15786=鎼滅储澶辫触
+15787=(鏂�)
+15788=姝ｅ湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
--
Gitblit v1.8.0