forked from len0rd/rockbox
Rename 'Playlist Catalogue' to 'Playlists'
When the Playlist Catalogue first appeared in the main menu in 2011 (FS#11808), the 'Playlists' menu item was renamed to 'Playlist Catalogue' which seems more verbose than is necessary these days. Since we don't have a 'Playlist Catalogue' menu item in the onplay menu anymore, either, LANG_CATALOG can be eliminated. Change-Id: I7f38b0847e9b982506371f4a4b473d1fb2551ad0
This commit is contained in:
parent
272ce05396
commit
87344d180b
39 changed files with 45 additions and 47 deletions
|
@ -417,7 +417,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -416,7 +416,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -419,7 +419,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -8621,7 +8621,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -8802,7 +8802,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -423,7 +423,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -9702,7 +9702,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -432,7 +432,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -410,7 +410,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -488,7 +488,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
@ -5937,16 +5937,16 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_CATALOG
|
id: LANG_CATALOG
|
||||||
desc: in main menu and onplay menu
|
desc: deprecated
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlist Catalogue"
|
*: ""
|
||||||
</source>
|
</source>
|
||||||
<dest>
|
<dest>
|
||||||
*: "Playlist Catalogue"
|
*: ""
|
||||||
</dest>
|
</dest>
|
||||||
<voice>
|
<voice>
|
||||||
*: "Playlist Catalogue"
|
*: ""
|
||||||
</voice>
|
</voice>
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
|
|
|
@ -9020,7 +9020,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -9620,7 +9620,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -443,7 +443,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -11429,7 +11429,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -423,7 +423,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -417,7 +417,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -414,7 +414,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -419,7 +419,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -427,7 +427,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -417,7 +417,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -411,7 +411,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -8910,7 +8910,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -9931,7 +9931,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -420,7 +420,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -418,7 +418,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -11517,7 +11517,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -9402,7 +9402,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -8938,7 +8938,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -412,7 +412,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -10793,7 +10793,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -412,7 +412,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -425,7 +425,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -388,7 +388,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -417,7 +417,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -9596,7 +9596,7 @@
|
||||||
</phrase>
|
</phrase>
|
||||||
<phrase>
|
<phrase>
|
||||||
id: LANG_PLAYLISTS
|
id: LANG_PLAYLISTS
|
||||||
desc: in the file view setting
|
desc: in the main menu and Playlist settings menu
|
||||||
user: core
|
user: core
|
||||||
<source>
|
<source>
|
||||||
*: "Playlists"
|
*: "Playlists"
|
||||||
|
|
|
@ -160,8 +160,8 @@ static int display_playlists(char* playlist, enum catbrowse_status_flags status)
|
||||||
struct browse_context browse = {
|
struct browse_context browse = {
|
||||||
.dirfilter = SHOW_M3U,
|
.dirfilter = SHOW_M3U,
|
||||||
.flags = BROWSE_SELECTONLY | (view ? 0 : BROWSE_NO_CONTEXT_MENU),
|
.flags = BROWSE_SELECTONLY | (view ? 0 : BROWSE_NO_CONTEXT_MENU),
|
||||||
.title = str(LANG_CATALOG),
|
.title = str(LANG_PLAYLISTS),
|
||||||
.icon = Icon_NOICON,
|
.icon = Icon_Playlist,
|
||||||
.root = selected_playlist,
|
.root = selected_playlist,
|
||||||
.selected = &most_recent_playlist[playlist_dir_length + 1],
|
.selected = &most_recent_playlist[playlist_dir_length + 1],
|
||||||
.buf = selected_playlist,
|
.buf = selected_playlist,
|
||||||
|
|
|
@ -503,9 +503,6 @@ MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER,
|
||||||
MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS,
|
MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS,
|
||||||
NULL, Icon_Plugin);
|
NULL, Icon_Plugin);
|
||||||
|
|
||||||
MENUITEM_RETURNVALUE(playlist_browser, ID2P(LANG_CATALOG), GO_TO_PLAYLIST_VIEWER,
|
|
||||||
NULL, Icon_Playlist);
|
|
||||||
|
|
||||||
static char *get_wps_item_name(int selected_item, void * data,
|
static char *get_wps_item_name(int selected_item, void * data,
|
||||||
char *buffer, size_t buffer_len)
|
char *buffer, size_t buffer_len)
|
||||||
{
|
{
|
||||||
|
@ -529,7 +526,7 @@ MENUITEM_RETURNVALUE(menu_, ID2P(LANG_SETTINGS), GO_TO_MAINMENU,
|
||||||
MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
|
MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
|
||||||
GO_TO_RECENTBMARKS, item_callback,
|
GO_TO_RECENTBMARKS, item_callback,
|
||||||
Icon_Bookmark);
|
Icon_Bookmark);
|
||||||
MENUITEM_RETURNVALUE(playlists, ID2P(LANG_CATALOG), GO_TO_PLAYLISTS_SCREEN,
|
MENUITEM_RETURNVALUE(playlists, ID2P(LANG_PLAYLISTS), GO_TO_PLAYLISTS_SCREEN,
|
||||||
NULL, Icon_Playlist);
|
NULL, Icon_Playlist);
|
||||||
MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
|
MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
|
||||||
NULL, Icon_System_menu);
|
NULL, Icon_System_menu);
|
||||||
|
|
|
@ -1893,7 +1893,7 @@ const struct settings_list settings[] = {
|
||||||
#ifdef HAVE_TAGCACHE
|
#ifdef HAVE_TAGCACHE
|
||||||
ID2P(LANG_TAGCACHE),
|
ID2P(LANG_TAGCACHE),
|
||||||
#endif
|
#endif
|
||||||
ID2P(LANG_CATALOG)),
|
ID2P(LANG_PLAYLISTS)),
|
||||||
|
|
||||||
#ifdef HAVE_BACKLIGHT
|
#ifdef HAVE_BACKLIGHT
|
||||||
CHOICE_SETTING(0, backlight_on_button_hold,
|
CHOICE_SETTING(0, backlight_on_button_hold,
|
||||||
|
|
|
@ -745,7 +745,8 @@ static int dirbrowse(void)
|
||||||
|
|
||||||
if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0)
|
if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0)
|
||||||
{
|
{
|
||||||
splash(HZ*2, ID2P(LANG_NO_FILES));
|
splash(HZ*2, *tc.dirfilter == SHOW_M3U ?
|
||||||
|
ID2P(LANG_CATALOG_NO_PLAYLISTS) : ID2P(LANG_NO_FILES));
|
||||||
return exit_to_new_screen(GO_TO_PREVIOUS); /* No files found for rockbox_browse() */
|
return exit_to_new_screen(GO_TO_PREVIOUS); /* No files found for rockbox_browse() */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue