From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 10:56:13 +0800
Subject: [PATCH] 合并了全部的代码，IOS 图片需要从新引入工程

---
 ZigbeeApp/GateWay.Ios/Resources/Language.ini |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
index f03d643..c8a6407 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Language.ini
+++ b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
@@ -206,7 +206,19 @@
 200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
 201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
 202=涓�妤�
-203=缃戝叧鍥炲瓒呮椂
+203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
+204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
+206=鍐荤粨澶辫触
+207=瑙ｅ喕澶辫触
+208=鍏变韩
+209=寮�閿佹柟寮忎笉鍖归厤锛岃褰曞叆褰撳墠鐣岄潰鐨勫紑閿佹柟寮忋��
+210=纭畾鎺堟潈璇ユ垚鍛樻嫢鏈夎繙绋嬪紑閿佹潈闄�
+211=鎺堟潈鎴愬姛
+212=鎺堟潈澶辫触
+213=璇ユ垚鍛樿鍐荤粨锛屼笉鑳芥坊鍔犲紑閿佹柟寮�
+214=鏈巿鏉�
+
 
 548=鎻愰啋璁剧疆
 550=鏂板鐢ㄦ埛
@@ -589,6 +601,7 @@
 
 
 10000=HDL Home
+10001=甯哥敤
 
 10100=鎵嬫満鍙�
 10101=閭
@@ -798,7 +811,7 @@
 15080=鎸夐敭闈㈡澘
 15081=浼犳劅鍣�
 15083=鐕冩皵浼犳劅鍣�
-15084=瀹夐槻鍔熻兘
+15084=鏈垎閰�
 15085=璁惧绫诲瀷
 15086=璁惧淇℃伅
 15087=璁惧鍚嶇О
@@ -1186,14 +1199,14 @@
 15518=鐢垫睜鐢甸噺浣�
 15519=璁惧琚媶闄�
 15520=缃戝叧绫诲瀷
-15521=璁惧纭欢鐗堟湰
+15521=纭欢鐗堟湰
 15522=缃戝叧鍥轰欢鐗堟湰
 15523=缃戝叧纭欢鐗堟湰
 15524=鍗忚皟鍣ㄥ浐浠剁増鏈�
 15525=鍗忚皟鍣ㄧ‖浠剁増鏈�
 15526=璁惧鍥轰欢鐗堟湰
 15527=璁惧闀滃儚ID
-15528=缃戝叧闀滃儚ID
+15528=闀滃儚ID
 15529=铏氭嫙椹卞姩闀滃儚ID
 15530=铏氭嫙椹卞姩鍥轰欢鐗堟湰
 15531=铏氭嫙椹卞姩纭欢鐗堟湰
@@ -1268,9 +1281,7 @@
 15611=鍘昏缃�
 15612=璇风‘淇濇墜鏈哄凡缁忛摼鎺IFI
 15614=璇烽�夋嫨缃戠粶
-15615=鍚�        绉�
-15616=瀵�        鐮�
-15617=璇疯緭鍏ョ綉缁滃瘑鐮�
+15617=璇疯緭鍏ifi瀵嗙爜
 15618=瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
 15619=璇风偣鎸夋棤绾跨綉鍏充笂鐨勬寜閿�
 15620=浣跨綉鍏宠繘鍏ラ厤缃戠姸鎬�
@@ -1551,6 +1562,16 @@
 15895=璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
 15896=璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
 15897=鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+15898=鑾峰彇绌鸿皟妯″紡澶辫触
+15899=璁剧疆绌鸿皟妯″紡澶辫触
+15900=缁х画娣诲姞缃戝叧
+15901=杩斿洖涓婚〉
+15902=娣诲姞鏅鸿兘缃戝叧鎴愬姛
+15903=UDP妯″紡(鎺ㄨ崘)
+15904=AP妯″紡
+15905=璺宠浆鍒扮Щ鍔ㄨ澶�
+15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
+
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�

--
Gitblit v1.8.0