From: 罗正 <1732036298@qq.com> Date: Fri, 13 Sep 2024 09:48:14 +0000 (+0000) Subject: Merge #964 into sdk602patch0626 from refs/changes/964/head X-Git-Tag: release_V1.2.70_20241020_135402~485^2^2~1^2~3^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=48170b60fce39018a2e2eaabf665fbad92995ad8;p=mirrors%2FFD230.git Merge #964 into sdk602patch0626 from refs/changes/964/head Code review from 罗正 * refs/changes/964/head: (21 commits squashed) - 闹钟UI优化: 1.#636,解决,手表,闹钟只响铃3次bug 2.闹钟编辑界面优化 3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug 修改闹钟弹窗无操作50s后自动关闭 - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #370,解决:下拉状态栏中,开启4G开关,停留在下拉菜单中,信号格状态不刷新(息屏时不会刷新)bug #618,解决:4G开关开启,重启手表,4G开关状态颜色响应比较慢bug - #639,解决:设置-图标不圆,有缺失,勿扰模式,更换卡片,省电模式bug - #154,解决:手表端超时不操作后,绑定请求会继续留在手表界面bug - 6.天气界面UI修改,与figma上设计保持一致 - 优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #644,解决,计时器显示问题bug #645,解决, 计时器显示错误bug - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #661,解决,手表,天气天气图标显示多云,文字显示中雨bug - 闹钟界面多国语言资源添加 - 闹钟界面适配多国语言 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/964 --- 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 7f6060316..3567471cd 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h @@ -578,7 +578,12 @@ enum UIResourceTextId : uint16_t { STR_SET_TARGET = 565, STR_PWUWC = 566, STR_CALENDAR = 567, - STR_MAX_ID = 568, + STR_ALARM_DELETE_NOTE = 568, + STR_ALARM_TIME_CHANGE = 569, + STR_ALARM_WEEK_CHANGE = 570, + STR_ALARM_REPEAT = 571, + STR_ALARM_ADD_LIMIT_NOTE = 572, + STR_MAX_ID = 573, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h index 700111186..7a4b22bb7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-09-02 20:04:12 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-10 16:31:01 + * @LastEditTime: 2024-09-13 15:21:58 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h */ @@ -42,9 +42,9 @@ private: UILabelButtonExt* button1{nullptr}; UILabelButtonExt* button2{nullptr}; UILabelExt *labelTime{nullptr}; - UILabel *labelSetTime{nullptr}; - UILabel *labelDay{nullptr}; - UILabel *labelSetWeek{nullptr}; + UILabelExt *labelSetTime{nullptr}; + UILabelExt *labelDay{nullptr}; + UILabelExt *labelSetWeek{nullptr}; char showtime[12]{0}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h index fa667aec4..aae3aa8f0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" -#include "components/ui_label_button.h" +#include "components/ui_label_button_ext.h" #include "components/ui_scroll_view.h" #include "font/ui_font.h" #include "components/ui_scroll_view.h" @@ -33,14 +33,13 @@ public: void RefreshSetWeek2(uint8_t week); private: UIScrollView *group{nullptr}; - UILabelButton *weekImage{nullptr}; - UILabel *labelRespeat{nullptr}; + UILabelButtonExt *weekImage{nullptr}; + UILabelExt *labelRespeat{nullptr}; UILabelButton *buttonWeek[7]{nullptr}; // 星期一共有7天,因此设置了七个星期的按钮 void CreateWeekButton1(void); void CreateWeekButton2(void); void SetLabelButton(void); - UILabelButton *CreateUILabelButton(const char *buttonText, int16_t x, int16_t y); - UIView *CreateUIView(int16_t x, int16_t y); + UILabelButtonExt *CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y); }; } // namespace OHOS #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp index 2799c227a..60b91a35c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp @@ -12,7 +12,7 @@ #include #include "color.h" #include "ConfigModel.h" - +#include "ui_resource_string.h" namespace OHOS { #define SET_ALARM "编辑闹钟" @@ -141,7 +141,8 @@ namespace OHOS } } editLabel->SetPosition(83, 50, 300, 35); - editLabel->SetText("编辑闹钟"); + // editLabel->SetText("编辑闹钟"); + editLabel->SetTextId(STR_ALARM); editLabel->SetStyle(STYLE_TEXT_FONT, 30); editLabel->SetStyle(STYLE_LINE_HEIGHT, 35); editLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -188,7 +189,8 @@ namespace OHOS } } labelSetTime->SetPosition(93, labelTime->GetY() + labelTime->GetHeight(), 250, 35); - labelSetTime->SetText("更改时间"); + // labelSetTime->SetText("更改时间"); + labelSetTime->SetTextId(STR_ALARM_TIME_CHANGE); labelSetTime->SetStyle(STYLE_TEXT_FONT, 30); labelSetTime->SetStyle(STYLE_LINE_HEIGHT, 35); labelSetTime->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); @@ -222,7 +224,8 @@ namespace OHOS } } labelSetWeek->SetPosition(93, labelDay->GetY() + labelDay->GetHeight(), 250, 35); - labelSetWeek->SetText("更改星期"); + // labelSetWeek->SetText("更改星期"); + labelSetWeek->SetTextId(STR_ALARM_WEEK_CHANGE); labelSetWeek->SetStyle(STYLE_TEXT_FONT, 30); labelSetWeek->SetStyle(STYLE_LINE_HEIGHT, 35); labelSetWeek->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp index 696562c2f..160358015 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp @@ -12,6 +12,7 @@ #include "alarm/include/AlarmPresenter.h" #include "alarm/include/MainAlarmView.h" #include "cmsis_os2.h" +#include "ui_resource_string.h" namespace OHOS { #define MAX_INETERFACES "当前闹钟个数已达上限" @@ -46,11 +47,17 @@ AlarmMaxClock::AlarmMaxClock() AlarmMaxClock::~AlarmMaxClock() { - container->RemoveAll(); - delete labelText; - labelText = nullptr; - delete container; - container = nullptr; + if(container) + { + container->RemoveAll(); + if(labelText) + { + delete labelText; + labelText = nullptr; + } + delete container; + container = nullptr; + } g_AlarmMaxClock = nullptr; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::~AlarmMaxClock"); } @@ -90,7 +97,7 @@ UIScrollView *AlarmMaxClock::InitAlarmMax(void) } } labelText->SetPosition(83, 236, 360, 35); - labelText->SetText(MAX_INETERFACES);//当前闹钟个数已达上限 + labelText->SetTextId(STR_ALARM_ADD_LIMIT_NOTE);//当前闹钟个数已达上限 labelText->SetStyle(STYLE_TEXT_FONT, 30); labelText->SetStyle(STYLE_LINE_HEIGHT, 35); labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp index d07ae4ded..77aed612a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp @@ -5,10 +5,11 @@ * Create: 2021-09-11 */ -#include "AlarmSetWeekView.h" +#include "alarm/include/AlarmSetWeekView.h" #include "common/screen.h" #include "components/ui_digital_clock.h" - +#include "ui_resource_string.h" +#include "ConfigModel.h" namespace OHOS { // #define MON "星期一" // #define TUE "星期二" @@ -24,6 +25,13 @@ namespace OHOS { #define FRI "五" #define SAT "六" #define SUN "日" +#define MON_EN "Mon" +#define TUE_EN "Tue" +#define WED_EN "Wed" +#define THUR_EN "Thu" +#define FRI_EN "Fri" +#define SAT_EN "Sat" +#define SUN_EN "Sun" #define RESPEAT "重复" #define SURE "确认" @@ -85,17 +93,29 @@ AlarmSetWeekView::AlarmSetWeekView() AlarmSetWeekView::~AlarmSetWeekView() { - group->RemoveAll(); - delete labelRespeat; - labelRespeat = nullptr; - delete weekImage; - weekImage = nullptr; - for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) { - delete buttonWeek[alarmNum]; - buttonWeek[alarmNum] = nullptr; + if(group) + { + group->RemoveAll(); + if(labelRespeat) + { + delete labelRespeat; + labelRespeat = nullptr; + } + if(weekImage) + { + delete weekImage; + weekImage = nullptr; + } + for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) { + if(buttonWeek[alarmNum]) + { + delete buttonWeek[alarmNum]; + buttonWeek[alarmNum] = nullptr; + } + } + delete group; + group = nullptr; } - delete group; - group = nullptr; g_pAlarmSetWeekView = nullptr; WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::~AlarmSetWeekView"); } @@ -105,21 +125,27 @@ AlarmSetWeekView *AlarmSetWeekView::GetInstance(void) return g_pAlarmSetWeekView; } -UILabelButton *AlarmSetWeekView::CreateUILabelButton(const char *buttonText, int16_t x, int16_t y) +UILabelButtonExt *AlarmSetWeekView::CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y) { - if (buttonText == nullptr) { + if (buttonText1 == nullptr || buttonText2 == nullptr) { return nullptr; } - UILabelButton *labelButton = new UILabelButton(); + UILabelButtonExt *labelButton = new UILabelButtonExt(); if (labelButton == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelButton fail"); return nullptr; } - + int language = ConfigModel::GetInstance()->GetLanguage(); + if(language == 0) + { + labelButton->SetText(buttonText1); + } + else + { + labelButton->SetText(buttonText2); + } labelButton->SetPosition(x, y); - labelButton->SetText(buttonText); - labelButton->SetViewId(buttonText); labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::PRESSED); labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::INACTIVE); @@ -154,7 +180,7 @@ void AlarmSetWeekView::CreateWeekButton1(void) int viewPositionX = VIEW_POSITION_X; // 60 150 UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN, viewPositionX, WEEK_Y1); + buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN,SUN_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_SUN] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSun fail"); return; @@ -164,7 +190,7 @@ void AlarmSetWeekView::CreateWeekButton1(void) buttonWeek[WEEK_SUN]->SetViewId(SUNDAY); viewPositionX += WEEK_GAP_X; - buttonWeek[WEEK_MON] = CreateUILabelButton(MON, viewPositionX, WEEK_Y1); + buttonWeek[WEEK_MON] = CreateUILabelButton(MON,MON_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_MON] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonMon fail"); return; @@ -174,7 +200,7 @@ void AlarmSetWeekView::CreateWeekButton1(void) buttonWeek[WEEK_MON]->SetViewId(MONDAY); viewPositionX += WEEK_GAP_X; - buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE, viewPositionX, WEEK_Y1); + buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE,TUE_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_TUE] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonTue fail"); return; @@ -184,7 +210,7 @@ void AlarmSetWeekView::CreateWeekButton1(void) buttonWeek[WEEK_TUE]->SetViewId(TUESDAY); viewPositionX += WEEK_GAP_X; - buttonWeek[WEEK_WED] = CreateUILabelButton(WED, viewPositionX, WEEK_Y1); + buttonWeek[WEEK_WED] = CreateUILabelButton(WED,WED_EN, viewPositionX, WEEK_Y1); if (buttonWeek[WEEK_WED] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonWed fail"); return; @@ -199,7 +225,7 @@ void AlarmSetWeekView::CreateWeekButton2(void) int viewPositionX2 = VIEW_POSITION_X2; // 12 210 UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance(); - buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR, viewPositionX2, WEEK_Y2); + buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR,THUR_EN, viewPositionX2, WEEK_Y2); if (buttonWeek[WEEK_THUR] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonThur fail"); return; @@ -209,7 +235,7 @@ void AlarmSetWeekView::CreateWeekButton2(void) buttonWeek[WEEK_THUR]->SetViewId(THURSDAY); viewPositionX2 += WEEK_GAP_X; - buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI, viewPositionX2, WEEK_Y2); + buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI,FRI_EN, viewPositionX2, WEEK_Y2); if (buttonWeek[WEEK_FRI] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonFri fail"); return; @@ -219,7 +245,7 @@ void AlarmSetWeekView::CreateWeekButton2(void) buttonWeek[WEEK_FRI]->SetViewId(FRIDAY); viewPositionX2 += WEEK_GAP_X; - buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT, viewPositionX2, WEEK_Y2); + buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT,SAT_EN, viewPositionX2, WEEK_Y2); if (buttonWeek[WEEK_SAT] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSat fail"); return; @@ -246,74 +272,59 @@ void AlarmSetWeekView::SetLabelButton(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new clickListener fail"); return; } - weekImage = new UILabelButton(); + weekImage = new UILabelButtonExt(); if (weekImage == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new weekImage fail"); return; } - // weekImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3); - // weekImage->SetText(SURE); - // weekImage->SetTouchable(true); - // weekImage->SetViewId(ALARM_WEEK_OK); - // weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_WEEK_FONT); - weekImage->SetPosition(0, 366, 466, 100); weekImage->SetViewId(ALARM_WEEK_OK); - weekImage->SetText(SURE); + weekImage->SetTextId(STR_OK);//确定 weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); weekImage->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); weekImage->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE); weekImage->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED); weekImage->SetTouchable(true); - - if (OHOS::AlarmPresenter::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail"); - return; - } - // weekImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue()); weekImage->SetOnClickListener(clickListener); - // weekImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE); group->Add(weekImage); } UIScrollView *AlarmSetWeekView::InitSetWeekView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView"); - + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView"); group = new UIScrollView(); if (group == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new group fail"); return group; } - group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - labelRespeat = new UILabel(); + group->SetTouchable(true); + group->SetDraggable(true); + UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); + if (setWeekDragListener == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail"); + return group; + } + group->SetOnDragListener(setWeekDragListener); + /* -------------------------------------------------------------------------- */ + labelRespeat = new UILabelExt(); if (labelRespeat == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelRespeat fail"); return group; } - group->Add(labelRespeat); - labelRespeat->SetText(RESPEAT); - // labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, DEFAULT_FONT); - // labelRespeat->SetPosition(TITLE_X, TITLE_Y, HORIZONTAL_RESOLUTION / 2, LABEL_POSITION_SIZE); + labelRespeat->SetTextId(STR_ALARM_REPEAT);//重复 labelRespeat->SetPosition(83, 50, 300, 35); labelRespeat->SetStyle(STYLE_TEXT_FONT, 30); labelRespeat->SetStyle(STYLE_LINE_HEIGHT, 35); labelRespeat->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + group->Add(labelRespeat); CreateWeekButton1(); CreateWeekButton2(); SetLabelButton(); - group->SetTouchable(true); - group->SetDraggable(true); - UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance(); - if (setWeekDragListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail"); - return group; - } - group->SetOnDragListener(setWeekDragListener); + return group; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp index 7711d2340..6f58e6a43 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -476,7 +476,7 @@ void MainAlarmView::OnStart() } // group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - group->SetScrollBlankSize(50); + group->SetScrollBlankSize(75); // group->SetMaxScrollDistance(1000); // 1000: max scroll distance // group->SetSwipeACCLevel(800); // 800: compensation distance // group->SetDragACCLevel(5); // 5: drag acceleration @@ -721,7 +721,7 @@ bool MainAlarmView::ChangeMaxClock(int16_t thisView) container[thisView] = maxClockView->InitAlarmMax(); RootView::GetInstance()->Add(container[thisView]); } - AlarmMaxClock::GetInstance()->AlarmMaxDelayExit(); + // AlarmMaxClock::GetInstance()->AlarmMaxDelayExit(); return true; } @@ -755,7 +755,7 @@ void MainAlarmView::DropView(UIView& view) } else if (&view == container[CHANGE_INTERFACE_MAXCLOCK]) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[CHANGE_INTERFACE_MAXCLOCK]"); ChangeView(CHANGE_INTERFACE_MAXCLOCK, MAIN_INTERFACE); - CancelScanHandle(); + // CancelScanHandle(); } else if (&view == container[MAIN_INTERFACE]) { // uint16_t preSlice = AlarmClockModel::GetInstance()->JudgePreSlice(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[MAIN_INTERFACE]"); diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang index a2629a214..023968d47 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang index 18c2706bf..a9f8e9fb4 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang index 41ad63467..dd8ae39c3 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang index 9c3e76f35..dd2877c37 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang index 2c0a60f63..6f6f4167d 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.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 9b9e524c7..1424fc25c 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/es.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang index 3124b85fc..e2785a67e 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang index a98cb6c78..22f7001b3 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang index 5d796fead..0711f07de 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang index a390261b8..4d62453be 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang index 5932db60c..53e70e4ec 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang index ecdef25a0..83b03d532 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang index acfb16d36..8e7162dd8 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang index c13034539..884f0e1b1 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang index 2ab090685..bf24ea00e 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.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 611219c2a..b32273965 100644 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/ko.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang index e7d0887d3..479bd0712 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang index 82d26318b..7bd0a9d5d 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang index 329fb406d..8b7e8b723 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang index 236635e1c..fa6dca7c4 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang index 69cc204a7..85705a5c0 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang index 6ead12720..f5fa048aa 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang index c183fda42..b2b7d008d 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang index ad69aa108..2920e2fc4 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang index 036f8136d..175a0f434 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang index 44c3ff7bd..b1eb3e50f 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.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 7f6060316..3567471cd 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 @@ -578,7 +578,12 @@ enum UIResourceTextId : uint16_t { STR_SET_TARGET = 565, STR_PWUWC = 566, STR_CALENDAR = 567, - STR_MAX_ID = 568, + STR_ALARM_DELETE_NOTE = 568, + STR_ALARM_TIME_CHANGE = 569, + STR_ALARM_WEEK_CHANGE = 570, + STR_ALARM_REPEAT = 571, + STR_ALARM_ADD_LIMIT_NOTE = 572, + STR_MAX_ID = 573, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang index 2062e602f..97b1e344c 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang index 3a5da1c6a..d896610c8 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang index 4230c4e3a..b1dbfe334 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang differ 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 163785bdf..b7c3c7785 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_ar.txt b/tools/language_tool/Language_xml/input_list_ar.txt index 729946bc4..9c16bcd11 100644 --- a/tools/language_tool/Language_xml/input_list_ar.txt +++ b/tools/language_tool/Language_xml/input_list_ar.txt @@ -565,4 +565,9 @@ STR_ROLLER$الأسطوانة STR_DIAL_BROWSING_SPECIAL_EFFECTS$تأثيرات تصفح وجه الساعة STR_SET_TARGET$تعيين الأهداف > STR_PWUWC$يرجى ارتداء الساعة بشكل صحيح والبقاء ساكناً. -STR_CALENDAR$التقويم \ No newline at end of file +STR_CALENDAR$التقويم +STR_ALARM_DELETE_NOTE$هل تريد حذف هذا المنبه؟ +STR_ALARM_TIME_CHANGE$قم بتغيير الوقت +STR_ALARM_WEEK_CHANGE$قم بتغيير يوم الأسبوع +STR_ALARM_REPEAT$كرر +STR_ALARM_ADD_LIMIT_NOTE$وصل عدد المنبهات الحالية إلى الحد الأقصى \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_az.txt b/tools/language_tool/Language_xml/input_list_az.txt index 43255e50b..32c67bf3a 100644 --- a/tools/language_tool/Language_xml/input_list_az.txt +++ b/tools/language_tool/Language_xml/input_list_az.txt @@ -565,4 +565,9 @@ STR_ROLLER$Silindr STR_DIAL_BROWSING_SPECIAL_EFFECTS$Saat üzümlərinin baxış effektləri STR_SET_TARGET$Məqsəd təyin edin> STR_PWUWC$Zəhmət olmasa, saatı düzgün taxın və hərəkətsiz qalın -STR_CALENDAR$Təqvim \ No newline at end of file +STR_CALENDAR$Təqvim +STR_ALARM_DELETE_NOTE$Bu saatı silmək istəyirsinizmi +STR_ALARM_TIME_CHANGE$Vaxtı dəyişdirin +STR_ALARM_WEEK_CHANGE$Həftənin gününü dəyişdirin +STR_ALARM_REPEAT$Təkrar edin +STR_ALARM_ADD_LIMIT_NOTE$Mövcut saatların sayı üst limitə çatdı \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_cs.txt b/tools/language_tool/Language_xml/input_list_cs.txt index f61618ce6..dd796a2d2 100644 --- a/tools/language_tool/Language_xml/input_list_cs.txt +++ b/tools/language_tool/Language_xml/input_list_cs.txt @@ -565,4 +565,9 @@ STR_ROLLER$válce STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efekty prohlížení ciferníku STR_SET_TARGET$Nastavit cíl> STR_PWUWC$Proszím, noste hodinky správně a zůstaňte v klidu. -STR_CALENDAR$Kalendář \ No newline at end of file +STR_CALENDAR$Kalendář +STR_ALARM_DELETE_NOTE$Chcete odstranit tento budík +STR_ALARM_TIME_CHANGE$Změnit čas +STR_ALARM_WEEK_CHANGE$Změnit den v týdnu +STR_ALARM_REPEAT$Opakovat +STR_ALARM_ADD_LIMIT_NOTE$Aktuální počet budíků dosáhl horní hranice \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_de.txt b/tools/language_tool/Language_xml/input_list_de.txt index 281cbb3f3..a10117dd9 100644 --- a/tools/language_tool/Language_xml/input_list_de.txt +++ b/tools/language_tool/Language_xml/input_list_de.txt @@ -565,4 +565,9 @@ STR_ROLLER$Walze STR_DIAL_BROWSING_SPECIAL_EFFECTS$Zifferblatt-Browsing-Spezialeffekte STR_SET_TARGET$Einstellungsziel> STR_PWUWC$Bitte tragen Sie die Uhr richtig und bleiben Sie still. -STR_CALENDAR$Kalender \ No newline at end of file +STR_CALENDAR$Kalender +STR_ALARM_DELETE_NOTE$Möchten Sie diesen Wecker löschen +STR_ALARM_TIME_CHANGE$Zeit ändern +STR_ALARM_WEEK_CHANGE$Zeit ändern +STR_ALARM_REPEAT$Wiederholen +STR_ALARM_ADD_LIMIT_NOTE$Die aktuelle Anzahl der Wecker hat die Obergrenze erreicht \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_el.txt b/tools/language_tool/Language_xml/input_list_el.txt index 689c1412e..ea591ace3 100644 --- a/tools/language_tool/Language_xml/input_list_el.txt +++ b/tools/language_tool/Language_xml/input_list_el.txt @@ -565,4 +565,9 @@ STR_ROLLER$κύλινδροι STR_DIAL_BROWSING_SPECIAL_EFFECTS$Εφέ περιήγησης προσώπου STR_SET_TARGET$Ρύθμιση στόχου> STR_PWUWC$Παρακαλώ φορέστε σωστά το ρολόι και παραμείνετε ακίνητοι. -STR_CALENDAR$Ημερολόγιο \ No newline at end of file +STR_CALENDAR$Ημερολόγιο +STR_ALARM_DELETE_NOTE$Θέλετε να διαγράψετε αυτόν τον ξυπνητήρα; +STR_ALARM_TIME_CHANGE$Αλλάξτε την ώρα +STR_ALARM_WEEK_CHANGE$Αλλάξτε την ημέρα της εβδομάδας +STR_ALARM_REPEAT$Επαναλάβετε +STR_ALARM_ADD_LIMIT_NOTE$Το τρέχον αριθμό των ξυπνητήρων έχει φτάσει το ανώτατο όριο \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt index 15064f0fc..30f714cf1 100644 --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@ -565,4 +565,9 @@ STR_ROLLER$Roller STR_DIAL_BROWSING_SPECIAL_EFFECTS$Dial browsing special effects STR_SET_TARGET$Set target> STR_PWUWC$Please wear the watch correctly and remain still. -STR_CALENDAR$calendar \ No newline at end of file +STR_CALENDAR$calendar +STR_ALARM_DELETE_NOTE$Whether to delete the alarm +STR_ALARM_TIME_CHANGE$Change time +STR_ALARM_WEEK_CHANGE$Change week +STR_ALARM_REPEAT$Repeat +STR_ALARM_ADD_LIMIT_NOTE$The current number of alarm clocks has reached the upper limit \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_es.txt b/tools/language_tool/Language_xml/input_list_es.txt index a32023bb9..20ea3524f 100644 --- a/tools/language_tool/Language_xml/input_list_es.txt +++ b/tools/language_tool/Language_xml/input_list_es.txt @@ -565,4 +565,9 @@ STR_ROLLER$Tambor STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efectos especiales de navegación del dial STR_SET_TARGET$Objetivo de configuración> STR_PWUWC$Por favor, use el reloj correctamente y manténgase quieto. -STR_CALENDAR$calendario \ No newline at end of file +STR_CALENDAR$calendario +STR_ALARM_DELETE_NOTE$¿Desea eliminar este despertador +STR_ALARM_TIME_CHANGE$Cambiar la hora +STR_ALARM_WEEK_CHANGE$Cambiar el día de la semana +STR_ALARM_REPEAT$Repetir +STR_ALARM_ADD_LIMIT_NOTE$El número actual de despertadores ha alcanzado el límite superior \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_fa.txt b/tools/language_tool/Language_xml/input_list_fa.txt index 8e804a97b..52e49715d 100644 --- a/tools/language_tool/Language_xml/input_list_fa.txt +++ b/tools/language_tool/Language_xml/input_list_fa.txt @@ -565,4 +565,9 @@ STR_ROLLER$استوانه STR_DIAL_BROWSING_SPECIAL_EFFECTS$اثرات مرور صفحه نمایش STR_SET_TARGET$هدف را تنظیم کنید > STR_PWUWC$لطفاً ساعت را به درستی بپوشید و بی‌حرکت بمانید. -STR_CALENDAR$تقویم \ No newline at end of file +STR_CALENDAR$تقویم +STR_ALARM_DELETE_NOTE$آیا می‌خواهید این ساعت بیدارکن را حذف کنید؟ +STR_ALARM_TIME_CHANGE$زمان را تغییر دهید +STR_ALARM_WEEK_CHANGE$روز هفته را تغییر دهید +STR_ALARM_REPEAT$تکرار کنید +STR_ALARM_ADD_LIMIT_NOTE$تعداد ساعت بیدارکن‌های فعلی به حداکثر رسیده است \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_fi.txt b/tools/language_tool/Language_xml/input_list_fi.txt index 8bb3e04e3..cb8e2f454 100644 --- a/tools/language_tool/Language_xml/input_list_fi.txt +++ b/tools/language_tool/Language_xml/input_list_fi.txt @@ -565,4 +565,9 @@ STR_ROLLER$Rullaus STR_DIAL_BROWSING_SPECIAL_EFFECTS$Kellotaulun selailuefektit STR_SET_TARGET$Aseta tavoitteet > STR_PWUWC$Ole hyvä ja käytä kelloa oikein ja pysy paikallaan. -STR_CALENDAR$Kalenteri \ No newline at end of file +STR_CALENDAR$Kalenteri +STR_ALARM_DELETE_NOTE$Haluatko poistaa tämän hälytyskellon +STR_ALARM_TIME_CHANGE$Muuta aikaa +STR_ALARM_WEEK_CHANGE$Muuta viikonpäivää +STR_ALARM_REPEAT$Toista +STR_ALARM_ADD_LIMIT_NOTE$Nykyinen hälytyskellojen määrä on saavuttanut ylärajan \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_fr.txt b/tools/language_tool/Language_xml/input_list_fr.txt index 9ae2ada2b..2d8f5ba7c 100644 --- a/tools/language_tool/Language_xml/input_list_fr.txt +++ b/tools/language_tool/Language_xml/input_list_fr.txt @@ -565,4 +565,9 @@ STR_ROLLER$Cylindre STR_DIAL_BROWSING_SPECIAL_EFFECTS$Effets de navigation du cadran STR_SET_TARGET$Définir l'objectif> STR_PWUWC$Veuillez porter correctement la montre et rester immobile. -STR_CALENDAR$Calendrier \ No newline at end of file +STR_CALENDAR$Calendrier +STR_ALARM_DELETE_NOTE$Voulez-vous supprimer ce réveil +STR_ALARM_TIME_CHANGE$Modifier l'heure +STR_ALARM_WEEK_CHANGE$Modifier le jour de la semaine +STR_ALARM_REPEAT$Répéter +STR_ALARM_ADD_LIMIT_NOTE$Le nombre actuel de réveils a atteint la limite \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_he.txt b/tools/language_tool/Language_xml/input_list_he.txt index d52f96247..789c9b03e 100644 --- a/tools/language_tool/Language_xml/input_list_he.txt +++ b/tools/language_tool/Language_xml/input_list_he.txt @@ -565,4 +565,9 @@ STR_ROLLER$גליל STR_DIAL_BROWSING_SPECIAL_EFFECTS$אפקטי דפדוף של שעון STR_SET_TARGET$הגדיר מטרה> STR_PWUWC$אנא לבש את השעון נכון ושמור על שקט -STR_CALENDAR$לוח שנה \ No newline at end of file +STR_CALENDAR$לוח שנה +STR_ALARM_DELETE_NOTE$האם תרצה למחוק את המתעורר הזה +STR_ALARM_TIME_CHANGE$לשנות את הזמן +STR_ALARM_WEEK_CHANGE$לשנות את היום בשבוע +STR_ALARM_REPEAT$לחזור +STR_ALARM_ADD_LIMIT_NOTE$מספר המתעוררים הנוכחי הגיע למגבלה העליונה \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_hi.txt b/tools/language_tool/Language_xml/input_list_hi.txt index 602ad51fe..8d66258c1 100644 --- a/tools/language_tool/Language_xml/input_list_hi.txt +++ b/tools/language_tool/Language_xml/input_list_hi.txt @@ -565,4 +565,9 @@ STR_ROLLER$रोलर STR_DIAL_BROWSING_SPECIAL_EFFECTS$डायल ब्राउज़िंग प्रभाव STR_SET_TARGET$लक्ष्य सेट करें> STR_PWUWC$कृपया घड़ी को सही तरीके से पहनें और स्थिर रहें। -STR_CALENDAR$तिथिपत्री \ No newline at end of file +STR_CALENDAR$तिथिपत्री +STR_ALARM_DELETE_NOTE$क्या आप इस अलार्म को हटाना चाहते हैं +STR_ALARM_TIME_CHANGE$समय बदलें। +STR_ALARM_WEEK_CHANGE$सप्ताह के दिन बदलें। +STR_ALARM_REPEAT$दोहराएँ। +STR_ALARM_ADD_LIMIT_NOTE$वर्तमान में अलार्म की संख्या ऊपरी सीमा तक पहुंच गई है। \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_hr.txt b/tools/language_tool/Language_xml/input_list_hr.txt index 1136e7101..a5a793670 100644 --- a/tools/language_tool/Language_xml/input_list_hr.txt +++ b/tools/language_tool/Language_xml/input_list_hr.txt @@ -565,4 +565,9 @@ STR_ROLLER$Bubanj STR_DIAL_BROWSING_SPECIAL_EFFECTS$Specijalni efekti pregleda sata STR_SET_TARGET$Cilj podeÅ¡avanja> STR_PWUWC$Molimo vas, nosite sat ispravno i ostanite mirni. -STR_CALENDAR$Kalendar \ No newline at end of file +STR_CALENDAR$Kalendar +STR_ALARM_DELETE_NOTE$Želite li izbrisati ovaj budilnik? +STR_ALARM_TIME_CHANGE$Promijenite vrijeme +STR_ALARM_WEEK_CHANGE$Promijenite dan u tjednu +STR_ALARM_REPEAT$Ponavljati +STR_ALARM_ADD_LIMIT_NOTE$Trenutačno je broj budilnika dosegao gornju granicu \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_id.txt b/tools/language_tool/Language_xml/input_list_id.txt index a130eb914..d8e6577fd 100644 --- a/tools/language_tool/Language_xml/input_list_id.txt +++ b/tools/language_tool/Language_xml/input_list_id.txt @@ -565,4 +565,9 @@ STR_ROLLER$Rol STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efek penjelajahan dial STR_SET_TARGET$Atur tujuan> STR_PWUWC$Silakan kenakan jam dengan benar dan tetap diam. -STR_CALENDAR$Kalender \ No newline at end of file +STR_CALENDAR$Kalender +STR_ALARM_DELETE_NOTE$Apakah Anda ingin menghapus alarm ini +STR_ALARM_TIME_CHANGE$Ubah waktu +STR_ALARM_WEEK_CHANGE$Ubah hari dalam seminggu +STR_ALARM_REPEAT$Ulangi pengukuran +STR_ALARM_ADD_LIMIT_NOTE$Jumlah alarm saat ini telah mencapai batas atas \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_it.txt b/tools/language_tool/Language_xml/input_list_it.txt index 9db20750b..81963719d 100644 --- a/tools/language_tool/Language_xml/input_list_it.txt +++ b/tools/language_tool/Language_xml/input_list_it.txt @@ -565,4 +565,9 @@ STR_ROLLER$Cilindro STR_DIAL_BROWSING_SPECIAL_EFFECTS$Effetti di navigazione del quadrante STR_SET_TARGET$Imposta obiettivo> STR_PWUWC$Si prega di indossare correttamente l'orologio e di rimanere fermo. -STR_CALENDAR$Calendario \ No newline at end of file +STR_CALENDAR$Calendario +STR_ALARM_DELETE_NOTE$Vuoi eliminare questo allarme +STR_ALARM_TIME_CHANGE$Modificare l'ora +STR_ALARM_WEEK_CHANGE$Modificare il giorno della settimana +STR_ALARM_REPEAT$Ripetere +STR_ALARM_ADD_LIMIT_NOTE$Il numero attuale di allarmi ha raggiunto il limite superiore \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_ja.txt b/tools/language_tool/Language_xml/input_list_ja.txt index c3dc115af..beda8bd2c 100644 --- a/tools/language_tool/Language_xml/input_list_ja.txt +++ b/tools/language_tool/Language_xml/input_list_ja.txt @@ -565,4 +565,9 @@ STR_ROLLER$ドラム STR_DIAL_BROWSING_SPECIAL_EFFECTS$文字盤閲覧エフェクト STR_SET_TARGET$設定目標> STR_PWUWC$正しく時計を着用し、静止してください。 -STR_CALENDAR$暦 \ No newline at end of file +STR_CALENDAR$暦 +STR_ALARM_DELETE_NOTE$このアラームを削除しますか +STR_ALARM_TIME_CHANGE$時間を変更します +STR_ALARM_WEEK_CHANGE$曜日を変更します +STR_ALARM_REPEAT$繰り返し +STR_ALARM_ADD_LIMIT_NOTE$現在のアラームの数が上限に達しています \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_ko.txt b/tools/language_tool/Language_xml/input_list_ko.txt index 62710a46c..6503c65fa 100644 --- a/tools/language_tool/Language_xml/input_list_ko.txt +++ b/tools/language_tool/Language_xml/input_list_ko.txt @@ -565,4 +565,9 @@ STR_ROLLER$드럼 STR_DIAL_BROWSING_SPECIAL_EFFECTS$다이얼 브라우징 특수효과 STR_SET_TARGET$설정 목표> STR_PWUWC$시계를 올바르게 착용하고 가만히 있어 주세요. -STR_CALENDAR$일력 \ No newline at end of file +STR_CALENDAR$일력 +STR_ALARM_DELETE_NOTE$이 알람을 삭제하시겠습니까 +STR_ALARM_TIME_CHANGE$시간을 변경합니다 +STR_ALARM_WEEK_CHANGE$요일을 변경합니다 +STR_ALARM_REPEAT$반복. +STR_ALARM_ADD_LIMIT_NOTE$현재 알람 개수가 상한에 도달했습니다 \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_ms.txt b/tools/language_tool/Language_xml/input_list_ms.txt index 669e69180..58e613bad 100644 --- a/tools/language_tool/Language_xml/input_list_ms.txt +++ b/tools/language_tool/Language_xml/input_list_ms.txt @@ -565,4 +565,9 @@ STR_ROLLER$Gelendong STR_DIAL_BROWSING_SPECIAL_EFFECTS$Kesan Pelayaran Paparan Jam STR_SET_TARGET$Tetapkan Sasaran> STR_PWUWC$Koa mu'ula to hia sio sa hao'ana e malaw. -STR_CALENDAR$Kalendar \ No newline at end of file +STR_CALENDAR$Kalendar +STR_ALARM_DELETE_NOTE$Adakah anda ingin memadamkan jam penggera ini +STR_ALARM_TIME_CHANGE$Tukar masa +STR_ALARM_WEEK_CHANGE$Tukar hari dalam seminggu +STR_ALARM_REPEAT$Ulang +STR_ALARM_ADD_LIMIT_NOTE$Bilangan jam penggera semasa telah mencapai had atas \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_nl.txt b/tools/language_tool/Language_xml/input_list_nl.txt index eb2b748a6..0c2fab6a3 100644 --- a/tools/language_tool/Language_xml/input_list_nl.txt +++ b/tools/language_tool/Language_xml/input_list_nl.txt @@ -565,4 +565,9 @@ STR_ROLLER$Cilinder STR_DIAL_BROWSING_SPECIAL_EFFECTS$Navigatie-effecten van de wijzerplaat STR_SET_TARGET$Doel instellen> STR_PWUWC$Draag alstublieft het horloge correct en blijf stil. -STR_CALENDAR$Agenda \ No newline at end of file +STR_CALENDAR$Agenda +STR_ALARM_DELETE_NOTE$Wilt u deze wekker verwijderen +STR_ALARM_TIME_CHANGE$Tijd wijzigen +STR_ALARM_WEEK_CHANGE$Dag van de week wijzigen +STR_ALARM_REPEAT$Herhalen +STR_ALARM_ADD_LIMIT_NOTE$Het huidige aantal wekkers heeft de bovengrens bereikt \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_pl.txt b/tools/language_tool/Language_xml/input_list_pl.txt index 3bbb10f25..275bd2f36 100644 --- a/tools/language_tool/Language_xml/input_list_pl.txt +++ b/tools/language_tool/Language_xml/input_list_pl.txt @@ -565,4 +565,9 @@ STR_ROLLER$Walec STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efek przeglądania tarczy zegarka STR_SET_TARGET$Ustaw cel> STR_PWUWC$Proszę nosić zegarek poprawnie i pozostać w bezruchu. -STR_CALENDAR$Kalendarz \ No newline at end of file +STR_CALENDAR$Kalendarz +STR_ALARM_DELETE_NOTE$Czy chcesz usunąć ten budzik +STR_ALARM_TIME_CHANGE$Zmień godzinę +STR_ALARM_WEEK_CHANGE$Zmień dzień tygodnia +STR_ALARM_REPEAT$Powtórz +STR_ALARM_ADD_LIMIT_NOTE$Obecna liczba budzików osiągnęła górny limit \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_pt.txt b/tools/language_tool/Language_xml/input_list_pt.txt index b6e6b02c8..cb5ecb7a8 100644 --- a/tools/language_tool/Language_xml/input_list_pt.txt +++ b/tools/language_tool/Language_xml/input_list_pt.txt @@ -565,4 +565,9 @@ STR_ROLLER$Cilindro STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efeitos de navegação do mostrador STR_SET_TARGET$Definir objetivo> STR_PWUWC$Por favor, use o relógio corretamente e permaneça parado. -STR_CALENDAR$Calendário \ No newline at end of file +STR_CALENDAR$Calendário +STR_ALARM_DELETE_NOTE$Deseja excluir este despertador +STR_ALARM_TIME_CHANGE$Alterar a hora +STR_ALARM_WEEK_CHANGE$Alterar o dia da semana +STR_ALARM_REPEAT$Alterar o dia da semana +STR_ALARM_ADD_LIMIT_NOTE$O número atual de despertadores atingiu o limite superior \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_ro.txt b/tools/language_tool/Language_xml/input_list_ro.txt index 2a455f1f8..449ae9685 100644 --- a/tools/language_tool/Language_xml/input_list_ro.txt +++ b/tools/language_tool/Language_xml/input_list_ro.txt @@ -565,4 +565,9 @@ STR_ROLLER$Rulou STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efecte de navigare a cadranului STR_SET_TARGET$Setează obiectivele > STR_PWUWC$Te rog să porți ceasul corect și să stai nemișcat. -STR_CALENDAR$Calendar \ No newline at end of file +STR_CALENDAR$Calendar +STR_ALARM_DELETE_NOTE$Doriți să ștergeți acest ceas deșteptător +STR_ALARM_TIME_CHANGE$Modificați ora +STR_ALARM_WEEK_CHANGE$Modificați ziua săptămânii +STR_ALARM_REPEAT$Repetați +STR_ALARM_ADD_LIMIT_NOTE$Numărul actual de ceasuri deșteptătoare a atins limita superioară \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_ru.txt b/tools/language_tool/Language_xml/input_list_ru.txt index 74a9a17ee..82159cfe3 100644 --- a/tools/language_tool/Language_xml/input_list_ru.txt +++ b/tools/language_tool/Language_xml/input_list_ru.txt @@ -565,4 +565,9 @@ STR_ROLLER$Барабан STR_DIAL_BROWSING_SPECIAL_EFFECTS$Специальные эффекты просмотра циферблата STR_SET_TARGET$Цель настройки> STR_PWUWC$Пожалуйста, правильно носите часы и оставайтесь неподвижными. -STR_CALENDAR$календар +STR_CALENDAR$календар +STR_ALARM_DELETE_NOTE$Удалить этот будильник +STR_ALARM_TIME_CHANGE$Изменить время +STR_ALARM_WEEK_CHANGE$Изменить день недели +STR_ALARM_REPEAT$Повторять +STR_ALARM_ADD_LIMIT_NOTE$Текущее количество будильников достигло верхнего предела \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_sv.txt b/tools/language_tool/Language_xml/input_list_sv.txt index 794e1e563..a5893494b 100644 --- a/tools/language_tool/Language_xml/input_list_sv.txt +++ b/tools/language_tool/Language_xml/input_list_sv.txt @@ -565,4 +565,9 @@ STR_ROLLER$Cylinder STR_DIAL_BROWSING_SPECIAL_EFFECTS$Bläddringseffekter för urtavla STR_SET_TARGET$Sätt mÃ¥l> STR_PWUWC$Vänligen bär klockan korrekt och hÃ¥ll dig stilla -STR_CALENDAR$Kalender \ No newline at end of file +STR_CALENDAR$Kalender +STR_ALARM_DELETE_NOTE$Vill du ta bort den här väckarklockan +STR_ALARM_TIME_CHANGE$Ändra tiden +STR_ALARM_WEEK_CHANGE$Ändra veckodagen +STR_ALARM_REPEAT$Upprepa +STR_ALARM_ADD_LIMIT_NOTE$Aktuell antal väckarklockor har nÃ¥tt övre gränsen \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_th.txt b/tools/language_tool/Language_xml/input_list_th.txt index 1b715b48f..f7946c67b 100644 --- a/tools/language_tool/Language_xml/input_list_th.txt +++ b/tools/language_tool/Language_xml/input_list_th.txt @@ -565,4 +565,9 @@ STR_ROLLER$ลูกกลิ้ง STR_DIAL_BROWSING_SPECIAL_EFFECTS$เอฟเฟกต์การเรียกดูหน้าปัดนาฬิกา STR_SET_TARGET$ตั้งเป้าหมาย> STR_PWUWC$กรุณาสวมใส่นาฬิกาให้ถูกต้องและนั่งนิ่งๆ -STR_CALENDAR$ปฏิทิน \ No newline at end of file +STR_CALENDAR$ปฏิทิน +STR_ALARM_DELETE_NOTE$คุณต้องการลบนาฬิกาปลุกนี้หรือไม่ +STR_ALARM_TIME_CHANGE$เปลี่ยนเวลา +STR_ALARM_WEEK_CHANGE$เปลี่ยนวันในสัปดาห์ +STR_ALARM_REPEAT$ทำซ้ำ +STR_ALARM_ADD_LIMIT_NOTE$จำนวนนาฬิกาปลุกในขณะนี้ได้ถึงขีดจำกัดสูงสุด \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_tr.txt b/tools/language_tool/Language_xml/input_list_tr.txt index dee227053..82262c474 100644 --- a/tools/language_tool/Language_xml/input_list_tr.txt +++ b/tools/language_tool/Language_xml/input_list_tr.txt @@ -565,4 +565,9 @@ STR_ROLLER$Silindir STR_DIAL_BROWSING_SPECIAL_EFFECTS$Kadran göz atma efektleri STR_SET_TARGET$Hedef ayarla > STR_PWUWC$Lütfen saati doğru takın ve hareketsiz kalın. -STR_CALENDAR$Takvim \ No newline at end of file +STR_CALENDAR$Takvim +STR_ALARM_DELETE_NOTE$Bu alarmı silmek istiyor musunuz +STR_ALARM_TIME_CHANGE$Zamanı değiştir +STR_ALARM_WEEK_CHANGE$Haftanın gününü değiştir +STR_ALARM_REPEAT$Tekrarla +STR_ALARM_ADD_LIMIT_NOTE$Mevcut alarm sayısı üst sınırı reached \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_uk.txt b/tools/language_tool/Language_xml/input_list_uk.txt index 1a948599b..d074b65d0 100644 --- a/tools/language_tool/Language_xml/input_list_uk.txt +++ b/tools/language_tool/Language_xml/input_list_uk.txt @@ -565,4 +565,9 @@ STR_ROLLER$Каток STR_DIAL_BROWSING_SPECIAL_EFFECTS$Ефекти перегляду циферблату STR_SET_TARGET$Встановити мету> STR_PWUWC$Будь ласка, правильно носіть годинник і залишайтеся нерухомими -STR_CALENDAR$Календар \ No newline at end of file +STR_CALENDAR$Календар +STR_ALARM_DELETE_NOTE$Чи бажаєте ви видалити цей будильник +STR_ALARM_TIME_CHANGE$Змінити час +STR_ALARM_WEEK_CHANGE$Змінити день тижня +STR_ALARM_REPEAT$Змінити день тижня +STR_ALARM_ADD_LIMIT_NOTE$Поточна кількість будильників досягла верхньої межі \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_uz.txt b/tools/language_tool/Language_xml/input_list_uz.txt index 19c4f086a..e028c91b5 100644 --- a/tools/language_tool/Language_xml/input_list_uz.txt +++ b/tools/language_tool/Language_xml/input_list_uz.txt @@ -565,4 +565,9 @@ STR_ROLLER$Silindr STR_DIAL_BROWSING_SPECIAL_EFFECTS$Soat dialsini ko‘rish effektlari STR_SET_TARGET$Maqsadni qo'yish> STR_PWUWC$Iltimos, soatni to'g'ri kiying va harakatsiz bo'ling -STR_CALENDAR$Kalendar \ No newline at end of file +STR_CALENDAR$Kalendar +STR_ALARM_DELETE_NOTE$Bu soatni o'chirishni xohlaysizmi +STR_ALARM_TIME_CHANGE$Vaqtni o'zgartiring +STR_ALARM_WEEK_CHANGE$Haftaning kunini o'zgartiring +STR_ALARM_REPEAT$Takrorlang +STR_ALARM_ADD_LIMIT_NOTE$Hozirgi soatlar soni yuqori chegaraga yetdi \ No newline at end of file diff --git a/tools/language_tool/Language_xml/input_list_vi.txt b/tools/language_tool/Language_xml/input_list_vi.txt index b70d0ca03..90623298b 100644 --- a/tools/language_tool/Language_xml/input_list_vi.txt +++ b/tools/language_tool/Language_xml/input_list_vi.txt @@ -565,4 +565,9 @@ STR_ROLLER$Cuộn STR_DIAL_BROWSING_SPECIAL_EFFECTS$Hiệu ứng duyệt mặt đồng hồ STR_SET_TARGET$Thiết lập mục tiêu> STR_PWUWC$Vui lòng đeo đồng hồ đúng cách và giữ yên. -STR_CALENDAR$Lịch \ No newline at end of file +STR_CALENDAR$Lịch +STR_ALARM_DELETE_NOTE$Bạn có muốn xóa đồng hồ báo thức này không +STR_ALARM_TIME_CHANGE$Thay đổi thời gian +STR_ALARM_WEEK_CHANGE$Thay đổi ngày trong tuần +STR_ALARM_REPEAT$Lặp lại +STR_ALARM_ADD_LIMIT_NOTE$Số lượng đồng hồ báo thức hiện tại đã đạt giới hạn trên \ 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 6010619f7..7b0ee46d7 100644 --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@ -565,4 +565,9 @@ STR_ROLLER$滚筒 STR_DIAL_BROWSING_SPECIAL_EFFECTS$表盘浏览特效 STR_SET_TARGET$设置目标> STR_PWUWC$请正确佩戴手表,并保持静止 -STR_CALENDAR$日历 \ No newline at end of file +STR_CALENDAR$日历 +STR_ALARM_DELETE_NOTE$是否删除此闹钟 +STR_ALARM_TIME_CHANGE$更改时间 +STR_ALARM_WEEK_CHANGE$更改星期 +STR_ALARM_REPEAT$重复 +STR_ALARM_ADD_LIMIT_NOTE$当前闹钟个数已达上限 \ No newline at end of file diff --git a/tools/language_tool/Language_xml/language_ar.xml b/tools/language_tool/Language_xml/language_ar.xml index 116ee6ebd..9d79e47ec 100644 --- a/tools/language_tool/Language_xml/language_ar.xml +++ b/tools/language_tool/Language_xml/language_ar.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_az.xml b/tools/language_tool/Language_xml/language_az.xml index a09aa7f9a..f7106479c 100644 --- a/tools/language_tool/Language_xml/language_az.xml +++ b/tools/language_tool/Language_xml/language_az.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_cs.xml b/tools/language_tool/Language_xml/language_cs.xml index e1ec29b16..dbf6f28c6 100644 --- a/tools/language_tool/Language_xml/language_cs.xml +++ b/tools/language_tool/Language_xml/language_cs.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx index 6ed7e1d9b..9b704c88d 100644 Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ diff --git a/tools/language_tool/Language_xml/language_de.xml b/tools/language_tool/Language_xml/language_de.xml index 3be47f3cd..db03b644f 100644 --- a/tools/language_tool/Language_xml/language_de.xml +++ b/tools/language_tool/Language_xml/language_de.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_el.xml b/tools/language_tool/Language_xml/language_el.xml index 0cbeb8f08..cfa7870fc 100644 --- a/tools/language_tool/Language_xml/language_el.xml +++ b/tools/language_tool/Language_xml/language_el.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml index a37b59342..a4aae325b 100644 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_es.xml b/tools/language_tool/Language_xml/language_es.xml index a5351fc37..bc57210d9 100644 --- a/tools/language_tool/Language_xml/language_es.xml +++ b/tools/language_tool/Language_xml/language_es.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_fa.xml b/tools/language_tool/Language_xml/language_fa.xml index 152538e7c..ef7072269 100644 --- a/tools/language_tool/Language_xml/language_fa.xml +++ b/tools/language_tool/Language_xml/language_fa.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_fi.xml b/tools/language_tool/Language_xml/language_fi.xml index 4a1e681fc..ba30fb024 100644 --- a/tools/language_tool/Language_xml/language_fi.xml +++ b/tools/language_tool/Language_xml/language_fi.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_fr.xml b/tools/language_tool/Language_xml/language_fr.xml index 9b1e0ae22..23cc61384 100644 --- a/tools/language_tool/Language_xml/language_fr.xml +++ b/tools/language_tool/Language_xml/language_fr.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_he.xml b/tools/language_tool/Language_xml/language_he.xml index 18311ef81..0d99b75e1 100644 --- a/tools/language_tool/Language_xml/language_he.xml +++ b/tools/language_tool/Language_xml/language_he.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_hi.xml b/tools/language_tool/Language_xml/language_hi.xml index 5f031c1a1..1936b4266 100644 --- a/tools/language_tool/Language_xml/language_hi.xml +++ b/tools/language_tool/Language_xml/language_hi.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_hr.xml b/tools/language_tool/Language_xml/language_hr.xml index 7a5510ed8..ac05e5d5d 100644 --- a/tools/language_tool/Language_xml/language_hr.xml +++ b/tools/language_tool/Language_xml/language_hr.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_id.xml b/tools/language_tool/Language_xml/language_id.xml index 41ef5a5ba..046e96a2f 100644 --- a/tools/language_tool/Language_xml/language_id.xml +++ b/tools/language_tool/Language_xml/language_id.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_it.xml b/tools/language_tool/Language_xml/language_it.xml index 6877ac19c..6e1591e29 100644 --- a/tools/language_tool/Language_xml/language_it.xml +++ b/tools/language_tool/Language_xml/language_it.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_ja.xml b/tools/language_tool/Language_xml/language_ja.xml index 882509b44..e6a30693d 100644 --- a/tools/language_tool/Language_xml/language_ja.xml +++ b/tools/language_tool/Language_xml/language_ja.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_ko.xml b/tools/language_tool/Language_xml/language_ko.xml index c8c9efb06..da0624ca1 100644 --- a/tools/language_tool/Language_xml/language_ko.xml +++ b/tools/language_tool/Language_xml/language_ko.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_ms.xml b/tools/language_tool/Language_xml/language_ms.xml index 6be45906b..41d05892f 100644 --- a/tools/language_tool/Language_xml/language_ms.xml +++ b/tools/language_tool/Language_xml/language_ms.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_nl.xml b/tools/language_tool/Language_xml/language_nl.xml index 70999027e..2385b7621 100644 --- a/tools/language_tool/Language_xml/language_nl.xml +++ b/tools/language_tool/Language_xml/language_nl.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_pl.xml b/tools/language_tool/Language_xml/language_pl.xml index 5481454c6..6b54ac13e 100644 --- a/tools/language_tool/Language_xml/language_pl.xml +++ b/tools/language_tool/Language_xml/language_pl.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_pt.xml b/tools/language_tool/Language_xml/language_pt.xml index b8db9cea1..fe3beaf40 100644 --- a/tools/language_tool/Language_xml/language_pt.xml +++ b/tools/language_tool/Language_xml/language_pt.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_ro.xml b/tools/language_tool/Language_xml/language_ro.xml index 078e30eb9..bef34d901 100644 --- a/tools/language_tool/Language_xml/language_ro.xml +++ b/tools/language_tool/Language_xml/language_ro.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_ru.xml b/tools/language_tool/Language_xml/language_ru.xml index e3af2e076..60601e332 100644 --- a/tools/language_tool/Language_xml/language_ru.xml +++ b/tools/language_tool/Language_xml/language_ru.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_sv.xml b/tools/language_tool/Language_xml/language_sv.xml index e990c7b5f..b7fdda7a1 100644 --- a/tools/language_tool/Language_xml/language_sv.xml +++ b/tools/language_tool/Language_xml/language_sv.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_th.xml b/tools/language_tool/Language_xml/language_th.xml index d0ce028d0..506ab3fc4 100644 --- a/tools/language_tool/Language_xml/language_th.xml +++ b/tools/language_tool/Language_xml/language_th.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_tr.xml b/tools/language_tool/Language_xml/language_tr.xml index 725b964da..7849986b9 100644 --- a/tools/language_tool/Language_xml/language_tr.xml +++ b/tools/language_tool/Language_xml/language_tr.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_uk.xml b/tools/language_tool/Language_xml/language_uk.xml index 24c62b340..05c424bd7 100644 --- a/tools/language_tool/Language_xml/language_uk.xml +++ b/tools/language_tool/Language_xml/language_uk.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_uz.xml b/tools/language_tool/Language_xml/language_uz.xml index 16cfc1dcb..2c363eedb 100644 --- a/tools/language_tool/Language_xml/language_uz.xml +++ b/tools/language_tool/Language_xml/language_uz.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_vi.xml b/tools/language_tool/Language_xml/language_vi.xml index 96891209f..f44df92c0 100644 --- a/tools/language_tool/Language_xml/language_vi.xml +++ b/tools/language_tool/Language_xml/language_vi.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 1c477cc25..49d7feda3 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -567,4 +567,9 @@ + + + + + diff --git a/tools/language_tool/font/ar.lang b/tools/language_tool/font/ar.lang index a2629a214..023968d47 100644 Binary files a/tools/language_tool/font/ar.lang and b/tools/language_tool/font/ar.lang differ diff --git a/tools/language_tool/font/az.lang b/tools/language_tool/font/az.lang index 18c2706bf..a9f8e9fb4 100644 Binary files a/tools/language_tool/font/az.lang and b/tools/language_tool/font/az.lang differ diff --git a/tools/language_tool/font/cs.lang b/tools/language_tool/font/cs.lang index 41ad63467..dd8ae39c3 100644 Binary files a/tools/language_tool/font/cs.lang and b/tools/language_tool/font/cs.lang differ diff --git a/tools/language_tool/font/de.lang b/tools/language_tool/font/de.lang index 9c3e76f35..dd2877c37 100644 Binary files a/tools/language_tool/font/de.lang and b/tools/language_tool/font/de.lang differ diff --git a/tools/language_tool/font/el.lang b/tools/language_tool/font/el.lang index 2c0a60f63..6f6f4167d 100644 Binary files a/tools/language_tool/font/el.lang and b/tools/language_tool/font/el.lang differ diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index 9b9e524c7..1424fc25c 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/es.lang b/tools/language_tool/font/es.lang index 3124b85fc..e2785a67e 100644 Binary files a/tools/language_tool/font/es.lang and b/tools/language_tool/font/es.lang differ diff --git a/tools/language_tool/font/fa.lang b/tools/language_tool/font/fa.lang index a98cb6c78..22f7001b3 100644 Binary files a/tools/language_tool/font/fa.lang and b/tools/language_tool/font/fa.lang differ diff --git a/tools/language_tool/font/fi.lang b/tools/language_tool/font/fi.lang index 5d796fead..0711f07de 100644 Binary files a/tools/language_tool/font/fi.lang and b/tools/language_tool/font/fi.lang differ diff --git a/tools/language_tool/font/fr.lang b/tools/language_tool/font/fr.lang index a390261b8..4d62453be 100644 Binary files a/tools/language_tool/font/fr.lang and b/tools/language_tool/font/fr.lang differ diff --git a/tools/language_tool/font/he.lang b/tools/language_tool/font/he.lang index 5932db60c..53e70e4ec 100644 Binary files a/tools/language_tool/font/he.lang and b/tools/language_tool/font/he.lang differ diff --git a/tools/language_tool/font/hi.lang b/tools/language_tool/font/hi.lang index ecdef25a0..83b03d532 100644 Binary files a/tools/language_tool/font/hi.lang and b/tools/language_tool/font/hi.lang differ diff --git a/tools/language_tool/font/hr.lang b/tools/language_tool/font/hr.lang index acfb16d36..8e7162dd8 100644 Binary files a/tools/language_tool/font/hr.lang and b/tools/language_tool/font/hr.lang differ diff --git a/tools/language_tool/font/id.lang b/tools/language_tool/font/id.lang index c13034539..884f0e1b1 100644 Binary files a/tools/language_tool/font/id.lang and b/tools/language_tool/font/id.lang differ diff --git a/tools/language_tool/font/it.lang b/tools/language_tool/font/it.lang index 2ab090685..bf24ea00e 100644 Binary files a/tools/language_tool/font/it.lang and b/tools/language_tool/font/it.lang differ diff --git a/tools/language_tool/font/ja.lang b/tools/language_tool/font/ja.lang index 611219c2a..b32273965 100644 Binary files a/tools/language_tool/font/ja.lang and b/tools/language_tool/font/ja.lang differ diff --git a/tools/language_tool/font/ko.lang b/tools/language_tool/font/ko.lang index e7d0887d3..479bd0712 100644 Binary files a/tools/language_tool/font/ko.lang and b/tools/language_tool/font/ko.lang differ diff --git a/tools/language_tool/font/ms.lang b/tools/language_tool/font/ms.lang index 82d26318b..7bd0a9d5d 100644 Binary files a/tools/language_tool/font/ms.lang and b/tools/language_tool/font/ms.lang differ diff --git a/tools/language_tool/font/nl.lang b/tools/language_tool/font/nl.lang index 329fb406d..8b7e8b723 100644 Binary files a/tools/language_tool/font/nl.lang and b/tools/language_tool/font/nl.lang differ diff --git a/tools/language_tool/font/pl.lang b/tools/language_tool/font/pl.lang index 236635e1c..fa6dca7c4 100644 Binary files a/tools/language_tool/font/pl.lang and b/tools/language_tool/font/pl.lang differ diff --git a/tools/language_tool/font/pt.lang b/tools/language_tool/font/pt.lang index 69cc204a7..85705a5c0 100644 Binary files a/tools/language_tool/font/pt.lang and b/tools/language_tool/font/pt.lang differ diff --git a/tools/language_tool/font/ro.lang b/tools/language_tool/font/ro.lang index 6ead12720..f5fa048aa 100644 Binary files a/tools/language_tool/font/ro.lang and b/tools/language_tool/font/ro.lang differ diff --git a/tools/language_tool/font/ru.lang b/tools/language_tool/font/ru.lang index c183fda42..b2b7d008d 100644 Binary files a/tools/language_tool/font/ru.lang and b/tools/language_tool/font/ru.lang differ diff --git a/tools/language_tool/font/sv.lang b/tools/language_tool/font/sv.lang index ad69aa108..2920e2fc4 100644 Binary files a/tools/language_tool/font/sv.lang and b/tools/language_tool/font/sv.lang differ diff --git a/tools/language_tool/font/th.lang b/tools/language_tool/font/th.lang index 036f8136d..175a0f434 100644 Binary files a/tools/language_tool/font/th.lang and b/tools/language_tool/font/th.lang differ diff --git a/tools/language_tool/font/tr.lang b/tools/language_tool/font/tr.lang index 44c3ff7bd..b1eb3e50f 100644 Binary files a/tools/language_tool/font/tr.lang and b/tools/language_tool/font/tr.lang differ diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h index 7f6060316..3567471cd 100644 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -578,7 +578,12 @@ enum UIResourceTextId : uint16_t { STR_SET_TARGET = 565, STR_PWUWC = 566, STR_CALENDAR = 567, - STR_MAX_ID = 568, + STR_ALARM_DELETE_NOTE = 568, + STR_ALARM_TIME_CHANGE = 569, + STR_ALARM_WEEK_CHANGE = 570, + STR_ALARM_REPEAT = 571, + STR_ALARM_ADD_LIMIT_NOTE = 572, + STR_MAX_ID = 573, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/uk.lang b/tools/language_tool/font/uk.lang index 2062e602f..97b1e344c 100644 Binary files a/tools/language_tool/font/uk.lang and b/tools/language_tool/font/uk.lang differ diff --git a/tools/language_tool/font/uz.lang b/tools/language_tool/font/uz.lang index 3a5da1c6a..d896610c8 100644 Binary files a/tools/language_tool/font/uz.lang and b/tools/language_tool/font/uz.lang differ diff --git a/tools/language_tool/font/vi.lang b/tools/language_tool/font/vi.lang index 4230c4e3a..b1dbfe334 100644 Binary files a/tools/language_tool/font/vi.lang and b/tools/language_tool/font/vi.lang differ diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index 163785bdf..b7c3c7785 100644 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ