From eb5a57942bae8eb57fd7fb61124c247bebb67e8e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 10:18:28 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
Home0618/Home.Ios/Resources/Language.ini | 73 ++++++++++++++----------------------
1 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/Home0618/Home.Ios/Resources/Language.ini b/Home0618/Home.Ios/Resources/Language.ini
index ef2b77b..9aa64bb 100755
--- a/Home0618/Home.Ios/Resources/Language.ini
+++ b/Home0618/Home.Ios/Resources/Language.ini
@@ -237,12 +237,12 @@
231=鎺ヨ繎鎰熷簲
232=鎺ヨ繎鎰熷簲鍔熻兘璁剧疆缃け璐�
233=鑾峰彇鎺ヨ繎鎰熷簲鍔熻兘澶辫触
-235=鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
+235=鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
236=缁胯壊鎸囩ず鐏棯鐑�
237=鎸囩ず鐏�
238=闀挎寜5绉掞紙鎸夐敭锛�
239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
242=鐢甸噺
243=甯稿紑妯″紡宸插紑鍚�
244=澶辨晥璁剧疆
@@ -263,10 +263,10 @@
259=澶辨晥鏃堕棿涓嶅悎娉曪紝璇烽噸鍐欒缃�
260=闊抽噺璁剧疆澶辫触
261=闊抽噺璁剧疆鎴愬姛
-262=褰撳墠鏃跺尯
+262=褰撳墠鏃跺尯
263=鍖�
264=涓�
-265=瑗�
+265=瑗�
266=褰撳墠璁惧涓嶅湪绾�
267=鑾峰彇闊抽噺澶辫触
268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
@@ -322,7 +322,7 @@
319=杞诲害姹℃煋
320=涓害姹℃煋
321=閲嶅害姹℃煋
-322=涓ラ噸姹℃煋
+322=涓ラ噸姹℃煋
323=鑷姩鍖栧叧闂�愰棬閿佸父寮�妯″紡銆戯紝闂ㄩ攣宸插叧
324=鍏ョ綉
;娉ㄦ剰鈥滃叆缃戔�濈殑鑻辨枃鈥淐onnection",鍥犱负灞忓箷涓婃槸杩欐牱鏄剧ず鐨�
@@ -332,7 +332,7 @@
328=鏈�澶氬彲娣诲姞{0}涓�
329=缁戝畾
330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜
-331=璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏�
+331=璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏�
332=绌鸿皟鐩爣
333=涓嶇粦瀹氫换浣曠洰鏍�
334= 鐫＄湢鏃堕棿
@@ -603,7 +603,7 @@
5390=澶辨晥璁剧疆
5391=灏忔椂
5392=闂ㄩ攣濮嬬粓鎵撳紑
-5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
5394=涓嶈兘灏忎簬1灏忔椂
5395=澶т簬12灏忔椂
5396=鎴�
@@ -616,8 +616,7 @@
5402=鏃舵晥鎬у父寮�灏嗚
5403=鍒嗗叧闂�
5404=鏃�
-
-
+5405=绫�
10000=HDL Home
10001=甯哥敤
@@ -656,50 +655,32 @@
10131=璐﹀彿鎴栧瘑鐮侀敊璇�
10132=璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
10133=璇疯緭鍏ラ獙璇佺爜
-10134=鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
10135=鐧诲綍涓�...
10136=褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
-10137=浣忓畢鍚嶇О涓虹┖
10138=閭閿欒锛岃閲嶆柊杈撳叆
10139=鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
10140=璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
-10141=浣犲凡琚己鍒朵笅绾匡紒
10142=鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
10143=璇峰厛鑾峰彇楠岃瘉鐮�
10144=蹇樿瀵嗙爜锛�
10145=宸叉湁璐﹀彿锛熺櫥褰�
-
-
-
10150=鎴块棿鍚嶇О宸插瓨鍦�
10151=鍦烘櫙鍚嶄笉鑳戒负绌�
10152=鎺у埗鍦烘櫙澶辫触
-10153=鍦烘櫙涓虹┖
-10154=璇ュ満鏅腑娌℃湁鎵ц鐩爣
10155=鎿嶄綔澶辫触
10156=鍙戦�侀獙璇佺爜澶辫触
-10157=缃戝叧涓嶅湪绾�
-10158=涓嬩竴姝�
-
10160=宸叉槸鏈�鏂扮増鏈�
10161=鏇存柊鏈�鏂扮増
-10162=鏇存柊鍐呭
10163=鏇存柊澶辫触
10164=姝ｅ湪鏇存柊涓�...
-10165=鍙栨秷鏇存柊
10166=鐗堟湰鍙�
10167=鏈嶅姟鍗忚
10168=鐗堟湰鏇存柊
-10169=鍗忚鏂囨湰淇℃伅鍐呭
-10170=鍙兘鐢变簬褰撳墠缃戠粶杈冨樊鎴栬澶囧凡琚粬浜虹粦瀹氥�倇\r\n}1.璇风‘淇濇墜鏈轰笌璁惧涔嬮棿鐨勮窛绂昏冻澶熻繎锛屽苟涓斿懆鍥寸綉缁滅幆澧冩病鏈夊己骞叉壈銆倇\r\n}2.鍚屾椂闇�纭搴旂敤鐨勫畾浣嶆潈闄愭湭琚叧闂�傝嫢鎵嬪姩鍏抽棴浜嗗簲鐢ㄥ畾浣嶆潈闄愬彲鑳藉鑷存棤娉曞彂鐜拌澶囥�倇\r\n}3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆� 濡傛灉浣犲苟涓嶆竻妤氭槸璋佽繛鎺ヤ簡璁惧锛屽彲浠ヨ繘琛岄噸缃紝閲嶇疆鏂瑰紡璇� 鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆�
-
-
11000=鍔熻兘
11001=鍦烘櫙
11002=鑷姩鍖�
-
11010=娌℃湁鍔熻兘{0}璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
11011=缂栬緫
11012=鍔熻兘璁剧疆
@@ -731,18 +712,8 @@
12100=鏈煡璁惧
-12101=鎺у埗闈㈡澘
-12102=缁х數鍣�
-12103=璋冨厜鐏�
-12104=绐楀笜
-12105=绌鸿皟
-12106=浼犳劅鍣�
-12107=绌烘皵寮�鍏�
-12108=褰╃伅
-12109=涓户鍣�
12110=娓╁害浼犳劅鍣�
12111=婀垮害浼犳劅鍣�
-12112=娓╂箍搴︿紶鎰熷櫒
12500=鏈変汉
12501=鏃犱汉
@@ -1176,7 +1147,7 @@
15391=鏄惁閲嶆柊鍒锋柊{0}缃戝叧?
15392=鍥炶矾
15393=鐕冩皵娉勬紡
-15394=鏈変笉鏄庣墿浣撶粡杩�
+15394=鏈変汉缁忚繃
15395=绱ф�ユ寜閽鎸変笅
15396=瑙﹀彂浼犳劅鍣ㄦ姤璀�
15397=缂栬緫缃戝叧淇℃伅
@@ -1732,7 +1703,7 @@
15978=閫氫俊閾炬帴澶辫触
15979=鑾峰彇缃戠粶SSID澶辫触
15980=瀵嗙爜鍙戦�佸け璐�
-15981=閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+15981=璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
15982=璇疯繛鎺ュ搴璚iFi
15983=姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
15984=璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
@@ -1873,6 +1844,16 @@
16119=DATA缁胯壊鎸囩ず鐏棯鐑�
16120=鑱旂郴鏂瑰紡
16121=璇疯緭鍏ユ偍鐨勮仈绯绘柟寮�
+16122=璇ュ唴瀹逛笉鑳界渷鐣�
+16123=Mini缃戝叧
+16124=娣诲姞Mini缃戝叧
+16125=鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+16128=鑹叉俯
+16129=Mini澶滅伅
+16130=鐕冩皵娉勯湶
+16131=蹇界暐
+16132=铚傞福鍣ㄥ紑鍏�
+16133=灏忓鐏紑鍏�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -2004,6 +1985,8 @@
30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
30041=绠�绾﹀鍔熻兘闈㈡澘
30042=绠�绾︾幆澧冮潰鏉�
+30043=Mini缃戝叧
+30044=鑹叉俯鐏�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -2027,10 +2010,10 @@
40018=鏂伴
40019=绌烘皵璐ㄩ噺
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
-50000=绱ф�ユ寜閽�
-50001=Zigbee鐕冩皵浼犳劅鍣�
-50002=Zigbee鐕冩皵浼犳劅鍣�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+50000=绱ф�ユ寜閽�
+50001=Zigbee鐕冩皵浼犳劅鍣�
+50002=Zigbee鐑熼浘浼犳劅鍣�
50003=Zigbee姘存蹈浼犳劅鍣�
50004=閽ュ寵鎵�
50005=Zigbee闂ㄧ獥浼犳劅鍣�
@@ -2071,6 +2054,8 @@
50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
50041=绠�绾﹀鍔熻兘闈㈡澘
50042=绠�绾︾幆澧冮潰鏉�
+50043=Mini缃戝叧
+50044=鑹叉俯鐏�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2115,4 +2100,4 @@
70025=鍚搁《鐕冩皵浼犳劅鍣�
70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
70027=绠�绾﹀鍔熻兘闈㈡澘
-70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file
+70028=绠�绾︾幆澧冮潰鏉�
--
Gitblit v1.8.0