From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/GateWay.Ios/Resources/Language.ini |  115 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 95 insertions(+), 20 deletions(-)

diff --git a/ZigbeeApp/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
index 3e58587..e1dbdcf 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Language.ini
+++ b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
@@ -181,7 +181,7 @@
 175=淇敼澶辫触
 176=璇ョ敤鎴峰彧鑳藉湪璁惧绔垹闄�
 177=鏈垎閰�
-178=楠岃瘉棰戠箒锛岃30绉掑悗鍐嶈瘯
+178=楠岃瘉棰戠箒锛岃15绉掑悗鍐嶈瘯
 179=鎿嶄綔澶辫触
 180=杩滅▼寮�閿佺粦瀹氭垚鍔�
 181=璇疯缃簩娆″畨鍏ㄩ獙璇佹柟寮�
@@ -206,6 +206,19 @@
 200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
 201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
 202=涓�妤�
+203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
+204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
+206=鍐荤粨澶辫触
+207=瑙ｅ喕澶辫触
+208=鍏变韩
+209=寮�閿佹柟寮忎笉鍖归厤锛岃褰曞叆褰撳墠鐣岄潰鐨勫紑閿佹柟寮忋��
+210=纭畾鎺堟潈璇ユ垚鍛樻嫢鏈夎繙绋嬪紑閿佹潈闄�
+211=鎺堟潈鎴愬姛
+212=鎺堟潈澶辫触
+213=璇ユ垚鍛樿鍐荤粨锛屼笉鑳芥坊鍔犲紑閿佹柟寮�
+214=鏈巿鏉�
+
 
 548=鎻愰啋璁剧疆
 550=鏂板鐢ㄦ埛
@@ -588,6 +601,7 @@
 
 
 10000=HDL Home
+10001=甯哥敤
 
 10100=鎵嬫満鍙�
 10101=閭
@@ -616,6 +630,14 @@
 10124=纭閲嶇疆
 10125=淇敼鎴愬姛
 10126=浣犵殑瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍
+10127=璇烽�夋嫨鍖哄彿
+10128=鏈縺娲�
+10129=璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
+10130=鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
+10131=璐﹀彿鎴栧瘑鐮侀敊璇�
+10132=璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+10133=璇疯緭鍏ラ獙璇佺爜
+10134=鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
 
 11000=鍔熻兘
 11001=鍦烘櫙
@@ -645,6 +667,7 @@
 11031=娣诲姞鎵ц鐩爣
 11032=閫夋嫨鍖哄煙
 11033=閫夋嫨鍦烘櫙鍥剧墖
+
 
 12100=鏈煡璁惧
 12101=鎺у埗闈㈡澘
@@ -700,11 +723,13 @@
 13139=璇ュ満鏅凡瀛樺湪
 13140=缂栬緫
 13141=缂栬緫鍦烘櫙
-
-
-
-
-
+13142=鏈垎閰嶅尯鍩�
+13143=鍔熻兘绫诲瀷
+13144=澶辫触锛岃閲嶈瘯
+13145=鎴愬姛
+13146=榛樿鍥惧簱
+13147=鎷嶇収
+13148=鎴戠殑鐩稿唽
 
 
 15000=瀵嗙爜闀垮害涓簕0}涓瓧绗�
@@ -786,7 +811,7 @@
 15080=鎸夐敭闈㈡澘
 15081=浼犳劅鍣�
 15083=鐕冩皵浼犳劅鍣�
-15084=瀹夐槻鍔熻兘
+15084=鏈垎閰�
 15085=璁惧绫诲瀷
 15086=璁惧淇℃伅
 15087=璁惧鍚嶇О
@@ -821,7 +846,7 @@
 15117=璇疯緭鍏ユ挙闃插瘑鐮�
 15118=璇疯緭鍏ュ瘑鐮�
 15119=瀹夐槻瀵嗙爜璁剧疆
-15120=鐢ㄦ埛瀵嗙爜
+15120=瀹夐槻瀵嗙爜
 15121=鑳佽揩瀵嗙爜
 15122=绯荤粺瀵嗙爜璁剧疆
 15123=璇疯緭鍏ョ郴缁熷瘑鐮�
@@ -894,10 +919,10 @@
 15190=娣诲姞浼犳劅鍣�
 15191=甯冮槻
 15192=纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
-15193=纭畾瑕佹挙閿�璇ユ垚鍛樼鐞嗘潈闄愬悧锛�
+15193=纭畾鍙栨秷銆寋0}銆嶇鐞嗗憳鏉冮檺锛�
 15194=鎴愬憳鎺堟潈
-15195=鎴愬憳鎺堟潈鎴愬姛
-15196=璇ユ垚鍛樺凡鎴愪负绠＄悊鍛榹0}鎮ㄧ殑鎺у埗鏉儃1}宸茬Щ浜�
+15195=鎺堟潈鎴愬姛!
+15196=璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�
 15197=纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵
 15198=鍒锋柊
 15199=鏈垎閰嶅尯鍩�
@@ -1016,7 +1041,7 @@
 15345=鏈缃�
 15346=娣诲姞瀵嗙爜
 15347=璇疯緭鍏ョ敤鎴峰瘑鐮�
-15348=鐢ㄦ埛瀵嗙爜宸叉洿鏂�
+15348=瀹夐槻瀵嗙爜璁剧疆鎴愬姛
 15349=淇敼鐢ㄦ埛瀵嗙爜澶辫触
 15350=鐢ㄦ埛瀵嗙爜鏁板凡婊�(鏈�澶�4涓�)
 15351=鐢ㄦ埛瀵嗙爜閲嶅
@@ -1174,14 +1199,14 @@
 15518=鐢垫睜鐢甸噺浣�
 15519=璁惧琚媶闄�
 15520=缃戝叧绫诲瀷
-15521=璁惧纭欢鐗堟湰
+15521=纭欢鐗堟湰
 15522=缃戝叧鍥轰欢鐗堟湰
 15523=缃戝叧纭欢鐗堟湰
 15524=鍗忚皟鍣ㄥ浐浠剁増鏈�
 15525=鍗忚皟鍣ㄧ‖浠剁増鏈�
 15526=璁惧鍥轰欢鐗堟湰
 15527=璁惧闀滃儚ID
-15528=缃戝叧闀滃儚ID
+15528=闀滃儚ID
 15529=铏氭嫙椹卞姩闀滃儚ID
 15530=铏氭嫙椹卞姩鍥轰欢鐗堟湰
 15531=铏氭嫙椹卞姩纭欢鐗堟湰
@@ -1256,9 +1281,7 @@
 15611=鍘昏缃�
 15612=璇风‘淇濇墜鏈哄凡缁忛摼鎺IFI
 15614=璇烽�夋嫨缃戠粶
-15615=鍚�        绉�
-15616=瀵�        鐮�
-15617=璇疯緭鍏ョ綉缁滃瘑鐮�
+15617=璇疯緭鍏ifi瀵嗙爜
 15618=瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
 15619=璇风偣鎸夋棤绾跨綉鍏充笂鐨勬寜閿�
 15620=浣跨綉鍏宠繘鍏ラ厤缃戠姸鎬�
@@ -1444,7 +1467,7 @@
 15800=鏂瑰悜
 15801=闄愪綅
 15802=寮�闄愪綅
-15803=鍏抽檺浣�
+15803=鍚堥檺浣�
 15804=閲嶇疆鐢垫満
 15805=閲嶇疆鐢垫満灏嗗垵濮嬪寲{0}鏂瑰悜涓庨檺浣嶈缃紝纭缁х画锛�
 15806=閫夋嫨鏂瑰悜
@@ -1484,8 +1507,8 @@
 15840=2.鍚屾椂闇�纭搴旂敤鐨勫畾浣嶆潈闄愭湭琚叧闂�傝嫢鎵嬪姩鍏抽棴浜嗗簲鐢ㄥ畾浣嶆潈闄愬彲鑳藉鑷存棤娉曡嚜鎷斿彂鐜拌澶囥��
 15841=3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆傚鏋滀綘骞朵笉娓呮鏄皝杩炴帴浜嗚澶囷紝鍙互杩涜閲嶇疆锛岄噸缃柟寮忚鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆�
 15842=鎴块棿鍒楄〃
-15843=杩樻病鏈夋坊鍔犲満鏅摝
-15844=杩樻病鏈夋坊鍔犺澶囧摝
+15843=杩樻病鏈夋坊鍔犲満鏅�
+15844=杩樻病鏈夋坊鍔犺澶�
 15845=鎴块棿鍚嶇О宸茬粡瀛樺湪
 15846=瀹ゅ唴鏈鸿缃�
 15847=绌鸿皟妯″紡
@@ -1497,6 +1520,58 @@
 15853=闄ゆ箍
 15854=鎵撳紑绌鸿皟澶辫触
 15855=鍏抽棴绌鸿皟澶辫触
+15856=璇锋敞鎰忔竻娲楁护缃戝摝
+15857=鏃犲彲鍏变韩鐨勫満鏅�
+15858=鏃犲彲鍏变韩鐨勮澶�
+15859=鏃犲彲鍙栨秷鍏变韩鐨勫満鏅�
+15860=鏃犲彲鍙栨秷鍏变韩鐨勮澶�
+15861=纭鍒犻櫎閫夋嫨鐨勫叡浜満鏅拰鍔熻兘锛�
+15862=纭畾鍒涘缓銆屽畨闃层�嶆嵎寰勫埌涓婚〉锛�
+15863=纭畾鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勶紵
+15864=璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+15865=24灏忔椂闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝峽0}闃插尯琚Е鍙戠珛鍗虫姤璀0}涓�鑸缃儫闆俱�佺噧姘斻�佹按娴哥瓑浼犳劅鍣�
+15866=鍦ㄧ瀹跺竷闃叉ā寮忎笅锛屽唴閮ㄩ槻鍖轰紶鎰熷櫒瑙﹀彂{0}绔嬪嵆鎶ヨ銆傚湪鍦ㄥ甯冮槻妯″紡涓媨0}鍐呴儴闃插尯鎵�鏈変紶鎰熷櫒涓嶅弬涓庢姤璀�
+15867=绂诲甯冮槻妯″紡鎴栧湪瀹跺竷闃叉ā寮忎笅{0}鍛ㄧ晫闃插尯浼犳劅鍣ㄨЕ鍙戠珛鍗虫姤璀�
+15868=鍦ㄥ竷闃插悗绯荤粺鎻愪緵涓�瀹氱殑寤惰繜鏃堕棿銆傚嚭闂ㄦ椂{0}澶栧嚭寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ{0}鍥炲鏃讹紝杩涘叆寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ
+15869=闈欓煶闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝嶏紝闃插尯琚珄0}瑙﹀彂绔嬪嵆鎶ヨ锛岄�氬父涓嶄骇鐢熷０闊虫垨{0}鍏朵粬鎻愮ず锛屽彧鍙戦�佷俊鎭埌鐗瑰畾鐨勬帴鏀惰��
+15870=杩樻病鏈夎缃紶鎰熷櫒
+15871=杩樻病鏈夎缃姤璀︾洰鏍�
+15872=鏃犳硶璇嗗埆鐨勮澶�
+15873=鎷嶇収
+15874=浠庣浉鍐屼腑閫夋嫨
+15875=鍑虹幇鏈煡閿欒
+15876=璇疯緭鍏ユ墜鍔�
+15877=璇峰啀娆¤緭鍏ユ墜鍔�
+15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
+15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
+15880=鎵嬪娍閿欒锛岃閲嶆柊杈撳叆
+15881=鎵嬪娍瀵嗙爜闀垮害蹇呴』澶т簬{0}
+15882=蹇樿鎵嬪娍锛�
+15883=鐢ㄤ簬鍦ㄥ甯冮槻銆佺瀹跺竷闃层�佹挙闃叉搷浣�
+15884=杈撳叆璇ュ瘑鐮侊紝绔嬪嵆閫氱煡浠栦汉
+15885=鍙栨秷鎴愬姛
+15886=璇ョ鐞嗗憳宸叉垚涓烘垚鍛�
+15887=璇疯緭鍏ユ柊鎵嬪娍
+15888=鐢ㄦ埛瀵嗙爜
+15889=褰撳墠浣跨敤瀵嗙爜
+15890=澶囨敞淇℃伅
+15891=璇疯緭鍏ュ娉ㄥ唴瀹�
+15892=淇敼澶囨敞淇℃伅鎴愬姛!
+15893=杈撳叆鍐呭杩囬暱,鏈�澶0}瀛楄妭
+15894=淇敼澶囨敞淇℃伅澶辫触
+15895=璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
+15896=璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
+15897=鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+15898=鑾峰彇绌鸿皟妯″紡澶辫触
+15899=璁剧疆绌鸿皟妯″紡澶辫触
+15900=缁х画娣诲姞缃戝叧
+15901=杩斿洖涓婚〉
+15902=娣诲姞鏅鸿兘缃戝叧鎴愬姛
+15903=UDP妯″紡(鎺ㄨ崘)
+15904=AP妯″紡
+15905=璺宠浆鍒扮Щ鍔ㄨ澶�
+15906=WLAN璁剧疆杩炴帴瀹跺涵WiFi
+
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�

--
Gitblit v1.8.0