From 8245dd3bba861d60556cd4804b39bca74c19c329 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 14:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index b8a4586..c6ff768 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -1525,6 +1525,9 @@
 15853=闄ゆ箍
 15854=鎵撳紑绌鸿皟澶辫触
 15855=鍏抽棴绌鸿皟澶辫触
+15856=璇锋敞鎰忔竻娲楁护缃戝摝
+15857=鏃犲彲鍏变韩鐨勫満鏅�
+15858=鏃犲彲鍏变韩鐨勮澶�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�

--
Gitblit v1.8.0