From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL-ON_Android/Assets/Language.ini | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 209 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index bccbac7..1fd37ce 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -49,7 +49,7 @@
33=澶滈棿妯″紡
34=閫氱敤璁剧疆
35=鑾峰彇鏀寔
-36=鏀惰棌
+36=涓婚〉
37=鍒嗙被
38=鏅鸿兘
39=涓汉
@@ -77,7 +77,7 @@
61=浜害
62=璁剧疆
63=浣嶇疆绠＄悊
-64=鍏变韩
+64=鍒嗕韩
65=娣诲姞鍒版闈�
66=淇敼鍚嶇О
67=鍙栨秷
@@ -166,7 +166,7 @@
150=甯冮槻/鎾ら槻
151=杩滅▼寮�閿佹椂
152=鍚姩杞欢鏃舵棤闇�瀵嗙爜/鎵嬪娍淇濇姢
-153=绂诲紑5鍒嗛挓涔嬪悗鍦ㄨ繘鍏ワ紝闇�瑕佷娇鐢ㄥ搴旀柟寮忚В閿�
+153=绂诲紑5鍒嗛挓涔嬪悗鍐嶈繘鍏ワ紝闇�瑕佷娇鐢ㄥ搴旀柟寮忚В閿�
154=涓汉涓績-瀹夐槻鍔熻兘甯冮槻/鎾ら槻鏃惰В閿佷娇鐢�
155=鏅鸿兘闂ㄩ攣鍔熻兘瑙ｉ攣浣跨敤
156=璁剧疆瑙ｉ攣鏂瑰紡
@@ -269,4 +269,209 @@
253=淇濆瓨涓紝璇风◢鍚�
254=淇敼鎴愬憳鏄电О
255=绉婚櫎璇ユ垚鍛�
-256=鏆傛棤宸叉敹钘忕殑鍔熻兘
\ No newline at end of file
+256=鏆傛棤宸叉敹钘忕殑鍔熻兘
+257=璇疯緭鍏ュ唴瀹�
+258=娆㈣繋鏂版垚鍛樺姞鍏�
+259=鏄惁纭绉婚櫎璇ユ垚鍛橈紵
+260=杈撳叆鐧诲綍瀵嗙爜楠岃瘉
+261=鍒囨崲浣忓畢鎴愬姛銆�
+262=鍏ㄩ��
+263=鍒嗕韩鍔熻兘閫夋嫨
+264=纭鍒嗕韩
+265=鍒嗕韩缁�
+266=鍔熻兘鍒嗕韩澶辫触銆�
+267=鍔熻兘鍒嗕韩鎴愬姛銆�
+268=閭鍦板潃
+269=淇敼缁戝畾
+270=瑙ｉ櫎缁戝畾
+271=褰撳墠閭鍦板潃:
+272=淇敼缁戝畾閭
+273=鏇存崲楠岃瘉鏂瑰紡
+274=楠岃瘉鐮佸凡鍙戦�侊紝璇疯緭鍏ラ獙璇佺爜
+275=閲嶆柊鍙戦��
+276=楠岃瘉鎴愬姛
+277=缁戝畾閭鍦板潃
+278=璇疯緭鍏ユ柊鐨勯偖绠�
+279=缁戝畾閭鎴愬姛
+280=缁戝畾閭澶辫触
+281=瑙ｉ櫎閭缁戝畾
+282=瑙ｇ粦鎴愬姛
+283=鎵嬫満鍙�
+284=褰撳墠鎵嬫満鍙�
+285=缁戝畾鎵嬫満鍙�
+286=缁戝畾鎵嬫満鎴愬姛
+287=缁戝畾鎵嬫満澶辫触
+288=鎵嬫満鍙蜂慨鏀�
+289=瑙ｇ粦鎵嬫満鍙�
+290=璇诲彇鍘嗗彶鏁版嵁澶辫触
+291=鏆傛棤宸叉敹钘忕殑鍦烘櫙
+292=鍏充簬ON
+293=鎴愬憳
+294=绠＄悊鍛�
+295=淇敼瀵嗙爜
+296=淇敼鐧诲綍瀵嗙爜鍓�
+297=璇疯繘琛岃韩浠介獙璇�
+298=鎵嬫満鍙烽獙璇�
+299=閭楠岃瘉
+300=鏈粦瀹氶偖绠憋紝鏃犳硶楠岃瘉
+301=鏈粦瀹氭墜鏈哄彿锛屾棤娉曢獙璇�
+302=鍘荤粦瀹�
+303=鎵嬫満鍙疯В缁戞垚鍔�
+304=楠岃瘉鐮佸凡鍙戦�佽嚦:
+305=鎵嬫満鍙锋敞鍐�
+306=閭娉ㄥ唽
+307=鎺ユ敹鍒版柊鐨勬暟鎹紝鏄惁闇�瑕佽鐩栵紵
+308=鑷姩鍖�
+309=鏂板缓鍦烘櫙
+310=娣诲姞鍦烘櫙
+311=鍩烘湰閰嶇疆
+312=鍦烘櫙鍚嶇О
+313=鎵�灞炲尯鍩�
+314=瀹屾垚
+315=鍏ㄥ畢鍦烘櫙
+316=绛涢��
+317=宸叉坊鍔�
+318=寮�鍏�
+319=椋庨��
+320=妯″紡
+321=寮�
+322=鍏�
+323=鍦烘櫙
+324=鍦烘櫙寤舵椂
+325=寤舵椂璁剧疆
+326=寤舵椂
+327=鎹曡幏鍦烘櫙
+328=鐢靛奖鍦烘櫙
+329=鏅��
+330=鏃堕棿妯″紡
+331=鍔熺巼鍦扮儹
+332=鍦板喎
+333=鍔熺巼鍦板喎
+334=璋冭妭鐧惧垎姣�
+335=鏃犲欢鏃�
+336=鏆傛棤鍦烘櫙
+337=缂栬緫鍦烘櫙
+338=鍦烘櫙鍚嶇О涓嶈兘涓虹┖
+339=鍦烘櫙鍚嶅凡瀛樺湪锛岃淇敼
+340=鎴块棿鍚嶅凡瀛樺湪锛岃淇敼
+341=鏄惁瑕佸垹闄よ鍦烘櫙?
+342=缃戝叧涓嶅湪绾�,杩滅▼杩炴帴澶辫触銆�
+343=MAC閿欒,杩滅▼杩炴帴澶辫触銆�
+344=杩滅▼杩炴帴澶辫触銆�
+345=鎵嬫満鍙疯处鍙�
+346=閭璐﹀彿
+347=璇疯緭鍏ユ柊鐨勬墜鏈哄彿
+348=鎵嬫満鍙峰凡琚娇鐢ㄣ��
+349=閭宸茶浣跨敤銆�
+350=閭鍦板潃涓庡綋鍓嶄竴鏍凤紝鏃犻』淇敼
+351=鎵嬫満鍙蜂笌褰撳墠涓�鏍凤紝鏃犻』淇敼
+352=妤煎眰鍒嗛厤
+353=鎷夊紑
+354=闂悎
+355=鍏充簬
+356=鐗堟湰鍙�
+357=姝ゅ姛鑳芥殏鏈紑鏀撅紒
+
+5000=闊充箰
+5001=缁勫悎
+5002=璁剧疆
+5003=鍩虹淇℃伅
+5004=鎾斁鍣ㄥ悕绉�
+5005=钃濈墮鍚嶇О
+5006=鍖哄煙
+5007=姝屽崟
+5008=鎴戠殑鏈�鐖�
+5009=鎴戠殑鍒楄〃
+5010=閫夋嫨闊虫簮
+5011=鏈湴闊充箰
+5012=USB
+5013=鍦ㄧ嚎鐢靛彴
+5014=QQ闊充箰
+5015=钃濈墮
+5016=绾胯矾杈撳叆
+5017=淇敼鍚嶇О
+5018=鍗曟洸鎾斁
+5019=闅忔満鎾斁
+5020=鍒楄〃鎾斁
+5021=宸插垏鎹㈠埌
+5022=鍙栨秷
+5023=鍒犻櫎
+5024=缂栬緫
+5025=鍒楄〃鍚嶇О鐩稿悓
+5026=鍒楄〃鍚嶄负绌�
+5027=璇疯緭鍏ュ垪琛ㄥ悕
+5028=娣诲姞鏂扮殑鍒楄〃
+5029=鎻愮ず
+5030=鏄惁纭鍒犻櫎鏂囦欢澶�
+5031=纭
+5032=鍚嶇О涓虹┖
+5033=宸叉坊鍔犲埌姝屽崟:
+5034=鐢靛彴
+5035=閫夋嫨缁勫悎
+5036=闇�瑕佹挱鏀�
+5037=鑷冲皯閫変腑涓や釜浠ヤ笂鎾斁鍣�
+5038=涓嶈兘閫変腑涓や釜鎴栦袱涓互涓婁富鎾斁鍣ㄨ繘琛岀粍鍚�
+5039=杩樻病閫変腑鎾斁鍣�
+5040=閫変腑瑙ｉ櫎鎾斁鍣�
+5041=杩樻病鏈夐�夋嫨瑙ｉ櫎缁勬挱鏀惧櫒
+5042=閰嶇疆涓�...
+5043=瑙ｉ櫎涓�...
+5044=闊抽噺
+5045=鎬婚煶閲�
+5046=璋冭妭闊抽噺
+5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
+
+
+7000=鏂板缓鑷姩鍖�
+7001=缂栬緫鑷姩鍖�
+7002=濡傛灉
+7003=鍚屾椂婊¤冻浠ヤ笅鏉′欢鏃�
+7004=浠讳竴婊¤冻浠ヤ笅鏉′欢鏃�
+7005=灏辨墽琛�
+7006=浠ヤ笅鍔ㄤ綔
+7007=寰幆鏂瑰紡
+7008=鎵ц涓�娆�
+7009=姣忓ぉ
+7010=姣忓懆
+7011=姣忔湀
+7012=淇濆瓨
+7013=鎵ц鎺ㄩ��
+7014=鍙戦�侀�氱煡
+7015=閫夋嫨鏉′欢
+7016=鏃堕棿
+7017=閫夋嫨鏃堕棿鏉′欢
+7018=鏃跺埢
+7019=鏃堕棿鑼冨洿
+7020=鏃�
+7021=鍒�
+7022=绉�
+7023=鍙栨秷
+7024=纭畾
+7025=*鍦ㄦ偍鎵�璁剧疆鐨勬椂闂存鍐呭繀瀹氫細鎵ц涓�娆℃偍鎵�璁剧疆鐨勮嚜鍔ㄥ寲
+7026=寮�濮嬫椂闂�
+7027=缁撴潫鏃堕棿
+7028=鍔熻兘
+7029=閫変腑鍔熻兘鏉′欢
+7030=鍏ㄩ儴鍖哄煙
+7031=鍏ㄩ儴鍔熻兘
+7032=寮�
+7033=鍏�
+7034=寮�鍏�
+7035=瀹屾垚
+7036=娣诲姞鎵ц鍔ㄤ綔
+7037=鍛ㄤ竴
+7038=鍛ㄤ簩
+7039=鍛ㄤ笁
+7040=鍛ㄥ洓
+7041=鍛ㄤ簲
+7042=鍛ㄥ叚
+7043=鍛ㄦ棩
+7044=婊¤冻鏉′欢
+7045=璁剧疆
+7046=鍚嶇О
+7047=淇敼鍚嶇О
+7048=鑷姩鍖栧悕绉板凡瀛樺湪
+7049=鏄惁瑕佸垹闄よ嚜鍔ㄥ寲锛�
+7050=娣诲姞鍦烘櫙
+7051=寤舵椂
+
--
Gitblit v1.8.0