From a2d26f15b940c853faaf6d6959b16a6d919cb800 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 27 十一月 2019 19:26:30 +0800
Subject: [PATCH] 请合并最新的代码（完成门锁功能）
---
ZigbeeApp/GateWay.Ios/Resources/Language.ini | 128 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
index f03d643..443d45e 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Language.ini
+++ b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
@@ -186,18 +186,18 @@
180=杩滅▼寮�閿佺粦瀹氭垚鍔�
181=璇疯缃簩娆″畨鍏ㄩ獙璇佹柟寮�
182=鍏抽棴
-183=姝ｅ湪寮�閿�
+183=寮�閿佷腑
184=鎵撳紑
185=骞�
186=鐭鎴愬姛
187=鐭澶辫触
-188=璇疯缃敓鏁堟椂闂�
+188=鏃犳晥鐨勬椂闂磋缃�
189=璇疯缃敓鏁堟棩鏈�
190=璇疯缃け鏁堟椂闂�
191=璇疯缃け鏁堟棩鏈�
192=璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜
193=涓嬩竴姝�
-194=璁惧澶囨敞
+194=璁惧鍚嶇О
195=璁剧疆鎴愬姛
196=璁剧疆澶辫触
197=璁剧疆澶辫触,璇烽噸鏂板皾璇�
@@ -206,7 +206,25 @@
200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
202=涓�妤�
-203=缃戝叧鍥炲瓒呮椂
+203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
+204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
+206=鍐荤粨澶辫触
+207=瑙ｅ喕澶辫触
+208=鍏变韩
+209=寮�閿佹柟寮忎笉鍖归厤锛岃褰曞叆褰撳墠鐣岄潰鐨勫紑閿佹柟寮忋��
+210=纭畾鎺堟潈璇ユ垚鍛樻嫢鏈夎繙绋嬪紑閿佹潈闄�
+211=鍏抽棴鏉冮檺澶辫触
+212=鎺堟潈澶辫触
+213=璇ユ垚鍛樿鍐荤粨
+214=鏈巿鏉�
+215=杩樻湭绛夊埌15绉掞紝璇峰啀绛変竴浼氬効
+216=楠岃瘉澶辫触
+217=寮�閿佹垚鍔�
+218=娣诲姞澶辫触
+219=寮�閿佸け璐�
+220=瀵嗙爜鍙兘涓嶅瓨鍦紝灏濊瘯閲嶆柊楠岃瘉杩滅▼寮�閿佸瘑鐮�
+221=缁戝畾澶辫触锛岀粦瀹氬嚭鐜版湭鐭ラ敊璇�
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -589,6 +607,7 @@
10000=HDL Home
+10001=甯哥敤
10100=鎵嬫満鍙�
10101=閭
@@ -718,6 +737,19 @@
13147=鎷嶇収
13148=鎴戠殑鐩稿唽
+13500=閫夋嫨鎽嗛
+13501=鑷姩
+13502=1鎸�
+13503=2鎸�
+13504=3鎸�
+13505=4鎸�
+13506=5鎸�
+
+
+
+
+
+
15000=瀵嗙爜闀垮害涓簕0}涓瓧绗�
15001=1涓皬鍐欏瓧姣�
@@ -798,7 +830,7 @@
15080=鎸夐敭闈㈡澘
15081=浼犳劅鍣�
15083=鐕冩皵浼犳劅鍣�
-15084=瀹夐槻鍔熻兘
+15084=鏈垎閰�
15085=璁惧绫诲瀷
15086=璁惧淇℃伅
15087=璁惧鍚嶇О
@@ -922,7 +954,7 @@
15206=瀹夐槻瀵嗙爜杈撳叆閿欒
15220=澶囦唤杩樺師
15221=鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛�
-15222=纭畾瑕佸垹闄ゆ枃浠跺悧?
+15222=纭鍒犻櫎璇ュ浠芥暟鎹�?
15223=娣诲姞澶囦唤
15224=缂栬緫澶囦唤
15225=澶囨敞
@@ -1186,14 +1218,14 @@
15518=鐢垫睜鐢甸噺浣�
15519=璁惧琚媶闄�
15520=缃戝叧绫诲瀷
-15521=璁惧纭欢鐗堟湰
+15521=纭欢鐗堟湰
15522=缃戝叧鍥轰欢鐗堟湰
15523=缃戝叧纭欢鐗堟湰
15524=鍗忚皟鍣ㄥ浐浠剁増鏈�
15525=鍗忚皟鍣ㄧ‖浠剁増鏈�
15526=璁惧鍥轰欢鐗堟湰
15527=璁惧闀滃儚ID
-15528=缃戝叧闀滃儚ID
+15528=闀滃儚ID
15529=铏氭嫙椹卞姩闀滃儚ID
15530=铏氭嫙椹卞姩鍥轰欢鐗堟湰
15531=铏氭嫙椹卞姩纭欢鐗堟湰
@@ -1268,9 +1300,7 @@
15611=鍘昏缃�
15612=璇风‘淇濇墜鏈哄凡缁忛摼鎺IFI
15614=璇烽�夋嫨缃戠粶
-15615=鍚� 绉�
-15616=瀵� 鐮�
-15617=璇疯緭鍏ョ綉缁滃瘑鐮�
+15617=璇疯緭鍏ifi瀵嗙爜
15618=瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
15619=璇风偣鎸夋棤绾跨綉鍏充笂鐨勬寜閿�
15620=浣跨綉鍏宠繘鍏ラ厤缃戠姸鎬�
@@ -1551,6 +1581,82 @@
15895=璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
15896=璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
15897=鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+15898=鑾峰彇绌鸿皟妯″紡澶辫触
+15899=璁剧疆绌鸿皟妯″紡澶辫触
+15900=缁х画娣诲姞缃戝叧
+15901=杩斿洖涓婚〉
+15902=娣诲姞鏅鸿兘缃戝叧鎴愬姛
+15903=UDP妯″紡(鎺ㄨ崘)
+15904=AP妯″紡
+15905=璺宠浆鍒扮Щ鍔ㄨ澶�
+15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
+15907=闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+15908=闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+15909=璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15910=璇疯緭鍏ュ搴璚IFI璐﹀彿
+15911=璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+15912=绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+15915=閫夋嫨鍦扮偣
+15916=鎮ㄧ殑鍙嶉鍜屾剰瑙佷細璁╂垜浠彉寰楁洿濂�
+15917=鍙嶉绫诲瀷
+15918=浼樺寲
+15919=鏂伴渶姹�
+15920=閭鍦板潃
+15921=璇疯緭鍏ユ偍鐨勯偖绠卞湴鍧�
+15922=鎻愪氦
+15923=鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+15924=涓婁紶
+15925=鑷姩澶囦唤
+15926=浠婃棩鎻愪氦娆℃暟宸蹭笂闄�
+15927=鑾峰彇缃戝叧淇￠亾澶辫触
+15928=鑾峰彇鍗忚皟鍣∕ac澶辫触
+15929=鑾峰彇鍗忚皟鍣≒anID澶辫触
+15930=涓婁紶鏁版嵁鑷充簯绔�
+15931=浠庝簯绔笅杞芥暟鎹�
+15932=涓婁紶鏁版嵁
+15933=涓婁紶鏁版嵁鎴愬姛
+15934=涓嬭浇鏁版嵁
+15935=涓嬭浇
+15936=璁剧疆缃戝叧缁忕含搴﹀け璐�
+15937=姝ｅ湪淇濆瓨鍗忚皟鍣╪v鍒嗗尯淇℃伅
+15938=淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅澶辫触
+15939=鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳藉け璐�
+15940=缃戝叧鏁版嵁澶囦唤澶辫触
+15941=寮�濮嬪浠界綉鍏虫暟鎹�
+15942=鍝嶅簲瓒呮椂,缃戝叧鏁版嵁澶囦唤澶辫触
+15943=鍒涘缓澶囦唤鏂囦欢
+15944=姝ｅ湪鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
+15945=鑾峰彇缃戝叧鑷姩澶囦唤璁剧疆澶辫触
+15946=璁剧疆缃戝叧鑷姩澶囦唤澶辫触
+15947=姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
+15948=鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+15949=鍝嶅簲瓒呮椂,鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+15950=姝ｅ湪涓嬭浇澶囦唤鏂囦欢
+15951=鍝嶅簲瓒呮椂,涓嬭浇澶囦唤鏂囦欢澶辫触
+15952=涓嬭浇澶囦唤鏂囦欢澶辫触
+15953=姝ｅ湪鎭㈠鍗忚皟鍣╪v鍒嗗尯
+15954=鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+15955=鍝嶅簲瓒呮椂,鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+15956=姝ｅ湪閲嶅惎缃戝叧绯荤粺
+15957=閲嶅惎缃戝叧绯荤粺澶辫触
+15958=鍝嶅簲瓒呮椂,閲嶅惎缃戝叧绯荤粺澶辫触
+15959=缃戝叧鏁版嵁鎭㈠鎴愬姛!
+15960=铏氭嫙椹卞姩璁惧
+15961=瀵嗙爜寮�閿佹垚鍔�
+15962=瀵嗙爜寮�閿佸け璐�
+15963=鎸囩汗寮�閿佹垚鍔�
+15964=鎸囩汗寮�閿佸け璐�
+15965=IC鍗″紑閿佹垚鍔�
+15966=IC鍗″紑閿佸け璐�
+15967=寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂�
+15968=纭畾瑕佽В闄ょ粦瀹歿0}锛�
+15969=鏇存柊绗笁鏂逛俊鎭け璐�
+15970=缁戝畾{0}鎴愬姛!
+15971=閿欒,绗笁鏂逛俊鎭涪澶�
+15972=鎮ㄥ綋鍓嶇殑IP鍙婄鍙ｅ湪浜戠涓嶅瓨鍦�,璇烽噸鏂扮櫥褰�!
+15973=娑堟伅涓績
+15974=纭鍒犻櫎娑堟伅?
+15975=姝ｅ湪涓婁紶澶囦唤鏂囦欢
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
--
Gitblit v1.8.0