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 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 55c49cb..344421e 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -537,6 +537,7 @@
7076=鐩爣涓嶈兘涓虹┖銆�
7077=鏃堕棿鏈缃紝璇疯缃椂闂淬��
7078=鏉′欢鎴栬�呯洰鏍囦负绌恒��
+7079=缃戝叧涓嶅湪绾�
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
@@ -587,7 +588,7 @@
9046=淇敼鎴愬姛!
9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
-9049=瀵嗙爜閿欒瓒呰繃10娆★紝璐﹀彿琚攣瀹氾紒
+9049=瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛�
9050=楠岃瘉闈㈠ID
9051=淇濆瓨鐢ㄦ埛澶村儚澶辫触
9052=鎺ㄩ�佹敞鍐屾甯�
@@ -599,7 +600,9 @@
9058=鏄惁闇�瑕佷繚瀛�
9059=鏆傛棤鍒嗕韩
9060=浣跨敤鏉冮檺
-9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴栨鏃�0鐐瑰悗鍐嶇櫥闄�.
+9061=璇烽�氳繃蹇樿瀵嗙爜鎵惧洖瀵嗙爜鎴杮0}鍒嗛挓鍚庨噸璇�.
+9062=鏌ョ湅
+9063=杩樻湁{0}娆℃満浼氥��
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
--
Gitblit v1.8.0