From 79fe8dab1bcb8e8d92d9058ca2540cd4e8f9ecf9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:05:32 +0800
Subject: [PATCH] 20201127 合并嘉乐代码
---
HDL-ON_Android/Assets/Language.ini | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index c631567..30d97ad 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -13,6 +13,12 @@
14=Register
42=Network anomaly
+10001=Failed to request the server, please try again later!
+10002=System maintenance, please try again later!
+10003=Login failed, please add a home first!
+10004=Account already exists
+
+
[Chinese]
1=鐧诲綍
2=鎵嬫満鍙风櫥褰�
@@ -301,8 +307,8 @@
285=缁戝畾鎵嬫満鍙�
286=缁戝畾鎵嬫満鎴愬姛
287=缁戝畾鎵嬫満澶辫触
-288=鎵嬫満鍙蜂慨鏀�
-289=瑙ｇ粦鎵嬫満鍙�
+288=淇敼缁戝畾鎵嬫満
+289=瑙ｉ櫎鎵嬫満缁戝畾
290=璇诲彇鍘嗗彶鏁版嵁澶辫触
291=鏆傛棤宸叉敹钘忕殑鍦烘櫙
292=鍏充簬ON
@@ -371,6 +377,11 @@
355=鍏充簬
356=鐗堟湰鍙�
357=姝ゅ姛鑳芥殏鏈紑鏀撅紒
+358=鐢佃瘽:
+359=閭:
+360=闈㈡澘鍦烘櫙
+361=鏈坊鍔�
+362=鍏ㄩ��
5000=闊充箰
5001=缁勫悎
@@ -421,3 +432,52 @@
5046=璋冭妭闊抽噺
5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
+9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
+9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
+9002=鐧诲綍鎵嬫満淇敼瀹屾垚
+9003=鐧诲綍鎵嬫満缁戝畾瀹屾垚
+9004=鐧诲綍閭淇敼瀹屾垚
+9005=鐧诲綍閭缁戝畾瀹屾垚
+9006=楠岃瘉鐮佸彲鑳戒細寤惰繜锛岃鍐嶇瓑涓�浼�
+9007=鍐嶇瓑涓�浼�
+9008=杩斿洖
+9009=涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�
+9010=鏂板瘑鐮�
+9011=鍐嶆杈撳叆鏂板瘑鐮�
+9012=鍚屾剰
+9013=鐢ㄦ埛鍗忚
+9014=闅愮鏀跨瓥
+9015=鍜�
+9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+9017=纭閫�鍑虹櫥褰曪紵
+9018=璇烽�夋嫨鍥藉/鍖哄煙
+9019=绔嬪嵆鏇存柊
+9020=浠ュ悗鍐嶈
+9021=鍥藉/鍦板尯
+9022=鏈嶅姟鍣ㄤ俊鎭�
+9023=褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細
+9024=*鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩�,鏃犻渶蹇呰,鎴戜滑涓嶅缓璁彂鐢熻縼绉�
+9025=鑻ラ渶瑕佽縼绉绘湇鍔″櫒,璇锋嫧鎵�
+9026=鍔熻兘浠嬬粛
+9027=鎶曡瘔
+9028=鐗堟湰鏇存柊
+9029=(鏍囬璇峰甫鎶曡瘔瀛楁牱锛屾垜浠細浼樺厛澶勭悊)
+9030=澶嶅埗鎴愬姛
+9031=绌虹┖濡備篃
+9032=鍙戠幇鏂扮増鏈�
+9033=宸茬粡鏄渶鏂扮増鏈�
+9034=鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
+9035=鍔熻兘闂
+9036=鍦烘櫙闂
+9037=APP浣跨敤杈呭姪
+9038=甯歌闂
+
+
+
+10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
+10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
+10002=绯荤粺缁存姢涓�,璇风◢鍚庡啀璇�!
+10003=鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
+10004=璐﹀彿宸插瓨鍦�
+10005=楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒
+10006=绛惧悕閿欒
--
Gitblit v1.8.0