From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码

---
 ZigbeeApp/Home.Ios/Resources/Language.ini |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 720aeb9..be67921 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -339,6 +339,10 @@
 335=璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞￠敊涔�
 336=鍚屾
 337=鍚屾澶辫触
+338=鏁版嵁鏍℃
+339=鐭娓╁害澶辫触
+340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
+341=璇疯緭鍏ユ纭殑鏁板��
 
 5097=鍙栨秷
 5098=纭畾
@@ -1880,10 +1884,12 @@
 16141=绱ф�ユ寜閽�
 16142=闂ㄧ獥浼犳劅鍣�
 16143=閽ュ寵鎵�
-16144=鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
+16144=鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
 16145=闀挎寜姝ゆ寜閿�
 16146=Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
 16147=寮�鍏抽敭
+16148=杩囨埛
+16149=浣忓畢杩囨埛
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1965,7 +1971,7 @@
 ;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
 21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
 ;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
-21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+21021=鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
 ;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
 21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
 ;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず

--
Gitblit v1.8.0