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
2025-10-13 18:17:39 -04:00 · 2025-03-08 00:26:11 +01:00 · 2025-03-08 00:26:11 +01:00 · 87344d180b
commit 87344d180b
parent 272ce05396
39 changed files with 45 additions and 47 deletions
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@ -417,7 +417,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@ -416,7 +416,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@ -419,7 +419,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@ -8621,7 +8621,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@ -8802,7 +8802,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@ -423,7 +423,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@ -9702,7 +9702,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@ -432,7 +432,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@ -410,7 +410,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@ -488,7 +488,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
@ -5937,16 +5937,16 @@
 </phrase>
 <phrase>
  id: LANG_CATALOG
-  desc: in main menu and onplay menu
+  desc: deprecated
  user: core
  <source>
-    *: "Playlist Catalogue"
+    *: ""
  </source>
  <dest>
-    *: "Playlist Catalogue"
+    *: ""
  </dest>
  <voice>
-    *: "Playlist Catalogue"
+    *: ""
  </voice>
 </phrase>
 <phrase>
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@ -9020,7 +9020,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@ -9620,7 +9620,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@ -443,7 +443,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@ -11429,7 +11429,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@ -423,7 +423,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@ -417,7 +417,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@ -414,7 +414,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@ -419,7 +419,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@ -427,7 +427,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@ -417,7 +417,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@ -411,7 +411,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@ -8910,7 +8910,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@ -9931,7 +9931,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@ -420,7 +420,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@ -418,7 +418,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@ -11517,7 +11517,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@ -9402,7 +9402,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@ -8938,7 +8938,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@ -412,7 +412,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@ -10793,7 +10793,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@ -412,7 +412,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@ -425,7 +425,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@ -388,7 +388,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@ -417,7 +417,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@ -9596,7 +9596,7 @@
 </phrase>
 <phrase>
  id: LANG_PLAYLISTS
-  desc: in the file view setting
+  desc: in the main menu and Playlist settings menu
  user: core
  <source>
    *: "Playlists"
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@ -160,8 +160,8 @@ static int display_playlists(char* playlist, enum catbrowse_status_flags status)
    struct browse_context browse = {
        .dirfilter = SHOW_M3U,
        .flags = BROWSE_SELECTONLY | (view ? 0 : BROWSE_NO_CONTEXT_MENU),
-        .title = str(LANG_CATALOG),
-        .icon = Icon_NOICON,
+        .title = str(LANG_PLAYLISTS),
+        .icon = Icon_Playlist,
        .root = selected_playlist,
        .selected = &most_recent_playlist[playlist_dir_length + 1],
        .buf = selected_playlist,
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@ -503,9 +503,6 @@ MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER,
 MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS,
                        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,
                               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),
                        GO_TO_RECENTBMARKS,  item_callback,
                        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);
 MENUITEM_RETURNVALUE(system_menu_, ID2P(LANG_SYSTEM), GO_TO_SYSTEM_SCREEN,
                     NULL, Icon_System_menu);
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@ -1893,7 +1893,7 @@ const struct settings_list settings[] = {
 #ifdef HAVE_TAGCACHE
                      ID2P(LANG_TAGCACHE),
 #endif
-                      ID2P(LANG_CATALOG)),
+                      ID2P(LANG_PLAYLISTS)),

 #ifdef HAVE_BACKLIGHT
    CHOICE_SETTING(0, backlight_on_button_hold,
--- a/apps/tree.c
+++ b/apps/tree.c
@ -745,7 +745,8 @@ static int dirbrowse(void)

    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() */
    }