Merge #964 into sdk602patch0626 from refs/changes/964/head 965/target/1
author罗正 <1732036298@qq.com>
Fri, 13 Sep 2024 09:48:14 +0000 (09:48 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 13 Sep 2024 09:48:14 +0000 (09:48 +0000)
Code review from 罗正

* refs/changes/964/head: (21 commits squashed)

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug

  - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug
    修改闹钟弹窗无操作50s后自动关闭

  - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug

  - Merge branch &#39;sdk602patch0626&#39; 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 &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #644,解决,计时器显示问题bug
    #645,解决,  计时器显示错误bug

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #661,解决,手表,天气天气图标显示多云,文字显示中雨bug

  - 闹钟界面多国语言资源添加

  - 闹钟界面适配多国语言

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/964
130 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp
code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
tools/language_tool/Language_xml/input_list_ar.txt
tools/language_tool/Language_xml/input_list_az.txt
tools/language_tool/Language_xml/input_list_cs.txt
tools/language_tool/Language_xml/input_list_de.txt
tools/language_tool/Language_xml/input_list_el.txt
tools/language_tool/Language_xml/input_list_en.txt
tools/language_tool/Language_xml/input_list_es.txt
tools/language_tool/Language_xml/input_list_fa.txt
tools/language_tool/Language_xml/input_list_fi.txt
tools/language_tool/Language_xml/input_list_fr.txt
tools/language_tool/Language_xml/input_list_he.txt
tools/language_tool/Language_xml/input_list_hi.txt
tools/language_tool/Language_xml/input_list_hr.txt
tools/language_tool/Language_xml/input_list_id.txt
tools/language_tool/Language_xml/input_list_it.txt
tools/language_tool/Language_xml/input_list_ja.txt
tools/language_tool/Language_xml/input_list_ko.txt
tools/language_tool/Language_xml/input_list_ms.txt
tools/language_tool/Language_xml/input_list_nl.txt
tools/language_tool/Language_xml/input_list_pl.txt
tools/language_tool/Language_xml/input_list_pt.txt
tools/language_tool/Language_xml/input_list_ro.txt
tools/language_tool/Language_xml/input_list_ru.txt
tools/language_tool/Language_xml/input_list_sv.txt
tools/language_tool/Language_xml/input_list_th.txt
tools/language_tool/Language_xml/input_list_tr.txt
tools/language_tool/Language_xml/input_list_uk.txt
tools/language_tool/Language_xml/input_list_uz.txt
tools/language_tool/Language_xml/input_list_vi.txt
tools/language_tool/Language_xml/input_list_zh.txt
tools/language_tool/Language_xml/language_ar.xml
tools/language_tool/Language_xml/language_az.xml
tools/language_tool/Language_xml/language_cs.xml
tools/language_tool/Language_xml/language_custom.xlsx
tools/language_tool/Language_xml/language_de.xml
tools/language_tool/Language_xml/language_el.xml
tools/language_tool/Language_xml/language_en.xml
tools/language_tool/Language_xml/language_es.xml
tools/language_tool/Language_xml/language_fa.xml
tools/language_tool/Language_xml/language_fi.xml
tools/language_tool/Language_xml/language_fr.xml
tools/language_tool/Language_xml/language_he.xml
tools/language_tool/Language_xml/language_hi.xml
tools/language_tool/Language_xml/language_hr.xml
tools/language_tool/Language_xml/language_id.xml
tools/language_tool/Language_xml/language_it.xml
tools/language_tool/Language_xml/language_ja.xml
tools/language_tool/Language_xml/language_ko.xml
tools/language_tool/Language_xml/language_ms.xml
tools/language_tool/Language_xml/language_nl.xml
tools/language_tool/Language_xml/language_pl.xml
tools/language_tool/Language_xml/language_pt.xml
tools/language_tool/Language_xml/language_ro.xml
tools/language_tool/Language_xml/language_ru.xml
tools/language_tool/Language_xml/language_sv.xml
tools/language_tool/Language_xml/language_th.xml
tools/language_tool/Language_xml/language_tr.xml
tools/language_tool/Language_xml/language_uk.xml
tools/language_tool/Language_xml/language_uz.xml
tools/language_tool/Language_xml/language_vi.xml
tools/language_tool/Language_xml/language_zh.xml
tools/language_tool/font/ar.lang
tools/language_tool/font/az.lang
tools/language_tool/font/cs.lang
tools/language_tool/font/de.lang
tools/language_tool/font/el.lang
tools/language_tool/font/en.lang
tools/language_tool/font/es.lang
tools/language_tool/font/fa.lang
tools/language_tool/font/fi.lang
tools/language_tool/font/fr.lang
tools/language_tool/font/he.lang
tools/language_tool/font/hi.lang
tools/language_tool/font/hr.lang
tools/language_tool/font/id.lang
tools/language_tool/font/it.lang
tools/language_tool/font/ja.lang
tools/language_tool/font/ko.lang
tools/language_tool/font/ms.lang
tools/language_tool/font/nl.lang
tools/language_tool/font/pl.lang
tools/language_tool/font/pt.lang
tools/language_tool/font/ro.lang
tools/language_tool/font/ru.lang
tools/language_tool/font/sv.lang
tools/language_tool/font/th.lang
tools/language_tool/font/tr.lang
tools/language_tool/font/ui_resource_string.h
tools/language_tool/font/uk.lang
tools/language_tool/font/uz.lang
tools/language_tool/font/vi.lang
tools/language_tool/font/zh.lang

index 7f60603..3567471 100644 (file)
@@ -578,7 +578,12 @@ enum UIResourceTextId : uint16_t {
     STR_SET_TARGET = 565,\r
     STR_PWUWC = 566,\r
     STR_CALENDAR = 567,\r
-    STR_MAX_ID = 568,\r
+    STR_ALARM_DELETE_NOTE = 568,\r
+    STR_ALARM_TIME_CHANGE = 569,\r
+    STR_ALARM_WEEK_CHANGE = 570,\r
+    STR_ALARM_REPEAT = 571,\r
+    STR_ALARM_ADD_LIMIT_NOTE = 572,\r
+    STR_MAX_ID = 573,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 7001111..7a4b22b 100644 (file)
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-09-02 20:04:12\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-09-10 16:31:01\r
+ * @LastEditTime: 2024-09-13 15:21:58\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h\r
  */\r
 \r
@@ -42,9 +42,9 @@ private:
     UILabelButtonExt* button1{nullptr};\r
     UILabelButtonExt* button2{nullptr};\r
     UILabelExt *labelTime{nullptr};\r
-    UILabel *labelSetTime{nullptr};\r
-    UILabel *labelDay{nullptr};\r
-    UILabel *labelSetWeek{nullptr};\r
+    UILabelExt *labelSetTime{nullptr};\r
+    UILabelExt *labelDay{nullptr};\r
+    UILabelExt *labelSetWeek{nullptr};\r
     char showtime[12]{0};\r
 };\r
 } // namespace OHOS\r
index fa667ae..aae3aa8 100644 (file)
@@ -11,7 +11,7 @@
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_ext.h"\r
-#include "components/ui_label_button.h"\r
+#include "components/ui_label_button_ext.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "font/ui_font.h"\r
 #include "components/ui_scroll_view.h"\r
@@ -33,14 +33,13 @@ public:
     void RefreshSetWeek2(uint8_t week);\r
 private:\r
     UIScrollView *group{nullptr};\r
-    UILabelButton *weekImage{nullptr};\r
-    UILabel *labelRespeat{nullptr};\r
+    UILabelButtonExt *weekImage{nullptr};\r
+    UILabelExt *labelRespeat{nullptr};\r
     UILabelButton *buttonWeek[7]{nullptr}; // 星期一共有7天,因此设置了七个星期的按钮\r
     void CreateWeekButton1(void);\r
     void CreateWeekButton2(void);\r
     void SetLabelButton(void);\r
-    UILabelButton *CreateUILabelButton(const char *buttonText, int16_t x, int16_t y);\r
-    UIView *CreateUIView(int16_t x, int16_t y);\r
+    UILabelButtonExt *CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y);\r
 };\r
 } // namespace OHOS\r
 #endif\r
index 2799c22..60b91a3 100644 (file)
@@ -12,7 +12,7 @@
 #include <sstream>\r
 #include "color.h"\r
 #include "ConfigModel.h"\r
-\r
+#include "ui_resource_string.h"\r
 namespace OHOS\r
 {\r
 #define SET_ALARM "编辑闹钟"\r
@@ -141,7 +141,8 @@ namespace OHOS
             }\r
         }\r
         editLabel->SetPosition(83, 50, 300, 35);\r
-        editLabel->SetText("编辑闹钟");\r
+        // editLabel->SetText("编辑闹钟");\r
+        editLabel->SetTextId(STR_ALARM);\r
         editLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
         editLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         editLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
@@ -188,7 +189,8 @@ namespace OHOS
             }\r
         }\r
         labelSetTime->SetPosition(93, labelTime->GetY() + labelTime->GetHeight(), 250, 35);\r
-        labelSetTime->SetText("更改时间");\r
+        // labelSetTime->SetText("更改时间");\r
+        labelSetTime->SetTextId(STR_ALARM_TIME_CHANGE);\r
         labelSetTime->SetStyle(STYLE_TEXT_FONT, 30);\r
         labelSetTime->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         labelSetTime->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
@@ -222,7 +224,8 @@ namespace OHOS
             }\r
         }\r
         labelSetWeek->SetPosition(93, labelDay->GetY() + labelDay->GetHeight(), 250, 35);\r
-        labelSetWeek->SetText("更改星期");\r
+        // labelSetWeek->SetText("更改星期");\r
+        labelSetWeek->SetTextId(STR_ALARM_WEEK_CHANGE);\r
         labelSetWeek->SetStyle(STYLE_TEXT_FONT, 30);\r
         labelSetWeek->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         labelSetWeek->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
index 696562c..1603580 100644 (file)
@@ -12,6 +12,7 @@
 #include "alarm/include/AlarmPresenter.h"\r
 #include "alarm/include/MainAlarmView.h"\r
 #include "cmsis_os2.h"\r
+#include "ui_resource_string.h"\r
 \r
 namespace OHOS {\r
 #define MAX_INETERFACES "当前闹钟个数已达上限"\r
@@ -46,11 +47,17 @@ AlarmMaxClock::AlarmMaxClock()
 \r
 AlarmMaxClock::~AlarmMaxClock()\r
 {\r
-    container->RemoveAll();\r
-    delete labelText;\r
-    labelText = nullptr;\r
-    delete container;\r
-    container = nullptr;\r
+    if(container)\r
+    {\r
+        container->RemoveAll();\r
+        if(labelText)\r
+        {\r
+            delete labelText;\r
+            labelText = nullptr;\r
+        }\r
+        delete container;\r
+        container = nullptr;\r
+    }\r
     g_AlarmMaxClock = nullptr;\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::~AlarmMaxClock");\r
 }\r
@@ -90,7 +97,7 @@ UIScrollView *AlarmMaxClock::InitAlarmMax(void)
             }\r
         }\r
         labelText->SetPosition(83, 236, 360, 35);\r
-        labelText->SetText(MAX_INETERFACES);//当前闹钟个数已达上限\r
+        labelText->SetTextId(STR_ALARM_ADD_LIMIT_NOTE);//当前闹钟个数已达上限\r
         labelText->SetStyle(STYLE_TEXT_FONT, 30);\r
         labelText->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
index d07ae4d..77aed61 100644 (file)
@@ -5,10 +5,11 @@
  * Create: 2021-09-11\r
  */\r
 \r
-#include "AlarmSetWeekView.h"\r
+#include "alarm/include/AlarmSetWeekView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_digital_clock.h"\r
-\r
+#include "ui_resource_string.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS {\r
 // #define MON "星期一"\r
 // #define TUE "星期二"\r
@@ -24,6 +25,13 @@ namespace OHOS {
 #define FRI "五"\r
 #define SAT "六"\r
 #define SUN "日"\r
+#define MON_EN "Mon"\r
+#define TUE_EN "Tue"\r
+#define WED_EN "Wed"\r
+#define THUR_EN "Thu"\r
+#define FRI_EN "Fri"\r
+#define SAT_EN "Sat"\r
+#define SUN_EN "Sun"\r
 #define RESPEAT "重复"\r
 #define SURE "确认"\r
 \r
@@ -85,17 +93,29 @@ AlarmSetWeekView::AlarmSetWeekView()
 \r
 AlarmSetWeekView::~AlarmSetWeekView()\r
 {\r
-    group->RemoveAll();\r
-    delete labelRespeat;\r
-    labelRespeat = nullptr;\r
-    delete weekImage;\r
-    weekImage = nullptr;\r
-    for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) {\r
-        delete buttonWeek[alarmNum];\r
-        buttonWeek[alarmNum] = nullptr;\r
+    if(group)\r
+    {\r
+        group->RemoveAll();\r
+        if(labelRespeat) \r
+        {\r
+            delete labelRespeat;\r
+            labelRespeat = nullptr;\r
+        }\r
+        if(weekImage)\r
+        {\r
+            delete weekImage;\r
+            weekImage = nullptr;\r
+        }\r
+        for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) {\r
+            if(buttonWeek[alarmNum])\r
+            {\r
+                delete buttonWeek[alarmNum];\r
+                buttonWeek[alarmNum] = nullptr;\r
+            }\r
+        }\r
+        delete group;\r
+        group = nullptr;\r
     }\r
-    delete group;\r
-    group = nullptr;\r
     g_pAlarmSetWeekView = nullptr;\r
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::~AlarmSetWeekView");\r
 }\r
@@ -105,21 +125,27 @@ AlarmSetWeekView *AlarmSetWeekView::GetInstance(void)
     return g_pAlarmSetWeekView;\r
 }\r
 \r
-UILabelButton *AlarmSetWeekView::CreateUILabelButton(const char *buttonText, int16_t x, int16_t y)\r
+UILabelButtonExt *AlarmSetWeekView::CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y)\r
 {\r
-    if (buttonText == nullptr) {\r
+    if (buttonText1 == nullptr || buttonText2 == nullptr) {\r
         return nullptr;\r
     }\r
 \r
-    UILabelButton *labelButton = new UILabelButton();\r
+    UILabelButtonExt *labelButton = new UILabelButtonExt();\r
     if (labelButton == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelButton fail");\r
         return nullptr;\r
     }\r
-\r
+    int language = ConfigModel::GetInstance()->GetLanguage();\r
+    if(language == 0)\r
+    {\r
+        labelButton->SetText(buttonText1);\r
+    }\r
+    else\r
+    {\r
+        labelButton->SetText(buttonText2);\r
+    }\r
     labelButton->SetPosition(x, y);\r
-    labelButton->SetText(buttonText);\r
-    labelButton->SetViewId(buttonText);\r
     labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
     labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::PRESSED);\r
     labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::INACTIVE);\r
@@ -154,7 +180,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     int viewPositionX = VIEW_POSITION_X;   // 60 150\r
     UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
 \r
-    buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN,SUN_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_SUN] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSun fail");\r
         return;\r
@@ -164,7 +190,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     buttonWeek[WEEK_SUN]->SetViewId(SUNDAY);\r
     viewPositionX += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_MON] = CreateUILabelButton(MON, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_MON] = CreateUILabelButton(MON,MON_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_MON] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonMon fail");\r
         return;\r
@@ -174,7 +200,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     buttonWeek[WEEK_MON]->SetViewId(MONDAY);\r
     viewPositionX += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE,TUE_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_TUE] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonTue fail");\r
         return;\r
@@ -184,7 +210,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     buttonWeek[WEEK_TUE]->SetViewId(TUESDAY);\r
     viewPositionX += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_WED] = CreateUILabelButton(WED, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_WED] = CreateUILabelButton(WED,WED_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_WED] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonWed fail");\r
         return;\r
@@ -199,7 +225,7 @@ void AlarmSetWeekView::CreateWeekButton2(void)
     int viewPositionX2 = VIEW_POSITION_X2; // 12 210\r
     UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
 \r
-    buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR, viewPositionX2, WEEK_Y2);\r
+    buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR,THUR_EN, viewPositionX2, WEEK_Y2);\r
     if (buttonWeek[WEEK_THUR] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonThur fail");\r
         return;\r
@@ -209,7 +235,7 @@ void AlarmSetWeekView::CreateWeekButton2(void)
     buttonWeek[WEEK_THUR]->SetViewId(THURSDAY);\r
     viewPositionX2 += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI, viewPositionX2, WEEK_Y2);\r
+    buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI,FRI_EN, viewPositionX2, WEEK_Y2);\r
     if (buttonWeek[WEEK_FRI] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonFri fail");\r
         return;\r
@@ -219,7 +245,7 @@ void AlarmSetWeekView::CreateWeekButton2(void)
     buttonWeek[WEEK_FRI]->SetViewId(FRIDAY);\r
     viewPositionX2 += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT, viewPositionX2, WEEK_Y2);\r
+    buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT,SAT_EN, viewPositionX2, WEEK_Y2);\r
     if (buttonWeek[WEEK_SAT] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSat fail");\r
         return;\r
@@ -246,74 +272,59 @@ void AlarmSetWeekView::SetLabelButton(void)
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new clickListener fail");\r
         return;\r
     }\r
-    weekImage = new UILabelButton();\r
+    weekImage = new UILabelButtonExt();\r
     if (weekImage == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new weekImage fail");\r
         return;\r
     }\r
-    // weekImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3);\r
-    // weekImage->SetText(SURE);\r
-    // weekImage->SetTouchable(true);\r
-    // weekImage->SetViewId(ALARM_WEEK_OK);\r
-    // weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_WEEK_FONT);\r
-\r
     weekImage->SetPosition(0, 366, 466, 100);\r
     weekImage->SetViewId(ALARM_WEEK_OK);\r
-    weekImage->SetText(SURE);\r
+    weekImage->SetTextId(STR_OK);//确定\r
     weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
     weekImage->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));\r
     weekImage->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);\r
     weekImage->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED);\r
     weekImage->SetTouchable(true);\r
-\r
-    if (OHOS::AlarmPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail");\r
-        return;\r
-    }\r
-    // weekImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue());\r
     weekImage->SetOnClickListener(clickListener);\r
-    // weekImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
     group->Add(weekImage);\r
 }\r
 \r
 UIScrollView *AlarmSetWeekView::InitSetWeekView()\r
 {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView");\r
-\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView");\r
     group = new UIScrollView();\r
     if (group == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new group fail");\r
         return group;\r
     }\r
-\r
     group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    labelRespeat = new UILabel();\r
+    group->SetTouchable(true);\r
+    group->SetDraggable(true);\r
+    UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance();\r
+    if (setWeekDragListener == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail");\r
+        return group;\r
+    }\r
+    group->SetOnDragListener(setWeekDragListener);\r
+    /* -------------------------------------------------------------------------- */\r
+    labelRespeat = new UILabelExt();\r
     if (labelRespeat == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelRespeat fail");\r
         return group;\r
     }\r
-    group->Add(labelRespeat);\r
-    labelRespeat->SetText(RESPEAT);\r
-    // labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, DEFAULT_FONT);\r
-    // labelRespeat->SetPosition(TITLE_X, TITLE_Y, HORIZONTAL_RESOLUTION / 2, LABEL_POSITION_SIZE);\r
+    labelRespeat->SetTextId(STR_ALARM_REPEAT);//重复\r
     labelRespeat->SetPosition(83, 50, 300, 35);\r
     labelRespeat->SetStyle(STYLE_TEXT_FONT, 30);\r
     labelRespeat->SetStyle(STYLE_LINE_HEIGHT, 35);\r
     labelRespeat->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
     labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+    group->Add(labelRespeat);\r
 \r
     CreateWeekButton1();\r
     CreateWeekButton2();\r
     SetLabelButton();\r
 \r
-    group->SetTouchable(true);\r
-    group->SetDraggable(true);\r
-    UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance();\r
-    if (setWeekDragListener == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail");\r
-        return group;\r
-    }\r
-    group->SetOnDragListener(setWeekDragListener);\r
+   \r
     return group;\r
 }\r
 \r
index 7711d23..6f58e6a 100644 (file)
@@ -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]");
index a2629a2..023968d 100644 (file)
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
index 18c2706..a9f8e9f 100644 (file)
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
index 41ad634..dd8ae39 100644 (file)
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
index 9c3e76f..dd2877c 100644 (file)
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
index 2c0a60f..6f6f416 100644 (file)
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
index 9b9e524..1424fc2 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
index 3124b85..e2785a6 100644 (file)
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
index a98cb6c..22f7001 100644 (file)
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
index 5d796fe..0711f07 100644 (file)
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
index a390261..4d62453 100644 (file)
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
index 5932db6..53e70e4 100644 (file)
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
index ecdef25..83b03d5 100644 (file)
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
index acfb16d..8e7162d 100644 (file)
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
index c130345..884f0e1 100644 (file)
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
index 2ab0906..bf24ea0 100644 (file)
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
index 611219c..b322739 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
index e7d0887..479bd07 100644 (file)
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
index 82d2631..7bd0a9d 100644 (file)
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
index 329fb40..8b7e8b7 100644 (file)
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
index 236635e..fa6dca7 100644 (file)
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
index 69cc204..85705a5 100644 (file)
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
index 6ead127..f5fa048 100644 (file)
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
index c183fda..b2b7d00 100644 (file)
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
index ad69aa1..2920e2f 100644 (file)
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
index 036f813..175a0f4 100644 (file)
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
index 44c3ff7..b1eb3e5 100644 (file)
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
index 7f60603..3567471 100644 (file)
@@ -578,7 +578,12 @@ enum UIResourceTextId : uint16_t {
     STR_SET_TARGET = 565,\r
     STR_PWUWC = 566,\r
     STR_CALENDAR = 567,\r
-    STR_MAX_ID = 568,\r
+    STR_ALARM_DELETE_NOTE = 568,\r
+    STR_ALARM_TIME_CHANGE = 569,\r
+    STR_ALARM_WEEK_CHANGE = 570,\r
+    STR_ALARM_REPEAT = 571,\r
+    STR_ALARM_ADD_LIMIT_NOTE = 572,\r
+    STR_MAX_ID = 573,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 2062e60..97b1e34 100644 (file)
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
index 3a5da1c..d896610 100644 (file)
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
index 4230c4e..b1dbfe3 100644 (file)
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
index 163785b..b7c3c77 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
index 729946b..9c16bcd 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$الأسطوانة
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$تأثيرات تصفح وجه الساعة\r
 STR_SET_TARGET$تعيين الأهداف >\r
 STR_PWUWC$يرجى ارتداء الساعة بشكل صحيح والبقاء ساكناً.\r
-STR_CALENDAR$التقويم
\ No newline at end of file
+STR_CALENDAR$التقويم\r
+STR_ALARM_DELETE_NOTE$هل تريد حذف هذا المنبه؟\r
+STR_ALARM_TIME_CHANGE$قم بتغيير الوقت\r
+STR_ALARM_WEEK_CHANGE$قم بتغيير يوم الأسبوع\r
+STR_ALARM_REPEAT$كرر\r
+STR_ALARM_ADD_LIMIT_NOTE$وصل عدد المنبهات الحالية إلى الحد الأقصى
\ No newline at end of file
index 43255e5..32c67bf 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Silindr
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Saat üzümlərinin baxış effektləri\r
 STR_SET_TARGET$Məqsəd təyin edin>\r
 STR_PWUWC$Zəhmət olmasa, saatı düzgün taxın və hərəkətsiz qalın\r
-STR_CALENDAR$Təqvim
\ No newline at end of file
+STR_CALENDAR$Təqvim\r
+STR_ALARM_DELETE_NOTE$Bu saatı silmək istəyirsinizmi\r
+STR_ALARM_TIME_CHANGE$Vaxtı dəyişdirin\r
+STR_ALARM_WEEK_CHANGE$Həftənin gününü dəyişdirin\r
+STR_ALARM_REPEAT$Təkrar edin\r
+STR_ALARM_ADD_LIMIT_NOTE$Mövcut saatların sayı üst limitə çatdı
\ No newline at end of file
index f61618c..dd796a2 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$válce
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efekty prohlížení ciferníku\r
 STR_SET_TARGET$Nastavit cíl>\r
 STR_PWUWC$Proszím, noste hodinky správně a zůstaňte v klidu.\r
-STR_CALENDAR$Kalendář
\ No newline at end of file
+STR_CALENDAR$Kalendář\r
+STR_ALARM_DELETE_NOTE$Chcete odstranit tento budík\r
+STR_ALARM_TIME_CHANGE$Změnit čas\r
+STR_ALARM_WEEK_CHANGE$Změnit den v týdnu\r
+STR_ALARM_REPEAT$Opakovat\r
+STR_ALARM_ADD_LIMIT_NOTE$Aktuální počet budíků dosáhl horní hranice
\ No newline at end of file
index 281cbb3..a10117d 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Walze
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Zifferblatt-Browsing-Spezialeffekte\r
 STR_SET_TARGET$Einstellungsziel>\r
 STR_PWUWC$Bitte tragen Sie die Uhr richtig und bleiben Sie still.\r
-STR_CALENDAR$Kalender
\ No newline at end of file
+STR_CALENDAR$Kalender\r
+STR_ALARM_DELETE_NOTE$Möchten Sie diesen Wecker löschen\r
+STR_ALARM_TIME_CHANGE$Zeit ändern\r
+STR_ALARM_WEEK_CHANGE$Zeit ändern\r
+STR_ALARM_REPEAT$Wiederholen\r
+STR_ALARM_ADD_LIMIT_NOTE$Die aktuelle Anzahl der Wecker hat die Obergrenze erreicht
\ No newline at end of file
index 689c141..ea591ac 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$κύλινδροι
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Εφέ περιήγησης προσώπου\r
 STR_SET_TARGET$Ρύθμιση στόχου>\r
 STR_PWUWC$Παρακαλώ φορέστε σωστά το ρολόι και παραμείνετε ακίνητοι.\r
-STR_CALENDAR$Ημερολόγιο
\ No newline at end of file
+STR_CALENDAR$Ημερολόγιο\r
+STR_ALARM_DELETE_NOTE$Θέλετε να διαγράψετε αυτόν τον ξυπνητήρα;\r
+STR_ALARM_TIME_CHANGE$Αλλάξτε την ώρα\r
+STR_ALARM_WEEK_CHANGE$Αλλάξτε την ημέρα της εβδομάδας\r
+STR_ALARM_REPEAT$Επαναλάβετε\r
+STR_ALARM_ADD_LIMIT_NOTE$Το τρέχον αριθμό των ξυπνητήρων έχει φτάσει το ανώτατο όριο
\ No newline at end of file
index 15064f0..30f714c 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Roller
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Dial browsing special effects\r
 STR_SET_TARGET$Set target>\r
 STR_PWUWC$Please wear the watch correctly and remain still.\r
-STR_CALENDAR$calendar
\ No newline at end of file
+STR_CALENDAR$calendar\r
+STR_ALARM_DELETE_NOTE$Whether to delete the alarm\r
+STR_ALARM_TIME_CHANGE$Change time\r
+STR_ALARM_WEEK_CHANGE$Change week\r
+STR_ALARM_REPEAT$Repeat\r
+STR_ALARM_ADD_LIMIT_NOTE$The current number of alarm clocks has reached the upper limit
\ No newline at end of file
index a32023b..20ea352 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Tambor
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efectos especiales de navegación del dial\r
 STR_SET_TARGET$Objetivo de configuración>\r
 STR_PWUWC$Por favor, use el reloj correctamente y manténgase quieto.\r
-STR_CALENDAR$calendario
\ No newline at end of file
+STR_CALENDAR$calendario\r
+STR_ALARM_DELETE_NOTE$¿Desea eliminar este despertador\r
+STR_ALARM_TIME_CHANGE$Cambiar la hora\r
+STR_ALARM_WEEK_CHANGE$Cambiar el día de la semana\r
+STR_ALARM_REPEAT$Repetir\r
+STR_ALARM_ADD_LIMIT_NOTE$El número actual de despertadores ha alcanzado el límite superior
\ No newline at end of file
index 8e804a9..52e4971 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$استوانه
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$اثرات مرور صفحه نمایش\r
 STR_SET_TARGET$هدف را تنظیم کنید >\r
 STR_PWUWC$لطفاً ساعت را به درستی بپوشید و بی‌حرکت بمانید.\r
-STR_CALENDAR$تقویم
\ No newline at end of file
+STR_CALENDAR$تقویم\r
+STR_ALARM_DELETE_NOTE$آیا می‌خواهید این ساعت بیدارکن را حذف کنید؟\r
+STR_ALARM_TIME_CHANGE$زمان را تغییر دهید\r
+STR_ALARM_WEEK_CHANGE$روز هفته را تغییر دهید\r
+STR_ALARM_REPEAT$تکرار کنید\r
+STR_ALARM_ADD_LIMIT_NOTE$تعداد ساعت بیدارکن‌های فعلی به حداکثر رسیده است
\ No newline at end of file
index 8bb3e04..cb8e2f4 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Rullaus
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Kellotaulun selailuefektit\r
 STR_SET_TARGET$Aseta tavoitteet >\r
 STR_PWUWC$Ole hyvä ja käytä kelloa oikein ja pysy paikallaan.\r
-STR_CALENDAR$Kalenteri
\ No newline at end of file
+STR_CALENDAR$Kalenteri\r
+STR_ALARM_DELETE_NOTE$Haluatko poistaa tämän hälytyskellon\r
+STR_ALARM_TIME_CHANGE$Muuta aikaa\r
+STR_ALARM_WEEK_CHANGE$Muuta viikonpäivää\r
+STR_ALARM_REPEAT$Toista\r
+STR_ALARM_ADD_LIMIT_NOTE$Nykyinen hälytyskellojen määrä on saavuttanut ylärajan
\ No newline at end of file
index 9ae2ada..2d8f5ba 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Cylindre
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Effets de navigation du cadran\r
 STR_SET_TARGET$Définir l'objectif>\r
 STR_PWUWC$Veuillez porter correctement la montre et rester immobile.\r
-STR_CALENDAR$Calendrier
\ No newline at end of file
+STR_CALENDAR$Calendrier\r
+STR_ALARM_DELETE_NOTE$Voulez-vous supprimer ce réveil\r
+STR_ALARM_TIME_CHANGE$Modifier l'heure\r
+STR_ALARM_WEEK_CHANGE$Modifier le jour de la semaine\r
+STR_ALARM_REPEAT$Répéter\r
+STR_ALARM_ADD_LIMIT_NOTE$Le nombre actuel de réveils a atteint la limite
\ No newline at end of file
index d52f962..789c9b0 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$גליל
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$אפקטי דפדוף של שעון\r
 STR_SET_TARGET$הגדיר מטרה>\r
 STR_PWUWC$אנא לבש את השעון נכון ושמור על שקט\r
-STR_CALENDAR$לוח שנה
\ No newline at end of file
+STR_CALENDAR$לוח שנה\r
+STR_ALARM_DELETE_NOTE$האם תרצה למחוק את המתעורר הזה\r
+STR_ALARM_TIME_CHANGE$לשנות את הזמן\r
+STR_ALARM_WEEK_CHANGE$לשנות את היום בשבוע\r
+STR_ALARM_REPEAT$לחזור\r
+STR_ALARM_ADD_LIMIT_NOTE$מספר המתעוררים הנוכחי הגיע למגבלה העליונה
\ No newline at end of file
index 602ad51..8d66258 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$रोलर
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$डायल ब्राउज़िंग प्रभाव\r
 STR_SET_TARGET$लक्ष्य सेट करें>\r
 STR_PWUWC$कृपया घड़ी को सही तरीके से पहनें और स्थिर रहें।\r
-STR_CALENDAR$तिथिपत्री
\ No newline at end of file
+STR_CALENDAR$तिथिपत्री\r
+STR_ALARM_DELETE_NOTE$क्या आप इस अलार्म को हटाना चाहते हैं\r
+STR_ALARM_TIME_CHANGE$समय बदलें।\r
+STR_ALARM_WEEK_CHANGE$सप्ताह के दिन बदलें।\r
+STR_ALARM_REPEAT$दोहराएँ।\r
+STR_ALARM_ADD_LIMIT_NOTE$वर्तमान में अलार्म की संख्या ऊपरी सीमा तक पहुंच गई है।
\ No newline at end of file
index 1136e71..a5a7936 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Bubanj
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Specijalni efekti pregleda sata\r
 STR_SET_TARGET$Cilj podešavanja>\r
 STR_PWUWC$Molimo vas, nosite sat ispravno i ostanite mirni.\r
-STR_CALENDAR$Kalendar
\ No newline at end of file
+STR_CALENDAR$Kalendar\r
+STR_ALARM_DELETE_NOTE$Želite li izbrisati ovaj budilnik?\r
+STR_ALARM_TIME_CHANGE$Promijenite vrijeme\r
+STR_ALARM_WEEK_CHANGE$Promijenite dan u tjednu\r
+STR_ALARM_REPEAT$Ponavljati\r
+STR_ALARM_ADD_LIMIT_NOTE$Trenutačno je broj budilnika dosegao gornju granicu
\ No newline at end of file
index a130eb9..d8e6577 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Rol
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efek penjelajahan dial\r
 STR_SET_TARGET$Atur tujuan>\r
 STR_PWUWC$Silakan kenakan jam dengan benar dan tetap diam.\r
-STR_CALENDAR$Kalender
\ No newline at end of file
+STR_CALENDAR$Kalender\r
+STR_ALARM_DELETE_NOTE$Apakah Anda ingin menghapus alarm ini\r
+STR_ALARM_TIME_CHANGE$Ubah waktu\r
+STR_ALARM_WEEK_CHANGE$Ubah hari dalam seminggu\r
+STR_ALARM_REPEAT$Ulangi pengukuran\r
+STR_ALARM_ADD_LIMIT_NOTE$Jumlah alarm saat ini telah mencapai batas atas
\ No newline at end of file
index 9db2075..8196371 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Cilindro
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Effetti di navigazione del quadrante\r
 STR_SET_TARGET$Imposta obiettivo>\r
 STR_PWUWC$Si prega di indossare correttamente l'orologio e di rimanere fermo.\r
-STR_CALENDAR$Calendario
\ No newline at end of file
+STR_CALENDAR$Calendario\r
+STR_ALARM_DELETE_NOTE$Vuoi eliminare questo allarme\r
+STR_ALARM_TIME_CHANGE$Modificare l'ora\r
+STR_ALARM_WEEK_CHANGE$Modificare il giorno della settimana\r
+STR_ALARM_REPEAT$Ripetere\r
+STR_ALARM_ADD_LIMIT_NOTE$Il numero attuale di allarmi ha raggiunto il limite superiore
\ No newline at end of file
index c3dc115..beda8bd 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$ドラム
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$文字盤閲覧エフェクト\r
 STR_SET_TARGET$設定目標>\r
 STR_PWUWC$正しく時計を着用し、静止してください。\r
-STR_CALENDAR$暦
\ No newline at end of file
+STR_CALENDAR$暦\r
+STR_ALARM_DELETE_NOTE$このアラームを削除しますか\r
+STR_ALARM_TIME_CHANGE$時間を変更します\r
+STR_ALARM_WEEK_CHANGE$曜日を変更します\r
+STR_ALARM_REPEAT$繰り返し\r
+STR_ALARM_ADD_LIMIT_NOTE$現在のアラームの数が上限に達しています
\ No newline at end of file
index 62710a4..6503c65 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$드럼
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$다이얼 브라우징 특수효과\r
 STR_SET_TARGET$설정 목표>\r
 STR_PWUWC$시계를 올바르게 착용하고 가만히 있어 주세요.\r
-STR_CALENDAR$일력
\ No newline at end of file
+STR_CALENDAR$일력\r
+STR_ALARM_DELETE_NOTE$이 알람을 삭제하시겠습니까\r
+STR_ALARM_TIME_CHANGE$시간을 변경합니다\r
+STR_ALARM_WEEK_CHANGE$요일을 변경합니다\r
+STR_ALARM_REPEAT$반복.\r
+STR_ALARM_ADD_LIMIT_NOTE$현재 알람 개수가 상한에 도달했습니다
\ No newline at end of file
index 669e691..58e613b 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Gelendong
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Kesan Pelayaran Paparan Jam\r
 STR_SET_TARGET$Tetapkan Sasaran>\r
 STR_PWUWC$Koa mu'ula to hia sio sa hao'ana e malaw.\r
-STR_CALENDAR$Kalendar
\ No newline at end of file
+STR_CALENDAR$Kalendar\r
+STR_ALARM_DELETE_NOTE$Adakah anda ingin memadamkan jam penggera ini\r
+STR_ALARM_TIME_CHANGE$Tukar masa\r
+STR_ALARM_WEEK_CHANGE$Tukar hari dalam seminggu\r
+STR_ALARM_REPEAT$Ulang\r
+STR_ALARM_ADD_LIMIT_NOTE$Bilangan jam penggera semasa telah mencapai had atas
\ No newline at end of file
index eb2b748..0c2fab6 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Cilinder
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Navigatie-effecten van de wijzerplaat\r
 STR_SET_TARGET$Doel instellen>\r
 STR_PWUWC$Draag alstublieft het horloge correct en blijf stil.\r
-STR_CALENDAR$Agenda
\ No newline at end of file
+STR_CALENDAR$Agenda\r
+STR_ALARM_DELETE_NOTE$Wilt u deze wekker verwijderen\r
+STR_ALARM_TIME_CHANGE$Tijd wijzigen\r
+STR_ALARM_WEEK_CHANGE$Dag van de week wijzigen\r
+STR_ALARM_REPEAT$Herhalen\r
+STR_ALARM_ADD_LIMIT_NOTE$Het huidige aantal wekkers heeft de bovengrens bereikt
\ No newline at end of file
index 3bbb10f..275bd2f 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Walec
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efek przeglądania tarczy zegarka\r
 STR_SET_TARGET$Ustaw cel>\r
 STR_PWUWC$Proszę nosić zegarek poprawnie i pozostać w bezruchu.\r
-STR_CALENDAR$Kalendarz
\ No newline at end of file
+STR_CALENDAR$Kalendarz\r
+STR_ALARM_DELETE_NOTE$Czy chcesz usunąć ten budzik\r
+STR_ALARM_TIME_CHANGE$Zmień godzinę\r
+STR_ALARM_WEEK_CHANGE$Zmień dzień tygodnia\r
+STR_ALARM_REPEAT$Powtórz\r
+STR_ALARM_ADD_LIMIT_NOTE$Obecna liczba budzików osiągnęła górny limit
\ No newline at end of file
index b6e6b02..cb5ecb7 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Cilindro
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efeitos de navegação do mostrador\r
 STR_SET_TARGET$Definir objetivo>\r
 STR_PWUWC$Por favor, use o relógio corretamente e permaneça parado.\r
-STR_CALENDAR$Calendário
\ No newline at end of file
+STR_CALENDAR$Calendário\r
+STR_ALARM_DELETE_NOTE$Deseja excluir este despertador\r
+STR_ALARM_TIME_CHANGE$Alterar a hora\r
+STR_ALARM_WEEK_CHANGE$Alterar o dia da semana\r
+STR_ALARM_REPEAT$Alterar o dia da semana\r
+STR_ALARM_ADD_LIMIT_NOTE$O número atual de despertadores atingiu o limite superior
\ No newline at end of file
index 2a455f1..449ae96 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Rulou
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Efecte de navigare a cadranului\r
 STR_SET_TARGET$Setează obiectivele >\r
 STR_PWUWC$Te rog să porți ceasul corect și să stai nemișcat.\r
-STR_CALENDAR$Calendar
\ No newline at end of file
+STR_CALENDAR$Calendar\r
+STR_ALARM_DELETE_NOTE$Doriți să ștergeți acest ceas deșteptător\r
+STR_ALARM_TIME_CHANGE$Modificați ora\r
+STR_ALARM_WEEK_CHANGE$Modificați ziua săptămânii\r
+STR_ALARM_REPEAT$Repetați\r
+STR_ALARM_ADD_LIMIT_NOTE$Numărul actual de ceasuri deșteptătoare a atins limita superioară
\ No newline at end of file
index 74a9a17..82159cf 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Барабан
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Специальные эффекты просмотра циферблата\r
 STR_SET_TARGET$Цель настройки>\r
 STR_PWUWC$Пожалуйста, правильно носите часы и оставайтесь неподвижными.\r
-STR_CALENDAR$календар
+STR_CALENDAR$календар\r
+STR_ALARM_DELETE_NOTE$Удалить этот будильник\r
+STR_ALARM_TIME_CHANGE$Изменить время\r
+STR_ALARM_WEEK_CHANGE$Изменить день недели\r
+STR_ALARM_REPEAT$Повторять\r
+STR_ALARM_ADD_LIMIT_NOTE$Текущее количество будильников достигло верхнего предела
\ No newline at end of file
index 794e1e5..a589349 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Cylinder
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Bläddringseffekter för urtavla\r
 STR_SET_TARGET$Sätt mål>\r
 STR_PWUWC$Vänligen bär klockan korrekt och håll dig stilla\r
-STR_CALENDAR$Kalender
\ No newline at end of file
+STR_CALENDAR$Kalender\r
+STR_ALARM_DELETE_NOTE$Vill du ta bort den här väckarklockan\r
+STR_ALARM_TIME_CHANGE$Ändra tiden\r
+STR_ALARM_WEEK_CHANGE$Ändra veckodagen\r
+STR_ALARM_REPEAT$Upprepa\r
+STR_ALARM_ADD_LIMIT_NOTE$Aktuell antal väckarklockor har nått övre gränsen
\ No newline at end of file
index 1b715b4..f7946c6 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$ลูกกลิ้ง
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$เอฟเฟกต์การเรียกดูหน้าปัดนาฬิกา\r
 STR_SET_TARGET$ตั้งเป้าหมาย>\r
 STR_PWUWC$กรุณาสวมใส่นาฬิกาให้ถูกต้องและนั่งนิ่งๆ\r
-STR_CALENDAR$ปฏิทิน
\ No newline at end of file
+STR_CALENDAR$ปฏิทิน\r
+STR_ALARM_DELETE_NOTE$คุณต้องการลบนาฬิกาปลุกนี้หรือไม่\r
+STR_ALARM_TIME_CHANGE$เปลี่ยนเวลา\r
+STR_ALARM_WEEK_CHANGE$เปลี่ยนวันในสัปดาห์\r
+STR_ALARM_REPEAT$ทำซ้ำ\r
+STR_ALARM_ADD_LIMIT_NOTE$จำนวนนาฬิกาปลุกในขณะนี้ได้ถึงขีดจำกัดสูงสุด
\ No newline at end of file
index dee2270..82262c4 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Silindir
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Kadran göz atma efektleri\r
 STR_SET_TARGET$Hedef ayarla >\r
 STR_PWUWC$Lütfen saati doğru takın ve hareketsiz kalın.\r
-STR_CALENDAR$Takvim
\ No newline at end of file
+STR_CALENDAR$Takvim\r
+STR_ALARM_DELETE_NOTE$Bu alarmı silmek istiyor musunuz\r
+STR_ALARM_TIME_CHANGE$Zamanı değiştir\r
+STR_ALARM_WEEK_CHANGE$Haftanın gününü değiştir\r
+STR_ALARM_REPEAT$Tekrarla\r
+STR_ALARM_ADD_LIMIT_NOTE$Mevcut alarm sayısı üst sınırı reached
\ No newline at end of file
index 1a94859..d074b65 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Каток
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Ефекти перегляду циферблату\r
 STR_SET_TARGET$Встановити мету>\r
 STR_PWUWC$Будь ласка, правильно носіть годинник і залишайтеся нерухомими\r
-STR_CALENDAR$Календар
\ No newline at end of file
+STR_CALENDAR$Календар\r
+STR_ALARM_DELETE_NOTE$Чи бажаєте ви видалити цей будильник\r
+STR_ALARM_TIME_CHANGE$Змінити час\r
+STR_ALARM_WEEK_CHANGE$Змінити день тижня\r
+STR_ALARM_REPEAT$Змінити день тижня\r
+STR_ALARM_ADD_LIMIT_NOTE$Поточна кількість будильників досягла верхньої межі
\ No newline at end of file
index 19c4f08..e028c91 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Silindr
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Soat dialsini ko‘rish effektlari\r
 STR_SET_TARGET$Maqsadni qo'yish>\r
 STR_PWUWC$Iltimos, soatni to'g'ri kiying va harakatsiz bo'ling\r
-STR_CALENDAR$Kalendar
\ No newline at end of file
+STR_CALENDAR$Kalendar\r
+STR_ALARM_DELETE_NOTE$Bu soatni o'chirishni xohlaysizmi\r
+STR_ALARM_TIME_CHANGE$Vaqtni o'zgartiring\r
+STR_ALARM_WEEK_CHANGE$Haftaning kunini o'zgartiring\r
+STR_ALARM_REPEAT$Takrorlang\r
+STR_ALARM_ADD_LIMIT_NOTE$Hozirgi soatlar soni yuqori chegaraga yetdi
\ No newline at end of file
index b70d0ca..9062329 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$Cuộn
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$Hiệu ứng duyệt mặt đồng hồ\r
 STR_SET_TARGET$Thiết lập mục tiêu>\r
 STR_PWUWC$Vui lòng đeo đồng hồ đúng cách và giữ yên.\r
-STR_CALENDAR$Lịch
\ No newline at end of file
+STR_CALENDAR$Lịch\r
+STR_ALARM_DELETE_NOTE$Bạn có muốn xóa đồng hồ báo thức này không\r
+STR_ALARM_TIME_CHANGE$Thay đổi thời gian\r
+STR_ALARM_WEEK_CHANGE$Thay đổi ngày trong tuần\r
+STR_ALARM_REPEAT$Lặp lại\r
+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
index 6010619..7b0ee46 100644 (file)
@@ -565,4 +565,9 @@ STR_ROLLER$滚筒
 STR_DIAL_BROWSING_SPECIAL_EFFECTS$表盘浏览特效\r
 STR_SET_TARGET$设置目标>\r
 STR_PWUWC$请正确佩戴手表,并保持静止\r
-STR_CALENDAR$日历
\ No newline at end of file
+STR_CALENDAR$日历\r
+STR_ALARM_DELETE_NOTE$是否删除此闹钟\r
+STR_ALARM_TIME_CHANGE$更改时间\r
+STR_ALARM_WEEK_CHANGE$更改星期\r
+STR_ALARM_REPEAT$重复\r
+STR_ALARM_ADD_LIMIT_NOTE$当前闹钟个数已达上限
\ No newline at end of file
index 116ee6e..9d79e47 100644 (file)
        <lanstr id="STR_SET_TARGET" value="تعيين الأهداف &gt;"/>
        <lanstr id="STR_PWUWC" value="يرجى ارتداء الساعة بشكل صحيح والبقاء ساكناً."/>
        <lanstr id="STR_CALENDAR" value="التقويم"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="هل تريد حذف هذا المنبه؟"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="قم بتغيير الوقت"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="قم بتغيير يوم الأسبوع"/>
+       <lanstr id="STR_ALARM_REPEAT" value="كرر"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="وصل عدد المنبهات الحالية إلى الحد الأقصى"/>
 </language>
index a09aa7f..f710647 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Məqsəd təyin edin&gt;"/>
        <lanstr id="STR_PWUWC" value="Zəhmət olmasa, saatı düzgün taxın və hərəkətsiz qalın"/>
        <lanstr id="STR_CALENDAR" value="Təqvim"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Bu saatı silmək istəyirsinizmi"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Vaxtı dəyişdirin"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Həftənin gününü dəyişdirin"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Təkrar edin"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Mövcut saatların sayı üst limitə çatdı"/>
 </language>
index e1ec29b..dbf6f28 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Nastavit cíl&gt;"/>
        <lanstr id="STR_PWUWC" value="Proszím, noste hodinky správně a zůstaňte v klidu."/>
        <lanstr id="STR_CALENDAR" value="Kalendář"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Chcete odstranit tento budík"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Změnit čas"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Změnit den v týdnu"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Opakovat"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Aktuální počet budíků dosáhl horní hranice"/>
 </language>
index 6ed7e1d..9b704c8 100644 (file)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ
index 3be47f3..db03b64 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Einstellungsziel&gt;"/>
        <lanstr id="STR_PWUWC" value="Bitte tragen Sie die Uhr richtig und bleiben Sie still."/>
        <lanstr id="STR_CALENDAR" value="Kalender"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Möchten Sie diesen Wecker löschen"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Zeit ändern"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Zeit ändern"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Wiederholen"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Die aktuelle Anzahl der Wecker hat die Obergrenze erreicht"/>
 </language>
index 0cbeb8f..cfa7870 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Ρύθμιση στόχου&gt;"/>
        <lanstr id="STR_PWUWC" value="Παρακαλώ φορέστε σωστά το ρολόι και παραμείνετε ακίνητοι."/>
        <lanstr id="STR_CALENDAR" value="Ημερολόγιο"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Θέλετε να διαγράψετε αυτόν τον ξυπνητήρα;"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Αλλάξτε την ώρα"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Αλλάξτε την ημέρα της εβδομάδας"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Επαναλάβετε"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Το τρέχον αριθμό των ξυπνητήρων έχει φτάσει το ανώτατο όριο"/>
 </language>
index a37b593..a4aae32 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Set target&gt;"/>
        <lanstr id="STR_PWUWC" value="Please wear the watch correctly and remain still."/>
        <lanstr id="STR_CALENDAR" value="calendar"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Whether to delete the alarm"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Change time"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Change week"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Repeat"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="The current number of alarm clocks has reached the upper limit"/>
 </language>
index a5351fc..bc57210 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Objetivo de configuración&gt;"/>
        <lanstr id="STR_PWUWC" value="Por favor, use el reloj correctamente y manténgase quieto."/>
        <lanstr id="STR_CALENDAR" value="calendario"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="¿Desea eliminar este despertador"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Cambiar la hora"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Cambiar el día de la semana"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Repetir"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="El número actual de despertadores ha alcanzado el límite superior"/>
 </language>
index 152538e..ef70722 100644 (file)
        <lanstr id="STR_SET_TARGET" value="هدف را تنظیم کنید &gt;"/>
        <lanstr id="STR_PWUWC" value="لطفاً ساعت را به درستی بپوشید و بی‌حرکت بمانید."/>
        <lanstr id="STR_CALENDAR" value="تقویم"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="آیا می‌خواهید این ساعت بیدارکن را حذف کنید؟"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="زمان را تغییر دهید"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="روز هفته را تغییر دهید"/>
+       <lanstr id="STR_ALARM_REPEAT" value="تکرار کنید"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="تعداد ساعت بیدارکن‌های فعلی به حداکثر رسیده است"/>
 </language>
index 4a1e681..ba30fb0 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Aseta tavoitteet &gt;"/>
        <lanstr id="STR_PWUWC" value="Ole hyvä ja käytä kelloa oikein ja pysy paikallaan."/>
        <lanstr id="STR_CALENDAR" value="Kalenteri"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Haluatko poistaa tämän hälytyskellon"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Muuta aikaa"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Muuta viikonpäivää"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Toista"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Nykyinen hälytyskellojen määrä on saavuttanut ylärajan"/>
 </language>
index 9b1e0ae..23cc613 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Définir l'objectif&gt;"/>
        <lanstr id="STR_PWUWC" value="Veuillez porter correctement la montre et rester immobile."/>
        <lanstr id="STR_CALENDAR" value="Calendrier"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Voulez-vous supprimer ce réveil"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Modifier l'heure"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Modifier le jour de la semaine"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Répéter"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Le nombre actuel de réveils a atteint la limite"/>
 </language>
index 18311ef..0d99b75 100644 (file)
        <lanstr id="STR_SET_TARGET" value="הגדיר מטרה&gt;"/>
        <lanstr id="STR_PWUWC" value="אנא לבש את השעון נכון ושמור על שקט"/>
        <lanstr id="STR_CALENDAR" value="לוח שנה"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="האם תרצה למחוק את המתעורר הזה"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="לשנות את הזמן"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="לשנות את היום בשבוע"/>
+       <lanstr id="STR_ALARM_REPEAT" value="לחזור"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="מספר המתעוררים הנוכחי הגיע למגבלה העליונה"/>
 </language>
index 5f031c1..1936b42 100644 (file)
        <lanstr id="STR_SET_TARGET" value="लक्ष्य सेट करें&gt;"/>
        <lanstr id="STR_PWUWC" value="कृपया घड़ी को सही तरीके से पहनें और स्थिर रहें।"/>
        <lanstr id="STR_CALENDAR" value="तिथिपत्री"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="क्या आप इस अलार्म को हटाना चाहते हैं"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="समय बदलें।"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="सप्ताह के दिन बदलें।"/>
+       <lanstr id="STR_ALARM_REPEAT" value="दोहराएँ।"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="वर्तमान में अलार्म की संख्या ऊपरी सीमा तक पहुंच गई है।"/>
 </language>
index 7a5510e..ac05e5d 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Cilj podešavanja&gt;"/>
        <lanstr id="STR_PWUWC" value="Molimo vas, nosite sat ispravno i ostanite mirni."/>
        <lanstr id="STR_CALENDAR" value="Kalendar"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Želite li izbrisati ovaj budilnik?"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Promijenite vrijeme"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Promijenite dan u tjednu"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Ponavljati"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Trenutačno je broj budilnika dosegao gornju granicu"/>
 </language>
index 41ef5a5..046e96a 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Atur tujuan&gt;"/>
        <lanstr id="STR_PWUWC" value="Silakan kenakan jam dengan benar dan tetap diam."/>
        <lanstr id="STR_CALENDAR" value="Kalender"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Apakah Anda ingin menghapus alarm ini"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Ubah waktu"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Ubah hari dalam seminggu"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Ulangi pengukuran"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Jumlah alarm saat ini telah mencapai batas atas"/>
 </language>
index 6877ac1..6e1591e 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Imposta obiettivo&gt;"/>
        <lanstr id="STR_PWUWC" value="Si prega di indossare correttamente l'orologio e di rimanere fermo."/>
        <lanstr id="STR_CALENDAR" value="Calendario"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Vuoi eliminare questo allarme"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Modificare l'ora"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Modificare il giorno della settimana"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Ripetere"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Il numero attuale di allarmi ha raggiunto il limite superiore"/>
 </language>
index 882509b..e6a3069 100644 (file)
        <lanstr id="STR_SET_TARGET" value="設定目標>"/>
        <lanstr id="STR_PWUWC" value="正しく時計を着用し、静止してください。"/>
        <lanstr id="STR_CALENDAR" value="暦"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="このアラームを削除しますか"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="時間を変更します"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="曜日を変更します"/>
+       <lanstr id="STR_ALARM_REPEAT" value="繰り返し"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="現在のアラームの数が上限に達しています"/>
 </language>
index c8c9efb..da0624c 100644 (file)
        <lanstr id="STR_SET_TARGET" value="설정 목표&gt;"/>
        <lanstr id="STR_PWUWC" value="시계를 올바르게 착용하고 가만히 있어 주세요."/>
        <lanstr id="STR_CALENDAR" value="일력"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="이 알람을 삭제하시겠습니까"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="시간을 변경합니다"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="요일을 변경합니다"/>
+       <lanstr id="STR_ALARM_REPEAT" value="반복."/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="현재 알람 개수가 상한에 도달했습니다"/>
 </language>
index 6be4590..41d0589 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Tetapkan Sasaran&gt;"/>
        <lanstr id="STR_PWUWC" value="Koa mu'ula to hia sio sa hao'ana e malaw."/>
        <lanstr id="STR_CALENDAR" value="Kalendar"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Adakah anda ingin memadamkan jam penggera ini"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Tukar masa"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Tukar hari dalam seminggu"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Ulang"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Bilangan jam penggera semasa telah mencapai had atas"/>
 </language>
index 7099902..2385b76 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Doel instellen&gt;"/>
        <lanstr id="STR_PWUWC" value="Draag alstublieft het horloge correct en blijf stil."/>
        <lanstr id="STR_CALENDAR" value="Agenda"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Wilt u deze wekker verwijderen"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Tijd wijzigen"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Dag van de week wijzigen"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Herhalen"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Het huidige aantal wekkers heeft de bovengrens bereikt"/>
 </language>
index 5481454..6b54ac1 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Ustaw cel&gt;"/>
        <lanstr id="STR_PWUWC" value="Proszę nosić zegarek poprawnie i pozostać w bezruchu."/>
        <lanstr id="STR_CALENDAR" value="Kalendarz"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Czy chcesz usunąć ten budzik"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Zmień godzinę"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Zmień dzień tygodnia"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Powtórz"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Obecna liczba budzików osiągnęła górny limit"/>
 </language>
index b8db9ce..fe3beaf 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Definir objetivo&gt;"/>
        <lanstr id="STR_PWUWC" value="Por favor, use o relógio corretamente e permaneça parado."/>
        <lanstr id="STR_CALENDAR" value="Calendário"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Deseja excluir este despertador"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Alterar a hora"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Alterar o dia da semana"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Alterar o dia da semana"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="O número atual de despertadores atingiu o limite superior"/>
 </language>
index 078e30e..bef34d9 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Setează obiectivele &gt;"/>
        <lanstr id="STR_PWUWC" value="Te rog să porți ceasul corect și să stai nemișcat."/>
        <lanstr id="STR_CALENDAR" value="Calendar"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Doriți să ștergeți acest ceas deșteptător"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Modificați ora"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Modificați ziua săptămânii"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Repetați"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Numărul actual de ceasuri deșteptătoare a atins limita superioară"/>
 </language>
index e3af2e0..60601e3 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Цель настройки&gt;"/>
        <lanstr id="STR_PWUWC" value="Пожалуйста, правильно носите часы и оставайтесь неподвижными."/>
        <lanstr id="STR_CALENDAR" value="календар"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Удалить этот будильник"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Изменить время"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Изменить день недели"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Повторять"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Текущее количество будильников достигло верхнего предела"/>
 </language>
index e990c7b..b7fdda7 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Sätt mål&gt;"/>
        <lanstr id="STR_PWUWC" value="Vänligen bär klockan korrekt och håll dig stilla"/>
        <lanstr id="STR_CALENDAR" value="Kalender"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Vill du ta bort den här väckarklockan"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Ändra tiden"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Ändra veckodagen"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Upprepa"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Aktuell antal väckarklockor har nått övre gränsen"/>
 </language>
index d0ce028..506ab3f 100644 (file)
        <lanstr id="STR_SET_TARGET" value="ตั้งเป้าหมาย&gt;"/>
        <lanstr id="STR_PWUWC" value="กรุณาสวมใส่นาฬิกาให้ถูกต้องและนั่งนิ่งๆ"/>
        <lanstr id="STR_CALENDAR" value="ปฏิทิน"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="คุณต้องการลบนาฬิกาปลุกนี้หรือไม่"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="เปลี่ยนเวลา"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="เปลี่ยนวันในสัปดาห์"/>
+       <lanstr id="STR_ALARM_REPEAT" value="ทำซ้ำ"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="จำนวนนาฬิกาปลุกในขณะนี้ได้ถึงขีดจำกัดสูงสุด"/>
 </language>
index 725b964..7849986 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Hedef ayarla &gt;"/>
        <lanstr id="STR_PWUWC" value="Lütfen saati doğru takın ve hareketsiz kalın."/>
        <lanstr id="STR_CALENDAR" value="Takvim"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Bu alarmı silmek istiyor musunuz"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Zamanı değiştir"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Haftanın gününü değiştir"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Tekrarla"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Mevcut alarm sayısı üst sınırı reached"/>
 </language>
index 24c62b3..05c424b 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Встановити мету&gt;"/>
        <lanstr id="STR_PWUWC" value="Будь ласка, правильно носіть годинник і залишайтеся нерухомими"/>
        <lanstr id="STR_CALENDAR" value="Календар"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Чи бажаєте ви видалити цей будильник"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Змінити час"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Змінити день тижня"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Змінити день тижня"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Поточна кількість будильників досягла верхньої межі"/>
 </language>
index 16cfc1d..2c363ee 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Maqsadni qo'yish&gt;"/>
        <lanstr id="STR_PWUWC" value="Iltimos, soatni to'g'ri kiying va harakatsiz bo'ling"/>
        <lanstr id="STR_CALENDAR" value="Kalendar"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Bu soatni o'chirishni xohlaysizmi"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Vaqtni o'zgartiring"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Haftaning kunini o'zgartiring"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Takrorlang"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Hozirgi soatlar soni yuqori chegaraga yetdi"/>
 </language>
index 9689120..f44df92 100644 (file)
        <lanstr id="STR_SET_TARGET" value="Thiết lập mục tiêu&gt;"/>
        <lanstr id="STR_PWUWC" value="Vui lòng đeo đồng hồ đúng cách và giữ yên."/>
        <lanstr id="STR_CALENDAR" value="Lịch"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="Bạn có muốn xóa đồng hồ báo thức này không"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="Thay đổi thời gian"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="Thay đổi ngày trong tuần"/>
+       <lanstr id="STR_ALARM_REPEAT" value="Lặp lại"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="Số lượng đồng hồ báo thức hiện tại đã đạt giới hạn trên"/>
 </language>
index 1c477cc..49d7fed 100644 (file)
        <lanstr id="STR_SET_TARGET" value="设置目标&gt;"/>
        <lanstr id="STR_PWUWC" value="请正确佩戴手表,并保持静止"/>
        <lanstr id="STR_CALENDAR" value="日历"/>
+       <lanstr id="STR_ALARM_DELETE_NOTE" value="是否删除此闹钟"/>
+       <lanstr id="STR_ALARM_TIME_CHANGE" value="更改时间"/>
+       <lanstr id="STR_ALARM_WEEK_CHANGE" value="更改星期"/>
+       <lanstr id="STR_ALARM_REPEAT" value="重复"/>
+       <lanstr id="STR_ALARM_ADD_LIMIT_NOTE" value="当前闹钟个数已达上限"/>
 </language>
index a2629a2..023968d 100644 (file)
Binary files a/tools/language_tool/font/ar.lang and b/tools/language_tool/font/ar.lang differ
index 18c2706..a9f8e9f 100644 (file)
Binary files a/tools/language_tool/font/az.lang and b/tools/language_tool/font/az.lang differ
index 41ad634..dd8ae39 100644 (file)
Binary files a/tools/language_tool/font/cs.lang and b/tools/language_tool/font/cs.lang differ
index 9c3e76f..dd2877c 100644 (file)
Binary files a/tools/language_tool/font/de.lang and b/tools/language_tool/font/de.lang differ
index 2c0a60f..6f6f416 100644 (file)
Binary files a/tools/language_tool/font/el.lang and b/tools/language_tool/font/el.lang differ
index 9b9e524..1424fc2 100644 (file)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ
index 3124b85..e2785a6 100644 (file)
Binary files a/tools/language_tool/font/es.lang and b/tools/language_tool/font/es.lang differ
index a98cb6c..22f7001 100644 (file)
Binary files a/tools/language_tool/font/fa.lang and b/tools/language_tool/font/fa.lang differ
index 5d796fe..0711f07 100644 (file)
Binary files a/tools/language_tool/font/fi.lang and b/tools/language_tool/font/fi.lang differ
index a390261..4d62453 100644 (file)
Binary files a/tools/language_tool/font/fr.lang and b/tools/language_tool/font/fr.lang differ
index 5932db6..53e70e4 100644 (file)
Binary files a/tools/language_tool/font/he.lang and b/tools/language_tool/font/he.lang differ
index ecdef25..83b03d5 100644 (file)
Binary files a/tools/language_tool/font/hi.lang and b/tools/language_tool/font/hi.lang differ
index acfb16d..8e7162d 100644 (file)
Binary files a/tools/language_tool/font/hr.lang and b/tools/language_tool/font/hr.lang differ
index c130345..884f0e1 100644 (file)
Binary files a/tools/language_tool/font/id.lang and b/tools/language_tool/font/id.lang differ
index 2ab0906..bf24ea0 100644 (file)
Binary files a/tools/language_tool/font/it.lang and b/tools/language_tool/font/it.lang differ
index 611219c..b322739 100644 (file)
Binary files a/tools/language_tool/font/ja.lang and b/tools/language_tool/font/ja.lang differ
index e7d0887..479bd07 100644 (file)
Binary files a/tools/language_tool/font/ko.lang and b/tools/language_tool/font/ko.lang differ
index 82d2631..7bd0a9d 100644 (file)
Binary files a/tools/language_tool/font/ms.lang and b/tools/language_tool/font/ms.lang differ
index 329fb40..8b7e8b7 100644 (file)
Binary files a/tools/language_tool/font/nl.lang and b/tools/language_tool/font/nl.lang differ
index 236635e..fa6dca7 100644 (file)
Binary files a/tools/language_tool/font/pl.lang and b/tools/language_tool/font/pl.lang differ
index 69cc204..85705a5 100644 (file)
Binary files a/tools/language_tool/font/pt.lang and b/tools/language_tool/font/pt.lang differ
index 6ead127..f5fa048 100644 (file)
Binary files a/tools/language_tool/font/ro.lang and b/tools/language_tool/font/ro.lang differ
index c183fda..b2b7d00 100644 (file)
Binary files a/tools/language_tool/font/ru.lang and b/tools/language_tool/font/ru.lang differ
index ad69aa1..2920e2f 100644 (file)
Binary files a/tools/language_tool/font/sv.lang and b/tools/language_tool/font/sv.lang differ
index 036f813..175a0f4 100644 (file)
Binary files a/tools/language_tool/font/th.lang and b/tools/language_tool/font/th.lang differ
index 44c3ff7..b1eb3e5 100644 (file)
Binary files a/tools/language_tool/font/tr.lang and b/tools/language_tool/font/tr.lang differ
index 7f60603..3567471 100644 (file)
@@ -578,7 +578,12 @@ enum UIResourceTextId : uint16_t {
     STR_SET_TARGET = 565,\r
     STR_PWUWC = 566,\r
     STR_CALENDAR = 567,\r
-    STR_MAX_ID = 568,\r
+    STR_ALARM_DELETE_NOTE = 568,\r
+    STR_ALARM_TIME_CHANGE = 569,\r
+    STR_ALARM_WEEK_CHANGE = 570,\r
+    STR_ALARM_REPEAT = 571,\r
+    STR_ALARM_ADD_LIMIT_NOTE = 572,\r
+    STR_MAX_ID = 573,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 2062e60..97b1e34 100644 (file)
Binary files a/tools/language_tool/font/uk.lang and b/tools/language_tool/font/uk.lang differ
index 3a5da1c..d896610 100644 (file)
Binary files a/tools/language_tool/font/uz.lang and b/tools/language_tool/font/uz.lang differ
index 4230c4e..b1dbfe3 100644 (file)
Binary files a/tools/language_tool/font/vi.lang and b/tools/language_tool/font/vi.lang differ
index 163785b..b7c3c77 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ