From 92906312dfc5f55b6ef364f4d9da0d5768c00782 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL-ON_Android/Assets/Language.ini | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index eb71aaa..344421e 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -253,7 +253,7 @@
231=鍏朵粬鍖哄煙
232=鎴愬憳绠＄悊
233=鏄电О
-234=浣跨敤鏉冮檺
+234=鎴愬憳鏉冮檺绠＄悊
235=鍒涘缓鍦烘櫙
236=鏄电О涓嶈兘涓虹┖
237=缂栬緫鏄电О
@@ -273,7 +273,7 @@
251=娣诲姞澶辫触锛屾潈闄愪笉瓒炽��
252=淇濆瓨鎴愬姛
253=淇濆瓨涓紝璇风◢鍚�
-254=淇敼鎴愬憳鏄电О
+254=鏄电О缂栬緫
255=绉婚櫎璇ユ垚鍛�
256=鏆傛棤宸叉敹钘忕殑鍔熻兘
257=璇疯緭鍏ュ唴瀹�
@@ -395,9 +395,18 @@
373=娣诲姞妤煎眰澶辫触銆�
374=浣忓畢鏁版嵁宸茶鍒犻櫎锛孉PP灏嗚嚜鍔ㄥ垏鎹㈠埌鍙︿竴浣忓畢銆�
375=缃戝叧鏈繛鎺ユ湇鍔″櫒锛屾棤娉曞垱寤哄満鏅��
-376=娆㈣繋鍥炲
-377=浜岀淮鐮佸け鏁堬紝璇烽噸璇�
-378=閲嶈瘯
+376=鏃犳硶杈撳叆鐗规畩瀛楃
+377=鍏ㄥ畢鍖哄煙
+378=鍙樺寲鏃堕棿
+379=鍙樺寲閫熷害
+400=娆㈣繋鍥炲
+401=浜岀淮鐮佸け鏁堬紝璇烽噸璇�
+402=閲嶈瘯
+403=鑹叉俯
+404=蹇嵎璋冭妭
+405=娓╅Θ
+406=浼氬
+407=闃呰
5000=闊充箰
5001=缁勫悎
@@ -518,7 +527,17 @@
7066=绂诲紑
7067=涓�鑸�
7068=鏃堕棿
-
+7069=鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
+7070=姝ゅ绌虹┖濡備篃~
+7071=寮�濮嬫椂闂存湭璁剧疆锛岃璁剧疆寮�濮嬫椂闂淬��
+7072=缁撴潫鏃堕棿鏈缃紝璇疯缃粨鏉熸椂闂淬��
+7073=寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓�鏍枫��
+7074=寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+7075=鏉′欢涓嶈兘涓虹┖銆�
+7076=鐩爣涓嶈兘涓虹┖銆�
+7077=鏃堕棿鏈缃紝璇疯缃椂闂淬��
+7078=鏉′欢鎴栬�呯洰鏍囦负绌恒��
+7079=缃戝叧涓嶅湪绾�
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -569,9 +588,21 @@
9046=淇敼鎴愬姛!
9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
-9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+9049=瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛�
9050=楠岃瘉闈㈠ID
9051=淇濆瓨鐢ㄦ埛澶村儚澶辫触
+9052=鎺ㄩ�佹敞鍐屾甯�
+9053=鎺ㄩ�佹敞鍐屽紓甯�
+9054=鏁板瓧瀵嗙爜楠岃瘉
+9055=缁樺埗鎵嬪娍楠岃瘉
+9056=骞�
+9057=鏃犲尯鍩熷姛鑳�
+9058=鏄惁闇�瑕佷繚瀛�
+9059=鏆傛棤鍒嗕韩
+9060=浣跨敤鏉冮檺
+9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
+9062=鏌ョ湅
+9063=杩樻湁{0}娆℃満浼氥��
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
--
Gitblit v1.8.0