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 | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index c2b864a..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=甯哥敤
@@ -1593,7 +1616,7 @@
15873=鎷嶇収
15874=浠庣浉鍐屼腑閫夋嫨
15875=鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
-15876=璇疯緭鍏ユ墜鍔縜
+15876=璇疯緭鍏ユ墜鍔�
15877=璇峰啀娆¤緭鍏ユ墜鍔�
15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
@@ -1847,6 +1870,9 @@
16131=蹇界暐
16132=铚傞福鍣ㄥ紑鍏�
16133=灏忓鐏紑鍏�
+16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+16135=鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+16136=闇�閲嶆柊缁戝畾
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1933,6 +1959,8 @@
21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐞冨瀷绉诲姩浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21024=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
@@ -1980,6 +2008,7 @@
30042=绠�绾︾幆澧冮潰鏉�
30043=Mini缃戝叧
30044=鑹叉俯鐏�
+30045=ZigBee鐞冨瀷绉诲姩浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -2049,6 +2078,7 @@
50042=绠�绾︾幆澧冮潰鏉�
50043=Mini缃戝叧
50044=鑹叉俯鐏�
+50045=鐞冨瀷绉诲姩浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2093,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