From 53cb8c211ecec2388a6583d32c5d2fe709285344 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 14:54:52 +0800
Subject: [PATCH] 上传

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index e6078b0..6c4e455 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -237,13 +237,11 @@
 231=鎺ヨ繎鎰熷簲
 232=鎺ヨ繎鎰熷簲鍔熻兘璁剧疆缃け璐�
 233=鑾峰彇鎺ヨ繎鎰熷簲鍔熻兘澶辫触
-235=鎸変綇闈㈡澘妯″紡锛圡ode)鍜岄閫燂紙Fan)鎸夐敭{0}缁胯壊鎸囩ず鐏寒璧枫�傚垯閰嶇綉鎴愬姛
-;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+235=鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛 
 236=缁胯壊鎸囩ず鐏棯鐑�
 237=鎸囩ず鐏�
 238=闀挎寜5绉掞紙鎸夐敭锛�
 239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
 241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
 242=鐢甸噺
 243=甯稿紑妯″紡宸插紑鍚�
@@ -315,6 +313,8 @@
 310=璇疯緭鍏ュ悎娉曠殑鏁板瓧
 311=鎵嬪姩
 312= 鑳屽厜鐏鑹�
+313=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
+314=鑷姩妯″紡涓嶆敮鎸佹搷浣�
 
 5097=鍙栨秷
 5098=纭畾
@@ -589,6 +589,12 @@
 5397=鏃堕棿涓虹┖
 5398=鍙敮鎸佹暟瀛楄緭鍏�
 
+5399=鍏抽棴澶辫触
+5400=寮�鍚け璐�
+5401=娣诲姞澶辫触
+5402=鏃舵晥鎬у父寮�璁剧疆
+5403=鏃跺叧闂�
+
 10000=HDL Home
 10001=甯哥敤
 
@@ -670,7 +676,7 @@
 11001=鍦烘櫙
 11002=鑷姩鍖�
 
-11010=娌℃湁鍔熻兘 {\r\n} 璇峰湪涓汉涓績--璁惧绠$悊澶勬坊鍔�
+11010=娌℃湁鍔熻兘{0}璇峰湪涓汉涓績--璁惧绠$悊澶勬坊鍔�
 11011=缂栬緫
 11012=鍔熻兘璁剧疆
 11013=淇℃伅缂栬緫
@@ -684,7 +690,7 @@
 11021=淇濆瓨
 11022=鎻愰啋
 11023=鍙栨秷
-11024=娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+11024=娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
 11025=璁剧疆
 11026=寤舵椂
 11027=纭畾鍒犻櫎鍚楋紵
@@ -1837,6 +1843,7 @@
 16113=鐏叏寮�
 16114=鐏叏鍏�
 16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+16116=娓稿浣撻獙
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1912,11 +1919,11 @@
 ;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
 21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
 ;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21018=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+21018=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
 ;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21019=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+21019=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
 ;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21020=鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
 ;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
 21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
 ;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
@@ -1965,6 +1972,7 @@
 30037=S-one
 30038=鏂规偊鏂伴灏忔ā鍧�
 30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
+30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
 40000=閬槼
@@ -2028,6 +2036,7 @@
 50037=Zigbee鏅鸿兘闂ㄩ攣
 50038=鏂伴鎺у埗灏忔ā鍧�
 50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
+50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
 60000=浼犳劅鍣�
@@ -2069,4 +2078,5 @@
 70022=娓╂箍搴︿紶鎰熷櫒
 70023=涓户鍣�
 70024=鏅鸿兘绌哄紑
-70025=鍚搁《鐕冩皵浼犳劅鍣�
\ No newline at end of file
+70025=鍚搁《鐕冩皵浼犳劅鍣�
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file

--
Gitblit v1.8.0