From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Home.Ios/Resources/Language.ini | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp20200414/Home.Ios/Resources/Language.ini b/ZigbeeApp20200414/Home.Ios/Resources/Language.ini
index dc4a993..cb720fa 100755
--- a/ZigbeeApp20200414/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp20200414/Home.Ios/Resources/Language.ini
@@ -310,6 +310,8 @@
303=娓╁害鏉ユ簮
304=婀垮害鏉ユ簮
305=PM2.5鏉ユ簮
+307=涓嶈兘鍒涘缓鑷姩鍖栧父寮�妯″紡
+308=涓嶈兘鍒涘缓鑷姩鍖栧父寮�妯″紡
@@ -1408,9 +1410,9 @@
15697=妯″潡鏇存崲鐢垫睜
15698=閿欒灏濊瘯寮�閿佽鎶�
15699=鏆村姏寮�闂�
-15700=甯稿紑妯″紡寮�鍚�
-15701=甯稿紑妯″紡缁撴潫
-15702=闂ㄩ搩瑙﹀彂
+15700=甯稿紑妯″紡寮�鍚�(闂ㄩ攣瑙﹀彂)
+15701=甯稿紑妯″紡缁撴潫(闂ㄩ攣瑙﹀彂)
+15702=鏈変汉璁块棶
15703=鍘嗗彶璁板綍
15704=绫诲瀷绛涢��
15705=娓呯┖璁板綍
@@ -1794,6 +1796,12 @@
16085=涓埆鎵ц鐩爣娣诲姞澶辫触
16086=鍒濆鍖栨墽琛岀洰鏍囧け璐�
16087=淇敼鍦烘櫙鍚嶇О澶辫触
+16088=甯稿紑妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+16089=甯稿紑妯″紡缁撴潫(缃戝叧瑙﹀彂)
+16090=甯稿紑妯″紡
+16091=甯稿紑妯″紡鎵嬪姩寮�鍚�
+16092=甯稿紑妯″紡鎵嬪姩鍙栨秷
+16093=甯稿紑妯″紡鍚敤{0}灏忔椂
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1900,7 +1908,7 @@
30017=zigbee涓户鍣�
30018=12鎸夐敭瑙︽懜闈㈡澘(1璺户鐢靛櫒搴曞骇)
30019=4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
-30020=绾㈠浼犳劅鍣�
+30020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
30021=1璺皟鍏夊櫒灏忔ā鍧�
30022=zigbee杞珺uspro鍗忚杞崲鍣�
30023=zigbee杞�485鍗忚杞崲鍣�
@@ -1912,13 +1920,13 @@
30029=鏂规偊鍗曞紑鍙屾帶闈㈡澘
30030=鏂规偊鍙屽紑鍥涙帶闈㈡澘
30031=鏂规偊鍥涘紑鍏帶闈㈡澘
-30032=Zigbee鏂规偊鏂伴闈㈡澘
+30032=鏂规偊鏂伴闈㈡澘
30033=鏂规偊鐜闈㈡澘
30034=绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
30035=绠�绾�2璺獥甯橀潰鏉�
30036=鏂规偊/2璺獥甯橀潰鏉�-Z
30037=S-one
-
+
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
40001=鎸夐敭闈㈡澘
@@ -1928,7 +1936,7 @@
40005=闂ㄩ攣
40006=绌鸿皟
40007=涓户鍣�
-40008=鏅鸿兘绌哄叧
+40008=鏅鸿兘绌哄紑
40009=杞崲鍣�
40010=褰╃伅
40011=娓╂箍搴︿紶鎰熷櫒
@@ -1938,7 +1946,6 @@
40015=鎻掑骇
40016=鐏厜
40017=骞叉帴鐐�
-40018=鏂伴
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
50000=绱ф�ユ寜閽�
@@ -1978,7 +1985,7 @@
50034=Zigbee绠�绾�4鎸夐敭闈㈡澘
50035=Zigbee绠�绾�2璺潰鏉�
50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
-50037=Zigbee鏅鸿兘闂ㄩ攣
+50037=Zigbee鏅鸿兘闂ㄩ攣
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -1992,4 +1999,31 @@
60008=杞崲鍣�
60009=绌鸿皟妯″潡
60010=鏅鸿兘闂ㄩ攣
-60011=鏂伴
\ No newline at end of file
+60011=鏂伴妯″潡
+
+;//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭ｉ噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
+70000=2鎸夐敭闈㈡澘
+70001=3鎸夐敭闈㈡澘
+70002=4鎸夐敭闈㈡澘
+70003=鏂规偊鍗曞紑鍙屾帶闈㈡澘
+70004=鏂规偊鍙屽紑鍥涙帶闈㈡澘
+70005=鏂规偊鍥涘紑鍏帶闈㈡澘
+70006=鏂规偊鏂伴灏忔ā鍧�
+70007=鏂规偊鏂伴闈㈡澘
+70008=鏂规偊鐜闈㈡澘
+70009=绐楀笜闈㈡澘
+70010=3璺户鐢靛櫒
+70011=1璺皟鍏夊櫒
+70012=绐楀笜鐢垫満
+70013=鍗峰笜鐢垫満
+70014=绌鸿皟缃戝叧
+70015=闂ㄩ攣
+70016=PIR浼犳劅鍣�
+70017=绾㈠浼犳劅鍣�
+70018=鐕冩皵浼犳劅鍣�
+70019=鐑熼浘浼犳劅鍣�
+70020=姘存蹈浼犳劅鍣�
+70021=闂ㄧ獥浼犳劅鍣�
+70022=娓╂箍搴︿紶鎰熷櫒
+70023=涓户鍣�
+70024=鏅鸿兘绌哄紑
\ No newline at end of file
--
Gitblit v1.8.0