From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成

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

diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index d049587..8724e0e 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -225,6 +225,7 @@
 219=寮�閿佸け璐�
 220=瀵嗙爜鍙兘涓嶅瓨鍦紝灏濊瘯閲嶆柊楠岃瘉杩滅▼寮�閿佸瘑鐮�
 221=缁戝畾澶辫触锛岀粦瀹氬嚭鐜版湭鐭ラ敊璇�
+222=绂荤嚎鍦烘櫙
 
 548=鎻愰啋璁剧疆
 550=鏂板鐢ㄦ埛
@@ -685,6 +686,9 @@
 12107=绌烘皵寮�鍏�
 12108=褰╃伅
 12109=涓户鍣�
+12110=娓╁害浼犳劅鍣�
+12111=婀垮害浼犳劅鍣�
+12112=娓╂箍搴︿紶鎰熷櫒
 
 
 13100=鎴块棿鍒楄〃
@@ -736,6 +740,8 @@
 13146=榛樿鍥惧簱
 13147=鎷嶇収
 13148=鎴戠殑鐩稿唽
+13149=璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
+
 
 13500=閫夋嫨鎽嗛
 13501=鑷姩
@@ -744,6 +750,7 @@
 13504=3鎸�
 13505=4鎸�
 13506=5鎸�
+13511=璇锋竻娲佹护缃�
 
 
 

--
Gitblit v1.8.0