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/onplay.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'apps/onplay.c') diff --git a/apps/onplay.c b/apps/onplay.c index eb03b0781b..1e539e9d85 100644 --- a/apps/onplay.c +++ b/apps/onplay.c @@ -295,7 +295,7 @@ MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), save_playlist, NULL, NULL, Icon_Playlist); MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), shuffle_playlist, NULL, NULL, Icon_Playlist); -MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST_MENU), +MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), NULL, Icon_Playlist, &playlist_viewer_item, &search_playlist_item, &playlist_save_item, &reshuffle_item @@ -373,7 +373,7 @@ MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW), view_playlist, NULL, treeplaylist_callback, Icon_Playlist); -MAKE_ONPLAYMENU( tree_playlist_menu, ID2P(LANG_PLAYLIST_MENU), +MAKE_ONPLAYMENU( tree_playlist_menu, ID2P(LANG_PLAYLIST), treeplaylist_callback, Icon_Playlist, /* view */ @@ -502,7 +502,7 @@ static int remove_dir(char* dirname, int len) #endif if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) { - gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, str(LANG_CANCEL)); result = -1; break; } @@ -1032,6 +1032,7 @@ MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), /* CONTEXT_WPS items */ MENUITEM_FUNCTION(browse_id3_item, 0, ID2P(LANG_MENU_SHOW_ID3_INFO), browse_id3, NULL, NULL, Icon_NOICON); +/* NOTE: the LANG_MENU_SET_RATING string has been removed from english.lang */ #ifdef HAVE_PITCHSCREEN MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), pitch_screen, NULL, NULL, Icon_Audio); -- cgit v1.2.3