From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码

---
 ZigbeeApp/Home.Ios/Resources/Language.ini |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index c810653..05fabd8 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -312,7 +312,7 @@
 307=璀﹀憡锛佹椂鏁堟�у父寮�鍏抽棴闂ㄩ攣鍔熻兘澶辫触锛岃鎵嬪姩鍙栨秷甯稿紑妯″紡銆�
 308=璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
 309=鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆;
- 
+310=璇疯緭鍏ュ悎娉曠殑鏁板瓧
 
 5097=鍙栨秷
 5098=纭畾
@@ -1743,7 +1743,7 @@
 16034=闂厜鐏�
 16035=鎴块棿鐨勫唴瀹瑰湪姝ゅ鏄剧ず
 16036=鎴戠煡閬撲簡
-16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
 16038=宸ヤ綔妯″紡
 16039=鎺у埗妯″紡
 16040=瑙﹀彂妯″紡
@@ -1800,7 +1800,7 @@
 16091=甯稿紑妯″紡鎵嬪姩寮�鍚�
 16092=甯稿紑妯″紡鎵嬪姩鍙栨秷
 16093=甯稿紑妯″紡鍚敤{0}灏忔椂
-16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
 16095=鎴戝凡闃呰骞跺悓鎰�
 16096=闅愮鏉冩斂绛�
 16097=鍜�

--
Gitblit v1.8.0