From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码

---
 HDL-ON_iOS/Resources/Language.ini |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 98e2f4c..3dce668 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1703,7 +1703,7 @@
 1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
 1153=缁堟
 1154=姝e湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
-1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢鏂扮鐞嗗憳
 1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
 1157=杩囨埛澶辫触
 1158=璇烽噸鏂板皾璇�
@@ -1802,7 +1802,7 @@
 6016=绂荤嚎
 6017=鐗堟湰鍙�
 6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被锛屾煡鎵句娇鐢�
 6020=鎺ㄨ崘鎸夐敭
 6021=璇疯緭鍏ユ寜閿悕绉�
 6022=涓嬩竴姝�

--
Gitblit v1.8.0