diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang index 79ec0625a9..ed5e579ea5 100644 --- a/apps/lang/arabic.lang +++ b/apps/lang/arabic.lang @@ -2534,20 +2534,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang index 32298fda24..3e3811b165 100644 --- a/apps/lang/basque.lang +++ b/apps/lang/basque.lang @@ -9410,20 +9410,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Uneko denbora" *: none - rtc: "Uneko denbora:" + rtc: "Uneko denbora" diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang index 4b251b9cc8..1d228d43d2 100644 --- a/apps/lang/bulgarian.lang +++ b/apps/lang/bulgarian.lang @@ -8689,16 +8689,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Часът е" *: none diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index 86b0c1408b..7c478e1891 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang @@ -9404,20 +9404,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Hora actual" *: none - rtc: "Hora actual:" + rtc: "Hora actual" diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index f305430d44..e4213c4178 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang @@ -3747,16 +3747,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "现在时间" *: none diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 2965e0901a..7822f25c3c 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang @@ -3835,20 +3835,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang index 6d8a58d7a0..5c28c23000 100644 --- a/apps/lang/czech.lang +++ b/apps/lang/czech.lang @@ -9427,20 +9427,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Aktuální čas" *: none - rtc: "Aktuální čas:" + rtc: "Aktuální čas" diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index 7daa131241..7798d47660 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang @@ -3533,16 +3533,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Klokken er" *: none diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index bf8e22f966..6bc58bb4bc 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang @@ -8670,16 +8670,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Uhrzeit" *: none diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang index 794343ecce..84442366a9 100644 --- a/apps/lang/eesti.lang +++ b/apps/lang/eesti.lang @@ -3984,17 +3984,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core - *: "" + *: none + rtc: "Current Time" - *: "" + *: none + rtc: "Kellaaeg" - *: "Kellaaeg:" + *: none + rtc: "Kellaaeg" diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang index 85d63e965d..55945e91a1 100644 --- a/apps/lang/english-us.lang +++ b/apps/lang/english-us.lang @@ -8616,16 +8616,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none diff --git a/apps/lang/english.lang b/apps/lang/english.lang index aed61d58e5..08a6a54e3b 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -8785,16 +8785,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index 3750219c8c..8284a02d2a 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang @@ -2321,16 +2321,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Hora actual" *: none diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang index fd6311ee67..529e671577 100644 --- a/apps/lang/esperanto.lang +++ b/apps/lang/esperanto.lang @@ -4109,17 +4109,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core - *: "" + *: none + rtc: "Current Time" - *: "" + *: none + rtc: "Nuna Tempo" - *: "Nuna Tempo:" + *: none + rtc: "Nuna Tempo" diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index c2ca288949..f2ca185d9a 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang @@ -4185,20 +4185,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Nykyinen aika" *: none - rtc: "Nykyinen aika:" + rtc: "Nykyinen aika" diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index d45916dad8..abfb2a6a37 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang @@ -8770,16 +8770,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Temps actuel" *: none diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang index 22f68a2321..06d139e59b 100644 --- a/apps/lang/galego.lang +++ b/apps/lang/galego.lang @@ -2778,20 +2778,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Hora actual" *: none - rtc: "Hora actual:" + rtc: "Hora actual" diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index 191d202c14..09629339b3 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang @@ -9322,20 +9322,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Τρέχουσα ώρα" *: none - rtc: "Τρέχουσα ώρα:" + rtc: "Τρέχουσα ώρα" diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index 1b68720dcd..900bedc060 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang @@ -9443,20 +9443,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "זמן נוכחי" *: none - rtc: "זמן נוכחי:" + rtc: "זמן נוכחי" diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang index 92e170ea64..e829186e3a 100644 --- a/apps/lang/hrvatski.lang +++ b/apps/lang/hrvatski.lang @@ -9407,20 +9407,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Trenutno vrijeme" *: none - rtc: "Trenutno vrijeme:" + rtc: "Trenutno vrijeme" diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang index 39def533c8..09456e3d18 100644 --- a/apps/lang/islenska.lang +++ b/apps/lang/islenska.lang @@ -3094,20 +3094,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index 291beb283a..4db3112bdd 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang @@ -8606,16 +8606,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "ora attuale" *: none diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index c4505a68b3..38bbe01097 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang @@ -8693,16 +8693,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "現在時刻" *: none diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index 503e1f1ee6..01cc66728a 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang @@ -8633,16 +8633,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "현재 시간" *: none diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang index 099199d8a8..a001fc2317 100644 --- a/apps/lang/latviesu.lang +++ b/apps/lang/latviesu.lang @@ -8619,16 +8619,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Tekošais laiks" *: none diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang index 29702d487b..590c26ed73 100644 --- a/apps/lang/lietuviu.lang +++ b/apps/lang/lietuviu.lang @@ -9485,20 +9485,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Dabartinis laikas" *: none - rtc: "Dabartinis laikas:" + rtc: "Dabartinis laikas" diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index 1d0eaadc14..9a54ffa51d 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang @@ -8921,20 +8921,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/moldoveneste.lang b/apps/lang/moldoveneste.lang index 1e0d64599c..cdb68fe877 100644 --- a/apps/lang/moldoveneste.lang +++ b/apps/lang/moldoveneste.lang @@ -8013,16 +8013,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Timp curent" *: none diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index 373bd3fb05..5c9fbc4e2f 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang @@ -3882,20 +3882,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "huidige tijd" *: none - rtc: "huidige tijd:" + rtc: "huidige tijd" diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang index 5bbee471ab..11f1a9a9db 100644 --- a/apps/lang/norsk-nynorsk.lang +++ b/apps/lang/norsk-nynorsk.lang @@ -4150,12 +4150,12 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none @@ -4163,6 +4163,7 @@ *: none + rtc: "" diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 0a33aa1003..97aab2549d 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang @@ -3521,20 +3521,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Gjeldende tid" *: none - rtc: "Gjeldende tid:" + rtc: "Gjeldende tid" diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index 2b07ed56b8..86a62e3f81 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang @@ -8612,16 +8612,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Aktualna godzina" *: none diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index f4d0e1d221..de54932db6 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang @@ -8688,16 +8688,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Tempo atual" *: none diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index f6ef08abd5..e8055b9acd 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang @@ -10479,20 +10479,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Tempo actual" *: none - rtc: "Tempo actual:" + rtc: "Tempo actual" diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index 7280218c89..9de770aa65 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang @@ -8013,16 +8013,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Timp curent" *: none diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index 7e14c4ba5e..0ec8899ee4 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang @@ -3493,16 +3493,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Текущее время" *: none diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang index a95cdb67fa..079efc0494 100644 --- a/apps/lang/slovak.lang +++ b/apps/lang/slovak.lang @@ -8604,16 +8604,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Aktuálny čas" *: none diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang index 7d13456719..a978a8f507 100644 --- a/apps/lang/slovenscina.lang +++ b/apps/lang/slovenscina.lang @@ -10282,20 +10282,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index a030641b13..b1c99f57c3 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang @@ -8775,16 +8775,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Тренутно време" *: none diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index 02093cfff9..2234f76f66 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang @@ -8694,16 +8694,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Klockan är" *: none diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index 9ce6359ad0..2f93d5d16a 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang @@ -9444,20 +9444,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index 8b6ac990d2..add5e74786 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang @@ -9389,20 +9389,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "Current time:" + rtc: "Current time" diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang index a2b1d3b13b..6a86871cdb 100644 --- a/apps/lang/turkce.lang +++ b/apps/lang/turkce.lang @@ -4631,16 +4631,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Geçerli Zaman" *: none diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang index 26e97209f4..656deba462 100644 --- a/apps/lang/ukrainian.lang +++ b/apps/lang/ukrainian.lang @@ -8686,16 +8686,16 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "Поточний час" *: none diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang index f54e171dbf..4d84c6a1a7 100644 --- a/apps/lang/vlaams.lang +++ b/apps/lang/vlaams.lang @@ -4179,20 +4179,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "huidigen tijd" *: none - rtc: "huidigen tijd:" + rtc: "huidigen tijd" diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang index 8d05b80c49..4df7ebb5a1 100644 --- a/apps/lang/wallisertitsch.lang +++ b/apps/lang/wallisertitsch.lang @@ -2439,17 +2439,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core - *: "" + *: none + rtc: "Current Time" - *: "" + *: none + rtc: "" - *: "" + *: none + rtc: "" diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang index 7318d88de0..c5b8fc07aa 100644 --- a/apps/lang/walon.lang +++ b/apps/lang/walon.lang @@ -9426,20 +9426,20 @@ - id: VOICE_CURRENT_TIME - desc: spoken only, for wall clock announce + id: LANG_CURRENT_TIME + desc: for wall clock announce user: core *: none - rtc: "" + rtc: "Current Time" *: none - rtc: "" + rtc: "eure do moumint" *: none - rtc: "eure do moumint:" + rtc: "eure do moumint" diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 4a0b8f2eb5..052f989a0a 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -240,7 +240,7 @@ static int info_speak_item(int selected_item, void * data) #if CONFIG_RTC case INFO_TIME: - talk_id(VOICE_CURRENT_TIME, false); + talk_id(LANG_CURRENT_TIME, false); /* fallthrough */ case INFO_DATE: tm = get_time(); diff --git a/apps/misc.c b/apps/misc.c index a404a46e94..5ba907dc65 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -1575,7 +1575,7 @@ void talk_timedate(void) struct tm *tm = get_time(); if (!global_settings.talk_menu) return; - talk_id(VOICE_CURRENT_TIME, false); + talk_id(LANG_CURRENT_TIME, false); if (valid_time(tm)) { talk_time(tm, true); diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 74ca7b97cd..652243f934 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c @@ -208,11 +208,6 @@ static bool verify_shortcut(struct shortcut* sc) case SHORTCUT_SETTING: return sc->setting != NULL; case SHORTCUT_TIME: -#if CONFIG_RTC - if (sc->u.timedata.talktime) - return sc->name[0] != '\0'; -#endif - return sc->name[0] != '\0' || sc->u.timedata.sleep_timeout < 0; case SHORTCUT_DEBUGITEM: case SHORTCUT_SEPARATOR: case SHORTCUT_SHUTDOWN: @@ -504,7 +499,24 @@ static const char * shortcut_menu_get_name(int selected_item, void * data, ) /* String representation for toggling sleep timer */ return string_sleeptimer(buffer, buffer_len); - return sc->name; + if (sc->name[0]) + return sc->name; + +#if CONFIG_RTC + if (sc->u.timedata.talktime) + return P2STR(ID2P(LANG_CURRENT_TIME)); + else +#endif + { + format_sleeptimer(sc->name, sizeof(sc->name), + sc->u.timedata.sleep_timeout, NULL); + snprintf(buffer, buffer_len, "%s (%s)", + P2STR(ID2P(LANG_SLEEP_TIMER)), + sc->name[0] ? sc->name : P2STR(ID2P(LANG_OFF))); + sc->name[0] = '\0'; + return buffer; + } + } else if ((sc->type == SHORTCUT_SHUTDOWN || sc->type == SHORTCUT_REBOOT) && sc->name[0] == '\0') diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex index e4c9e99130..08cb289b38 100644 --- a/manual/main_menu/main.tex +++ b/manual/main_menu/main.tex @@ -342,8 +342,7 @@ Available types are: \item[time] \config{data} needs to be \opt{rtc}{either ``talk'' to talk the time, or }``sleep X'' where X can, optionally, be the number of minutes to run the sleep timer for (0 to disable). If ``sleep'' is not followed by a number, the sleep timer can be stopped, if running, - or started using the default duration; \config{name} will be ignored in that case. Otherwise - \config{name} is required for this shortcut type. + or started using the default duration; \config{name} will be ignored in that case. \item[shutdown] \config{data} is ignored; \config{name} can be used to display text \item[reboot] \config{data} is ignored; \config{name} can be used to display text \end{description}