From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/GateWay.Ios/Resources/Language.ini |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
index 20bf98f..d049587 100755
--- a/ZigbeeApp/GateWay.Ios/Resources/Language.ini
+++ b/ZigbeeApp/GateWay.Ios/Resources/Language.ini
@@ -1618,7 +1618,7 @@
 15934=涓嬭浇鏁版嵁
 15935=涓嬭浇
 15936=璁剧疆缃戝叧缁忕含搴﹀け璐�
-15937=姝ｅ湪淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
+15937=姝ｅ湪淇濆瓨鍗忚皟鍣╪v鍒嗗尯淇℃伅
 15938=淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅澶辫触
 15939=鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳藉け璐�
 15940=缃戝叧鏁版嵁澶囦唤澶辫触
@@ -1626,6 +1626,39 @@
 15942=鍝嶅簲瓒呮椂,缃戝叧鏁版嵁澶囦唤澶辫触
 15943=鍒涘缓澶囦唤鏂囦欢
 15944=姝ｅ湪鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
+15945=鑾峰彇缃戝叧鑷姩澶囦唤璁剧疆澶辫触
+15946=璁剧疆缃戝叧鑷姩澶囦唤澶辫触
+15947=姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
+15948=鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+15949=鍝嶅簲瓒呮椂,鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+15950=姝ｅ湪涓嬭浇澶囦唤鏂囦欢
+15951=鍝嶅簲瓒呮椂,涓嬭浇澶囦唤鏂囦欢澶辫触
+15952=涓嬭浇澶囦唤鏂囦欢澶辫触
+15953=姝ｅ湪鎭㈠鍗忚皟鍣╪v鍒嗗尯
+15954=鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+15955=鍝嶅簲瓒呮椂,鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+15956=姝ｅ湪閲嶅惎缃戝叧绯荤粺
+15957=閲嶅惎缃戝叧绯荤粺澶辫触
+15958=鍝嶅簲瓒呮椂,閲嶅惎缃戝叧绯荤粺澶辫触
+15959=缃戝叧鏁版嵁鎭㈠鎴愬姛!
+15960=铏氭嫙椹卞姩璁惧
+15961=瀵嗙爜寮�閿佹垚鍔�
+15962=瀵嗙爜寮�閿佸け璐�
+15963=鎸囩汗寮�閿佹垚鍔�
+15964=鎸囩汗寮�閿佸け璐�
+15965=IC鍗″紑閿佹垚鍔�
+15966=IC鍗″紑閿佸け璐�
+15967=寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂�
+15968=纭畾瑕佽В闄ょ粦瀹歿0}锛�
+15969=鏇存柊绗笁鏂逛俊鎭け璐�
+15970=缁戝畾{0}鎴愬姛!
+15971=閿欒,绗笁鏂逛俊鎭涪澶�
+15972=鎮ㄥ綋鍓嶇殑IP鍙婄鍙ｅ湪浜戠涓嶅瓨鍦�,璇烽噸鏂扮櫥褰�!
+15973=娑堟伅涓績
+15974=纭鍒犻櫎娑堟伅?
+15975=姝ｅ湪涓婁紶澶囦唤鏂囦欢
+15976=纭鍒犻櫎鍏ㄩ儴娑堟伅?
+15977=纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�

--
Gitblit v1.8.0