summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIrfan Abdul <irfan.abdul@samsung.com>2017-01-06 13:20:56 +0530
committerIrfan Abdul <irfan.abdul@samsung.com>2017-01-06 13:20:56 +0530
commita87f8c7ad168d2e67d6139ceec1a03ad549414f4 (patch)
tree46e4fca8137848b71a79111189718401b07f49c0
parentfe58561ffe1224ea1220faa25b47841487b2c4dc (diff)
parent69312a33eeece85ce0c2c4cae8ca71790f491bc3 (diff)
downloadtimer-a87f8c7ad168d2e67d6139ceec1a03ad549414f4.tar.gz
timer-a87f8c7ad168d2e67d6139ceec1a03ad549414f4.tar.bz2
timer-a87f8c7ad168d2e67d6139ceec1a03ad549414f4.zip
Merge branch 'tizen_3.0' into tizen
Change-Id: I2af7fd9b9cd055fb179c0d1b87a664e0597d3611 Signed-off-by: Irfan Abdul <irfan.abdul@samsung.com>
-rwxr-xr-xedje_include/timer_main_group.edc6
-rwxr-xr-xedje_include/timer_time_panel.edc20
-rwxr-xr-xinc/log.h46
-rwxr-xr-xinc/main.h40
-rw-r--r--inc/timer_string.h23
-rwxr-xr-x[-rw-r--r--]res/po/ar.po45
-rwxr-xr-xres/po/as.po39
-rwxr-xr-x[-rw-r--r--]res/po/az.po49
-rwxr-xr-xres/po/be_BY.po39
-rwxr-xr-x[-rw-r--r--]res/po/bg.po47
-rwxr-xr-xres/po/bn.po39
-rwxr-xr-xres/po/bn_BD.po39
-rwxr-xr-x[-rw-r--r--]res/po/ca.po49
-rwxr-xr-x[-rw-r--r--]res/po/cs.po49
-rwxr-xr-x[-rw-r--r--]res/po/da.po47
-rwxr-xr-x[-rw-r--r--]res/po/de.po51
-rwxr-xr-x[-rw-r--r--]res/po/el_GR.po51
-rwxr-xr-x[-rw-r--r--]res/po/en.po45
-rwxr-xr-x[-rw-r--r--]res/po/en_PH.po49
-rwxr-xr-x[-rw-r--r--]res/po/en_US.po45
-rwxr-xr-x[-rw-r--r--]res/po/es_ES.po45
-rwxr-xr-x[-rw-r--r--]res/po/es_US.po49
-rwxr-xr-x[-rw-r--r--]res/po/et.po49
-rwxr-xr-x[-rw-r--r--]res/po/eu.po49
-rwxr-xr-xres/po/fa.po39
-rwxr-xr-x[-rw-r--r--]res/po/fi.po47
-rwxr-xr-x[-rw-r--r--]res/po/fr.po45
-rwxr-xr-x[-rw-r--r--]res/po/fr_CA.po49
-rwxr-xr-x[-rw-r--r--]res/po/ga.po47
-rwxr-xr-x[-rw-r--r--]res/po/gl.po47
-rwxr-xr-xres/po/gu.po39
-rwxr-xr-xres/po/he.po39
-rwxr-xr-xres/po/hi.po39
-rwxr-xr-x[-rw-r--r--]res/po/hr.po49
-rwxr-xr-x[-rw-r--r--]res/po/hu.po47
-rwxr-xr-x[-rw-r--r--]res/po/hy.po51
-rwxr-xr-xres/po/id.po39
-rwxr-xr-x[-rw-r--r--]res/po/is.po49
-rwxr-xr-x[-rw-r--r--]res/po/it_IT.po49
-rwxr-xr-x[-rw-r--r--]res/po/ja_JP.po45
-rwxr-xr-x[-rw-r--r--]res/po/ka.po45
-rwxr-xr-x[-rw-r--r--]res/po/kk.po51
-rwxr-xr-xres/po/km.po39
-rwxr-xr-xres/po/kn.po39
-rwxr-xr-x[-rw-r--r--]res/po/ko_KR.po43
-rwxr-xr-xres/po/ky_KG.po39
-rwxr-xr-xres/po/lo.po39
-rwxr-xr-x[-rw-r--r--]res/po/lt.po49
-rwxr-xr-x[-rw-r--r--]res/po/lv.po49
-rwxr-xr-x[-rw-r--r--]res/po/mk.po49
-rwxr-xr-xres/po/ml.po39
-rwxr-xr-xres/po/mn_MN.po39
-rwxr-xr-xres/po/mr.po39
-rwxr-xr-xres/po/ms.po39
-rwxr-xr-xres/po/my_MM.po39
-rwxr-xr-xres/po/my_ZG.po39
-rwxr-xr-x[-rw-r--r--]res/po/nb.po49
-rwxr-xr-xres/po/ne.po39
-rwxr-xr-x[-rw-r--r--]res/po/nl.po51
-rwxr-xr-xres/po/or.po39
-rwxr-xr-xres/po/pa.po39
-rwxr-xr-x[-rw-r--r--]res/po/pl.po49
-rwxr-xr-xres/po/pl_SP.po39
-rwxr-xr-x[-rw-r--r--]res/po/pt_BR.po49
-rwxr-xr-x[-rw-r--r--]res/po/pt_PT.po47
-rwxr-xr-x[-rw-r--r--]res/po/ro.po51
-rwxr-xr-x[-rw-r--r--]res/po/ru_RU.po51
-rwxr-xr-xres/po/si.po39
-rwxr-xr-x[-rw-r--r--]res/po/sk.po49
-rwxr-xr-x[-rw-r--r--]res/po/sl.po49
-rwxr-xr-xres/po/sq.po39
-rwxr-xr-x[-rw-r--r--]res/po/sr.po47
-rwxr-xr-x[-rw-r--r--]res/po/sv.po49
-rwxr-xr-xres/po/ta.po39
-rwxr-xr-xres/po/te.po39
-rwxr-xr-xres/po/tg_TJ.po39
-rwxr-xr-xres/po/th.po39
-rwxr-xr-xres/po/tk_TM.po39
-rwxr-xr-xres/po/tl.po39
-rwxr-xr-x[-rw-r--r--]res/po/tr_TR.po47
-rwxr-xr-x[-rw-r--r--]res/po/uk.po49
-rwxr-xr-xres/po/ur.po39
-rwxr-xr-x[-rw-r--r--]res/po/uz.po49
-rwxr-xr-xres/po/vi.po39
-rwxr-xr-x[-rw-r--r--]res/po/zh_CN.po41
-rwxr-xr-x[-rw-r--r--]res/po/zh_HK.po45
-rwxr-xr-x[-rw-r--r--]res/po/zh_TW.po43
-rwxr-xr-xsrc/main.c539
-rwxr-xr-xtimer_alert/inc/log.h46
-rwxr-xr-xtimer_alert/inc/ring.h2
-rw-r--r--timer_alert/inc/timer_alert_string.h12
-rwxr-xr-xtimer_alert/res/edje/ring.edc4
-rwxr-xr-xtimer_alert/src/ring.c125
93 files changed, 3309 insertions, 1186 deletions
diff --git a/edje_include/timer_main_group.edc b/edje_include/timer_main_group.edc
index 8e3bb48..93baf1d 100755
--- a/edje_include/timer_main_group.edc
+++ b/edje_include/timer_main_group.edc
@@ -123,17 +123,18 @@ group
{
name: "elm.text.title";
type: TEXTBLOCK;
+ mouse_events: 1;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 10 10;
visible : 1;
rel1 {
- relative: 0.0 49/360;
+ relative: 85/360 49/360;
to: "background";
}
rel2 {
- relative: 1.0 92/360;
+ relative: 275/360 92/360;
to: "background";
}
text {
@@ -169,6 +170,7 @@ group
visible : 0;
}
}
+
part
{
name: "lbutton,touch";
diff --git a/edje_include/timer_time_panel.edc b/edje_include/timer_time_panel.edc
index 3698f5e..4e337b8 100755
--- a/edje_include/timer_time_panel.edc
+++ b/edje_include/timer_time_panel.edc
@@ -60,6 +60,26 @@ group{
}
part
{
+ name: "time_text";
+ type: RECT;
+ scale: 1;
+ mouse_events: 1;
+ description
+ {
+ state: "default" 0.0;
+ rel1 {
+ relative: 20/360 142/360;
+ to: "bg";
+ }
+ rel2 {
+ relative: 340/360 227/360;
+ to: "bg";
+ }
+ color : 0 0 0 0;
+ }
+ }
+ part
+ {
name: "hour";
type: TEXTBLOCK;
mouse_events: 0;
diff --git a/inc/log.h b/inc/log.h
index 9d95f4e..150ac8f 100755
--- a/inc/log.h
+++ b/inc/log.h
@@ -45,38 +45,38 @@
#if !defined(_D)
#define _D(fmt, arg...) dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg)
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg)
#endif
#if !defined(_W)
#define _W(fmt, arg...) (dlog_print(DLOG_WARN, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(_E)
-#define _E(fmt,arg...) (dlog_print(DLOG_ERROR, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+#define _E(fmt, arg...) (dlog_print(DLOG_ERROR, \
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(TMR_INFO)
#define TMR_INFO(fmt, arg...) (dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(TMR_SINFO)
#define TMR_SINFO(fmt, arg...) (dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(TMR_ERR)
-#define TMR_ERR(fmt,arg...) (dlog_print(DLOG_ERROR, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+#define TMR_ERR(fmt, arg...) (dlog_print(DLOG_ERROR, \
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(_TMR_ENTER_)
@@ -87,13 +87,13 @@
#define DBG(fmt , args...) \
do { \
dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg)\
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg)\
} while (0)
#endif
#define retvm_if(expr, val, fmt, arg...) do { \
- if(expr) { \
+ if (expr) { \
_E(fmt, ##arg); \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return val; \
@@ -101,14 +101,14 @@
} while (0)
#define retv_if(expr, val) do { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return (val); \
} \
} while (0)
#define retm_if(expr, fmt, arg...) do { \
- if(expr) { \
+ if (expr) { \
_E(fmt, ##arg); \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return; \
@@ -116,28 +116,28 @@
} while (0)
#define ret_if(expr) do { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return; \
} \
} while (0)
#define goto_if(expr, val) do { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> goto", #expr); \
goto val; \
} \
} while (0)
#define break_if(expr) { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> break", #expr); \
break; \
} \
}
#define continue_if(expr) { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> continue", #expr); \
continue; \
} \
diff --git a/inc/main.h b/inc/main.h
index 06a26db..cc2befa 100755
--- a/inc/main.h
+++ b/inc/main.h
@@ -25,7 +25,6 @@
#include <utils_i18n.h>
#include <glib.h>
-
#if !defined(PACKAGE)
#define PACKAGE "timer"
#endif
@@ -43,9 +42,9 @@
#define UPTIME_FILE "/proc/uptime"
#define IS_STR_EQUAL(a, b) (!strcmp(a, b))
#define CALLOC(num, type) ((type *)calloc(num, sizeof(type)))
-#define FREEIF(p) ({if (p) {free(p); p = NULL; }})
-#define ECORE_TIMER_DELIF(p) ({if (p) {ecore_timer_del(p); p = NULL; }})
-#define DLL_DEFAULT __attribute__ ((visibility ("default")))
+#define FREEIF(p) ({if (p) {free(p); p = NULL; } })
+#define ECORE_TIMER_DELIF(p) ({if (p) {ecore_timer_del(p); p = NULL; } })
+#define DLL_DEFAULT __attribute__ ((visibility("default")))
#define TIMER_START_TIME "APP_TIMER_START_TIME"
#define TIMER_TIMER_ID "APP_TIMER_TIMER_ID"
@@ -75,6 +74,7 @@ typedef enum {
typedef enum {
TMR_SYSTIME_TYPE_USEC,
TMR_SYSTIME_TYPE_SEC,
+ TMR_SYSTIME_TYPE_MAX,
} TMR_SYSTIME_TYPE;
@@ -87,14 +87,25 @@ struct lap_data {
};
typedef enum {
- SAMPLE_APP_ERROR_OK = 0,
- SAMPLE_APP_ERROR_FAIL = -1,
-
- SAMPLE_APP_ERROR_INVALID_PARAMETER = -2,
- SAMPLE_APP_ERROR_OUT_OF_MEMORY = -3,
- SAMPLE_APP_ERROR_NO_DATA = -4,
+ SAMPLE_APP_ERROR_OK = 0,
+ SAMPLE_APP_ERROR_FAIL = -1,
+ SAMPLE_APP_ERROR_INVALID_PARAMETER = -2,
+ SAMPLE_APP_ERROR_OUT_OF_MEMORY = -3,
+ SAMPLE_APP_ERROR_NO_DATA = -4,
} sample_app_error_e;
+typedef struct screenreader_data {
+ Evas_Object* timer_title;
+ Evas_Object* hour_spinner;
+ Evas_Object* min_spinner;
+ Evas_Object* sec_spinner;
+ Evas_Object* start_button;
+ Evas_Object* reset_cancel_button;
+ Evas_Object* pause_resume_button;
+ Evas_Object* time_text;
+ Evas_Object* cancel_button;
+} screenreader_data;
+
typedef struct appdata {
Evas_Object *win;
Evas_Object *conform;
@@ -111,9 +122,9 @@ typedef struct appdata {
Evas_Object *hour_entry;
Evas_Object *min_entry;
Evas_Object *sec_entry;
- Evas_Object *progressbar;
- Eext_Circle_Surface *circle_surface;
- Evas_Object *navi_bar;
+ Evas_Object *progressbar;
+ Eext_Circle_Surface *circle_surface;
+ Evas_Object *navi_bar;
Elm_Object_Item *ei_naviframe;
TMR_STATE_TYPE cur_state; //current state
TMR_TIME_TYPE t_type;
@@ -153,6 +164,7 @@ typedef struct appdata {
int screen_width;
int screen_height;
Evas_Object* focused_obj;
-}appdata_s;
+ screenreader_data* sr_data;
+} appdata_s;
void main_get_resource_path(appdata_s *ad);
diff --git a/inc/timer_string.h b/inc/timer_string.h
index bde6e7b..d9fae3b 100644
--- a/inc/timer_string.h
+++ b/inc/timer_string.h
@@ -18,15 +18,20 @@
#define _TIMER_STRING_H
-#define STRING_TMR_START "WDS_TMR_ACBUTTON_START_ABB2"
-#define STRING_TMR_RESET "WDS_TMR_ACBUTTON_RESET_ABB"
-#define STRING_TMR_PAUSE "WDS_TMR_ACBUTTON_PAUSE_ABB"
-#define STRING_TMR_RESUME "IDS_TMR_BUTTON_RESUME_ABB3"
-#define STRING_TMR_CANCEL "WDS_TMR_ACBUTTON_CANCEL_ABB"
-#define STRING_TMR_HRS "IDS_TMR_BODY_HRS_LC_ABB"
-#define STRING_TMR_MIN "IDS_TMR_BODY_MIN"
-#define STRING_TMR_SEC "WDS_TMR_BODY_SECS_ABB"
-#define STRING_TMR_TIMER "IDS_TMR_BODY_TIMER"
+#define STRING_TMR_START "WDS_SWT_BUTTON_START_ABB"
+#define STRING_TMR_RESET "WDS_SWT_BUTTON_RESET_ABB"
+#define STRING_TMR_PAUSE "WDS_TMR_BUTTON_PAUSE_ABB2"
+#define STRING_TMR_RESUME "WDS_SWT_BUTTON_RESUME_ABB"
+#define STRING_TMR_CANCEL "WDS_TMR_BUTTON_CANCEL_ABB"
+#define STRING_TMR_HRS "WDS_ST_HEADER_HR_ABB"
+#define STRING_TMR_MIN "WDS_ST_HEADER_MIN_ABB"
+#define STRING_TMR_SEC "WDS_ST_HEADER_SEC_ABB"
+#define STRING_TMR_TIMER "WDS_TMR_HEADER_TIMER_ABB"
+#define STRING_TTS_TMR_ROTATE_BEZEL "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+#define STRING_TTS_TMR_HOUR "Hour"
+#define STRING_TTS_TMR_MINUTE "Minute"
+#define STRING_TTS_TMR_SECOND "Second"
+#define STRING_TTS_TMR_BUTTON "BUTTON"
#endif //_TIMER_STRING_H
diff --git a/res/po/ar.po b/res/po/ar.po
index e7dd26c..296d108 100644..100755
--- a/res/po/ar.po
+++ b/res/po/ar.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "المؤقت"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "قم بتدوير الإطار لتعديل %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "بدء"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "البدء"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "إعادة الضبط"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "استئناف"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "إيقاف مؤقت"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "إلغاء"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "الموقت"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "استئناف"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "إعادة الضبط"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "س"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "دق"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ث"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "الثواني"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "د"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "إلغاء"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "انتهى الوقت"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "إيقاف"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "استبعاد"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "اسحب الشاشة نحو اليمين بإصبعين لإيقاف التنبيه."
+
diff --git a/res/po/as.po b/res/po/as.po
new file mode 100755
index 0000000..4ff7d34
--- /dev/null
+++ b/res/po/as.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s মিলাবলৈ বিজেল ঘূৰাওক৷"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "আৰম্ভ কৰক"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "পুনৰাৰম্ভ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "বিৰতি"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "টাইমাৰ"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "পুনঃছেট কৰক"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ঘ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ছে"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "মি"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "বাতিল কৰক"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "সময় সমাপ্ত"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "অগ্ৰাহ্য"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "এলাৰ্ট অগ্ৰাহ্য কৰিবলৈ দুটা আঙুলিৰে সোঁফালে ঘহাঁওক৷"
+
diff --git a/res/po/az.po b/res/po/az.po
index 1ec1fd7..19fdd65 100644..100755
--- a/res/po/az.po
+++ b/res/po/az.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Sayqac"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s tənzimləmək üçün pəncərəni saat əqrəbi istiqamətində fırlat."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "BAŞLA"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Başla"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "SIFIRLA"
-
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUZA VER"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Davam"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "LƏĞV ET"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauza"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Davam"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Taymer"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "saat"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Sıfırla"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "dəqiqə"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "St"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "San"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Dəq"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Ləğv et"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Vaxt bitdi"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Söndürmək"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Rədd et"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Siqnalı söndürmək üçün iki barmaqla sağa sürüşdür."
+
diff --git a/res/po/be_BY.po b/res/po/be_BY.po
new file mode 100755
index 0000000..4a17262
--- /dev/null
+++ b/res/po/be_BY.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Павярніце шкалу, каб адрэгуляваць %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Пачаць"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Узнавіць"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Паўза"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Скінуць"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Г"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "С"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Мін"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Адмена"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Час выйшаў"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Адхіліць"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Правядзіце ўправа двума пальцамі, каб адхіліць абвестку."
+
diff --git a/res/po/bg.po b/res/po/bg.po
index 488742d..512a634 100644..100755
--- a/res/po/bg.po
+++ b/res/po/bg.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Таймер"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Завъртете безела за регулиране на %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Старт"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "СТАРТ"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Продълж."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "НУЛИРАНЕ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Пауза"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ПАУЗА"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ОТКАЗ"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Нулиране"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Възоб."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Час"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "ч"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Сек"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "мин."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Мин"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Сек."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Отказ"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Времето изтече"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Отхвърляне"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Плъзнете надясно с два пръста, за да прекратите известието."
+
diff --git a/res/po/bn.po b/res/po/bn.po
new file mode 100755
index 0000000..f9525d0
--- /dev/null
+++ b/res/po/bn.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s সামঞ্জস্য করতে বেজেল ঘোরান।"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "শুরু করুন"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "পুনরারম্ভ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "বিরাম দিন"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "টাইমার"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "রিসেট করুন"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ঘ."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "সে."
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "মি."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "বাতিল করুন"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "সময় শেষ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "খারিজ"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "সতর্কতা খারিজ করতে দুই আঙুল দিয়ে ডানে সোয়াইপ করুন।"
+
diff --git a/res/po/bn_BD.po b/res/po/bn_BD.po
new file mode 100755
index 0000000..e5f69c2
--- /dev/null
+++ b/res/po/bn_BD.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s সমন্বয় করতে কাঠামোটি ঘোরান।"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "শুরু"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "পুনরারম্ভ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "বিরতি"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "টাইমার"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "রিসেট"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ঘ."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "সে."
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "মি."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "বাতিল"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "সময় শেষ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "বাতিল করুন"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "অ্যালার্ট বন্ধ করতে দুই আঙুল দিয়ে ডানে সোয়াইপ করুন৷"
+
diff --git a/res/po/ca.po b/res/po/ca.po
index 0469f79..ac0f651 100644..100755
--- a/res/po/ca.po
+++ b/res/po/ca.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Temporitzador"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Giri el bisell per ajustar %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Iniciar"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INICI"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Continuar"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESTABLIR"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausa"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSAR"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Temporitzador"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCEL·LAR"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Restablir"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Repren"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Seg"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "minut"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "S"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancel·lar"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "S'ha exhaurit el temps"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "S'ha exhaur temps"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Descartar"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Desplaci's a la dreta amb dos dits per descartar l'avís."
+
diff --git a/res/po/cs.po b/res/po/cs.po
index a6e53a4..a3f5dbb 100644..100755
--- a/res/po/cs.po
+++ b/res/po/cs.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Časovač"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Otočte rámeček a upravte %s."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "OBNOVIT"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Start"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "POZASTAVIT"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Pokračov."
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ZRUŠIT"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pozastavit"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Pokr."
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Časovač"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "hod"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Vynulovat"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Hod"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "S"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Zrušit"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Časový limit"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Konec"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Zrušit"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Přejetím dvěma prsty doprava zrušíte upozornění."
+
diff --git a/res/po/da.po b/res/po/da.po
index ac57157..afb06cb 100644..100755
--- a/res/po/da.po
+++ b/res/po/da.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Roter panel for at justere %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Start"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Genoptag"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "NULSTIL"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANNULLER"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nulstil"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Forts."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "T"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "tmr"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Annuller"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tiden er gået"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Afvis"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Stryg til højre med to fingre for at afvise varslet."
+
diff --git a/res/po/de.po b/res/po/de.po
index b4d7d6b..4cae03c 100644..100755
--- a/res/po/de.po
+++ b/res/po/de.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Drehen Sie die Lünette, um %s anzupassen."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ZURÜCKSETZEN"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Starten"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ANHALTEN"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Weiter"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ABBRECHEN"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Weiter"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Zurücksetzen"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "Min."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Std"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Sek"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Zeit abgelaufen"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Abbruch"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Zeit abgelaufen."
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Verwerfen"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Mit zwei Fingern nach rechts streichen, um die Benachrichtigung zu beenden."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Schließen"
diff --git a/res/po/el_GR.po b/res/po/el_GR.po
index b945616..1e7bc88 100644..100755
--- a/res/po/el_GR.po
+++ b/res/po/el_GR.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Αντίστροφη μέτρηση"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Περιστρέψτε τη στεφάνη για να προσαρμόσετε το %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ΕΝΑΡΞΗ"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Έναρξη"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ΕΠΑΝΑΦΟΡΑ"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Συνέχεια"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ΠΑΥΣΗ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Παύση"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ΑΚΥΡΟ"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Αντίστρ. μέτρ."
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Συνέχ."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Επαναφορά"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "ώρες"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Ώρα"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "λεπ."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Δευ"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Δευτ."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Λεπ"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Ο χρόνος τελείωσε"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Άκυρο"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Ο χρόνος έληξε"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Απόρριψη"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Κάντε σάρωση προς τα δεξιά με δύο δάχτυλα για να κλείσετε την ειδοποίηση."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Ματαίωση"
diff --git a/res/po/en.po b/res/po/en.po
index 4794d80..7fad860 100644..100755
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rotate bezel to adjust %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Start"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESET"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Resume"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCEL"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Resume"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Reset"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "Hr"
-msgid "IDS_TMR_BODY_MIN"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sec"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sec"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancel"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Time is up"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Time's up"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Dismiss"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Swipe right with two fingers to dismiss alert."
+
diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index e6388d9..7fad860 100644..100755
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rotate bezel to adjust %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Start"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESET"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Resume"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "Cancel"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Resume"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Reset"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "hrs"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Hr"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "mins"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sec"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Secs"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Time is up"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancel"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Time's up"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Dismiss"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Swipe right with two fingers to dismiss alert."
+
diff --git a/res/po/en_US.po b/res/po/en_US.po
index 4794d80..7fad860 100644..100755
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rotate bezel to adjust %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Start"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESET"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Resume"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCEL"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Resume"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Reset"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "Hr"
-msgid "IDS_TMR_BODY_MIN"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sec"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sec"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancel"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Time is up"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Time's up"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Dismiss"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Swipe right with two fingers to dismiss alert."
+
diff --git a/res/po/es_ES.po b/res/po/es_ES.po
index 2d55016..748d366 100644..100755
--- a/res/po/es_ES.po
+++ b/res/po/es_ES.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Cronómetro"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Gire el bisel para ajustar %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INICIO"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Inicio"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESTABLECER"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Reanudar"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSAR"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausar"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCELAR"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Cuenta atrás"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Reanud"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Restablecer"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "h"
-msgid "IDS_TMR_BODY_MIN"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "s"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
msgstr "min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "s"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancelar"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tiempo agotado"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Rechazar"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Descartar"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Deslice hacia la derecha con dos dedos para descartar la alerta."
+
diff --git a/res/po/es_US.po b/res/po/es_US.po
index 33a9bea..cd2b84c 100644..100755
--- a/res/po/es_US.po
+++ b/res/po/es_US.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Temporizador"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Gire el bisel para ajustar %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Iniciar"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INICIAR"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Reanudar"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESTABLECER"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausar"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSAR"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Temporizador"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCELAR"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Restablecer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Reanu."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "h"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "hrs."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "s"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "minutos"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "ss"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancelar"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tiempo agotado"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Rechazar"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Descartar"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Deslice hacia la derecha con dos dedos para descartar la alerta."
+
diff --git a/res/po/et.po b/res/po/et.po
index 126dbd6..de18bc5 100644..100755
--- a/res/po/et.po
+++ b/res/po/et.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Taimer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Keerake rõngast, et seadistada %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ALUSTA"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Alusta"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "LÄHTESTA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Jätka"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUS"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Paus"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "TÜHISTA"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Taimer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Jätka"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Lähtesta"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Tühista"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Aeg on läbi"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Keeldu"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Eira"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Libistage kahe sõrmega paremale, et märguannet eirata."
+
diff --git a/res/po/eu.po b/res/po/eu.po
index a209a19..d2f95df 100644..100755
--- a/res/po/eu.po
+++ b/res/po/eu.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Tenporizadorea"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Biratu %s doitzeko."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Hasi"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "HASI"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Berrab."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "BERREZARRI"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausatu"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSATU"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Tenporizadorea"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "UTZI"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Berrezarri"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Berr."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "ordu"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "minutu"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Segun."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Utzi"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Denbora amaitu da"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Kendu"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Baztertu"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Alerta baztertzeko, irristatu bi hatzekin eskuinera."
+
diff --git a/res/po/fa.po b/res/po/fa.po
new file mode 100755
index 0000000..8b59ce9
--- /dev/null
+++ b/res/po/fa.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "برای تنظیم %s، دایره را بچرخانید."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "شروع"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ازسرگیری"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "مکث"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "تایمر"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "بازنشانی"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ساعت"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ثانیه"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "دقیقه"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "لغو"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "وقت تمام است"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "رد کردن"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "برای قطع زنگ هشدار، با دو انگشت به راست بکشید."
+
diff --git a/res/po/fi.po b/res/po/fi.po
index 80d691a..41380d6 100644..100755
--- a/res/po/fi.po
+++ b/res/po/fi.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Ajastin"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Säädä kohdetta %s kiertämällä etulevyä."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "KÄYNNISTÄ"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Käynnistä"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "NOLLAA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Jatka"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "TAUKO"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Tauko"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "PERUUTA"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Ajastin"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Jatka"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nollaa"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Peruuta"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Aika on lopussa"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Hylkää"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Hylkää hälytys pyyhkäisemällä kahdella sormella oikealle."
+
diff --git a/res/po/fr.po b/res/po/fr.po
index 17e84d0..1b7b421 100644..100755
--- a/res/po/fr.po
+++ b/res/po/fr.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Minuteur"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Tournez la lunette pour ajuster %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "DÉMARRER"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Démarrer"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RÉINIT."
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Reprendre"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANNULER"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Minuteur"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Lect."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Réinit."
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
-
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "S"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Annuler"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Temps écoulé"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Ignorer"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Faites glisser deux doigts vers la droite pour ignorer l'alerte."
+
diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po
index a40edac..7b8ec2a 100644..100755
--- a/res/po/fr_CA.po
+++ b/res/po/fr_CA.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Minuterie"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Tournez la lunette pour ajuster %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "DÉMARRER"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Démarrer"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RÉINIT."
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Reprendre"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANNULER"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Minuteur"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Repr."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Réinit."
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
-
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "S"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Temps écoulé"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
msgstr "Annuler"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Temps écoulé"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Ignorer"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Glissez deux doigts vers la droite pour ignorer l'alerte."
+
diff --git a/res/po/ga.po b/res/po/ga.po
index 010c159..ccb72d1 100644..100755
--- a/res/po/ga.po
+++ b/res/po/ga.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Amadóir"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rothlaigh beiséal le %s a cheartú."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Tosaigh"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "TOSAIGH"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Atosaigh"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ATHSHOC."
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Cuir ar sos"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "CUIR AR SOS"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Amadóir"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "AR CEAL"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Athshoc."
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Atosú"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Ur"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "uair"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sc"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "nóim"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Nm"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Soic"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Ar Ceal"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tá an t-am istigh"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Ruaig"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Svaidhpeáil ar dheis le dhá mhéar leis an bhfoláireamh a ruaigeadh."
+
diff --git a/res/po/gl.po b/res/po/gl.po
index 8233c2f..da63846 100644..100755
--- a/res/po/gl.po
+++ b/res/po/gl.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Temporizador"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Xira o bisel para axustar %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Inicio"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INICIO"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Continuar"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESTABLECER"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausa"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSA"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Temporizador"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCELAR"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Restablecer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Conti."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "h"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "hrs."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "s"
-msgid "IDS_TMR_BODY_MIN"
+msgid "WDS_ST_HEADER_MIN_ABB"
msgstr "min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Seg."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancelar"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tempo esgotado"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Rexeitar"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Descartar"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Pasa dous dedos pola pantalla á dereita para rexeitar a alerta."
+
diff --git a/res/po/gu.po b/res/po/gu.po
new file mode 100755
index 0000000..ccd70ea
--- /dev/null
+++ b/res/po/gu.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ને સંતુલિત કરવા માટે બેઝલને ફેરવો."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "પ્રારંભ કરો"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ફરી શરૂ કરો"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "પોઝ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ટાઇમર"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "રીસેટ કરો"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "કલાક"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "સેકંડ"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "મિ."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "રદ કરો"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "સમય સમાપ્ત થયો"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "કાઢી નાખો"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ચેતવણીને કાઢી નાખવા માટે બે આંગળીઓથી જમણે સ્વાઇપ કરો."
+
diff --git a/res/po/he.po b/res/po/he.po
new file mode 100755
index 0000000..5820686
--- /dev/null
+++ b/res/po/he.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "סובב את החוגה כדי לכוונן את %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "התחל"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "המשך"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "השהה"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "טיימר"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "איפוס"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "שע'"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "שנ'"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "דק'"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ביטול"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "הזמן תם"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "התעלם"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "כדי להתעלם מהתראה, החלק לימין בשתי אצבעות."
+
diff --git a/res/po/hi.po b/res/po/hi.po
new file mode 100755
index 0000000..07c2b03
--- /dev/null
+++ b/res/po/hi.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s को समायोजित करने के लिए बेजल घुमाएँ।"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "प्रारंभ करे"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "पुनः शुरू"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "विराम दें"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "टाइमर"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "रीसेट करें"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "घं"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "से"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "मि"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "रद्द करें"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "समय समाप्त"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "निरस्त करें"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "सतर्क निरस्त करने के लिए दो उंगलियों से दाएँ स्वाइप करें।"
+
diff --git a/res/po/hr.po b/res/po/hr.po
index f3da19d..4cdde05 100644..100755
--- a/res/po/hr.po
+++ b/res/po/hr.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Odbrojavanje"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Zakrenite okvir za podešavanje %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "POČETAK"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Početak"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "PO. POSTAV."
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Nastavi"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUZIRAJ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauza"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ODUSTANI"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Brojač"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Nast."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Pon. post."
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "s"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Odustani"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Vrijeme isteklo"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Prekini"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Odbaci"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Za odbacivanje upozorenja prijeđite s dva prsta udesno."
+
diff --git a/res/po/hu.po b/res/po/hu.po
index 6906bca..6e30d55 100644..100755
--- a/res/po/hu.po
+++ b/res/po/hu.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Időzítő"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "A %s beállításához forgassa el a keretet."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INDÍTÁS"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Indítás"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "VISSZAÁLLÍT"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Folytatás"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "SZÜNET"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Szünet"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "MÉGSE"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Időzítő"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Folyt."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nullázás"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "óra"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "perc"
-
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Mp"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "P"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Mégse"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Lejárt az idő"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Elutasít"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Bezárás"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Két ujját jobbra húzva bezárhatja a jelzést."
+
diff --git a/res/po/hy.po b/res/po/hy.po
index 71266e3..4fdfbcc 100644..100755
--- a/res/po/hy.po
+++ b/res/po/hy.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Ժամանակաչափ"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Պտտեք շրջանակը՝ %s կարգավորելու համար:"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ՍԿՍԵԼ"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Սկսել"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ՀԵՏԱԴԱՐՁԵԼ"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Վերսկսել"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ԴԱԴԱՐ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Դադար"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ԴԱԴԱՐԵՑՆԵԼ"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Ժամաչափ"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Վերսկ."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Հետադարձել"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "ժամ"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Ժամ"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "րոպ"
-
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Վրկ"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Ժամանակը սպառվեց"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Րոպ"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Դադարեցնել"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Ժամանակը լրացավ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Բաց թողնել"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Զգուշացումը բաց թողնելու համար երկու մատը սահեցրեք աջ:"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Չղրկլ"
diff --git a/res/po/id.po b/res/po/id.po
new file mode 100755
index 0000000..9c684bf
--- /dev/null
+++ b/res/po/id.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Putar bingkai untuk menyesuaikan %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Mulai"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Lanjutkan"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Jeda"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Pewaktu"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Reset"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Jm"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Dtk"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Mnt"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Batalkan"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Waktu habis"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Abaikan"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Usap ke kanan dengan dua jari untuk mengabaikan peringatan."
+
diff --git a/res/po/is.po b/res/po/is.po
index 8102dbe..1e2be2e 100644..100755
--- a/res/po/is.po
+++ b/res/po/is.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Niðurteljari"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Snúðu skáa til að stilla %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "HEFJA"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Byrja"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ENDURSTILLA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Áfram"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "HLÉ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Gera hlé"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "HÆTTA VIÐ"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Teljari"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Áfram"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Endurstilla"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Kl."
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "klst"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "mín"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Mín"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Hætta við"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tíminn er liðinn"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Sleppa"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Hunsa"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Strjúktu til hægri með tveimur fingrum til að hunsa áminningu."
+
diff --git a/res/po/it_IT.po b/res/po/it_IT.po
index 959baa0..f9fade2 100644..100755
--- a/res/po/it_IT.po
+++ b/res/po/it_IT.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INIZIO"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Ruota la ghiera per regolare %s."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RIPRISTINA"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Avvia"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Riprendi"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANNULLA"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausa"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Ripr."
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "ore"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Ripristina"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Ora"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Sec"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Annulla"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tempo scaduto"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Rifiuta"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Elimina"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Trascina due dita verso destra per rifiutare l’avviso."
+
diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po
index 5c85219..582bf02 100644..100755
--- a/res/po/ja_JP.po
+++ b/res/po/ja_JP.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "タイマー"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%sを調整するには、ベゼルを回します。"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
+msgid "WDS_SWT_BUTTON_START_ABB"
msgstr "開始"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "リセット"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "再開"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "一時停止"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "キャンセル"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "タイマー"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "再開"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "リセット"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "時間"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "時"
-msgid "IDS_TMR_BODY_MIN"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "秒"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
msgstr "分"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "秒"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "キャンセル"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "終了"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "解除"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "タイムアップ"
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "アラームを解除するには、2本の指で右にスワイプしてください。"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "無効"
diff --git a/res/po/ka.po b/res/po/ka.po
index d0a29bf..322363c 100644..100755
--- a/res/po/ka.po
+++ b/res/po/ka.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "თაიმერი"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s რომ შეარჩიოთ, მოაბრუნეთ წრე."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
+msgid "WDS_SWT_BUTTON_START_ABB"
msgstr "დაწყება"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "გადატვირთვა"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "გაგრძელ."
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "პაუზა"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "გაუქმება"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ტაიმერი"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "გაგრძ."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "გადატვირთვა"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "სთ."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "სთ"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "წუთი"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "წმ"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "წამი"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "წთ"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "გაუქმება"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "დრო გავიდა"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "უარყოფა"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "დახურვა"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "სიგნალის გამოსართავად, გადაუსვით ორი თითი მარჯვნივ."
+
diff --git a/res/po/kk.po b/res/po/kk.po
index 108c4ea..73cf63e 100644..100755
--- a/res/po/kk.po
+++ b/res/po/kk.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Таймер"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s уақытын реттеу үшін, тұтқышты бұрыңыз."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Бастау"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Жалғас-у"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "БАСТАУ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Кідірту"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ҚАЛП.КЕЛТ-У"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Қалп. кел."
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "КІДІРТУ"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Сағ"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "БАС ТАРТУ"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Сек"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Жалғ."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Мин"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "сағ"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Бас тарту"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "мин"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Уақыт аяқталды"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Секунд"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Босату"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Уақыт бітті"
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Оятарды босату үшін екі саусақпен оңға қарай сипаңыз."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Қабылдамау"
diff --git a/res/po/km.po b/res/po/km.po
new file mode 100755
index 0000000..36a6ed0
--- /dev/null
+++ b/res/po/km.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "បង្វិល​ស៊ុមមុខ ដើម្បី​លៃតម្រូវ %s។"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ចាប់ផ្ដើម"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ចាប់ផ្ដើម​បន្ត"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "ផ្អាក"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "រង្វាស់ពេល"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "កំណត់​ឡើងវិញ"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ម៉ោង"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "វិនាទី"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "នាទី"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "បោះបង់"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "ដល់​ម៉ោង"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ចោល"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ប្រើ​ម្រាមដៃ​ពីរ​អូស​ទៅ​ស្ដាំ ដើម្បី​ចោល​ការប្រាប់ដំណឹង។"
+
diff --git a/res/po/kn.po b/res/po/kn.po
new file mode 100755
index 0000000..c144c2e
--- /dev/null
+++ b/res/po/kn.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ಸರಿಹೊಂದಿಸಲು ಬೆಜೆಲ್ ತಿರುಗಿಸಿ."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ಪ್ರಾರಂಭ"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ಮುಂದುವರಿಸಿ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "ವಿರಾಮಗೊಳಿಸು"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ಟೈಮರ್"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ಮರುಹೊಂದಿಸಿ"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ಗಂಟೆ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ಸೆಕೆಂ"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "ನಿಮಿಷ"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ರದ್ದುಮಾಡಿ"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "ಸಮಯ ಮುಗಿದಿದೆ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ವಜಾಗೊಳಿಸಿ"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ಎಚ್ಚರಿಕೆಯನ್ನು ವಜಾಗೊಳಿಸಲು ಎರಡು ಬೆರಳುಗಳಿಂದ ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."
+
diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index 0e546e4..8f83549 100644..100755
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "타이머"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s 값을 조절하려면 베젤을 돌리세요."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
+msgid "WDS_SWT_BUTTON_START_ABB"
msgstr "시작"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "초기화"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "계속"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "일시정지"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "취소"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "타이머"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "계속"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "초기화"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "시간"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "시"
-msgid "IDS_TMR_BODY_MIN"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "초"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
msgstr "분"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "초"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "취소"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "타이머 완료"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "타이머 종료"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "해제"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "알림을 해제하려면 두 손가락으로 오른쪽으로 미세요."
+
diff --git a/res/po/ky_KG.po b/res/po/ky_KG.po
new file mode 100755
index 0000000..1f8f2c0
--- /dev/null
+++ b/res/po/ky_KG.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s жөндөө үчүн рамканы айландырыңыз."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Баштоо"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Улантуу"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Пауза"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Кайра коюу"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "С."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Сек"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Мүн"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Токтотуу"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Убакыт аяктады"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Четтетүү"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Сигналды четтетүү үчүн, эки бармагыңыз менен оңго жылдырыңыз."
+
diff --git a/res/po/lo.po b/res/po/lo.po
new file mode 100755
index 0000000..f302245
--- /dev/null
+++ b/res/po/lo.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "ໝູນຂອບຮູບພາບເພື່ອປັບປ່ຽນ %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ເລີ່ມ"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ເລີ່ມໃໝ່"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "ຢຸດຊົ່ວຄາວ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ເຄື່ອງຈັບເວລາ"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ຕັ້ງຄືນ​"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ຊມ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ວນທ"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "ນທ"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ຍົກ​ເລີກ"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "ໝົດເວລາ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ປ່ອຍ​ໄປ"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ຮູດໄປທາງຂວາດ້ວຍມືສອງນິ້ວເພື່ອປ່ອຍໂມງປຸກໄປ."
+
diff --git a/res/po/lt.po b/res/po/lt.po
index 363af18..be8493a 100644..100755
--- a/res/po/lt.po
+++ b/res/po/lt.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Laikmatis"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Pasukite rėmelį ir sureguliuokite %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Pradėti"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "PRADĖTI"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Naujinti"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ATKURTI"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pristabdyti"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUZĖ"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Laikmatis"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ATŠAUKTI"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nust.naujai"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Tęsti"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Val"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "val."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Atšaukti"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Laikas baigėsi"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Nutraukti"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Atmesti"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Įspėjimą panaikinkite dviem pirštais braukdami į dešinę."
+
diff --git a/res/po/lv.po b/res/po/lv.po
index eac0bdd..7667c34 100644..100755
--- a/res/po/lv.po
+++ b/res/po/lv.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Taimeris"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Pagrieziet apli, lai regulētu %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "SĀKT"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Sākt"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ATIESTATĪT"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Atsākt"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUZĒT"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauzēt"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ATCELT"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Taimeris"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Atsākt"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Atiestatīt"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "st."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Laiks beidzies"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Atcelt"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Laiks ir beidzies"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Noraidīt"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Pavelciet pa labi ar diviem pirkstiem, lai noraidītu brīdinājumu."
+
diff --git a/res/po/mk.po b/res/po/mk.po
index 87a4e3c..e95c2a5 100644..100755
--- a/res/po/mk.po
+++ b/res/po/mk.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Тајмер"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Ротирајте го лежиштето за приспособување на %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Почеток"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ПОЧНИ"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Продолжи"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "РЕСЕТИРАЈ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Пауза"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ПАУЗА"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Тајмер"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ОТКАЖИ"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Ресетирај"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Прод."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Час"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "чсв"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Сек"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "мин"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Мин"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Сек."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Откажи"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Времето истече"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Откажи"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Отфрлете"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Поминете надесно со два прста за да го отфрлите предупредувањето."
+
diff --git a/res/po/ml.po b/res/po/ml.po
new file mode 100755
index 0000000..f664c54
--- /dev/null
+++ b/res/po/ml.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ക്രമപ്പെടുത്തുന്നതിന് ബേസൽ തിരിക്കുക."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ആരംഭിക്കുക"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "റെസ്യും"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "തല്‍ക്കാലം നിർത്തുക"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ടൈമർ"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "പുനഃക്രമീക."
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "മണി."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "സെ."
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "മിനി."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "റദ്ദാക്കുക"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "സമയം കഴിഞ്ഞു"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ഡിസ്മിസ് ചെ."
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "സൂചന ഡിസ്മിസ് ചെയ്യുന്നതിന് രണ്ട് വിരലുകളുപയോഗിച്ച് വലത്തോട്ട് സ്വൈപ് ചെയ്യുക."
+
diff --git a/res/po/mn_MN.po b/res/po/mn_MN.po
new file mode 100755
index 0000000..15c6db8
--- /dev/null
+++ b/res/po/mn_MN.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s-г тохируулахын тулд хүрээг эргүүл."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Эхлэх"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Үргэлжл.л"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Түр зогсох"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Цаг хэмжигч"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Дахин тох.х"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Цаг"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Сек"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Мин"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Цуцлах"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Цаг дууслаа"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Болих"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Дохиолол болихдоо хоёр хуруугаараа баруун тийш шудар."
+
diff --git a/res/po/mr.po b/res/po/mr.po
new file mode 100755
index 0000000..b580290
--- /dev/null
+++ b/res/po/mr.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s समायोजित करण्यास बेझल फिरवा."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "सुरू करा"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "पुन्हा सुरू करा"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "विराम द्या"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "टाइमर"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "पुन्हा मांडणी करा"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "तास"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "से"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "मिन"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "रद्द करा"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "वेळ संपली"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "डिसमिस करा"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "सतर्क डिसमिस करण्यासाठी दोन बोटांनी उजवीकडे स्‍वाइप करा."
+
diff --git a/res/po/ms.po b/res/po/ms.po
new file mode 100755
index 0000000..22a1105
--- /dev/null
+++ b/res/po/ms.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Putar bezel untuk melaraskan %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Mulakan"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Teruskan"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Jeda"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Pemasa"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Tetap smula"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Jam"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Saat"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Batal"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Masa tamat"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Buang"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Leret ke kanan dengan dua jari untuk membuang peringatan."
+
diff --git a/res/po/my_MM.po b/res/po/my_MM.po
new file mode 100755
index 0000000..5832a60
--- /dev/null
+++ b/res/po/my_MM.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ကိုချိန်ညှိရန်နောက်တစ်ကြိမ်လှည့်ပါ။"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "စတင်"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ပြန်စပါ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "တန့်ထားပါ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "အချိန်မှတ် စက်"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ပြန်သတ်မှတ်ပါ"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "နာရီ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "စက္ကန့်"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "မိနစ်"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ပယ်ဖျက်ပါ"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "အချိန်စေ့ပြီ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "လွှတ်သည်"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "သတိပေးချက်ကို ဖြုတ်ပယ်ရန် လက်နှစ်ချောင်းဖြင့် ညာဘက်သို့ ပွတ်ဆွဲပါ။"
+
diff --git a/res/po/my_ZG.po b/res/po/my_ZG.po
new file mode 100755
index 0000000..f5ac4f1
--- /dev/null
+++ b/res/po/my_ZG.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ကိုခ်ိန္ၫွိရန္ေနာက္တစ္ႀကိမ္လွည့္ပါ။"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "စတင္သည္"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ျပန္စ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "ရပ္ထားပါ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "အခ်ိန္မွတ္ စက္"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ျပန္သတ္မွတ္ပါ"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "နာရီ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "စကၠန္႔"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "မိနစ္"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ပယ္ဖ်က္ပါ"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "အခ်ိန္ေစ့ၿပီ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "လႊတ္သည္"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "သတိေပးခ်က္ကုိ ျဖဳတ္ပယ္ရန္ လက္ႏွစ္ေခ်ာင္းျဖင့္ ညာဘက္သုိ႔ ပြတ္ဆြဲပါ။"
+
diff --git a/res/po/nb.po b/res/po/nb.po
index 8cf4a5d..eab4af6 100644..100755
--- a/res/po/nb.po
+++ b/res/po/nb.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Nedtelling"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Roter rammen for å justere %s."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "NULLSTILL"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Start"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSE"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Fortsett"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "AVBRYT"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pause"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Forts."
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Nedtelling"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "t"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nullstill"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "T"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Sek"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Avbryt"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tiden er ute"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Stopp"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Avvis"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Stryk mot høyre med to fingre for å avvise varselet."
+
diff --git a/res/po/ne.po b/res/po/ne.po
new file mode 100755
index 0000000..db4d73a
--- /dev/null
+++ b/res/po/ne.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s समायोजन गर्न बेजललाई घुमाउनुहोस्।"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "सुरु गर्नु"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "पुन: सुरू"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "पज गर्नुहोस्"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "टाइमर"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "रिसेट गर्नुहोस्"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "घं."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "सेकेन्ड"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "मिनट"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "रद्द गर्नु"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "समय समाप्त भयो"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "खारेज गर्नु"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "सतर्कता खारेज गर्न गर्न दुई औंलाले दायाँ स्वाइप गर्नुहोस्।"
+
diff --git a/res/po/nl.po b/res/po/nl.po
index c989745..6472251 100644..100755
--- a/res/po/nl.po
+++ b/res/po/nl.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Draai ring om %s aan te passen."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "STARTEN"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Starten"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESETTEN"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Hervat"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUZE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauze"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANNULEREN"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Hervat"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Resetten"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Uur"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sec"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "u."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Annuleren"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Tijd verstreken"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "sec"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Sluiten"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Tijd is om"
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Veeg met twee vingers naar rechts om de melding te annuleren."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Uitzetten"
diff --git a/res/po/or.po b/res/po/or.po
new file mode 100755
index 0000000..54fa281
--- /dev/null
+++ b/res/po/or.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ନିୟନ୍ତ୍ରଣ କରିବାକୁ ବିଜେଲ୍ ଘୂର୍ଣ୍ଣନ କରନ୍ତୁ।"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ଆରମ୍ଭ"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ପୁନରାରମ୍ଭ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "ବିରତ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ଟାଇମର୍"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ପୁନଃସେଟ୍"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ଘ."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ସେ."
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "ମି."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ବାତିଲ୍"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "ସମୟ ସମାପ୍ତ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ପ୍ରତ୍ୟାଖ୍ୟାନ"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ସତର୍କ ପ୍ରତ୍ୟାଖ୍ୟାନ କରିବାକୁ ଦୁଇ ଆଙ୍ଗୁଠି ସହ ଡାହାଣକୁ ସ୍ଵାଇପ୍ କରନ୍ତୁ।"
+
diff --git a/res/po/pa.po b/res/po/pa.po
new file mode 100755
index 0000000..3ff5775
--- /dev/null
+++ b/res/po/pa.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ਨੂੰ ਸਮਾਯੋਜਿਤ ਕਰਨ ਲਈ ਬੇਜ਼ਲ ਘੁਮਾਉ।"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ਅਰੰਭ ਕਰੋ"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "ਪੁਨਰ ਅਰੰਭ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "ਵਿਰਾਮ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ਟਾਈਮਰ"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ਰੀਸੈੱਟ ਕਰੋ"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ਘੰ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "ਸਕਿ"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "ਮਿੰ"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ਰੱਦ ਕਰੋ"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ਖਾਰਿਜ ਕਰੋ"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ਸਚੇਤ ਖਾਰਿਜ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਸੱਜੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ।"
+
diff --git a/res/po/pl.po b/res/po/pl.po
index 27b212e..b8aede8 100644..100755
--- a/res/po/pl.po
+++ b/res/po/pl.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Czasomierz"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Obróć ramkę, aby wyregulować ustawienie %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "START"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Rozpocznij"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ZERUJ"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Kontynuuj"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "WSTRZYMAJ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Wstrzymaj"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANULUJ"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Minutnik"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Wznów"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Zeruj"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "g."
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "ss"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Upłynął czas"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Anuluj"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Czas minął"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Odrzuć"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Przeciągnij dwoma palcami w prawo, aby zignorować alert."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Porzuć"
diff --git a/res/po/pl_SP.po b/res/po/pl_SP.po
new file mode 100755
index 0000000..763322b
--- /dev/null
+++ b/res/po/pl_SP.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Ôbrōć rōmka coby napasować %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Sztart"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Puś dalij"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Sztopnij"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nuluj"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "h"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "sek"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Pociep"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Czas minył"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Ôdciep"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Przeciōng dwōma palcami na prawo, coby zignorować alert."
+
diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po
index 8bd361b..c43d77a 100644..100755
--- a/res/po/pt_BR.po
+++ b/res/po/pt_BR.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Contagem regressiva"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Gire a coroa para ajustar %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INICIAR"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Iniciar"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "REDEFINIR"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Continuar"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSAR"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausar"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCELAR"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Temporizador"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Cont."
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Redefinir"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Seg"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Segs"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancelar"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tempo esgotado"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Cancelar"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Ignorar"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Deslize para a direita com dois dedos para ignorar o alerta."
+
diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po
index f9b53df..3bcd147 100644..100755
--- a/res/po/pt_PT.po
+++ b/res/po/pt_PT.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Temporizador"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "INÍCIO"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rode o aro para ajustar %s."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "REPOR"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Iniciar"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUSA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Retomar"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "CANCELAR"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pausa"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Retom."
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Temporizador"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Repor"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "S"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "M"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Cancelar"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Tempo esgotado"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Cancelar"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Deslize com dois dedos para a direita, para cancelar o alerta."
+
diff --git a/res/po/ro.po b/res/po/ro.po
index ca36609..9cb58f8 100644..100755
--- a/res/po/ro.po
+++ b/res/po/ro.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Temporizator"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "PORNIRE"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rotiți rama pentru a ajusta %s."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESETARE"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Pornire"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ÎNTRERUPERE"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Reluare"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ANULARE"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauză"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Rel."
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Temporizator"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Resetare"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Sec."
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Timp expirat"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Anulare"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Timpul a expirat"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Anulare"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Pentru a anula alerta, glisați la dreapta folosind două degete."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Oprire"
diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po
index 595d79a..4fbfe06 100644..100755
--- a/res/po/ru_RU.po
+++ b/res/po/ru_RU.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Таймер"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Для настройки %s поверните кольцо."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Начать"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Возобнов."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ПУСК"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Пауза"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "СБРОС"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Сброс"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ПАУЗА"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Ч."
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ОТМЕНА"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "С"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Воз."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "М."
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "час."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Отмена"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "мин."
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Время вышло"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Сек."
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Отклонить"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Время истекло"
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Проведите двумя пальцами вправо, чтобы отключить уведомление."
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Отменить"
diff --git a/res/po/si.po b/res/po/si.po
new file mode 100755
index 0000000..dc8e417
--- /dev/null
+++ b/res/po/si.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s සීරුමාරු කිරීමට බෙසලය කරකවන්න."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "අරඹන්න"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "යළි අරඹ."
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "රඳවන්න"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "කාල මාපකය"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "යළි සකසන්න"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "පැය"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "තත්"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "විනා"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "අවලංගු කර."
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "වේලාව හරි"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ඉවතලන්න"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ඇඟවුම ඉවතලෑමට ඇඟිලි දෙකක් සමග දකුණට ස්වයිප් කරන්න."
+
diff --git a/res/po/sk.po b/res/po/sk.po
index 3f7e5c2..8ef14c3 100644..100755
--- a/res/po/sk.po
+++ b/res/po/sk.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Časovač"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Otočením panela môžete upraviť %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Štart"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ŠTART"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Pokrač."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "VYNULOVAŤ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pozastaviť"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "POZASTAVIŤ"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Časovač"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "ZRUŠIŤ"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Vynulovať"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Pokr."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Hod"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "hod."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sek."
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Zrušiť"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Čas vypršal"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "Odmietnuť"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Zrušiť"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Potiahnutím dvomi prstami doprava môžete zrušiť upozornenie."
+
diff --git a/res/po/sl.po b/res/po/sl.po
index fae7c92..8532c09 100644..100755
--- a/res/po/sl.po
+++ b/res/po/sl.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Časovnik"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Vrtite okvir, da prilagodite možnost %s."
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ZAČNI"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Začni"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "PONASTAVI"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Naprej"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PREMOR"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Premor"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "PREKLIČI"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Časovnik"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Naprej"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Ponastavi"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "h"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "H"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "minut"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "S"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sekund"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Časa je zmanjkalo"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Prekliči"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Čas je potekel"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Opusti"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Z dvema prstoma podrsajte v desno, da opustite opozorilo."
+
diff --git a/res/po/sq.po b/res/po/sq.po
new file mode 100755
index 0000000..f7ec92a
--- /dev/null
+++ b/res/po/sq.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rrotullo unazën për të përshtatur %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Fillo"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Vazhdo"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauzë"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Kohëmatësi"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Reseto"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Orë"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Anulo"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Deri këtu"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Shpërfill"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Rrëshqit djathtas me dy gishta për ta shpërfillur sinjalizimin."
+
diff --git a/res/po/sr.po b/res/po/sr.po
index 1ac862a..dc25568 100644..100755
--- a/res/po/sr.po
+++ b/res/po/sr.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Tajmer"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "POČNI"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Rotirajte okvir da biste prilagodili %s."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "RESETUJ"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Počni"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUZA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Nastavi"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "OTKAŽI"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Pauza"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Nast."
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Tajmer"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "sati"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Resetuj"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Č"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Sek."
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Otkaži"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Vreme je isteklo"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Odbaci"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Prevucite nadesno koristeći dva prsta da biste odbacili upozorenje."
+
diff --git a/res/po/sv.po b/res/po/sv.po
index 0fc311a..9eebfe6 100644..100755
--- a/res/po/sv.po
+++ b/res/po/sv.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Timer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Vrid ramen för att kunna justera %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Starta"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "STARTA"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Fortsätt"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "ÅTERSTÄLL"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Paus"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "PAUS"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "AVBRYT"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Återställ"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Forts."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Tim"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "tim."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "min"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Sekund"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Avbryt"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Tiden har gått ut"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Tiden är ute"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Stäng"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Svep åt höger med två fingrar om du vill avvisa aviseringen."
+
diff --git a/res/po/ta.po b/res/po/ta.po
new file mode 100755
index 0000000..5c0aa61
--- /dev/null
+++ b/res/po/ta.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s-ஐ சரிசெய்ய, பெஸலை சுழற்றவும்."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "துவங்குக"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "மீ.தொடர்"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "இடைநிறுத்துக"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "டைமர்"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "ரீசெட்"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ம."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "வி."
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "நி."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ரத்துசெய்க"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "நேரம் முடிவுற்றது"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "தவிர்க்கவும்"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "விழிப்பூட்டலை நிராகரிக்க இரு விரலைக் கொண்டு வலப்புறம் ஸ்வைப் செய்யவும்."
+
diff --git a/res/po/te.po b/res/po/te.po
new file mode 100755
index 0000000..b42b586
--- /dev/null
+++ b/res/po/te.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%sను సర్దుబాటు చేయడం కోసం గడియారం దిమ్మెను రొటేట్ చేయండి."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "ప్రారంభించు"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "పునఃప్రారంభం"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "పాజ్ చేయి"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "టైమర్"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "రీసెట్ చేయి"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "గం"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "సెకను"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "ని."
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "రద్దు చేయి"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "సమయం ముగిసింది"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "విస్మరించు"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "హెచ్చరికను విస్మరించడానికి రెండు వేళ్లతో కుడివైపుకు స్వైప్ చేయండి."
+
diff --git a/res/po/tg_TJ.po b/res/po/tg_TJ.po
new file mode 100755
index 0000000..933310f
--- /dev/null
+++ b/res/po/tg_TJ.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Барои мос кардани %s безелро тоб диҳед."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Оғоз"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Давом"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Тавақ. д-н"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Барқарорс."
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "С"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Сон"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Дақ"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Бекор к-дан"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Вақт расид"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Холӣ кардан"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Барои ҳушдорро қатъ кардан, бо ду ангушт ба рост бимолед."
+
diff --git a/res/po/th.po b/res/po/th.po
new file mode 100755
index 0000000..3e2e7aa
--- /dev/null
+++ b/res/po/th.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "หมุนขอบหน้าปัดเพื่อปรับ %s"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "เริ่ม"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "กลับ"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "พัก"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ตัวตั้งเวลา"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "รีเซ็ท"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "ชม."
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "วิ"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "นาที"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "ยกเลิก"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "หมดเวลา"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "ปิด"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "ใช้นิ้วสองนิ้วปัดไปทางขวาเพื่อปิดการแจ้งเตือน"
+
diff --git a/res/po/tk_TM.po b/res/po/tk_TM.po
new file mode 100755
index 0000000..0b13392
--- /dev/null
+++ b/res/po/tk_TM.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s sazlamak üçin, çarçuwajygy aýlaň."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Başla"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Dowam et"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Sägindir"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Taýmer"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Nol et"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Sag"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sek"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Ýatyr"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Wagt boldy"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Ret et"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Duýduryşy aýyrmak üçin, iki barmak bilen saga syryň."
+
diff --git a/res/po/tl.po b/res/po/tl.po
new file mode 100755
index 0000000..98534ca
--- /dev/null
+++ b/res/po/tl.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Ipihit ang bezel para i-adjust ang %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Simulan"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Ituloy"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "I-pause"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Timer"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "I-reset"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Hr"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sec"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Kanselahin"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Ubos na ang oras"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "I-dismiss"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Mag-swipe pakanan gamit ang dalawang daliri para i-dismiss ang alerto."
+
diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po
index 433ba10..e052dfc 100644..100755
--- a/res/po/tr_TR.po
+++ b/res/po/tr_TR.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Zamanlayıcı"
-
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "BAŞLAT"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s ayarı için bezeli döndürün."
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "SIFIRLA"
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Başlat"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "DURAKLAT"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Devam"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "İPTAL ET"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Duraklat"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Sürdür"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Zamanlayıcı"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "saat"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Sıfırla"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "dk"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Sa"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "Sn"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Dk"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "İptal et"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Süre doldu"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Durdur"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Uyarıyı durdurmak için iki parmağınızla sağa kaydırın."
+
diff --git a/res/po/uk.po b/res/po/uk.po
index 88100fc..19b1b85 100644..100755
--- a/res/po/uk.po
+++ b/res/po/uk.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Таймер"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Поверніть рамку, щоб налаштувати %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Почати"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "ПУСК"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Поновити"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "СКИНУТИ"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Пауза"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "ПАУЗА"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Таймер"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "СКАСУВАТИ"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Скидання"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Понов."
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Г."
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "год."
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "С."
-msgid "IDS_TMR_BODY_MIN"
-msgstr "хв."
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Хв."
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Секунд"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Скасувати"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "Час вичерпано"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Час вийшов"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "Відхилити"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Проведіть вправо двома пальцями, щоб вимкнути будильник."
+
diff --git a/res/po/ur.po b/res/po/ur.po
new file mode 100755
index 0000000..503639e
--- /dev/null
+++ b/res/po/ur.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s کو مطابق کرنے کے لیے بیزل کو گھمائیں۔"
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "شروع"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "دوبارہ چلائیں"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "وقفہ"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "ٹائمر"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "پھر سیٹ"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "گھنٹہ"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "سیکنڈ"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "منٹ"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "منسوخ کریں"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "وقت پورا ہوگیا"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "برخاست کریں"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "انتباہ برخاست کرنے کے لیے دو انگلیوں سے دائیں جانب سوائپ کریں۔"
+
diff --git a/res/po/uz.po b/res/po/uz.po
index c7beb81..115f439 100644..100755
--- a/res/po/uz.po
+++ b/res/po/uz.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "Taymer"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "%s’ni sozlash uchun tig‘ni aylantiring."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "Boshlash"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
-msgstr "BOSHLASH"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Davom et"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "QAYTARISH"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "To‘xtam"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
-msgstr "TO‘XTAM"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Taymer"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "BEKOR QIL"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Tashlash"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "Dvm et"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "St"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "soat"
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Son"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "daq"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Daq"
-msgid "WDS_TMR_BODY_SECS_ABB"
-msgstr "Soniya"
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Bekor qil"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "Vaqt bo‘ldi"
-msgid "IDS_ALM_SK_DISMISS"
-msgstr "O‘tkazish"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "O‘tkazib yub"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Signalni o‘tkazib yuborish uchun o‘ngga ikkita barmoq bilan suring."
+
diff --git a/res/po/vi.po b/res/po/vi.po
new file mode 100755
index 0000000..7f15f59
--- /dev/null
+++ b/res/po/vi.po
@@ -0,0 +1,39 @@
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "Xoay vòng để điều chỉnh %s."
+
+msgid "WDS_SWT_BUTTON_START_ABB"
+msgstr "B.đầu"
+
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "Tiếp tục"
+
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
+msgstr "Tạm dừng"
+
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "Đếm giờ"
+
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "Đặt lại"
+
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "Hr"
+
+msgid "WDS_ST_HEADER_SEC_ABB"
+msgstr "Sec"
+
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "Min"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "Hủy"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "Hết giờ"
+
+msgid "WDS_ALM_BODY_DISMISS_ABB"
+msgstr "Bỏ qua"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "Vuốt sang phải bằng hai ngón tay để tắt thông báo."
+
diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po
index 0c81970..401f613 100644..100755
--- a/res/po/zh_CN.po
+++ b/res/po/zh_CN.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "定时器"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "转动表圈以调整%s。"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
+msgid "WDS_SWT_BUTTON_START_ABB"
msgstr "开始"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "重置"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "继续"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "暂停"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "取消"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "定时器"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "继续"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "重置"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "小时"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "分钟"
-
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "秒"
-msgid "IDS_TMR_POP_TIME_IS_UP"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "分"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "取消"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
msgstr "时间到"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "解除"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "用两个手指向右滑动以解除提醒。"
+
diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po
index 9f9cc6d..c89f9cb 100644..100755
--- a/res/po/zh_HK.po
+++ b/res/po/zh_HK.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "計時器"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "轉動錶圈以調整%s。"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
+msgid "WDS_SWT_BUTTON_START_ABB"
msgstr "開始"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "重設"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "繼續"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "暫停"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "取消"
-
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "繼續"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "計時器"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
-msgstr "小時"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "重設"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "分鐘"
+msgid "WDS_ST_HEADER_HR_ABB"
+msgstr "時"
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "秒"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "時間到了"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "分"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "取消"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "時間已到"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "解除"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "以兩指向右滑動以解除提示。"
+
diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po
index dfa1642..feb7f4e 100644..100755
--- a/res/po/zh_TW.po
+++ b/res/po/zh_TW.po
@@ -1,32 +1,39 @@
-msgid "IDS_TMR_BODY_TIMER"
-msgstr "計時器"
+msgid "WDS_TTS_TBBODY_ROTATE_BEZEL_TO_ADJUST_PS"
+msgstr "旋轉邊框來調整%s。"
-msgid "WDS_TMR_ACBUTTON_START_ABB2"
+msgid "WDS_SWT_BUTTON_START_ABB"
msgstr "開始"
-msgid "WDS_TMR_ACBUTTON_RESET_ABB"
-msgstr "重設"
+msgid "WDS_SWT_BUTTON_RESUME_ABB"
+msgstr "繼續"
-msgid "WDS_TMR_ACBUTTON_PAUSE_ABB"
+msgid "WDS_TMR_BUTTON_PAUSE_ABB2"
msgstr "暫停"
-msgid "WDS_TMR_ACBUTTON_CANCEL_ABB"
-msgstr "取消"
+msgid "WDS_TMR_HEADER_TIMER_ABB"
+msgstr "計時器"
-msgid "IDS_TMR_BUTTON_RESUME_ABB3"
-msgstr "繼續"
+msgid "WDS_SWT_BUTTON_RESET_ABB"
+msgstr "重設"
-msgid "IDS_TMR_BODY_HRS_LC_ABB"
+msgid "WDS_ST_HEADER_HR_ABB"
msgstr "小時"
-msgid "IDS_TMR_BODY_MIN"
-msgstr "分鐘"
-
-msgid "WDS_TMR_BODY_SECS_ABB"
+msgid "WDS_ST_HEADER_SEC_ABB"
msgstr "秒"
-msgid "IDS_TMR_POP_TIME_IS_UP"
-msgstr "時間已到。"
+msgid "WDS_ST_HEADER_MIN_ABB"
+msgstr "分"
+
+msgid "WDS_TMR_BUTTON_CANCEL_ABB"
+msgstr "取消"
+
+msgid "WDS_TMR_NPBODY_TIMES_UP_ABB"
+msgstr "時間已到"
-msgid "IDS_ALM_SK_DISMISS"
+msgid "WDS_ALM_BODY_DISMISS_ABB"
msgstr "關閉"
+
+msgid "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+msgstr "向右滑動雙指來解除提醒。"
+
diff --git a/src/main.c b/src/main.c
index 72db9f7..357846f 100755
--- a/src/main.c
+++ b/src/main.c
@@ -12,7 +12,7 @@
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.rbutton,show
*/
@@ -27,6 +27,8 @@
#include <app_alarm.h>
#include "timer_string.h"
+#define __SCREEN_READER_ENABLE 1
+
#define MATH_PI (3.141592)
float remain_sec = 0;
@@ -46,6 +48,22 @@ static void _tmr_lbtn_cb_ex(void *data, Evas_Object *obj, const char *emission,
static void _tmr_rbtn_cb_ex(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _tmr_pm_state_set(Eina_Bool isLock);
+//screen reader apis
+#ifdef __SCREEN_READER_ENABLE
+void _screen_reader_hour_description_change(void* data);
+void _screen_reader_min_description_change(void* data);
+void _screen_reader_sec_description_change(void* data);
+static Eina_Bool _screen_reader_reset_button_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info);
+void _screen_reader_objects_create(void* data);
+void _screen_reader_setting_screen_update(void* data);
+void _screen_reader_preset_screen_launch(void* data);
+void _screen_reader_transition_from_runing_to_setting_screen(void* data);
+void _screen_reader_transition_from_setting_to_runing_screen(void* data);
+void _screen_reader_pause_screen_update(void* data);
+void _screen_reader_running_screen_update(void* data);
+static Eina_Bool _screen_reader_pause_button_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info);
+#endif
+
static void _tr_zoomout_del_cb(void *data, Elm_Transit *transit)
{
_TMR_ENTER_;
@@ -66,7 +84,7 @@ static void _tr_zoomin_del_cb(void *data, Elm_Transit *transit)
elm_transit_del(ad->tr);
ad->tr = NULL;
}
- edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.show", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.show", "*");
}
static Eina_Bool __progressbar_hide_cb(void *data)
@@ -77,7 +95,7 @@ static Eina_Bool __progressbar_hide_cb(void *data)
struct appdata *ad = (struct appdata *)data;
- edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.hide", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.hide", "*");
return ECORE_CALLBACK_CANCEL;
}
@@ -95,7 +113,7 @@ static void _tmr_progressbar_transit_hide(void *data)
ad->tr = elm_transit_add();
TMR_INFO("_tmr_progressbar_transit_hide");
- edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.show", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.show", "*");
if (ad->tr != NULL) {
Evas_Object *indicator = elm_object_part_content_get(ad->conform, "elm.swallow.circle");
@@ -171,7 +189,7 @@ static void _tmr_string_to_upper(char *text)
gchar *strLower = (gchar *)text;
gchar *goodUpper = g_utf8_strup(strLower, -1);
- strncpy(text, goodUpper, strlen(goodUpper));
+ strncpy(text, goodUpper, strlen(text));
g_free(goodUpper);
}
@@ -233,25 +251,28 @@ static Eina_Bool _tmr_view_change_to_timeset_cb(void *data)
ad->restart_flag = EINA_FALSE;
_tmr_get_start_time(ad);
- edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.hide", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.hide", "*");
elm_scroller_page_show(ad->scroller, 0, 0);
evas_object_show(ad->hour_spinner);
evas_object_show(ad->min_spinner);
evas_object_show(ad->sec_spinner);
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "timer,cancel", "*");
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,reset", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,reset", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_RESET));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
TMR_INFO("Top button changed to RESET");
_tmr_timepicker_time_update(ad);
- edje_object_signal_emit(_EDJ(ad->progress), "default", "");
+ elm_object_signal_emit(ad->progress, "default", "");
TMR_INFO("progressbar hide");
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_transition_from_runing_to_setting_screen(ad);
+#endif
return ECORE_CALLBACK_CANCEL;
}
@@ -284,7 +305,7 @@ static void _tmr_set_start_time(struct appdata *ad)
Evas_Object *load_edj(Evas_Object * parent, const char *file, const char *group)
{
_TMR_ENTER_;
- Evas_Object *eo;
+ Evas_Object *eo = NULL;
int r;
eo = elm_layout_add(parent);
if (eo) {
@@ -344,6 +365,9 @@ static void _tmr_hour_spinner_change_cb(void *data, Evas_Object * obj, void *eve
TMR_INFO("hour = %d", ad->hour);
_tmr_button_state_update(ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_hour_description_change(ad);
+#endif
}
static void _tmr_min_spinner_change_cb(void *data, Evas_Object * obj, void *event_info)
@@ -361,6 +385,9 @@ static void _tmr_min_spinner_change_cb(void *data, Evas_Object * obj, void *even
TMR_INFO("min = %d", ad->min);
_tmr_button_state_update(ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_min_description_change(ad);
+#endif
}
static void _tmr_sec_spinner_change_cb(void *data, Evas_Object * obj, void *event_info)
@@ -377,6 +404,9 @@ static void _tmr_sec_spinner_change_cb(void *data, Evas_Object * obj, void *even
TMR_INFO("sec = %d", ad->sec);
_tmr_button_state_update(ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_sec_description_change(ad);
+#endif
}
static void _tmr_hour_spinner_focused_cb(void *data, Evas_Object * obj, void *event_info)
@@ -480,7 +510,7 @@ static void _tmr_keypad_activated_cb(void *data, Evas_Object * obj, void *event_
struct appdata *ad = (struct appdata *)data;
TMR_INFO("keypad on");
- edje_object_signal_emit(_EDJ(ad->timepicker), "keypad,on", "");
+ elm_object_signal_emit(ad->timepicker, "keypad,on", "");
}
static void _tmr_keypad_dismissed_cb(void *data, Evas_Object * obj, void *event_info)
@@ -491,7 +521,7 @@ static void _tmr_keypad_dismissed_cb(void *data, Evas_Object * obj, void *event_
struct appdata *ad = (struct appdata *)data;
TMR_INFO("keypad off");
- edje_object_signal_emit(_EDJ(ad->timepicker), "keypad,off", "");
+ elm_object_signal_emit(ad->timepicker, "keypad,off", "");
}
static void _panel_timeset_add(void *data)
@@ -639,11 +669,17 @@ static void _tmr_button_state_update(void *data)
if (ad->hour == 0 && ad->min == 0 && ad->sec == 0) {
elm_object_disabled_set(ad->eo_btn_lft, EINA_TRUE);
TMR_INFO("btn disable");
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,hide", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,hide", "*");
+ //call preset screen
} else {
elm_object_disabled_set(ad->eo_btn_lft, EINA_FALSE);
TMR_INFO("btn enable");
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,show", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,show", "*");
+
+ //call setting screen
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_setting_screen_update(ad);
+#endif
}
}
static void _tmr_timepicker_time_update(void *data)
@@ -678,13 +714,13 @@ static void _tmr_set_time_number(struct appdata *ad, int min, int sec)
_TMR_ENTER_;
double r, g, b, a = 0;
if (min >= 60)
- edje_object_signal_emit(_EDJ(ad->progress), "with,hour", "");
+ elm_object_signal_emit(ad->progress, "with,hour", "");
else
- edje_object_signal_emit(_EDJ(ad->progress), "without,hour", "");
+ elm_object_signal_emit(ad->progress, "without,hour", "");
if (min == 0 && sec < 6) {
- edje_object_signal_emit(_EDJ(ad->progress), "alert", "");
+ elm_object_signal_emit(ad->progress, "alert", "");
//todo:
//edje_color_class_get("AO0181", &r, &g, &b, &a, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
r = 216.75;
@@ -725,19 +761,19 @@ static void _tmr_set_time_number(struct appdata *ad, int min, int sec)
snprintf(buf, sizeof(buf), "%s%s", zero, buf_hour);
else
snprintf(buf, sizeof(buf), "%s", buf_hour);
- edje_object_part_text_set(_EDJ(ad->progress), "hour", buf);
+ elm_object_part_text_set(ad->progress, "hour", buf);
if (min%60 < 10)
snprintf(buf, sizeof(buf), "%s%s", zero, buf_min);
else
snprintf(buf, sizeof(buf), "%s", buf_min);
- edje_object_part_text_set(_EDJ(ad->progress), "min", buf);
+ elm_object_part_text_set(ad->progress, "min", buf);
if (sec < 10)
snprintf(buf, sizeof(buf), "%s%s", zero, buf_sec);
else
snprintf(buf, sizeof(buf), "%s", buf_sec);
- edje_object_part_text_set(_EDJ(ad->progress), "sec", buf);
+ elm_object_part_text_set(ad->progress, "sec", buf);
free(buf_sec);
free(buf_min);
free(buf_hour);
@@ -756,7 +792,6 @@ static void _tmr_panel_time_update(void *data)
if (ad->due_time.tv_sec == ad->current_showing_due_time.tv_sec)
return;
-
struct timeval fake_time;
if (ad->due_time.tv_sec != (3600*ad->hour + 60*ad->min + ad->sec)) {
fake_time.tv_sec = ad->due_time.tv_sec + 1;
@@ -825,13 +860,13 @@ void _tmr_btn_update(struct appdata *ad)
if (ad->cur_state == TMR_STATE_TYPE_START) {
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,cancel", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_CANCEL));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "lbutton,pause", "*");
+ elm_object_signal_emit(ad->ly_main, "lbutton,pause", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_PAUSE));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "lbutton", text);
@@ -839,21 +874,26 @@ void _tmr_btn_update(struct appdata *ad)
if (ad->cur_state == TMR_STATE_TYPE_STOP) {
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,cancel", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_CANCEL));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "lbutton,resume", "*");
+ elm_object_signal_emit(ad->ly_main, "lbutton,resume", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_RESUME));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "lbutton", text);
}
}
+static void _reply_from_alert(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
+{
+ _D("");
+ _tmr_view_change_to_timeset_cb(user_data);
+}
-void _launch_alert()
+void _launch_alert(void* data)
{
_TMR_ENTER_;
app_control_h app_control = NULL;
@@ -861,7 +901,7 @@ void _launch_alert()
display_state_e state;
ret = device_display_get_state(&state);
TMR_INFO("display status state: %d and ret:%d", state, ret);
- if(state == DISPLAY_STATE_SCREEN_OFF || state == DISPLAY_STATE_SCREEN_DIM) {
+ if (state == DISPLAY_STATE_SCREEN_OFF || state == DISPLAY_STATE_SCREEN_DIM) {
ret = device_display_change_state(DISPLAY_STATE_NORMAL);
TMR_INFO("set display status to normal: ret:%d", ret);
}
@@ -870,7 +910,7 @@ void _launch_alert()
app_control_set_operation(app_control, APP_CONTROL_OPERATION_DEFAULT);
app_control_set_app_id(app_control, "org.tizen.timer.alert");
app_control_add_extra_data(app_control, "type", "timer");
- ret = app_control_send_launch_request(app_control, NULL, NULL);
+ ret = app_control_send_launch_request(app_control, _reply_from_alert, data);
if (ret != 0)
TMR_ERR("ret = %d, launch request is failed", ret);
@@ -912,9 +952,7 @@ static Eina_Bool _tmr_timer_cb(void *data)
ad->due_time.tv_sec = -1;
_tmr_panel_time_update(ad);
- _launch_alert();
- ecore_timer_add(1.5, _tmr_view_change_to_timeset_cb, ad);
-
+ _launch_alert(ad);
return ECORE_CALLBACK_CANCEL;
} else {
_tmr_panel_time_update(ad);
@@ -931,7 +969,6 @@ static void _tmr_start_cb(void *data)
return;
struct appdata *ad = (struct appdata *)data;
- int nErr;
time_t trigger_time = ad->due_time.tv_sec;
time_t atime = time(NULL) + trigger_time;
TMR_INFO("atime = %d", atime);
@@ -965,21 +1002,12 @@ static void _tmr_start_cb(void *data)
}
- int alarm_mgr_id;
- char usec_time[32] = { 0 };
-
-
-
if (ad->timer == NULL)
ad->timer = ecore_timer_add(0.1, _tmr_timer_cb, ad);
else
ecore_timer_thaw(ad->timer);
-
-
int msec = (ad->due_time.tv_sec * 1000) + (ad->due_time.tv_usec / 1000);
-
char *value = g_strdup_printf("%d", msec);
-
FREEIF(value);
}
@@ -1002,7 +1030,7 @@ static void _tmr_stop_cb(void *data)
ad->start_systime = ad->current_systime;
TMR_INFO("cancel alarm");
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "lbutton,resume", "*");
+ elm_object_signal_emit(ad->ly_main, "lbutton,resume", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_RESUME));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "lbutton", text);
@@ -1059,7 +1087,10 @@ static void _tmr_reset_cb(void *data)
free(ad->time_string);
ad->time_string = NULL;
}
- edje_object_signal_emit(_EDJ(ad->progress), "default", "");
+ elm_object_signal_emit(ad->progress, "default", "");
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_preset_screen_launch(ad);
+#endif
}
static Eina_Bool _tmr_start_delay_cb(void *data)
@@ -1071,10 +1102,10 @@ static Eina_Bool _tmr_start_delay_cb(void *data)
struct appdata *ad = (struct appdata *)data;
char text[256] = { 0 };
TMR_INFO("_tmr_start_delay_cb enter");
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,started", "");
+ elm_object_signal_emit(ad->ly_main, "timer,started", "");
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,cancel", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_CANCEL));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
@@ -1103,7 +1134,7 @@ static Eina_Bool _tmr_reset_delay_cb(void *data)
struct appdata *ad = (struct appdata *)data;
char text[256] = { 0 };
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,reset", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,reset", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_RESET));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
@@ -1135,6 +1166,7 @@ static void _tmr_rbtn_cb_ex(void *data, Evas_Object *obj, const char *emission,
ad->min = 0;
ad->sec = 0;
_tmr_timepicker_time_update(ad);
+ _screen_reader_preset_screen_launch(ad);
} else {
if ((ad->due_time.tv_sec <= 0)
|| (ad->due_time.tv_sec == 1 && ad->due_time.tv_usec <= 0)) {
@@ -1146,8 +1178,8 @@ static void _tmr_rbtn_cb_ex(void *data, Evas_Object *obj, const char *emission,
TMR_ERR("now timer is reseting");
return;
}
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,cancel", "*");
- edje_object_signal_emit(elm_layout_edje_get(ad->ly_main), "progressbar.hide", "*");
+ elm_object_signal_emit(ad->ly_main, "timer,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.hide", "*");
_tmr_progressbar_transit_hide(ad);
TMR_INFO("progressbar hide");
ad->reset_delaying = EINA_TRUE;
@@ -1155,17 +1187,18 @@ static void _tmr_rbtn_cb_ex(void *data, Evas_Object *obj, const char *emission,
ad->restart_flag = EINA_FALSE;
elm_scroller_page_show(ad->scroller, 0, 0);
ecore_timer_add(0.1, _tmr_reset_delay_cb, ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_transition_from_runing_to_setting_screen(ad);
+#endif
}
}
static void _tmr_startbtn_cb_ex(void *data, Evas_Object * obj, void *event_info)
{
_TMR_ENTER_;
- if (!data)
- return;
-
struct appdata *ad = (struct appdata *)data;
-
+ if (!ad)
+ return;
if (ad->tr)
return;
char text1[256] = { 0 };
@@ -1194,10 +1227,10 @@ static void _tmr_startbtn_cb_ex(void *data, Evas_Object * obj, void *event_info)
eext_circle_object_value_min_max_set(ad->progressbar, 0.0, ad->due_time.tv_sec);
eext_circle_object_value_set(ad->progressbar, (ad->due_time.tv_sec+1));
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,started", "");
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,show", "*");
+ elm_object_signal_emit(ad->ly_main, "timer,started", "");
+ elm_object_signal_emit(ad->ly_main, "rbutton,show", "*");
memset(text1, 0, sizeof(text1));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,cancel", "*");
snprintf(text1, sizeof(text1), S_(STRING_TMR_CANCEL));
_tmr_string_to_upper(text1);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text1);
@@ -1220,15 +1253,18 @@ static void _tmr_startbtn_cb_ex(void *data, Evas_Object * obj, void *event_info)
b = 89.25;
a = 255;
eext_circle_object_item_color_set(ad->progressbar, "bg", r, g, b, a);
- edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.show", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.show", "*");
memset(text2, 0, sizeof(text2));
- edje_object_signal_emit(_EDJ(ad->ly_main), "lbutton,pause", "*");
+ elm_object_signal_emit(ad->ly_main, "lbutton,pause", "*");
snprintf(text2, sizeof(text2), S_(STRING_TMR_PAUSE));
_tmr_string_to_upper(text2);
elm_object_translatable_part_text_set(ad->ly_main, "lbutton", text2);
_tmr_start_delay_cb(ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_transition_from_setting_to_runing_screen(ad);
+#endif
}
}
@@ -1244,7 +1280,7 @@ void _tmr_lbtn_cb_ex(void *data, Evas_Object *obj, const char *emission, const c
TMR_INFO("cur_state = %d", ad->cur_state);
if (ad->cur_state == TMR_STATE_TYPE_STOP) {
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,started", "");
+ elm_object_signal_emit(ad->ly_main, "timer,started", "");
int ret = feedback_play(FEEDBACK_PATTERN_TAP);
if (ret != FEEDBACK_ERROR_NONE)
@@ -1252,17 +1288,20 @@ void _tmr_lbtn_cb_ex(void *data, Evas_Object *obj, const char *emission, const c
memset(text1, 0, sizeof(text1));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,cancel", "*");
snprintf(text1, sizeof(text1), S_(STRING_TMR_CANCEL));
_tmr_string_to_upper(text1);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text1);
memset(text2, 0, sizeof(text2));
- edje_object_signal_emit(_EDJ(ad->ly_main), "lbutton,pause", "*");
+ elm_object_signal_emit(ad->ly_main, "lbutton,pause", "*");
snprintf(text2, sizeof(text2), S_(STRING_TMR_PAUSE));
_tmr_string_to_upper(text2);
elm_object_translatable_part_text_set(ad->ly_main, "lbutton", text2);
_tmr_restart_cb(ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_pause_screen_update(ad);
+#endif
} else if (ad->cur_state == TMR_STATE_TYPE_START) {
int ret = feedback_play(FEEDBACK_PATTERN_TAP);
@@ -1288,9 +1327,12 @@ void _tmr_lbtn_cb_ex(void *data, Evas_Object *obj, const char *emission, const c
TMR_INFO("sec = %d, usec = %d", ad->due_time.tv_sec, ad->due_time.tv_usec);
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,stopped", "");
+ elm_object_signal_emit(ad->ly_main, "timer,stopped", "");
_tmr_stop_cb(ad);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_running_screen_update(ad);
+#endif
}
}
@@ -1480,7 +1522,13 @@ static void _layout_create(appdata_s *ad)
int r, g, b, a = 0;
char text[256] = { 0 };
main_get_resource_path(ad);
+ ad->ly_main = NULL;
ad->ly_main = load_edj(ad->navi_bar, ad->timer_edj_path, GRP_MAIN_GEAR3_NEW);
+ if (ad->ly_main == NULL) {
+ _D("layout creation failed");
+ return;
+ }
+
evas_object_size_hint_weight_set(ad->ly_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
eext_object_event_callback_add(ad->ly_main, EEXT_CALLBACK_BACK, layout_back_cb, ad);
evas_object_event_callback_add(ad->ly_main, EVAS_CALLBACK_RESIZE, _layout_resize_cb, ad);
@@ -1488,6 +1536,8 @@ static void _layout_create(appdata_s *ad)
snprintf(text, sizeof(text), S_(STRING_TMR_TIMER));
elm_object_domain_translatable_part_text_set(ad->ly_main, "elm.text.title", PACKAGE, text);
+
+
ad->progressbar = eext_circle_object_slider_add(ad->ly_main, ad->circle_surface);
evas_object_data_set(ad->progressbar, "cnt", (void*) 0);
evas_object_size_hint_align_set(ad->progressbar, EVAS_HINT_FILL, 0.5);
@@ -1506,8 +1556,8 @@ static void _layout_create(appdata_s *ad)
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
- TMR_INFO("Top button changed to RESET");
- edje_object_signal_callback_add(_EDJ(ad->ly_main), "rbutton,clicked", "edj", _tmr_rbtn_cb_ex, ad);
+
+ elm_object_signal_callback_add(ad->ly_main, "rbutton,clicked", "edj", _tmr_rbtn_cb_ex, ad);
/* Create Bottom Button */
ad->eo_btn_lft = elm_button_add(ad->ly_main);
@@ -1519,27 +1569,21 @@ static void _layout_create(appdata_s *ad)
evas_object_smart_callback_add(ad->eo_btn_lft, "clicked", _tmr_startbtn_cb_ex, ad);
elm_object_part_content_set(ad->ly_main, "elm.swallow.button", ad->eo_btn_lft);
evas_object_show(ad->eo_btn_lft);
-
memset(text, 0, sizeof(text));
snprintf(text, sizeof(text), S_(STRING_TMR_PAUSE));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "lbutton", text);
-
- edje_object_signal_callback_add(_EDJ(ad->ly_main), "lbutton,clicked", "edj", _tmr_lbtn_cb_ex, ad);
-
- ad->ei_naviframe =
- elm_naviframe_item_push(ad->navi_bar, NULL, NULL, NULL, ad->ly_main, NULL);
+ elm_object_signal_callback_add(ad->ly_main, "lbutton,clicked", "edj", _tmr_lbtn_cb_ex, ad);
+ ad->ei_naviframe = elm_naviframe_item_push(ad->navi_bar, NULL, NULL, NULL, ad->ly_main, NULL);
elm_naviframe_item_title_enabled_set(ad->ei_naviframe, EINA_FALSE, EINA_FALSE);
elm_naviframe_item_pop_cb_set(ad->ei_naviframe, _pop_cb, ad);
-
memset(text, 0, sizeof(text));
snprintf(text, sizeof(text), S_(STRING_TMR_TIMER));
elm_object_item_domain_translatable_text_set(ad->ei_naviframe, PACKAGE, text);
evas_object_show(ad->ly_main);
evas_object_show(ad->navi_bar);
-
- edje_object_signal_emit(_EDJ(ad->ly_main), "screen,init", "*");
-
+ elm_object_signal_emit(ad->ly_main, "screen,init", "*");
+ TMR_INFO("return");
}
static void _layout_destroy(appdata_s *ad)
@@ -1563,8 +1607,8 @@ static bool app_create(void *data)
}
char* respath = app_get_resource_path();
char locale_path[256] = {0,};
- snprintf(locale_path,sizeof(locale_path),"%s/locale",respath);
- bindtextdomain(PACKAGE,locale_path);
+ snprintf(locale_path, sizeof(locale_path), "%s/locale", respath);
+ bindtextdomain(PACKAGE, locale_path);
evas_object_show(ad->win);
sound_manager_set_session_type(SOUND_SESSION_TYPE_ALARM);
@@ -1651,6 +1695,8 @@ static void app_resume(void *data)
}
+
+
static void app_control(app_control_h service, void *data)
{
struct appdata *ad = (struct appdata *)data;
@@ -1678,7 +1724,7 @@ static void app_control(app_control_h service, void *data)
ad->hour = ad->min/60;
ad->min = ad->min%60;
_tmr_set_start_time(ad);
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "timer,cancel", "*");
if (ad->cur_state == TMR_STATE_TYPE_STOP || ad->cur_state == TMR_STATE_TYPE_START) {
_tmr_reset_cb(ad);
_tmr_startbtn_cb_ex(ad, NULL, NULL);
@@ -1760,7 +1806,10 @@ static void app_control(app_control_h service, void *data)
elm_object_part_content_set(ad->conform, "elm.swallow.content", ad->navi_bar);
_layout_create(ad);
-
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_objects_create(ad);
+ _screen_reader_preset_screen_launch(ad);
+#endif
ad->cur_state = TMR_STATE_TYPE_RESET;
ad->restart_flag = EINA_FALSE;
@@ -1803,10 +1852,10 @@ static void app_control(app_control_h service, void *data)
return;
}
- edje_object_signal_emit(_EDJ(ad->ly_main), "timer,started", "*");
+ elm_object_signal_emit(ad->ly_main, "timer,started", "*");
memset(text, 0, sizeof(text));
- edje_object_signal_emit(_EDJ(ad->ly_main), "rbutton,cancel", "*");
+ elm_object_signal_emit(ad->ly_main, "rbutton,cancel", "*");
snprintf(text, sizeof(text), S_(STRING_TMR_CANCEL));
_tmr_string_to_upper(text);
elm_object_translatable_part_text_set(ad->ly_main, "rbutton", text);
@@ -1819,7 +1868,7 @@ static void app_control(app_control_h service, void *data)
eext_circle_object_value_min_max_set(ad->progressbar, 0.0, start_sec);
eext_circle_object_value_set(ad->progressbar, (ad->due_time.tv_sec+1));
- edje_object_signal_emit(_EDJ(ad->ly_main), "progressbar.show", "*");
+ elm_object_signal_emit(ad->ly_main, "progressbar.show", "*");
TMR_INFO("progressbar show");
_tmr_start_cb(ad);
}
@@ -1893,3 +1942,333 @@ int main(int argc, char *argv[])
return ret;
}
+#ifdef __SCREEN_READER_ENABLE
+static Eina_Bool _screen_reader_reset_button_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ retv_if(!ad, EINA_TRUE);
+ retv_if(!obj, EINA_TRUE);
+ _tmr_rbtn_cb_ex(data, obj, NULL, NULL);
+ return EINA_TRUE;
+}
+
+static Eina_Bool _screen_reader_pause_button_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ retv_if(!ad, EINA_TRUE);
+ retv_if(!obj, EINA_TRUE);
+ _tmr_lbtn_cb_ex(data, obj, NULL, NULL);
+ return EINA_TRUE;
+}
+
+static Eina_Bool _screen_reader_start_button_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ retv_if(!ad, EINA_TRUE);
+ retv_if(!obj, EINA_TRUE);
+ _tmr_startbtn_cb_ex(data, obj, NULL);
+ return EINA_TRUE;
+}
+
+char* _get_time_text(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ retv_if(!ad, NULL);
+ char buf[256] = {0,};
+ int min = ad->due_time.tv_sec / 60;
+ int sec = ad->due_time.tv_sec % 60;
+ int hour = min/60;
+ min = min % 60;
+ if (hour)
+ snprintf(buf, sizeof(buf), "%d %s, %d %s, %d %s", hour, S_(STRING_TTS_TMR_HOUR), min, S_(STRING_TTS_TMR_MINUTE), sec, S_(STRING_TTS_TMR_SECOND));
+ else if (min)
+ snprintf(buf, sizeof(buf), "%d %s, %d %s", min, S_(STRING_TTS_TMR_MINUTE), sec, S_(STRING_TTS_TMR_SECOND));
+ else
+ snprintf(buf, sizeof(buf), "%d %s", sec, S_(STRING_TTS_TMR_SECOND));
+
+ return strdup(buf);
+}
+
+void _screen_reader_objects_create(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = (screenreader_data*) calloc(1, sizeof(screenreader_data));
+ ad->sr_data = sr_data;
+ char buf[256] = { 0, };
+ char tempbuf[256] = { 0, };
+
+ sr_data->time_text = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->progress), "time_text"), ad->ly_main);
+ char* timestr = _get_time_text(ad);
+ _D("Time text:%s", timestr);
+ elm_atspi_accessible_name_set(sr_data->time_text, timestr);
+ elm_atspi_accessible_translation_domain_set(sr_data->time_text, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->time_text, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ //for reset button and cancle_button
+ sr_data->reset_cancel_button = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "rbutton,touch"), ad->ly_main);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_RESET));
+ elm_atspi_accessible_name_set(sr_data->reset_cancel_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->reset_cancel_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->reset_cancel_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->reset_cancel_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+ elm_access_action_cb_set(sr_data->reset_cancel_button, ELM_ACCESS_ACTION_ACTIVATE, _screen_reader_reset_button_cb, ad);
+
+ //for pause and resume buttons
+ sr_data->pause_resume_button = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "lbutton,touch"), ad->ly_main);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_PAUSE));
+ elm_atspi_accessible_name_set(sr_data->pause_resume_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->pause_resume_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->pause_resume_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->pause_resume_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+ elm_access_action_cb_set(sr_data->pause_resume_button, ELM_ACCESS_ACTION_ACTIVATE, _screen_reader_pause_button_cb, ad);
+
+
+ //for title
+ sr_data->timer_title = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "elm.text.title"), ad->ly_main);
+ elm_atspi_accessible_name_set(sr_data->timer_title, S_(STRING_TMR_TIMER));
+ elm_atspi_accessible_translation_domain_set(sr_data->timer_title, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->timer_title, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ //for hour spinner
+ sr_data->hour_spinner = elm_object_part_content_get(ad->hour_spinner, "elm.swallow.text_button");
+ snprintf(tempbuf, sizeof(tempbuf), "%d %s", ad->hour, S_(STRING_TTS_TMR_HOUR));
+ elm_atspi_accessible_name_set(sr_data->hour_spinner, tempbuf);
+ snprintf(buf, sizeof(buf), S_(STRING_TTS_TMR_ROTATE_BEZEL), tempbuf);
+ elm_atspi_accessible_description_set(sr_data->hour_spinner, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->hour_spinner, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->hour_spinner, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ //for min spinner
+ sr_data->min_spinner = elm_object_part_content_get(ad->min_spinner, "elm.swallow.text_button");
+ snprintf(tempbuf, sizeof(tempbuf), "%d %s", ad->min, S_(STRING_TTS_TMR_MINUTE));
+ elm_atspi_accessible_name_set(sr_data->min_spinner, tempbuf);
+ snprintf(buf, sizeof(buf), S_(STRING_TTS_TMR_ROTATE_BEZEL), tempbuf);
+ elm_atspi_accessible_description_set(sr_data->min_spinner, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->min_spinner, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->min_spinner, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ //for sec spinner
+ sr_data->sec_spinner = elm_object_part_content_get(ad->sec_spinner, "elm.swallow.text_button");
+ snprintf(tempbuf, sizeof(tempbuf), "%d %s", ad->sec, S_(STRING_TTS_TMR_SECOND));
+ elm_atspi_accessible_name_set(sr_data->sec_spinner, tempbuf);
+ snprintf(buf, sizeof(buf), S_(STRING_TTS_TMR_ROTATE_BEZEL), tempbuf);
+ elm_atspi_accessible_description_set(sr_data->sec_spinner, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->sec_spinner, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->sec_spinner, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ //start buttton ad->eo_btn_lft
+ sr_data->start_button = elm_access_object_register(ad->eo_btn_lft, ad->ly_main);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_START));
+ elm_atspi_accessible_name_set(sr_data->start_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->start_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->start_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->start_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+ elm_access_action_cb_set(sr_data->start_button, ELM_ACCESS_ACTION_ACTIVATE, _screen_reader_start_button_cb, ad);
+
+
+ elm_atspi_accessible_relationship_append(sr_data->reset_cancel_button, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->timer_title);
+ elm_atspi_accessible_relationship_append(sr_data->hour_spinner, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->reset_cancel_button);
+ elm_atspi_accessible_relationship_append(sr_data->min_spinner, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->hour_spinner);
+ elm_atspi_accessible_relationship_append(sr_data->sec_spinner, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->min_spinner);
+ elm_atspi_accessible_relationship_append(sr_data->start_button, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->sec_spinner);
+ elm_atspi_accessible_relationship_append(sr_data->time_text, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->start_button);
+
+ elm_atspi_accessible_relationship_append(sr_data->pause_resume_button, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->time_text);
+ //elm_atspi_accessible_relationship_append(sr_data->time_text, ELM_ATSPI_RELATION_FLOWS_FROM, sr_data->cancel_button);
+
+ elm_atspi_accessible_relationship_append(sr_data->timer_title, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->reset_cancel_button);
+ elm_atspi_accessible_relationship_append(sr_data->reset_cancel_button, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->hour_spinner);
+ elm_atspi_accessible_relationship_append(sr_data->hour_spinner, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->min_spinner);
+ elm_atspi_accessible_relationship_append(sr_data->min_spinner, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->sec_spinner);
+ elm_atspi_accessible_relationship_append(sr_data->sec_spinner, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->start_button);
+ elm_atspi_accessible_relationship_append(sr_data->start_button, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->time_text);
+
+ //elm_atspi_accessible_relationship_append(sr_data->cancel_button, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->time_text);
+ elm_atspi_accessible_relationship_append(sr_data->time_text, ELM_ATSPI_RELATION_FLOWS_TO, sr_data->pause_resume_button);
+ elm_atspi_accessible_relationship_append(sr_data->time_text, ELM_ATSPI_RELATION_FLOWS_TO, NULL);
+
+}
+
+
+void _screen_reader_setting_screen_update(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ //title is hidden here
+ elm_atspi_accessible_can_highlight_set(sr_data->timer_title, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->reset_cancel_button, EINA_TRUE);
+}
+
+void _screen_reader_preset_screen_launch(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+
+ //when this screen is luanched grab
+ elm_atspi_accessible_can_highlight_set(sr_data->timer_title, EINA_TRUE);
+ elm_atspi_accessible_can_highlight_set(sr_data->reset_cancel_button, EINA_FALSE);
+ //elm_atspi_accessible_can_highlight_set(sr_data->cancel_button, EINA_FALSE);
+ elm_atspi_component_highlight_grab(sr_data->timer_title);
+}
+
+void _screen_reader_hour_description_change(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ char buf[256] = { 0, };
+ snprintf(buf, sizeof(buf), "%d %s", ad->hour, S_(STRING_TTS_TMR_HOUR));
+ elm_atspi_accessible_name_set(sr_data->hour_spinner, buf);
+ snprintf(buf, sizeof(buf), "%s %s", S_(STRING_TTS_TMR_ROTATE_BEZEL), S_(STRING_TTS_TMR_HOUR));
+ elm_atspi_accessible_description_set(sr_data->hour_spinner, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->hour_spinner, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->hour_spinner, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+}
+
+void _screen_reader_min_description_change(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ char buf[256] = { 0, };
+ snprintf(buf, sizeof(buf), "%d %s", ad->min, S_(STRING_TTS_TMR_MINUTE));
+ elm_atspi_accessible_name_set(sr_data->min_spinner, buf);
+ snprintf(buf, sizeof(buf), "%s %s", S_(STRING_TTS_TMR_ROTATE_BEZEL), S_(STRING_TTS_TMR_MINUTE));
+ elm_atspi_accessible_description_set(sr_data->min_spinner, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->min_spinner, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->min_spinner, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+}
+
+void _screen_reader_sec_description_change(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ char buf[256] = { 0, };
+ snprintf(buf, sizeof(buf), "%d %s", ad->sec, S_(STRING_TTS_TMR_SECOND));
+ elm_atspi_accessible_name_set(sr_data->sec_spinner, buf);
+ snprintf(buf, sizeof(buf), "%s %s", S_(STRING_TTS_TMR_ROTATE_BEZEL), S_(STRING_TTS_TMR_SECOND));
+ elm_atspi_accessible_description_set(sr_data->sec_spinner, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->sec_spinner, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->sec_spinner, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+}
+
+
+
+
+void _screen_reader_running_screen_update(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ char buf[256] = {0,};
+ //change lable for pause_resume_button to pause
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_PAUSE));
+ elm_atspi_accessible_name_set(sr_data->pause_resume_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->pause_resume_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->pause_resume_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->pause_resume_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+}
+
+void _screen_reader_pause_screen_update(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ char buf[256] = {0,};
+ //change lable for pause_resume_button to pause
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_RESUME));
+ elm_atspi_accessible_name_set(sr_data->pause_resume_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->pause_resume_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->pause_resume_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->pause_resume_button, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
+}
+
+void _screen_reader_transition_from_setting_to_runing_screen(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ char buf[256] = {0,};
+
+ elm_atspi_accessible_can_highlight_set(sr_data->timer_title, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->hour_spinner, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->min_spinner, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->sec_spinner, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->start_button, EINA_FALSE);
+
+ elm_atspi_accessible_can_highlight_set(sr_data->time_text, EINA_TRUE);
+ elm_atspi_accessible_can_highlight_set(sr_data->pause_resume_button, EINA_TRUE);
+ //elm_atspi_component_highlight_grab(sr_data->cancel_button);
+ elm_atspi_accessible_can_highlight_set(sr_data->reset_cancel_button, EINA_TRUE);
+ elm_atspi_component_highlight_grab(sr_data->reset_cancel_button);
+
+ //change lable for reset button to cancel
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_CANCEL));
+ elm_atspi_accessible_name_set(sr_data->reset_cancel_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->reset_cancel_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->reset_cancel_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->reset_cancel_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ //change lable for pause_resume_button to pause
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_PAUSE));
+ elm_atspi_accessible_name_set(sr_data->pause_resume_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->pause_resume_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->pause_resume_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->pause_resume_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+}
+
+void _screen_reader_transition_from_runing_to_setting_screen(void* data)
+{
+ _D("");
+ struct appdata *ad = (struct appdata *)data;
+ char buf[256] = {0,};
+ ret_if(!ad);
+ screenreader_data* sr_data = ad->sr_data;
+ elm_atspi_accessible_can_highlight_set(sr_data->timer_title, EINA_FALSE);
+ //elm_atspi_accessible_can_highlight_set(sr_data->cancel_button, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->time_text, EINA_FALSE);
+ elm_atspi_accessible_can_highlight_set(sr_data->pause_resume_button, EINA_FALSE);
+
+ elm_atspi_accessible_can_highlight_set(sr_data->hour_spinner, EINA_TRUE);
+ elm_atspi_accessible_can_highlight_set(sr_data->min_spinner, EINA_TRUE);
+ elm_atspi_accessible_can_highlight_set(sr_data->sec_spinner, EINA_TRUE);
+ elm_atspi_accessible_can_highlight_set(sr_data->start_button, EINA_TRUE);
+ elm_atspi_accessible_can_highlight_set(sr_data->reset_cancel_button, EINA_TRUE);
+ elm_atspi_component_highlight_grab(sr_data->reset_cancel_button);
+
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_RESET));
+ elm_atspi_accessible_name_set(sr_data->reset_cancel_button, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_BUTTON));
+ elm_atspi_accessible_description_set(sr_data->reset_cancel_button, buf);
+ elm_atspi_accessible_translation_domain_set(sr_data->reset_cancel_button, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(sr_data->reset_cancel_button, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+}
+#endif
diff --git a/timer_alert/inc/log.h b/timer_alert/inc/log.h
index df46ffc..32b7dd6 100755
--- a/timer_alert/inc/log.h
+++ b/timer_alert/inc/log.h
@@ -44,38 +44,38 @@
#if !defined(_D)
#define _D(fmt, arg...) dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg)
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg)
#endif
#if !defined(_W)
#define _W(fmt, arg...) (dlog_print(DLOG_WARN, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(_E)
-#define _E(fmt,arg...) (dlog_print(DLOG_ERROR, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+#define _E(fmt, arg...) (dlog_print(DLOG_ERROR, \
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(TMR_INFO)
#define TMR_INFO(fmt, arg...) (dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(TMR_SINFO)
#define TMR_SINFO(fmt, arg...) (dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(TMR_ERR)
-#define TMR_ERR(fmt,arg...) (dlog_print(DLOG_ERROR, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg))
+#define TMR_ERR(fmt, arg...) (dlog_print(DLOG_ERROR, \
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_RED fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg))
#endif
#if !defined(_TMR_ENTER_)
@@ -86,13 +86,13 @@
#define DBG(fmt , args...) \
do { \
dlog_print(DLOG_DEBUG, \
- LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
- __func__, __LINE__, ##arg)\
+ LOG_TAG, "%s: %s(%d) > " WCOLOR_GREEN fmt WCOLOR_END, MODULE_INFO, \
+ __func__, __LINE__, ##arg)\
} while (0)
#endif
#define retvm_if(expr, val, fmt, arg...) do { \
- if(expr) { \
+ if (expr) { \
_E(fmt, ##arg); \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return val; \
@@ -100,14 +100,14 @@
} while (0)
#define retv_if(expr, val) do { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return (val); \
} \
} while (0)
#define retm_if(expr, fmt, arg...) do { \
- if(expr) { \
+ if (expr) { \
_E(fmt, ##arg); \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return; \
@@ -115,28 +115,28 @@
} while (0)
#define ret_if(expr) do { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> %s() return", #expr, __FUNCTION__); \
return; \
} \
} while (0)
#define goto_if(expr, val) do { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> goto", #expr); \
goto val; \
} \
} while (0)
#define break_if(expr) { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> break", #expr); \
break; \
} \
}
#define continue_if(expr) { \
- if(expr) { \
+ if (expr) { \
_E("(%s) -> continue", #expr); \
continue; \
} \
diff --git a/timer_alert/inc/ring.h b/timer_alert/inc/ring.h
index 84689e6..ff259a0 100755
--- a/timer_alert/inc/ring.h
+++ b/timer_alert/inc/ring.h
@@ -34,4 +34,6 @@
#define GRP_MAIN "main"
#define BUF_LEN 1024
+void _screen_reader_objects_create(void* data);
+
#endif /* __ring_H__ */
diff --git a/timer_alert/inc/timer_alert_string.h b/timer_alert/inc/timer_alert_string.h
index a9486b2..a08debd 100644
--- a/timer_alert/inc/timer_alert_string.h
+++ b/timer_alert/inc/timer_alert_string.h
@@ -17,9 +17,11 @@
#if !defined(TIMER_ALERT_STRING_H_)
#define TIMER_ALERT_STRING_H_
-#define STRING_TIMER_TIME_IS_UP "IDS_TMR_POP_TIME_IS_UP"
-#define STRING_TMR_DISMISS "IDS_ALM_SK_DISMISS"
-
-
-
+#define STRING_TIMER_TIME_IS_UP "WDS_TMR_NPBODY_TIMES_UP_ABB"
+#define STRING_TMR_DISMISS "WDS_ALM_BODY_DISMISS_ABB"
+#define STRING_TTS_TMR_SWIPE_RIGHT_TO_DISMISS "WDS_FMD_TBBODY_SWIPE_RIGHT_WITH_TWO_FINGERS_TO_DISMISS_ALERT"
+#define STRING_TTS_TIME_LAPSED "lapse time is "
+#define STRING_TTS_TIME_HOUR "Hour"
+#define STRING_TTS_TIME_MINUTE "Minutes"
+#define STRING_TTS_TIME_SECOND "Seconds"
#endif /* TIMER_ALERT_STRING_H_ */
diff --git a/timer_alert/res/edje/ring.edc b/timer_alert/res/edje/ring.edc
index 558d384..8632ab6 100755
--- a/timer_alert/res/edje/ring.edc
+++ b/timer_alert/res/edje/ring.edc
@@ -156,7 +156,7 @@ group {
part { name: "time";
type: TEXT;
scale: 1;
- mouse_events: 0;
+ mouse_events: 1;
clip_to: "clipper";
description {
state: "default" 0.0;
@@ -177,7 +177,7 @@ group {
part { name: "text";
type: TEXT;
scale: 1;
- mouse_events: 0;
+ mouse_events: 1;
clip_to: "clipper";
description {
state: "default" 0.0;
diff --git a/timer_alert/src/ring.c b/timer_alert/src/ring.c
index 9c3a471..6233428 100755
--- a/timer_alert/src/ring.c
+++ b/timer_alert/src/ring.c
@@ -23,7 +23,7 @@
#include "timer_alert_string.h"
#include "log.h"
#include <feedback.h>
-
+#define __SCREEN_READER_ENABLE 1
#define KEY_POWER "XF86PowerOff"
#define KEY_BACK "XF86Back"
@@ -32,6 +32,8 @@ typedef struct appdata {
Evas_Object* layout;
Evas_Object* conform;
Evas_Object* nf;
+ Evas_Object* ly_main;
+ Evas_Object* elapse_time;
} appdata_s;
Ecore_Timer *timer = NULL;
@@ -86,8 +88,8 @@ static Eina_Bool _key_pressed(void *data, Evas_Object *obj, Evas_Object *src, Ev
_TMR_ENTER_;
_D("_key_pressed");
Evas_Event_Key_Down *ev = event_info;
- _D("type:%d, key: %s ,powerkey:%s",type, ev->key, KEY_POWER);
- if (type == EVAS_CALLBACK_KEY_DOWN && ( strncmp(KEY_POWER, ev->key, strlen(KEY_POWER)) == 0 || strncmp(KEY_BACK, ev->key, strlen(KEY_BACK)) == 0) ) {
+ _D("type:%d, key: %s ,powerkey:%s", type, ev->key, KEY_POWER);
+ if (type == EVAS_CALLBACK_KEY_DOWN && (strncmp(KEY_POWER, ev->key, strlen(KEY_POWER)) == 0 || strncmp(KEY_BACK, ev->key, strlen(KEY_BACK)) == 0)) {
_D("KEY PRESSED: %s", ev->key);
close_alert_app();
@@ -122,8 +124,6 @@ create_base_gui(appdata_s *ad)
elm_conformant is mandatory for base gui to have proper size
when indicator or virtual keypad is visible. */
ad->conform = elm_conformant_add(ad->win);
- elm_win_indicator_mode_set(ad->win, ELM_WIN_INDICATOR_SHOW);
- elm_win_indicator_opacity_set(ad->win, ELM_WIN_INDICATOR_OPAQUE);
evas_object_size_hint_weight_set(ad->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(ad->win, ad->conform);
elm_object_event_callback_add(ad->win, _key_pressed, NULL);
@@ -170,7 +170,6 @@ Evas_Object *view_create_layout(Evas_Object *parent, const char *file_path, cons
}
_D("view_create_layout 0");
layout = elm_layout_add(parent);
- //elm_layout_theme_set(layout, "layout", "nocontents", "default");
_D("view_create_layout file_path:%s, group_name:%s", file_path, group_name);
int ret = elm_layout_file_set(layout, file_path, group_name);
_D("view_create_layout ret : %d", ret);
@@ -222,7 +221,7 @@ Elm_Object_Item* view_push_item_to_naviframe(Evas_Object *nf, Evas_Object *item,
static Eina_Bool _update_ring_view_by_timer_cb(void *data)
{
- //_TMR_ENTER_;
+
if (!data) {
_E("canceled timer");
return ECORE_CALLBACK_CANCEL;
@@ -235,39 +234,37 @@ static Eina_Bool _update_ring_view_by_timer_cb(void *data)
snprintf(buf, sizeof(buf), "-%02d:%02d", delay_count/60, delay_count%60);
elm_object_part_text_set(ly_main, "time", buf);
- int ret = feedback_play(FEEDBACK_PATTERN_TAP);
+ int ret = feedback_play(FEEDBACK_PATTERN_TIMER);
_D("feedback play ret:%d", ret);
return ECORE_CALLBACK_RENEW;
}
-void ring_view_add_by_timer(Evas_Object *parent)
+void ring_view_add_by_timer(void *data)
{
_TMR_ENTER_;
+ appdata_s *ad = (appdata_s *)data;
+ ret_if(!ad);
_D("ring_view_add_by_timer >>");
Evas_Object *ly_main = NULL;
char file_path[BUF_LEN] = {0, };
- if (parent == NULL) {
- _E("failed to get parent.");
- return;
- }
-
/*
* Create a layout that shows when the alarm sounds.
*/
data_get_resource_path("edje/ring.edj", file_path, sizeof(file_path));
_E("file_path:%s", file_path);
- ly_main = view_create_layout(parent, file_path, "timer", NULL, NULL);
+ ly_main = view_create_layout(ad->nf, file_path, "timer", NULL, NULL);
if (ly_main == NULL) {
_E("failed to create a layout.");
return;
}
+ ad->ly_main = ly_main;
char text[256] = { 0 };
snprintf(text, sizeof(text), S_(STRING_TMR_DISMISS));
elm_object_signal_emit(ly_main, "reset_ani", "*");
elm_object_translatable_part_text_set(ly_main, "dismiss_text", text);
- elm_object_signal_callback_add(ly_main, "dismiss", "*", _ring_main_dismiss_timer_cb, parent);
+ elm_object_signal_callback_add(ly_main, "dismiss", "*", _ring_main_dismiss_timer_cb, ad->nf);
if (timer == NULL) {
_update_ring_view_by_timer_cb(ly_main);
@@ -279,7 +276,7 @@ void ring_view_add_by_timer(Evas_Object *parent)
evas_object_show(ly_main);
ring_create_player();
- view_push_item_to_naviframe(parent, ly_main, NULL, NULL);
+ view_push_item_to_naviframe(ad->nf, ly_main, NULL, NULL);
}
@@ -295,13 +292,16 @@ app_create(void *data)
int ret = 0;
char* respath = app_get_resource_path();
char locale_path[256] = {0,};
- snprintf(locale_path,sizeof(locale_path),"%s/locale",respath);
- bindtextdomain(PACKAGE,locale_path);
+ snprintf(locale_path, sizeof(locale_path), "%s/locale", respath);
+ bindtextdomain(PACKAGE, locale_path);
create_base_gui(ad);
_ring_pm_state_set(EINA_TRUE);
- ring_view_add_by_timer(ad->nf);
+ ring_view_add_by_timer(ad);
ret = feedback_initialize();
_D("Feeback init: %d", ret);
+#ifdef __SCREEN_READER_ENABLE
+ _screen_reader_objects_create(ad);
+#endif
return true;
}
@@ -309,13 +309,10 @@ static void
app_control(app_control_h app_control, void *data)
{
_TMR_ENTER_;
- /* Handle the launch request. */
- appdata_s *ad = data;
-
- //_D("app_control >>");
-
-
-
+ app_control_h reply;
+ app_control_create(&reply);
+ app_control_reply_to_launch_request(reply, app_control, APP_CONTROL_RESULT_SUCCEEDED);
+ app_control_destroy(reply);
}
static void
@@ -421,3 +418,77 @@ main(int argc, char *argv[])
return ret;
}
+
+#ifdef __SCREEN_READER_ENABLE
+
+static Eina_Bool _screen_reader_dismiss_button_scroll(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info)
+{
+ _D("");
+ appdata_s *ad = (appdata_s *)data;
+ retv_if(!ad, EINA_TRUE);
+ retv_if(!obj, EINA_TRUE);
+ _ring_main_dismiss_timer_cb(data, obj, NULL, NULL);
+ return EINA_TRUE;
+}
+static Eina_Bool _screen_reader_elpase_time_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info)
+{
+ _D("");
+ appdata_s *ad = (appdata_s *)data;
+ retv_if(!ad, EINA_TRUE);
+ retv_if(!obj, EINA_TRUE);
+ char buf[256] = {0,};
+ snprintf(buf, sizeof(buf), "%d %s, %d %s", delay_count/60, S_(STRING_TTS_TIME_MINUTE), delay_count%60, S_(STRING_TTS_TIME_SECOND));
+ elm_atspi_accessible_name_set(ad->elapse_time, buf);
+ elm_atspi_accessible_translation_domain_set(ad->elapse_time, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(ad->elapse_time, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+ return EINA_TRUE;
+}
+
+void _screen_reader_objects_create(void* data)
+{
+ _D("");
+ appdata_s *ad = (appdata_s*)data;
+ ret_if(!ad);
+ Evas_Object* icon;
+ Evas_Object* elapse_time;
+ Evas_Object* timeupstr;
+ char buf[256] = { 0, };
+
+ //create icon
+ //icon = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "dismiss_bg"), ad->ly_main);
+ icon = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "drag_item_dismiss"), ad->ly_main);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_DISMISS));
+ elm_atspi_accessible_name_set(icon, buf);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_SWIPE_RIGHT_TO_DISMISS));
+ elm_atspi_accessible_description_set(icon, buf);
+ elm_atspi_accessible_translation_domain_set(icon, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(icon, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+ elm_access_action_cb_set(icon, ELM_ACCESS_ACTION_SCROLL, _screen_reader_dismiss_button_scroll, ad);
+
+ //create time text
+ elapse_time = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "time"), ad->ly_main);
+ ad->elapse_time = elapse_time;
+ //tempbuf = elm_object_part_text_get(ad->ly_main, "time");
+ snprintf(buf, sizeof(buf), "%d %s, %d %s", delay_count/60, S_(STRING_TTS_TIME_MINUTE), delay_count%60, S_(STRING_TTS_TIME_SECOND));
+ elm_atspi_accessible_name_set(elapse_time, buf);
+ elm_atspi_accessible_translation_domain_set(elapse_time, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(elapse_time, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+ elm_access_action_cb_set(elapse_time, ELM_ACCESS_ACTION_ACTIVATE, _screen_reader_elpase_time_cb, ad);
+
+ //create timeup
+ timeupstr = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "text"), ad->ly_main);
+ snprintf(buf, sizeof(buf), "%s", S_(STRING_TIMER_TIME_IS_UP));
+ elm_atspi_accessible_name_set(timeupstr, buf);
+ elm_atspi_accessible_translation_domain_set(timeupstr, PACKAGE);
+ elm_atspi_accessible_reading_info_type_set(timeupstr, (ELM_ACCESSIBLE_READING_INFO_TYPE_NAME | ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION));
+
+ elm_atspi_accessible_relationship_append(elapse_time, ELM_ATSPI_RELATION_FLOWS_FROM, icon);
+ elm_atspi_accessible_relationship_append(timeupstr, ELM_ATSPI_RELATION_FLOWS_FROM, elapse_time);
+
+ elm_atspi_accessible_relationship_append(icon, ELM_ATSPI_RELATION_FLOWS_TO, elapse_time);
+ elm_atspi_accessible_relationship_append(elapse_time, ELM_ATSPI_RELATION_FLOWS_TO, timeupstr);
+
+ elm_atspi_accessible_can_highlight_set(icon, EINA_TRUE);
+ elm_atspi_component_highlight_grab(icon);
+}
+#endif