From 93bfc48782b0cb314dd63de0a7594c40defbea96 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Wed, 8 May 2024 20:19:41 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E5=9B=BD=E8=AF=AD?=
 =?utf8?q?=E8=A8=80=E5=A4=9A=E4=B8=80=E4=B8=AA=E7=9B=B8=E5=90=8Cid?=
 =?utf8?q?=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../language/Language_xml/input_list_zh.txt   |   4 +-
 .../language/Language_xml/language_zh.xml     |   6 +--
 .../fd230app/nativeui/language/font/en.lang   | Bin 8121 -> 8111 bytes
 .../fd230app/nativeui/language/font/ja.lang   | Bin 7139 -> 7129 bytes
 .../language/font/ui_resource_string.h        |  46 +++++++++---------
 .../fd230app/nativeui/language/font/zh.lang   | Bin 8068 -> 8058 bytes
 .../fd230/fs/user/res/font/en.lang            | Bin 8121 -> 8111 bytes
 .../fd230/fs/user/res/font/ja.lang            | Bin 7139 -> 7129 bytes
 .../fs/user/res/font/ui_resource_string.h     |  45 +++++++++--------
 .../fd230/fs/user/res/font/zh.lang            | Bin 8068 -> 8058 bytes
 10 files changed, 49 insertions(+), 52 deletions(-)

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 ebe9a29f7..8573f257a 100644
--- 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$是否确定重新启动？
 STR_SHUTDOWN_CONFIRM$是否确定关机？
 STR_RESET_CONFIRM_NOTE$该操作会清空并重置手表数据，是否确认继续？
-RECORDER$录音机
+STR_RECORDER$录音机
 STR_CLICK_TO_RECORD$点击开始录音
 STR_RECORDING$录音中
 STR_AUDIO_XX$录音XX
 STR_VOICE_RECORDING_REMINDER$录音提醒
 STR_VOICE_RECORDING_REMINDER_NOTE$录音数量不得超过30首，请删除已有录音
-STR_DELETE_RECORDING $删除录音
+STR_DELETE_RECORDING$删除录音
 STR_DELETE_PERMANENTLY$是否永久删除
 STR_DO_NOT_DISTURB_MODE$开启勿扰模式，手表将不会发出震动与铃声，是否开启
 STR_CONNECTION_STATUS$连接状态
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 8ab41800f..2a085ceaf 100644
--- 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 62a80382188215a1295defcd8949748553ca6ddd..ae14358fa222cd40b5f240119f106d2f652f545e 100644
GIT binary patch
delta 35
fcmdmKzusQ7*)e%-Y90d$*t1deBim*^_LUL<rMd{E

delta 44
pcmZ2)ztdjSPw_~6Y90d$*tb#iBOB{V2?mB$o0-|yNH8%l008h>3C{ok

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 d6d35cfc67e47bf6a626287a08ccf068a4ec3187..65427ed9d749e8dedc117df20a8c0b7cc96fac67 100644
GIT binary patch
delta 35
fcmaECe$!mkRCDv<tV9MBuxF#_N4Cv;?3YCVsx=7b

delta 44
pcmca<{@7gf)Vw>Bvl1Clz`l*5AK6$hi!d-;+04v-O@xVo0RS&T3&sEd

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 dc1dcb81d..9e192532a 100644
--- 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 @@
-/*
-* 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 {
+/*
+* 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,
     STR_EXERCISE_FREETRAINING = 1,
     STR_EXERCISE_RESISTANCETRAINING = 2,
@@ -447,19 +447,17 @@ enum UIResourceTextId : uint16_t {
     STR_TACK = 434,
     STR_CLICK = 435,
     STR_TACKNUM = 436,
-    RECORDER = 437,
-    //STR_DELETE_RECORDING  = 438,
-    STR_MON = 439,
-    STR_TUES = 440,
-    STR_WEDNES = 441,
-    STR_THURS = 442,
-    STR_FRI = 443,
-    STR_SATUR = 444,
-    STR_SUN = 445,
-    STR_MAX_ID = 446,
+    STR_MON = 437,
+    STR_TUES = 438,
+    STR_WEDNES = 439,
+    STR_THURS = 440,
+    STR_FRI = 441,
+    STR_SATUR = 442,
+    STR_SUN = 443,
+    STR_MAX_ID = 444,
 }; // UIResourceTextId
-
-enum FontLanguageId : uint8_t {
+
+enum FontLanguageId : uint8_t {
     LANGUAGE_ID_JA,
     LANGUAGE_ID_EN,
     LANGUAGE_ID_ZH,
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 53b1769d67bd0c20dcb8301dd788dfa29bf48dc3..f7fe8d220cd5f719fb576e19f2708cc4ddffff48 100644
GIT binary patch
delta 552
zcmY+;O(??w7{~GFuwh>IqWwpjoTwEMWfz&ZiyVwvA)6IxYO><An*YU`#A!*QrtIM0
zvX(^LmUf^Vl-CQj)wIL3q{hLwoILe;`t@9%-<qS;s~F}Zr$L|mn~Q{E(yAYN5sg8l
z1`Tk+jR4MYg&W-C72nVrMGUZ@1#PgSA0u#K1`Ak52wO-YjceTE&M2xp6W)+R0alZU
z4c!=o6K(_$!UlE_M*<Jf)lvrS7{DkdF^fe65y2z!Fq%agF=bXoe1s*0@dSfH3ACaM
zeHe!yD)w-M6Qof@nMI@-op8W|6|5qRO~i1F6kd=;!OQxBrjEz3!iEmmF@!OAaELsL
zD50`mqzA*8z%;y=gAaZLl2zsJdR^vnI~Pl4_s^rBinltmevsRZ|J{-<%TGnr*JS+#
DP!wJ{

delta 583
zcmY+<O(??w7{~EvMcavO_Mb%~F3Rgg4&DoSDJ~Rkd1*!CASsc{UlPk<4x6M_c5sqf
z>wh5gQeH0{MD4KJK{ne7g~K@bmXoJGPru*cIXs!>l@?{q>|I@S%fC4dE2eBUl_T<v
ztXvTjI?)9ub`i!Q&T)$*-jIRL$PH{LMJ4LciXIGL1a2%K1Pup>;LIqhTodl_h#2%H
z5erICjRthV2{-1jj12^Efe+}+A_b^IJ=)QSA&g@dmx$s!PsCsm>9D9G{R9VQaD@!?
ziby_+P=O{4VhXG9AqWj|yu)Y}v7;Q_7{w%JFpqU?A%q*;Bc`&R@QMud`FxK;l%fWW
z=!O?j#F4-!%4{OFXhSa?7=a5Dn8Gw>@qD<H^6aPmk(cFTNv-X@_`@l!K>v{A`%=a<
cm-WYBO`L3|ceG^SND`i4dVBY;`-Y3{zsPrO<^TWy

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 62a80382188215a1295defcd8949748553ca6ddd..ae14358fa222cd40b5f240119f106d2f652f545e 100644
GIT binary patch
delta 35
fcmdmKzusQ7*)e%-Y90d$*t1deBim*^_LUL<rMd{E

delta 44
pcmZ2)ztdjSPw_~6Y90d$*tb#iBOB{V2?mB$o0-|yNH8%l008h>3C{ok

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 d6d35cfc67e47bf6a626287a08ccf068a4ec3187..65427ed9d749e8dedc117df20a8c0b7cc96fac67 100644
GIT binary patch
delta 35
fcmaECe$!mkRCDv<tV9MBuxF#_N4Cv;?3YCVsx=7b

delta 44
pcmca<{@7gf)Vw>Bvl1Clz`l*5AK6$hi!d-;+04v-O@xVo0RS&T3&sEd

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 b9810c085..9e192532a 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
@@ -1,15 +1,15 @@
-/*
-* 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 {
+/*
+* 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,
     STR_EXERCISE_FREETRAINING = 1,
     STR_EXERCISE_RESISTANCETRAINING = 2,
@@ -447,18 +447,17 @@ enum UIResourceTextId : uint16_t {
     STR_TACK = 434,
     STR_CLICK = 435,
     STR_TACKNUM = 436,
-    RECORDER = 437,
-    STR_MON = 439,
-    STR_TUES = 440,
-    STR_WEDNES = 441,
-    STR_THURS = 442,
-    STR_FRI = 443,
-    STR_SATUR = 444,
-    STR_SUN = 445,
-    STR_MAX_ID = 446,
+    STR_MON = 437,
+    STR_TUES = 438,
+    STR_WEDNES = 439,
+    STR_THURS = 440,
+    STR_FRI = 441,
+    STR_SATUR = 442,
+    STR_SUN = 443,
+    STR_MAX_ID = 444,
 }; // UIResourceTextId
-
-enum FontLanguageId : uint8_t {
+
+enum FontLanguageId : uint8_t {
     LANGUAGE_ID_JA,
     LANGUAGE_ID_EN,
     LANGUAGE_ID_ZH,
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 53b1769d67bd0c20dcb8301dd788dfa29bf48dc3..f7fe8d220cd5f719fb576e19f2708cc4ddffff48 100644
GIT binary patch
delta 552
zcmY+;O(??w7{~GFuwh>IqWwpjoTwEMWfz&ZiyVwvA)6IxYO><An*YU`#A!*QrtIM0
zvX(^LmUf^Vl-CQj)wIL3q{hLwoILe;`t@9%-<qS;s~F}Zr$L|mn~Q{E(yAYN5sg8l
z1`Tk+jR4MYg&W-C72nVrMGUZ@1#PgSA0u#K1`Ak52wO-YjceTE&M2xp6W)+R0alZU
z4c!=o6K(_$!UlE_M*<Jf)lvrS7{DkdF^fe65y2z!Fq%agF=bXoe1s*0@dSfH3ACaM
zeHe!yD)w-M6Qof@nMI@-op8W|6|5qRO~i1F6kd=;!OQxBrjEz3!iEmmF@!OAaELsL
zD50`mqzA*8z%;y=gAaZLl2zsJdR^vnI~Pl4_s^rBinltmevsRZ|J{-<%TGnr*JS+#
DP!wJ{

delta 583
zcmY+<O(??w7{~EvMcavO_Mb%~F3Rgg4&DoSDJ~Rkd1*!CASsc{UlPk<4x6M_c5sqf
z>wh5gQeH0{MD4KJK{ne7g~K@bmXoJGPru*cIXs!>l@?{q>|I@S%fC4dE2eBUl_T<v
ztXvTjI?)9ub`i!Q&T)$*-jIRL$PH{LMJ4LciXIGL1a2%K1Pup>;LIqhTodl_h#2%H
z5erICjRthV2{-1jj12^Efe+}+A_b^IJ=)QSA&g@dmx$s!PsCsm>9D9G{R9VQaD@!?
ziby_+P=O{4VhXG9AqWj|yu)Y}v7;Q_7{w%JFpqU?A%q*;Bc`&R@QMud`FxK;l%fWW
z=!O?j#F4-!%4{OFXhSa?7=a5Dn8Gw>@qD<H^6aPmk(cFTNv-X@_`@l!K>v{A`%=a<
cm-WYBO`L3|ceG^SND`i4dVBY;`-Y3{zsPrO<^TWy

-- 
2.17.1