连接状态视图语言资源提交

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 3207362..62f0561 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@ -543,13 +543,12 @@ enum UIResourceTextId : uint16_t {
     STR_MAXIMUM_TIME_REACH_NOTE = 530,\r
     STR_STOPWATCH_STOP_NOTE = 531,\r
     STR_TMCHBR = 532,\r
-    STR_MAXIMUM_TIME_REACH = 533,\r
-    STR_MAX_ID = 534,\r
+    STR_MAX_ID = 533,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 9702822..bcdddc2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -55,14 +55,14 @@ namespace OHOS
 #ifdef A5133_DEMO_CLIENT
         {VIEW_OBU_MESSAGE, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_DEFAULT_IMG, "OBU", STR_OBU_MESSAGE, nullptr},
 #endif
-        {VIEW_MAIN_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_DEFAULT_IMG, "电话", STR_PHONE, nullptr},
+        {VIEW_MAIN_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_DEFAULT_IMG, "电话", STR_TELEPHONE, nullptr},
 #if HEART_APPLIST
         {VIEW_HEART_CHART, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_DEFAULT_IMG, "心率", STR_HEART_RATE, nullptr},
 #endif
         {VIEW_BLOOD_RESULT, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧", STR_BLOOD_OXYGEN, nullptr},
         {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr},
-        {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "è®­ç»\83", STR_TRAINING, nullptr},
-        {VIEW_TRAINING_RECORD, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_DEFAULT_IMG, "è®­ç»\83记录", STR_TRAINING_RECORD, nullptr},
+        {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "è¿\90å\8a¨", STR_TRAINING, nullptr},
+        {VIEW_TRAINING_RECORD, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_DEFAULT_IMG, "è¿\90å\8a¨记录", STR_TRAINING_RECORD, nullptr},
         {VIEW_GOAL, PNG_APPLIST_GOAL_IMAGE, PNG_APPLIST_GOAL_IMAGE, PNG_APPLIST_DEFAULT_IMG, "活动", STR_ACTIVITY, nullptr},
         {VIEW_AI_VOICE, PNG_APPLIST_AIVOICE_IMAGE, PNG_APPLIST_AIVOICE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "AI全家桶", STR_AI_FAMILY_MEALS, nullptr},
 #ifdef SUPPORT_ALIPAY_SEC

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 d55a42c..2a9ed47 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 3207362..62f0561 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
@@ -543,13 +543,12 @@ enum UIResourceTextId : uint16_t {
     STR_MAXIMUM_TIME_REACH_NOTE = 530,\r
     STR_STOPWATCH_STOP_NOTE = 531,\r
     STR_TMCHBR = 532,\r
-    STR_MAXIMUM_TIME_REACH = 533,\r
-    STR_MAX_ID = 534,\r
+    STR_MAX_ID = 533,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\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 569795e..999efbe 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_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index 677da9e..ca1fd57 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -528,6 +528,6 @@ STR_10_MIN$10min
 STR_30_MIN$30min\r
 STR_SET_COUNT_DOWN_NOTE$Please set up the countdown room first\r
 STR_COUNTDOWN_ENDS$Countdown ends\r
-STR_MAXIMUM_TIME_REACH$The maximum time has been reached\r
+STR_MAXIMUM_TIME_REACH_NOTE$The maximum time has been reached\r
 STR_STOPWATCH_STOP_NOTE$Stopwatch stops automatically, please restart\r
 STR_TMCHBR$The maximum count has been reached
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 7e9f0ec..c02cd1c 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -368,7 +368,7 @@ STR_RECORDING_LIST$录音列表
 STR_CRLEMPTY$当前录音列表为空\r
 STR_DO_NOT_DISTURB_MODE$开启勿扰模式，手表将不会发出震动与铃声，是否开启\r
 STR_CONNECTION_STATUS$连接状态\r
-STR_PHONE$电话\r
+STR_PHONE$手机\r
 STR_HEADSET$耳机\r
 STR_CONNECTED$已连接\r
 STR_DISCONNECTED$未连接\r

diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx
index 10d264c..fff3495 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_en.xml b/tools/language_tool/Language_xml/language_en.xml
index 7d04ae1..5cc9416 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -529,7 +529,7 @@
        <lanstr id="STR_30_MIN" value="30min"/>
        <lanstr id="STR_SET_COUNT_DOWN_NOTE" value="Please set up the countdown room first"/>
        <lanstr id="STR_COUNTDOWN_ENDS" value="Countdown ends"/>
-       <lanstr id="STR_MAXIMUM_TIME_REACH" value="The maximum time has been reached"/>
+       <lanstr id="STR_MAXIMUM_TIME_REACH_NOTE" value="The maximum time has been reached"/>
        <lanstr id="STR_STOPWATCH_STOP_NOTE" value="Stopwatch stops automatically, please restart"/>
        <lanstr id="STR_TMCHBR" value="The maximum count has been reached"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 5dbf9fe..43edbb6 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -369,7 +369,7 @@
        <lanstr id="STR_CRLEMPTY" value="当前录音列表为空"/>
        <lanstr id="STR_DO_NOT_DISTURB_MODE" value="开启勿扰模式，手表将不会发出震动与铃声，是否开启"/>
        <lanstr id="STR_CONNECTION_STATUS" value="连接状态"/>
-       <lanstr id="STR_PHONE" value="电话"/>
+       <lanstr id="STR_PHONE" value="手机"/>
        <lanstr id="STR_HEADSET" value="耳机"/>
        <lanstr id="STR_CONNECTED" value="已连接"/>
        <lanstr id="STR_DISCONNECTED" value="未连接"/>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index d55a42c..2a9ed47 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 3207362..62f0561 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -543,13 +543,12 @@ enum UIResourceTextId : uint16_t {
     STR_MAXIMUM_TIME_REACH_NOTE = 530,\r
     STR_STOPWATCH_STOP_NOTE = 531,\r
     STR_TMCHBR = 532,\r
-    STR_MAXIMUM_TIME_REACH = 533,\r
-    STR_MAX_ID = 534,\r
+    STR_MAX_ID = 533,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\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 569795e..999efbe 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ