修改多国语言多一个相同id名称问题

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
index ebe9a29..8573f25 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
@@ -356,13 +356,13 @@ STR_LANGUAGE_SELECTION$语言选择
 STR_RESET_CONFIRM$是否确定重新启动？\r
 STR_SHUTDOWN_CONFIRM$是否确定关机？\r
 STR_RESET_CONFIRM_NOTE$该操作会清空并重置手表数据，是否确认继续？\r
-RECORDER$录音机\r
+STR_RECORDER$录音机\r
 STR_CLICK_TO_RECORD$点击开始录音\r
 STR_RECORDING$录音中\r
 STR_AUDIO_XX$录音XX\r
 STR_VOICE_RECORDING_REMINDER$录音提醒\r
 STR_VOICE_RECORDING_REMINDER_NOTE$录音数量不得超过30首，请删除已有录音\r
-STR_DELETE_RECORDING $删除录音\r
+STR_DELETE_RECORDING$删除录音\r
 STR_DELETE_PERMANENTLY$是否永久删除\r
 STR_DO_NOT_DISTURB_MODE$开启勿扰模式，手表将不会发出震动与铃声，是否开启\r
 STR_CONNECTION_STATUS$连接状态\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
index 8ab4180..2a085ce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
@@ -188,7 +188,7 @@
        <lanstr id="STR_OTHER_TITLE" value="其他运动"/>
        <lanstr id="STR_EXERCISE_TITLE" value="健身运动"/>
        <lanstr id="STR_RAPID_TRAINING" value="快速训练"/>
-       <lanstr id="STR_SET_GOALS" value="设置目标 >"/>
+       <lanstr id="STR_SET_GOALS" value="设置目标 &gt;"/>
        <lanstr id="STR_DURATION" value="时长"/>
        <lanstr id="STR_DURATION_SETTING" value="时长（分钟）"/>
        <lanstr id="STR_CALORIE" value="卡路里"/>
@@ -357,13 +357,13 @@
        <lanstr id="STR_RESET_CONFIRM" value="是否确定重新启动？"/>
        <lanstr id="STR_SHUTDOWN_CONFIRM" value="是否确定关机？"/>
        <lanstr id="STR_RESET_CONFIRM_NOTE" value="该操作会清空并重置手表数据，是否确认继续？"/>
-       <lanstr id="RECORDER" value="录音机"/>
+       <lanstr id="STR_RECORDER" value="录音机"/>
        <lanstr id="STR_CLICK_TO_RECORD" value="点击开始录音"/>
        <lanstr id="STR_RECORDING" value="录音中"/>
        <lanstr id="STR_AUDIO_XX" value="录音XX"/>
        <lanstr id="STR_VOICE_RECORDING_REMINDER" value="录音提醒"/>
        <lanstr id="STR_VOICE_RECORDING_REMINDER_NOTE" value="录音数量不得超过30首，请删除已有录音"/>
-       <lanstr id="STR_DELETE_RECORDING " value="删除录音"/>
+       <lanstr id="STR_DELETE_RECORDING" value="删除录音"/>
        <lanstr id="STR_DELETE_PERMANENTLY" value="是否永久删除"/>
        <lanstr id="STR_DO_NOT_DISTURB_MODE" value="开启勿扰模式，手表将不会发出震动与铃声，是否开启"/>
        <lanstr id="STR_CONNECTION_STATUS" value="连接状态"/>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index 62a8038..ae14358 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
index d6d35cf..65427ed 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index dc1dcb8..9e19253 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@ -1,15 +1,15 @@
-/*\r
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
-* Description: language\r
-* Author: Graphic develop team\r
-* Create: 2021-07-06\r
-*/\r
-\r
-#ifndef UI_RESOURCE_STRING_H\r
-#define UI_RESOURCE_STRING_H\r
-#include <cstdint>\r
-namespace OHOS {\r
-enum UIResourceTextId : uint16_t {\r
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include <cstdint>
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
     STR_EXERCISE_GENERAL = 0,\r
     STR_EXERCISE_FREETRAINING = 1,\r
     STR_EXERCISE_RESISTANCETRAINING = 2,\r
@@ -447,19 +447,17 @@ enum UIResourceTextId : uint16_t {
     STR_TACK = 434,\r
     STR_CLICK = 435,\r
     STR_TACKNUM = 436,\r
-    RECORDER = 437,\r
-    //STR_DELETE_RECORDING  = 438,\r
-    STR_MON = 439,\r
-    STR_TUES = 440,\r
-    STR_WEDNES = 441,\r
-    STR_THURS = 442,\r
-    STR_FRI = 443,\r
-    STR_SATUR = 444,\r
-    STR_SUN = 445,\r
-    STR_MAX_ID = 446,\r
+    STR_MON = 437,\r
+    STR_TUES = 438,\r
+    STR_WEDNES = 439,\r
+    STR_THURS = 440,\r
+    STR_FRI = 441,\r
+    STR_SATUR = 442,\r
+    STR_SUN = 443,\r
+    STR_MAX_ID = 444,\r
 }; // UIResourceTextId\r
-\r
-enum FontLanguageId : uint8_t {\r
+
+enum FontLanguageId : uint8_t {
     LANGUAGE_ID_JA,\r
     LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 53b1769..f7fe8d2 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ

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 62a8038..ae14358 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/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
index d6d35cf..65427ed 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.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 b9810c0..9e19253 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
@@ -1,15 +1,15 @@
-/*\r
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
-* Description: language\r
-* Author: Graphic develop team\r
-* Create: 2021-07-06\r
-*/\r
-\r
-#ifndef UI_RESOURCE_STRING_H\r
-#define UI_RESOURCE_STRING_H\r
-#include <cstdint>\r
-namespace OHOS {\r
-enum UIResourceTextId : uint16_t {\r
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include <cstdint>
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
     STR_EXERCISE_GENERAL = 0,\r
     STR_EXERCISE_FREETRAINING = 1,\r
     STR_EXERCISE_RESISTANCETRAINING = 2,\r
@@ -447,18 +447,17 @@ enum UIResourceTextId : uint16_t {
     STR_TACK = 434,\r
     STR_CLICK = 435,\r
     STR_TACKNUM = 436,\r
-    RECORDER = 437,\r
-    STR_MON = 439,\r
-    STR_TUES = 440,\r
-    STR_WEDNES = 441,\r
-    STR_THURS = 442,\r
-    STR_FRI = 443,\r
-    STR_SATUR = 444,\r
-    STR_SUN = 445,\r
-    STR_MAX_ID = 446,\r
+    STR_MON = 437,\r
+    STR_TUES = 438,\r
+    STR_WEDNES = 439,\r
+    STR_THURS = 440,\r
+    STR_FRI = 441,\r
+    STR_SATUR = 442,\r
+    STR_SUN = 443,\r
+    STR_MAX_ID = 444,\r
 }; // UIResourceTextId\r
-\r
-enum FontLanguageId : uint8_t {\r
+
+enum FontLanguageId : uint8_t {
     LANGUAGE_ID_JA,\r
     LANGUAGE_ID_EN,\r
     LANGUAGE_ID_ZH,\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 53b1769..f7fe8d2 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