From b3113674819cd8daf44750d129c5d8298e830df0 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sun, 5 Aug 2007 19:19:39 +0000 Subject: *** Lang v2 cleanup (FS#6574) *** 1) Introduces apps/features.txt that controls which strings are included for each target based on defines. 2) .lng and .voice files are now target specific and the format versions of both these file types have been bumped, which means that new voice files are needed. 3) Use the 'features' mechanism to exclude strings for targets that didn't use them. 4) Delete unused and deprecated and duplicated strings, sort strings in english.lang Some string IDs were changed so translations will be slightly worse than before. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14198 a1c6a512-1295-4272-9138-f99709370657 --- apps/recorder/radio.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'apps/recorder/radio.c') diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 24996bb92b..fb178ace47 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -496,7 +496,7 @@ int radio_screen(void) #ifdef HAS_BUTTONBAR gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), - str(LANG_FM_BUTTONBAR_PRESETS), str(LANG_FM_BUTTONBAR_RECORD)); + str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD)); #endif #ifndef HAVE_NOISY_IDLE_MODE @@ -680,7 +680,7 @@ int radio_screen(void) } #ifdef HAS_BUTTONBAR gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), - str(LANG_FM_BUTTONBAR_PRESETS), + str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD)); #endif update_screen = true; @@ -713,7 +713,7 @@ int radio_screen(void) #ifdef HAS_BUTTONBAR gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU), - str(LANG_FM_BUTTONBAR_PRESETS), + str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD)); #endif update_screen = true; @@ -858,8 +858,8 @@ int radio_screen(void) FOR_NB_SCREENS(i) screens[i].puts_scroll(0, top_of_screen + 2, buf); - snprintf(buf, 128, "%s %s", str(LANG_FM_TUNE_MODE), - radio_mode ? str(LANG_RADIO_PRESET_MODE) : + snprintf(buf, 128, "%s %s", str(LANG_MODE), + radio_mode ? str(LANG_PRESET) : str(LANG_RADIO_SCAN_MODE)); FOR_NB_SCREENS(i) screens[i].puts_scroll(0, top_of_screen + 3, buf); @@ -1223,7 +1223,7 @@ int radio_preset_callback(int action, const struct menu_item_ex *this_item) return action; (void)this_item; } -MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_FM_BUTTONBAR_PRESETS), +MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_PRESET), radio_preset_callback, Icon_NOICON, &radio_edit_preset_item, &radio_delete_preset_item); /* present a list of preset stations */ @@ -1255,7 +1255,7 @@ static int handle_radio_presets(void) gui_buttonbar_draw(&buttonbar); #endif gui_synclist_init(&lists, presets_get_name, NULL, false, 1); - gui_synclist_set_title(&lists, str(LANG_FM_BUTTONBAR_PRESETS), NOICON); + gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON); gui_synclist_set_icon_callback(&lists, NULL); gui_synclist_set_nb_items(&lists, num_presets); gui_synclist_select_item(&lists, curr_preset<0 ? 0 : curr_preset); @@ -1318,8 +1318,8 @@ char* get_mode_text(int selected_item, void * data, char *buffer) { (void)selected_item; (void)data; - snprintf(buffer, MAX_PATH, "%s %s", str(LANG_FM_TUNE_MODE), - radio_mode ? str(LANG_RADIO_PRESET_MODE) : + snprintf(buffer, MAX_PATH, "%s %s", str(LANG_MODE), + radio_mode ? str(LANG_PRESET) : str(LANG_RADIO_SCAN_MODE)); return buffer; } @@ -1455,7 +1455,7 @@ static int fm_recording_settings(void) #endif /* HAVE_RECORDING */ #ifdef FM_RECORDING_SCREEN -MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING_MENU), +MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), fm_recording_screen, NULL, NULL, Icon_Recording); #endif #ifdef FM_RECORDING_SETTINGS @@ -1463,7 +1463,7 @@ MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), fm_recording_settings, NULL, NULL, Icon_Recording); #endif #ifndef FM_PRESET -MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_FM_BUTTONBAR_PRESETS), +MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), handle_radio_presets, NULL, NULL, Icon_NOICON); #endif #ifndef FM_PRESET_ADD -- cgit v1.2.3