From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Home.Ios/Resources/Language.ini | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 90368fb..093e27f 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -206,8 +206,8 @@
200= 淇敼涓存椂瀵嗙爜淇℃伅鍓�
201=璇风偣鍑诲彸涓婅鈥滄竻闄ゅ瘑鐮佲��
202=涓�妤�
-203=缃戝叧鍥炲澶辫触锛岃妫�鏌ョ綉缁滃拰璁惧鏄惁鍦ㄧ嚎
-204=浜戞湇鍔″櫒鍥炲澶辫触锛岃妫�鏌ョ綉缁滄槸鍚﹂摼鎺�
+203=缃戝叧鍥炲瓒呮椂
+204=浜戞湇鍔″櫒鍥炲鏃�
205=纭畾瑕佸皢璇ヨ处鎴峰喕缁擄紵
206=鍐荤粨澶辫触
207=瑙ｅ喕澶辫触
@@ -329,6 +329,16 @@
325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+328=鏈�澶氬彲娣诲姞{0}涓�
+329=缁戝畾
+330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜
+331=璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏�
+332=绌鸿皟鐩爣
+333=涓嶇粦瀹氫换浣曠洰鏍�
+334= 鐫＄湢鏃堕棿
+335=璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞￠敊涔�
+336=鍚屾
+337=鍚屾澶辫触
5097=鍙栨秷
5098=纭畾
@@ -602,7 +612,6 @@
5396=鎴�
5397=鏃堕棿涓虹┖
5398=鍙敮鎸佹暟瀛楄緭鍏�
-
5399=鍏抽棴澶辫触
5400=寮�鍚父寮�妯″紡澶辫触
5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
@@ -610,6 +619,20 @@
5403=鍒嗗叧闂�
5404=鏃�
5405=绫�
+5406=澶滅伅寮�鍏�
+5407=鑹叉俯
+5408=铚傞福鍣�
+5409=鐜鍏夌収搴�
+5410=鐓у害鍊�<
+5411=鏆梴\r\n} 0lux
+5412=浜畕\r\n} 100lux
+5413=鍦ㄥ鍐呮潯浠朵笅,榛戞殫鐓у害鍊肩害涓�0.02lux,榛勬槒鐓у害鍊納\r\n}绾︿负10lux,闃村ぉ鐓у害鍊肩害涓�5~50lux,璇锋牴鎹疄闄厈\r\n}闇�瑕佽繘琛岃皟鑺�
+5414=鍙瀵硅
+5415=鏍�
+5416=鍗曞厓
+5417=瀹ゅ鏈�
+
+
10000=HDL Home
10001=甯哥敤
@@ -648,50 +671,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=鍔熻兘璁剧疆
@@ -723,18 +728,8 @@
12100=鏈煡璁惧
-12101=鎺у埗闈㈡澘
-12102=缁х數鍣�
-12103=璋冨厜鐏�
-12104=绐楀笜
-12105=绌鸿皟
-12106=浼犳劅鍣�
-12107=绌烘皵寮�鍏�
-12108=褰╃伅
-12109=涓户鍣�
12110=娓╁害浼犳劅鍣�
12111=婀垮害浼犳劅鍣�
-12112=娓╂箍搴︿紶鎰熷櫒
12500=鏈変汉
12501=鏃犱汉
@@ -1621,7 +1616,7 @@
15873=鎷嶇収
15874=浠庣浉鍐屼腑閫夋嫨
15875=鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
-15876=璇疯緭鍏ユ墜鍔縜
+15876=璇疯緭鍏ユ墜鍔�
15877=璇峰啀娆¤緭鍏ユ墜鍔�
15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
@@ -1869,10 +1864,15 @@
16123=Mini缃戝叧
16124=娣诲姞Mini缃戝叧
16125=鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
-16126=璇烽�夋嫨widora-xxxx缃戠粶
-16127=鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}閫夋嫨widora-xxxx缃戠粶
16128=鑹叉俯
16129=Mini澶滅伅
+16130=鐕冩皵娉勯湶
+16131=蹇界暐
+16132=铚傞福鍣ㄥ紑鍏�
+16133=灏忓鐏紑鍏�
+16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+16135=鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+16136=闇�閲嶆柊缁戝畾
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1959,6 +1959,8 @@
21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐞冨瀷绉诲姩浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21024=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
@@ -2005,6 +2007,8 @@
30041=绠�绾﹀鍔熻兘闈㈡澘
30042=绠�绾︾幆澧冮潰鏉�
30043=Mini缃戝叧
+30044=鑹叉俯鐏�
+30045=ZigBee鐞冨瀷绉诲姩浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -2031,7 +2035,7 @@
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
50000=绱ф�ユ寜閽�
50001=Zigbee鐕冩皵浼犳劅鍣�
-50002=Zigbee鐕冩皵浼犳劅鍣�
+50002=Zigbee鐑熼浘浼犳劅鍣�
50003=Zigbee姘存蹈浼犳劅鍣�
50004=閽ュ寵鎵�
50005=Zigbee闂ㄧ獥浼犳劅鍣�
@@ -2073,6 +2077,8 @@
50041=绠�绾﹀鍔熻兘闈㈡澘
50042=绠�绾︾幆澧冮潰鏉�
50043=Mini缃戝叧
+50044=鑹叉俯鐏�
+50045=鐞冨瀷绉诲姩浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2117,4 +2123,5 @@
70025=鍚搁《鐕冩皵浼犳劅鍣�
70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
70027=绠�绾﹀鍔熻兘闈㈡澘
-70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file
+70028=绠�绾︾幆澧冮潰鏉�
+70029=鐞冨瀷绉诲姩浼犳劅鍣�
\ No newline at end of file
--
Gitblit v1.8.0