From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 15 十月 2019 11:06:05 +0800 Subject: [PATCH] 首次合并了全部的代码 --- ZigbeeApp/GateWay.Droid/Assets/Language.ini | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini index 2969b1f..c2813c8 100755 --- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini +++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini @@ -531,6 +531,32 @@ 5302=鎸夐敭涓� 5303=鎸夐敭鍥� 5304=鏄惁瑕佸垹闄�? +5305=寮�/鍏� +5306=鏃犱汉绉诲姩鏃堕棿 +5307=鏃犱汉绉诲姩鏃� +5308=瓒呰繃鏃堕棿鏈叧闂椂 +5309=鏈叧闂椂 +5340=姣忓懆 +5341=璇烽�夋嫨鎵ц鍛ㄦ湡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝� +5342=闂ㄩ攣 +5343=閫夋嫨鐢ㄦ埛 +5344=瀵嗙爜 +5345=鎸囩汗 +5346=IC鍗� +5347=绌烘皵寮�鍏� +5348=涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅� +5349=娣诲姞寤舵椂 +5350=鍒跺喎 +5351=鍒剁儹 +5352=鑷姩 +5353=闄ゆ箍 +5354=閫侀 +5355=浣庨 +5356=涓 +5357=楂橀 +5358=鎺ㄨ崘妯℃澘 +5359=浜烘潵鐏寒 +5360=浜鸿蛋鐏伃 @@ -546,7 +572,7 @@ 10106=娉ㄥ唽鐢ㄦ埛 10107=璇疯緭鍏ラ偖绠� 10108=鎼滅储 -10109=纭畾 +10109=瀹屾垚 10110=璐﹀彿鐧诲綍 10111=鍙戦�侀獙璇佺爜 10112=鍚庨噸鍙� @@ -612,6 +638,10 @@ 13114=绉� 13115=鍒嗛挓 13116=灏忔椂 +13117=鏈垎閰� +13118=鍏ㄩ�� +13119=娣诲姞鍒� + @@ -1010,7 +1040,7 @@ 15189=宸茶缃梺璺� 15190=娣诲姞浼犳劅鍣� 15191=甯冮槻 -15192=纭畾瑕佹巿鏉冭璐﹀彿涓轰富璐﹀彿? +15192=纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳? 15193=纭畾瑕佹挙閿�璇ユ垚鍛樼鐞嗘潈闄愬悧锛� 15194=鎴愬憳鎺堟潈 15195=鎴愬憳鎺堟潈鎴愬姛 @@ -1532,6 +1562,10 @@ 15771=缂栬緫鎴块棿 15772=鑾峰彇涓�... 15773=瀛樺湪闈炴硶瀛楃銆寋0}銆� +15774=涓嶅瓨鍦ㄨ璐︽埛锛岃閲嶆柊杈撳叆 +15775=杩斿洖 +15776=杩樻病鏈夊叡浜尯鍩熺粰鎴愬憳{0}鍙偣鍑诲彸涓婅鈥�+鈥濇坊鍔� +15777=纭鍒犻櫎鍏变韩鎴块棿锛� ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽� 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹� -- Gitblit v1.8.0