From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码

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

diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index da9b215..c218003 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -707,7 +707,7 @@
 
 11010=娌℃湁鍔熻兘 {\r\n} 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
 11011=缂栬緫
-11012=璁剧疆鍔熻兘
+11012=鍔熻兘璁剧疆
 11013=淇℃伅缂栬緫
 11014=鍔熻兘鍚嶇О
 11015=鎵�灞炲尯鍩�
@@ -732,7 +732,7 @@
 11034=纭畾瑕佺Щ闄よ鍔熻兘锛�
 11035=娣诲姞鍔熻兘
 11036=娣诲姞寤舵椂
-
+11037=绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
 
 
 12100=鏈煡璁惧
@@ -1817,6 +1817,9 @@
 16058=鎴戠殑瀹�
 16059=闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹�
 16060=鍔炲叕瀹�
+16061=鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+16062=鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+16063=璁剧疆绌鸿皟鎽嗛澶辫触
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�

--
Gitblit v1.8.0