From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 548e959..e07949f 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -309,11 +309,10 @@
303=娓╁害鏉ユ簮
304=婀垮害鏉ユ簮
305=PM2.5鏉ユ簮
-307=涓嶈兘鍒涘缓鑷姩鍖栧父寮�妯″紡
-308=涓嶈兘鍙栨秷鑷姩鍖栧父寮�妯″紡
-
-
-
+307=璀﹀憡锛佹椂鏁堟�у父寮�鍏抽棴闂ㄩ攣鍔熻兘澶辫触锛岃鎵嬪姩鍙栨秷甯稿紑妯″紡銆�
+308=璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
+309=鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆;
+
5097=鍙栨秷
5098=纭畾
@@ -1744,7 +1743,7 @@
16034=闂厜鐏�
16035=鎴块棿鐨勫唴瀹瑰湪姝ゅ鏄剧ず
16036=鎴戠煡閬撲簡
-16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
16038=宸ヤ綔妯″紡
16039=鎺у埗妯″紡
16040=瑙﹀彂妯″紡
@@ -1801,7 +1800,7 @@
16091=甯稿紑妯″紡鎵嬪姩寮�鍚�
16092=甯稿紑妯″紡鎵嬪姩鍙栨秷
16093=甯稿紑妯″紡鍚敤{0}灏忔椂
-16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
16095=鎴戝凡闃呰骞跺悓鎰�
16096=闅愮鏉冩斂绛�
16097=鍜�
--
Gitblit v1.8.0