更新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 a760197..d55a42c 100644 (file)
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 974f2c6..3207362 100644 (file)
--- 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,\r
     STR_SET_COUNT_DOWN_NOTE = 528,\r
     STR_COUNTDOWN_ENDS = 529,\r
-    STR_MAXIMUM_TIME_REACH = 530,\r
+    STR_MAXIMUM_TIME_REACH_NOTE = 530,\r
     STR_STOPWATCH_STOP_NOTE = 531,\r
     STR_TMCHBR = 532,\r
-    STR_MAXIMUM_TIME_REACH_NOTE = 533,\r
+    STR_MAXIMUM_TIME_REACH = 533,\r
     STR_MAX_ID = 534,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

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 9e40293..569795e 100644 (file)
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 6900f9d..7e9f0ec 100644 (file)
--- 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$坐轮椅移动\r
 STR_HEART_RATE$心率\r
 STR_BLOOD_OXYGEN$血氧\r
-STR_TRAINING$è®­ç»\83\r
-STR_TRAINING_RECORD$è®­ç»\83记录\r
+STR_TRAINING$è¿\90å\8a¨\r
+STR_TRAINING_RECORD$è¿\90å\8a¨记录\r
 STR_COMPASS$指南针\r
 STR_TELEPHONE$电话\r
 STR_FAVORITE_CONTACTS$常用联系人\r

diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx
index 924ee89..10d264c 100644 (file)
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 5533e5c..5dbf9fe 100644 (file)
--- 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="è®­ç»\83"/>
-       <lanstr id="STR_TRAINING_RECORD" value="è®­ç»\83记录"/>
+       <lanstr id="STR_TRAINING" value="è¿\90å\8a¨"/>
+       <lanstr id="STR_TRAINING_RECORD" value="è¿\90å\8a¨记录"/>
        <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 a760197..d55a42c 100644 (file)
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 974f2c6..3207362 100644 (file)
--- 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,\r
     STR_SET_COUNT_DOWN_NOTE = 528,\r
     STR_COUNTDOWN_ENDS = 529,\r
-    STR_MAXIMUM_TIME_REACH = 530,\r
+    STR_MAXIMUM_TIME_REACH_NOTE = 530,\r
     STR_STOPWATCH_STOP_NOTE = 531,\r
     STR_TMCHBR = 532,\r
-    STR_MAXIMUM_TIME_REACH_NOTE = 533,\r
+    STR_MAXIMUM_TIME_REACH = 533,\r
     STR_MAX_ID = 534,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 9e40293..569795e 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ