From f8b647c263f068babb8efcc19ff4e74026a4bd28 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 03 十二月 2019 10:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Home.Ios/Resources/Language.ini | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/GateWay.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
similarity index 96%
rename from ZigbeeApp/GateWay.Ios/Resources/Language.ini
rename to ZigbeeApp/Home.Ios/Resources/Language.ini
index 3490b3e..8b87531 100755
--- a/ZigbeeApp/GateWay.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=璇锋竻娲佹护缃�
@@ -1618,7 +1625,7 @@
15934=涓嬭浇鏁版嵁
15935=涓嬭浇
15936=璁剧疆缃戝叧缁忕含搴﹀け璐�
-15937=姝ｅ湪淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
+15937=姝ｅ湪淇濆瓨鍗忚皟鍣╪v鍒嗗尯淇℃伅
15938=淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅澶辫触
15939=鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳藉け璐�
15940=缃戝叧鏁版嵁澶囦唤澶辫触
@@ -1626,6 +1633,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