fix date and time issue, N_SE-44123

54 files changed, 314 insertions, 4 deletions

diff --git a/include/util.h b/include/util.h
index 11d2b67..0f66c7e 100755
--- a/include/util.h
+++ b/include/util.h
@@ -113,6 +113,8 @@ enum {
 	IDS_COM_BODY_NO_SIM_CARD_IN_DEVICE,
 	IDS_STU_BODY_HOW_TO_INSERT_SIM_CARD_HELP_MSG,
 	IDS_ST_BUTTON_TRY_AGAIN_ABB,
+	IDS_ST_BODY_DATE_AND_TIME,
+	IDS_ST_BODY_SET_DATE_AND_TIME,
 	IDS_PWLOCK_APP_STRING_MAX,
 };
 
diff --git a/po/ar.po b/po/ar.po
index 3aa4906..8fc5f34 100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "التاريخ و الوقت"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "ضبط التاريخ والوقت"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "أدخل PIN ثانية"
 
diff --git a/po/az.po b/po/az.po
index 534f1e1..4c01887 100755
--- a/po/az.po
+++ b/po/az.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Tarix və vaxt"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Tarixi və vaxtı təyin et"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Yeni PINi təsdiq et"
 
diff --git a/po/bg.po b/po/bg.po
index d5d83aa..1567491 100755
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Дата и час"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Настройка на дата и час"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Потвърждаване на новия PIN"
 
diff --git a/po/ca.po b/po/ca.po
index 8b4e69c..f314018 100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Hora i data"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Definir data i hora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirmar nou PIN"
 
diff --git a/po/cs.po b/po/cs.po
index 732d144..c593e46 100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum a čas"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Nastavit datum a čas"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Potvrdit nový PIN"
 
diff --git a/po/da.po b/po/da.po
index 5446202..96e0953 100755
--- a/po/da.po
+++ b/po/da.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dato og tid"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Angiv dato og tid"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Bekræft ny PIN-kode"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index a0d5ac1..fab8115 100755
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum und Uhrzeit"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Datum und Uhrzeit festlegen"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Neue PIN bestätigen"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 56261a9..7d6b899 100755
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Ημερομηνία & ώρα"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Ρύθμιση ώρας και ημερομηνίας"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Επιβεβαίωση νέου ΡΙΝ"
 
diff --git a/po/en.po b/po/en.po
index ec89262..528b2dd 100755
--- a/po/en.po
+++ b/po/en.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Date and time"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Set date and time"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirm new PIN"
 
diff --git a/po/en_PH.po b/po/en_PH.po
index 62eea10..4b9e58a 100755
--- a/po/en_PH.po
+++ b/po/en_PH.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Date and time"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Set date and time"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirm new PIN"
 
diff --git a/po/en_US.po b/po/en_US.po
index caada1a..8c3bca6 100755
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Date and time"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Set date and time"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirm new PIN"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 394173b..a29d855 100755
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Fecha y hora"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Definir fecha y hora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirme el nuevo código PIN"
 
diff --git a/po/es_MX.po b/po/es_MX.po
index 7567566..12590c9 100755
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Fecha y hora"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Definir fecha y hora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirmar nuevo PIN"
 
diff --git a/po/et.po b/po/et.po
index d423faf..4b75320 100755
--- a/po/et.po
+++ b/po/et.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Kuupäev ja kellaaeg"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Määra kuupäev ja kellaaeg"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Kinnita uus PIN"
 
diff --git a/po/eu.po b/po/eu.po
index dccb288..6882d4e 100755
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data eta ordua"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Ezarri eguna eta ordua"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "PIN berria baieztatu"
 
diff --git a/po/fi.po b/po/fi.po
index 62ce5c1..bdaf2b3 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Päivämäärä ja aika"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Määritä päivämäärä ja kellonaika"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Vahvista uusi PIN-koodi"
 
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 0e30453..6fec167 100755
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Date et heure"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Définir la date et l'heure"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirmer nouveau NIP"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 486f624..b3c904e 100755
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Date et heure"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Définir la date et l'heure"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirmer le nouveau code PIN"
 
diff --git a/po/ga.po b/po/ga.po
index 7c1b728..4af4d99 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dáta agus am"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Socraigh dáta agus am"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Deimhnigh PIN nua"
 
diff --git a/po/gl.po b/po/gl.po
index 38961b6..6b8df0e 100755
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data e hora"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Definir data e hora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirme novo PIN"
 
diff --git a/po/hi.po b/po/hi.po
index d504d60..a2e2e9f 100755
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "तिथि और समय"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "तारीख और समय सेट करें"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "नए PIN की पुष्टि करें"
 
diff --git a/po/hr.po b/po/hr.po
index e4d7944..50dd9b7 100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum i vrijeme"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Podešavanje datuma i vremena"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Potvrdite novi PIN"
 
diff --git a/po/hu.po b/po/hu.po
index c3ff7a5..1440ee4 100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dátum és idő"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Dátum és idő beállítása"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Írja be újra az új PIN-kódot!"
 
diff --git a/po/hy.po b/po/hy.po
index ab5b540..aaba26c 100755
--- a/po/hy.po
+++ b/po/hy.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Անսաթիվ և ժամանակ"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Նախադրել ամսաթիվ և ժամ"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Հաստատեք նոր PIN-ը"
 
diff --git a/po/is.po b/po/is.po
index 383b356..5410f48 100755
--- a/po/is.po
+++ b/po/is.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dagsetning og tími"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Stilla dagsetningu og klukku"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Staðfesta nýtt PIN"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 2b809fd..fb03941 100755
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data e ora"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Imposta data e ora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Conferma nuovo PIN"
 
diff --git a/po/ja_JP.po b/po/ja_JP.po
index 532c3f7..21a68e5 100755
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "日付と時刻"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "日付と時刻の設定"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "新しいPINを確認します。"
 
diff --git a/po/ka.po b/po/ka.po
index 7a9fd01..71b7155 100755
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "თარიღი და დრო"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "თარიღისა და დროის დაყენება"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "დაადასტურეთ ახალი PIN"
 
diff --git a/po/kk.po b/po/kk.po
index e6078fd..e06202a 100755
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Күні және уақыты"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Күні мен уақытын қою"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Жаңа PIN растау"
 
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 7208d0e..a7e4b72 100755
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "날짜 및 시간"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "날짜 및 시간을 설정하세요"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "새 PIN 확인"
 
diff --git a/po/lt.po b/po/lt.po
index 7ec87a4..98681c8 100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data ir laikas"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Nustatyti datą ir laiką"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Patvirtinti naują PIN kodą"
 
diff --git a/po/lv.po b/po/lv.po
index 7b0eb59..7cb113f 100755
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datums un laiks"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Iestatīt datumu un laiku"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Apstiprināt jauno PIN kodu"
 
diff --git a/po/mk.po b/po/mk.po
index f2b7731..2fbcad2 100755
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Датум и време"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Постави датум и време"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Потврдете го новиот PIN"
 
diff --git a/po/nb.po b/po/nb.po
index 925fa6b..731a064 100755
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dato og tid"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Angi dato og tid"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Bekreft ny PIN"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 7c5c439..13808a8 100755
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum en tijd"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Datum en tijd instellen"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Nieuwe PIN bevestigen"
 
diff --git a/po/pl.po b/po/pl.po
index b52b45b..d09e11b 100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data i godzina"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Ustaw datę i godzinę"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Potwierdź nowy PIN"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 292b181..efacf94 100755
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data e Hora"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Definir data e hora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirme o novo PIN"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 987ed14..47d2cc2 100755
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Data e hora"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Definir data e hora"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirmar novo PIN"
 
diff --git a/po/ro.po b/po/ro.po
index 6819bae..e8760e0 100755
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dată şi oră"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Setare dată şi oră"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Confirmare PIN nou"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 7a777ea..7981063 100755
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Дата и время"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Задать дату и время"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Подтвердите новый PIN"
 
diff --git a/po/sk.po b/po/sk.po
index 6b15739..1984189 100755
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Dátum a čas"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Nastaviť dátum a čas"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Potvrdiť nový PIN"
 
diff --git a/po/sl.po b/po/sl.po
index f90bb7e..c8700c7 100755
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum in čas"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Nastavi datum in čas"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Potrdite novi PIN"
 
diff --git a/po/sr.po b/po/sr.po
index 29b54fb..581ce21 100755
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum i vreme"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Podesi datum i vreme"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Potvrdi novi PIN kod"
 
diff --git a/po/sv.po b/po/sv.po
index cb26285..c9605cc 100755
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Datum och tid"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Ange datum och tid"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Bekräfta ny PIN-kod"
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 121dbd3..e3872e0 100755
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Tarih ve saat"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Tarih ve saati ayarla"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Yeni PIN kodunu onaylayın"
 
diff --git a/po/uk.po b/po/uk.po
index d19a6d7..734eb9f 100755
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Дата і час"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Встановити дату й час"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Підтвердити новий PIN"
 
diff --git a/po/uz.po b/po/uz.po
index a9703a1..74bd592 100755
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "Sana va vaqt"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "Sana va vaqtni o‘rnatish"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "Yangi PIN-kodni tasdiqlash"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ecbb7eb..caec009 100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "日期和时间"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "设置日期和时间"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "确认新 PIN"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5ed9308..06ed9e2 100755
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "日期和時間"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "設定日期和時間"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "確認新 PIN 碼"
 
diff --git a/po/zh_SG.po b/po/zh_SG.po
index 24975c5..28e9aab 100755
--- a/po/zh_SG.po
+++ b/po/zh_SG.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "日期和时间"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "设置日期和时间"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "确认新PIN"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 06cfcfa..5b5fab5 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,3 +1,9 @@
+msgid "IDS_ST_BODY_DATE_AND_TIME"
+msgstr "日期與時間"
+
+msgid "IDS_ST_BODY_SET_DATE_AND_TIME"
+msgstr "設定日期與時間"
+
 msgid "IDS_IDLE_BODY_CONFIRM_NEW_PIN"
 msgstr "確認新的 PIN"
 
diff --git a/src/ui.c b/src/ui.c
index 2ccffcd..ea2872a 100755
--- a/src/ui.c
+++ b/src/ui.c
@@ -1330,13 +1330,13 @@ int show_greeting(struct appdata *ad) {
 	elm_object_text_set(button, pwlock_get_lang_title());
 	evas_object_smart_callback_add(button, "clicked", _menu_greeting_button_lang_cb, ad);
 
-	elm_object_part_text_set(contents, "text.dt", "Set date and time");
+	elm_object_part_text_set(contents, "text.dt", pwlock_get_string(IDS_ST_BODY_SET_DATE_AND_TIME));
 
 	dt_btn = elm_button_add(navi);
 	//elm_object_style_set(dt_btn, "pwlock/lang_btn");
 	elm_object_part_content_set(contents, "button.select.dt", dt_btn);
 
-	elm_object_text_set(dt_btn, "Date and time");
+	elm_object_text_set(dt_btn, pwlock_get_string(IDS_ST_BODY_DATE_AND_TIME));
 	evas_object_smart_callback_add(dt_btn, "clicked", _menu_greeting_button_dt_cb, ad);
 
 	toolbar = _create_toolbar_btn(navi);
diff --git a/src/util.c b/src/util.c
index 1c374d9..6624b14 100755
--- a/src/util.c
+++ b/src/util.c
@@ -88,8 +88,10 @@ const char *app_str_table[] = {
 	"IDS_STU_BODY_DEVICE_IS_SET_UP_AND_READY_TO_USE",
 	"IDS_STU_POP_SETUP_COMPLETE",
 	"IDS_COM_BODY_NO_SIM_CARD_IN_DEVICE",
-	"IDS_STU_BODY_HOW_TO_INSERT_SIM_CARD_HELP_MSG",
-	"IDS_ST_BUTTON_TRY_AGAIN_ABB"
+	"IDS_STU_BODY_HOW_TO_INSERT_SIM_CARD_HELP_MSG",	
+	"IDS_ST_BUTTON_TRY_AGAIN_ABB",
+	"IDS_ST_BODY_DATE_AND_TIME",
+	"IDS_ST_BODY_SET_DATE_AND_TIME"
 };
 
 static void _log(char *msg)