From: Caisking <3449750381@qq.com>
Date: Wed, 21 Aug 2024 02:35:03 +0000 (+0800)
Subject: 更新applist中的训练->运动
X-Git-Tag: release_V1.2.70_20241020_135402~614^2~5
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f178e939dca5c1e241897852fec26e576dc7b94b;p=mirrors%2FFD230.git

更新applist中的训练->运动
---

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index a7601977f..d55a42c99 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 974f2c6e6..3207362fb 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -540,16 +540,16 @@ enum UIResourceTextId : uint16_t {
     STR_30_MIN = 527,
     STR_SET_COUNT_DOWN_NOTE = 528,
     STR_COUNTDOWN_ENDS = 529,
-    STR_MAXIMUM_TIME_REACH = 530,
+    STR_MAXIMUM_TIME_REACH_NOTE = 530,
     STR_STOPWATCH_STOP_NOTE = 531,
     STR_TMCHBR = 532,
-    STR_MAXIMUM_TIME_REACH_NOTE = 533,
+    STR_MAXIMUM_TIME_REACH = 533,
     STR_MAX_ID = 534,
 }; // UIResourceTextId
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,
     LANGUAGE_ID_ZH,
+    LANGUAGE_ID_EN,
     LANGUAGE_ID_MAX
 }; // UITextLanguageTextId
 }
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 9e4029325..569795e6a 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ
diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 6900f9dbd..7e9f0ec3c 100644
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -176,8 +176,8 @@ STR_OTHER_TILTING$倾斜
 STR_OTHER_WHEELCHAIR$坐轮椅移动
 STR_HEART_RATE$心率
 STR_BLOOD_OXYGEN$血氧
-STR_TRAINING$训练
-STR_TRAINING_RECORD$训练记录
+STR_TRAINING$运动
+STR_TRAINING_RECORD$运动记录
 STR_COMPASS$指南针
 STR_TELEPHONE$电话
 STR_FAVORITE_CONTACTS$常用联系人
diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx
index 924ee89cd..10d264c7c 100644
Binary files a/tools/language_tool/Language_xml/language.xlsx and b/tools/language_tool/Language_xml/language.xlsx differ
diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 5533e5cdc..5dbf9fe02 100644
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -177,8 +177,8 @@
 	<lanstr id="STR_OTHER_WHEELCHAIR" value="坐轮椅移动"/>
 	<lanstr id="STR_HEART_RATE" value="心率"/>
 	<lanstr id="STR_BLOOD_OXYGEN" value="血氧"/>
-	<lanstr id="STR_TRAINING" value="训练"/>
-	<lanstr id="STR_TRAINING_RECORD" value="训练记录"/>
+	<lanstr id="STR_TRAINING" value="运动"/>
+	<lanstr id="STR_TRAINING_RECORD" value="运动记录"/>
 	<lanstr id="STR_COMPASS" value="指南针"/>
 	<lanstr id="STR_TELEPHONE" value="电话"/>
 	<lanstr id="STR_FAVORITE_CONTACTS" value="常用联系人"/>
diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index a7601977f..d55a42c99 100644
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ
diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index 974f2c6e6..3207362fb 100644
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -540,16 +540,16 @@ enum UIResourceTextId : uint16_t {
     STR_30_MIN = 527,
     STR_SET_COUNT_DOWN_NOTE = 528,
     STR_COUNTDOWN_ENDS = 529,
-    STR_MAXIMUM_TIME_REACH = 530,
+    STR_MAXIMUM_TIME_REACH_NOTE = 530,
     STR_STOPWATCH_STOP_NOTE = 531,
     STR_TMCHBR = 532,
-    STR_MAXIMUM_TIME_REACH_NOTE = 533,
+    STR_MAXIMUM_TIME_REACH = 533,
     STR_MAX_ID = 534,
 }; // UIResourceTextId
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,
     LANGUAGE_ID_ZH,
+    LANGUAGE_ID_EN,
     LANGUAGE_ID_MAX
 }; // UITextLanguageTextId
 }
diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 9e4029325..569795e6a 100644
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ