From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Home.Ios/Resources/Language.ini | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 482c834..bc45717 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -232,7 +232,7 @@
226=纭鍒犻櫎鎸夐敭妯″紡鍙妠0}娓呯┖鎵�鏈夌洰鏍�
227=娓呯┖鎵�鏈夌洰鏍�
228=纭
-229=鍒嗕韩鎴愬姛
+229=鍒嗛厤鎴愬姛
230=纭畾瑕佸皢璇ヨ处鎴疯В鍐伙紵
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -369,7 +369,7 @@
5097=鍙栨秷
-5098=纭
+5098=纭畾
5099=鎻愮ず
5100=閫昏緫鍒楄〃
5101=鏃�
@@ -412,7 +412,7 @@
5138=鏃堕棿鏉′欢
5139=鏉′欢
5140=鎺ㄩ�佽缃�
-5141=鎺ㄩ�佸紑鍏�
+5141=鎺ㄩ�佹秷鎭�
5142=鑷畾涔夋帹閫�
5143=鏃ュ嚭鍓�
5144=鏃ュ嚭鍚�
@@ -540,7 +540,7 @@
5266=甯冮槻
5267=璇烽�夋嫨甯冮槻鎴栨挙闃蹭负鏉′欢
5268=璇烽�夋嫨瀹夐槻绫诲瀷
-5269=鏈変汉
+5269=妫�娴嬫湁浜烘椂
5270=鏃犱汉
5271=寮�鍚�
5272=鍏抽棴
@@ -554,7 +554,7 @@
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
5282=鑷畾涔夋埧闂�
-5283=璁剧疆鍛ㄦ湡
+5283=鐢熸晥鏃堕棿
5284=鑷姩鍖�
5285=鑷姩鍖栧悕绉�
5286=濡傛灉
@@ -614,12 +614,13 @@
5370=璇烽�夋嫨鐢ㄦ埛锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
5371=璇烽�夋嫨鍦烘櫙锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
5372=璇烽�夋嫨瀹夐槻妯″紡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
-5373=鑷姩鍖栧凡鎵ц.
+5373=宸叉墽琛�.
5374=娣诲姞浼犳劅鍣�
5375=娣诲姞寮�鍏�/鐏厜
5376=搴旂敤
5377=娌℃湁鑷姩鍖杮\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
+5379=鏆傛棤闂ㄩ攣鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
@@ -704,9 +705,9 @@
11001=鍦烘櫙
11002=鑷姩鍖�
-11010=娌℃湁鍔熻兘 {\r\n} 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
+11010=娌℃湁鍔熻兘 {\r\n} 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
11011=缂栬緫
-11012=璁剧疆鍔熻兘
+11012=鍔熻兘璁剧疆
11013=淇℃伅缂栬緫
11014=鍔熻兘鍚嶇О
11015=鎵�灞炲尯鍩�
@@ -731,7 +732,7 @@
11034=纭畾瑕佺Щ闄よ鍔熻兘锛�
11035=娣诲姞鍔熻兘
11036=娣诲姞寤舵椂
-
+11037=绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
12100=鏈煡璁惧
@@ -1678,7 +1679,7 @@
15920=閭鍦板潃
15921=璇疯緭鍏ユ偍鐨勯偖绠卞湴鍧�
15922=鎻愪氦
-15923=鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+15923=鎮ㄧ殑鍙嶉宸叉垚鍔熸彁浜�
15924=涓婁紶
15925=鑷姩澶囦唤
15926=浠婃棩鎻愪氦娆℃暟宸蹭笂闄�
@@ -1816,6 +1817,9 @@
16058=鎴戠殑瀹�
16059=闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹�
16060=鍔炲叕瀹�
+16061=鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+16062=鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+16063=璁剧疆绌鸿皟鎽嗛澶辫触
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
--
Gitblit v1.8.0