From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2

---
 HDL-ON_Android/Assets/Language.ini |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index ff8cadd..e4f7f4b 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -682,7 +682,7 @@
 695=Daily data of the past month
 696=Monthly data of the past year
 697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
-
+698=Break
 
 
 
@@ -2078,6 +2078,7 @@
 695=杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
 696=杩囧幓涓�骞寸殑姣忔湀鏁版嵁
 697=鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
+698=鏂紑
 
 
 
@@ -2628,9 +2629,6 @@
 7174=鐓ф槑搴﹂珮浜�
 7175=鐓ф槑搴︿綆浜�
 7176=鍏夌収
-
-
-  
 
 
 
@@ -3473,6 +3471,7 @@
 695=Daily data of the past month
 696=Monthly data of the past year
 697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
 
 
 
@@ -4861,6 +4860,7 @@
 695=Daily data of the past month
 696=Monthly data of the past year
 697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
 
 
 
@@ -6234,6 +6234,7 @@
 695=Daily data of the past month
 696=Monthly data of the past year
 697=prompt: The closer the starting color selection is to the edge of the color ring, the more obvious the dazzling effect. The closer to the white center, the less noticeable the dazzling effect.
+698=Break
 
 
 
@@ -6943,8 +6944,6 @@
 10032=袩芯褌褉械斜懈褌械谢褟褌 薪褟屑邪 褉邪蟹褉械褕械薪懈械.
 10033=校褋褌褉芯泄褋褌胁芯褌芯 薪械 褋褗褖械褋褌胁褍胁邪.
 
-
-
 [Ukraine]
 1=袙褏褨写 胁 褋懈褋褌械屑褍
 2=袧芯屑械褉 褌械谢械褎芯薪褍
@@ -7535,7 +7534,7 @@
 601=袙懈斜械褉褨褌褜 写胁邪 邪斜芯 斜褨谢褜褕械 锌褉懈褋褌褉芯褩胁
 602=袦褨泄 写褨屑
 603=袘褍写褜 谢邪褋泻邪, 锌褉芯褔懈褌邪泄褌械 褍胁邪卸薪芯
-604=袩褉芯褌芯泻芯谢 蟹斜芯褉褍 褨薪褎芯褉屑邪褑褨褩 锌褉芯 芯斜谢懈褔褔褟 Pro Face
+604="袩褉芯褌芯泻芯谢 蟹斜芯褉褍 褨薪褎芯褉屑邪褑褨褩 锌褉芯 芯斜谢懈褔褔褟 Pro Face
 605= 携泻褖芯 胁懈 蟹谐芯写薪褨 蟹 褑褨褦褞 褍谐芯写芯褞, 斜褍写褜 谢邪褋泻邪, 薪邪褌懈褋薪褨褌褜 泻薪芯锌泻褍 [袟谐芯写械薪].
 606=袩褉懈胁'褟蟹泻邪 芯斜谢褨泻芯胁芯谐芯 蟹邪锌懈褋褍 褍褋锌褨褕薪邪, 胁懈 屑芯卸械褌械 锌褉芯写芯胁卸懈褌懈 芯锌械褉邪褑褨褞 蟹胁'褟蟹褍胁邪薪薪褟 锌褉懈褋褌褉芯褩胁
 607=袩芯锌械褉械写薪褟 褋褌芯褉褨薪泻邪

--
Gitblit v1.8.0