diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c index c2f2422aea..c7fe59547a 100644 --- a/apps/alarm_menu.c +++ b/apps/alarm_menu.c @@ -74,7 +74,8 @@ int alarm_screen(void) talk_value(mins_togo % 60, UNIT_MIN, true); talk_force_enqueue_next(); } - splashf(HZ*2, ID2P(LANG_ALARM_MOD_TIME_TO_GO), + /* (voiced above) */ + splashf(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO), mins_togo / 60, mins_togo % 60); } else { splash(HZ, ID2P(LANG_ALARM_MOD_ERROR)); diff --git a/apps/playlist.c b/apps/playlist.c index aafc56db11..166c340287 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -684,7 +684,7 @@ static void display_playlist_count(int count, const unsigned char *fmt, } } - splashf(0, fmt, count, str(LANG_OFF_ABORT)); + splashf(0, P2STR(fmt), count, str(LANG_OFF_ABORT)); /* (voiced above) */ } /* diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index ace01f541a..a7096ca213 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c @@ -264,8 +264,8 @@ static void display_insert_count(int count) talk_number(count, false); talk_id(LANG_PLAYLIST_INSERT_COUNT, true); } - - splashf(0, ID2P(LANG_PLAYLIST_INSERT_COUNT), count, str(LANG_OFF_ABORT)); + /* (voiced above) */ + splashf(0, str(LANG_PLAYLIST_INSERT_COUNT), count, str(LANG_OFF_ABORT)); } /* Add specified track into playlist. Callback from directory insert */ diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c index 4bc75374ac..1c09f7ff39 100644 --- a/apps/plugins/mikmod/mikmod.c +++ b/apps/plugins/mikmod/mikmod.c @@ -711,7 +711,8 @@ static void mm_errorhandler(void) rb->talk_value_decimal(MikMod_errno, UNIT_INT, 0, true); rb->talk_force_enqueue_next(); } - rb->splashf(HZ, ID2P(LANG_ERROR_FORMATSTR), MikMod_strerror(MikMod_errno)); + /* (voiced above) */ + rb->splashf(HZ, rb->str(LANG_ERROR_FORMATSTR), MikMod_strerror(MikMod_errno)); quit = true; } diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c index 7b7aeb5ed4..14111c37c6 100644 --- a/apps/plugins/vbrfix.c +++ b/apps/plugins/vbrfix.c @@ -130,7 +130,7 @@ static void fileerror(int rc) rb->talk_force_enqueue_next(); } - rb->splashf(HZ*2, ID2P(LANG_FILE_ERROR), rc); + rb->splashf(HZ*2, rb->str(LANG_FILE_ERROR), rc); /* (voiced above) */ } static const unsigned char empty_id3_header[] = diff --git a/apps/root_menu.c b/apps/root_menu.c index 4c4b9bf13f..37adda7468 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -257,8 +257,8 @@ static int browser(void* param) } else { - splashf(0, ID2P(LANG_BUILDING_DATABASE), - stat->processed_entries); + splashf(0, str(LANG_BUILDING_DATABASE), + stat->processed_entries); /* (voiced above) */ } } } diff --git a/apps/tagtree.c b/apps/tagtree.c index 049d0c6455..1317122eed 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c @@ -2404,8 +2404,8 @@ static bool insert_all_playlist(struct tree_context *c, n, slots_remaining); talk_id(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY, true); - splashf(HZ * 2, ID2P(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY), - slots_remaining); + splashf(HZ * 2, str(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY), + slots_remaining); /* voiced above */ } }