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 |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 71eef6b..093e27f 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -337,6 +337,8 @@
 333=涓嶇粦瀹氫换浣曠洰鏍�
 334= 鐫＄湢鏃堕棿
 335=璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞￠敊涔�
+336=鍚屾
+337=鍚屾澶辫触
 
 5097=鍙栨秷
 5098=纭畾
@@ -625,6 +627,10 @@
 5411=鏆梴\r\n} 0lux
 5412=浜畕\r\n} 100lux
 5413=鍦ㄥ鍐呮潯浠朵笅,榛戞殫鐓у害鍊肩害涓�0.02lux,榛勬槒鐓у害鍊納\r\n}绾︿负10lux,闃村ぉ鐓у害鍊肩害涓�5~50lux,璇锋牴鎹疄闄厈\r\n}闇�瑕佽繘琛岃皟鑺�
+5414=鍙瀵硅
+5415=鏍�
+5416=鍗曞厓
+5417=瀹ゅ鏈�
 
 
 
@@ -1610,7 +1616,7 @@
 15873=鎷嶇収
 15874=浠庣浉鍐屼腑閫夋嫨
 15875=鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
-15876=璇疯緭鍏ユ墜鍔縜
+15876=璇疯緭鍏ユ墜鍔�
 15877=璇峰啀娆¤緭鍏ユ墜鍔�
 15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
 15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
@@ -1865,6 +1871,8 @@
 16132=铚傞福鍣ㄥ紑鍏�
 16133=灏忓鐏紑鍏�
 16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+16135=鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+16136=闇�閲嶆柊缁戝畾
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�

--
Gitblit v1.8.0