Rename “Current Playlist” and “Playlist Catalogue” context menus

Use action-oriented and more descriptive titles

"Add to Playlist..." instead of "Playlist Catalogue"
- "Add to Existing Playlist" instead of "Add to Playlist"
- "Add to New Playlist" (unchanged)

- "Playing Next..." instead of "Current Playlist"

In WPS context menu:

- "Current Playlist" instead of "Playlist"

Change-Id: I5cce9e317676537988682f46ac6b920598af3b9e

9 files changed, 86 insertions, 43 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index d5f6ac3fa7..18842a3207 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -6452,16 +6452,16 @@
 </phrase>
 <phrase>
   id: LANG_CATALOG_ADD_TO
-  desc: in onplay playlist catalogue submenu
+  desc: deprecated
   user: core
   <source>
-    *: "Add to Playlist"
+    *: ""
   </source>
   <dest>
-    *: "Add to Playlist"
+    *: ""
   </dest>
   <voice>
-    *: "Add to Playlist"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -16461,3 +16461,46 @@
     recording: "Recording Directory"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ADD_TO_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Playlist..."
+  </source>
+  <dest>
+    *: "Add to Playlist..."
+  </dest>
+  <voice>
+    *: "Add to Playlist..."
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_EXISTING_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Existing Playlist"
+  </source>
+  <dest>
+    *: "Add to Existing Playlist"
+  </dest>
+  <voice>
+    *: "Add to Existing Playlist"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playing Next..."
+  </source>
+  <dest>
+    *: "Playing Next..."
+  </dest>
+  <voice>
+    *: "Playing Next..."
+  </voice>
+</phrase>
+
diff --git a/apps/onplay.c b/apps/onplay.c
index 842a328ee9..415cc05be8 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -491,7 +491,7 @@ MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST),
                   shuffle_playlist, NULL, Icon_Playlist);
 MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME),
                   playing_time, NULL, Icon_Playlist);
-MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST),
+MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_CURRENT_PLAYLIST),
                  NULL, Icon_Playlist,
                  &wps_view_cur_playlist_item, &search_playlist_item,
                  &playlist_save_item, &reshuffle_item, &playing_time_item
@@ -676,7 +676,7 @@ MENUITEM_FUNCTION_W_PARAM(replace_shuf_pl_item, 0, ID2P(LANG_PLAY_SHUFFLED),
                   add_to_playlist, &addtopl_replace_shuffled,
                   treeplaylist_callback, Icon_Playlist);
 
-MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_CURRENT_PLAYLIST),
+MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_PLAYING_NEXT),
                 treeplaylist_callback, Icon_Playlist,
 
                 /* insert */
@@ -801,11 +801,11 @@ static int cat_playlist_callback(int action,
                                  const struct menu_item_ex *this_item,
                                  struct gui_synclist *this_list);
 
-MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO),
+MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_ADD_TO_EXISTING_PL),
                   cat_add_to_a_playlist, NULL, Icon_Playlist);
 MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW),
                   cat_add_to_a_new_playlist, NULL, Icon_Playlist);
-MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG),
+MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_ADD_TO_PL),
                 cat_playlist_callback, Icon_Playlist,
                 &cat_add_to_list, &cat_add_to_new);
 
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index e9b57285cc..c9b027ea63 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -598,7 +598,7 @@ static enum pv_onplay_result onplay_menu(int index)
     struct playlist_entry * current_track =
         playlist_buffer_get_track(&viewer.buffer, index);
     MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL,
-                        ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG),
+                        ID2P(LANG_PLAYING_NEXT), ID2P(LANG_ADD_TO_PL),
                         ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_MENU_SHOW_ID3_INFO),
                         ID2P(LANG_SHUFFLE),
                         ID2P(LANG_SAVE),
diff --git a/manual/configure_rockbox/playlist_options.tex b/manual/configure_rockbox/playlist_options.tex
index b29842ceed..d881ba5b40 100644
--- a/manual/configure_rockbox/playlist_options.tex
+++ b/manual/configure_rockbox/playlist_options.tex
@@ -33,17 +33,17 @@ related to playlists.
 
   \item[Keep Current Track When Replacing Playlist.]
   If set to \setting{Yes}, then \setting{Play} and \setting{Play Shuffled} in
-  the \setting{Current Playlist submenu} will allow the current track to finish
+  the \setting{Playing Next Submenu} will allow the current track to finish
   playing before the new tracks play. If set to \setting{No}, the current
   track will be interrupted and new tracks will start playing immediately.
 
   \item[Show Shuffled Adding Options.]
   If set to \setting{No}, Rockbox will not offer to add shuffled tracks
-  in the \setting{Current Playlist submenu}.
+  in the \setting{Playing Next Submenu}.
 
   \item[Show Queue Options.]
   If set to \setting{No}, Rockbox will not display the options to queue items in
-  the \setting{Current Playlist submenu}.
+  the \setting{Playing Next Submenu}.
   If set to \setting{In Submenu}, Rockbox will move the options into a
   separate submenu.
 
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 4aded9810b..34868ca759 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -160,7 +160,7 @@ The details of this menu are covered in
   three ways. Playing a file in a directory causes all the files in it
   to be placed in a playlist. Playlists can be created manually by
   either using the  \setting{Context Menu} (see \reference{ref:Contextmenu}) or using
-  the \setting{Playlist} menu. Both automatically and manually created
+  the \setting{Current Playlist} menu. Both automatically and manually created
   playlists can be edited using this menu.
 
 \subsection{\label{ref:playlistcatalogue_contextmenu}The Playlist Catalogue Context Menu}
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 0d249299d5..5b4e80e107 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -3,7 +3,7 @@
 PictureFlow is a visual browser for your albums.  After you've selected something to play,
 PictureFlow will continue running by default, or can optionally show the WPS. Using the
 context menu, albums or songs can be added to the dynamic playlist directly from
-PictureFlow (see \reference{ref:currentplaylist_submenu}).
+PictureFlow (see \reference{ref:playingnext_submenu}).
 
 
 \subsubsection{Sort Options}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index d97d227fe9..8460c12ec9 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -123,11 +123,11 @@ each option pertains both to files and directories):
 \begin{description}
 \item [View.]
   Displays the contents of the selected playlist file.
-\item [Current Playlist.]
-  Enters the \setting{Current Playlist Submenu} (see \reference{ref:currentplaylist_submenu}).
-\item [Playlist Catalogue.]
-  Enters the \setting{Playlist Catalogue Submenu} (see 
-  \reference{ref:playlist_catalogue}).
+\item [Playing Next...]
+  Enters the \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}).
+\item [Add to Playlist...]
+  Enters the \setting{Add to Playlist Submenu} (see 
+  \reference{ref:addtoplaylist_submenu}).
 \item [Rename.]
   This function lets the user modify the name of a file or directory.
 \item [Cut.]
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 7623f89146..45b3860b0e 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -179,8 +179,8 @@ several indicators.
 Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu}
 allows you quick access to some often used functions.
 
-\subsubsection{Playlist}
-The \setting{Playlist} submenu allows you to view, save, search, reshuffle,
+\subsubsection{Current Playlist}
+The \setting{Current Playlist} submenu allows you to view, save, search, reshuffle,
 and display the play time of the current playlist. These and other operations
 are detailed in \reference{ref:working_with_playlists}. To change settings for
 the \setting{Playlist Viewer} press \ActionStdContext{} while viewing the
@@ -198,12 +198,12 @@ menu, you can find the \setting{Playlist Viewer Settings}.
   \end{description}
 
 
-\subsubsection{Playlist catalogue}
+\subsubsection{Add to Playlist...}
   \begin{description}
-    \item [Add to playlist.] Adds the currently playing file to a playlist.
+    \item [Add to Existing Playlist.] Adds the currently playing file to a playlist.
     Select the playlist you want the file to be added to and it will get
     appended to that playlist.
-    \item [Add to new playlist.] Similar to the previous entry this will
+    \item [Add to New Playlist.] Similar to the previous entry this will
     add the currently playing track to a playlist. You need to enter a name
     for the new playlist first.
   \end{description}
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index 8571aac61c..c0e5615dea 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -17,7 +17,7 @@ playlists:
 
 \item[Dynamic playlist.]  A dynamic playlist is a playlist that is created
   ``On the fly.'' Any time you insert or queue tracks using the
-  \setting{Current Playlist submenu} (see \reference{ref:currentplaylist_submenu}), you are
+  \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}), you are
   creating (or adding to) a dynamic playlist.
 
 \item[Insert.] In Rockbox, to \setting{Insert} an item into a playlist means
@@ -49,17 +49,17 @@ song.
   playlist, see the section below on how to add music to a playlist.}
 
 \subsubsection{By using the Play or Play Shuffled functions}
-The \setting{Play} function as described in \ref{ref:currentplaylist_submenu}
+The \setting{Play} function as described in \ref{ref:playingnext_submenu}
 will replace the dynamic playlist with the selected tracks. The \setting{Play
 Shuffled} function is similar, except the selected tracks will be added to the
 playlist in a random order.
 
-\subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue}
-The \setting{Playlist catalogue} makes it possible to modify and create
-playlists that are not currently playing. To do this select \setting{Playlist
-catalogue} in the \setting{Context Menu}. There you will have two choices,
-\setting{Add to playlist} adds the selected track or directory to an existing
-playlist and \setting{Add to a new playlist} creates a new playlist containing
+\subsubsection{\label{ref:addtoplaylist_submenu}By using the Add to Playlist submenu}
+The \setting{Add to Playlist submenu} makes it possible to modify and create
+playlists that are not currently playing. To do this select \setting{Add to Playlist...}
+in the \setting{Context Menu}. There you will have two choices,
+\setting{Add to Existing Playlist} adds the selected track or directory to an existing
+playlist and \setting{Add to New Playlist} creates a new playlist containing
 the selected track or directory.
 
 \note{All playlists in the \setting{Playlist catalogue} are stored by default
@@ -75,9 +75,9 @@ To create a playlist containing some or all of the music on your \dap{}, you can
 
 \subsection{Adding music to playlists}
 
-\subsubsection{\label{ref:currentplaylist_submenu}Adding music to a dynamic playlist}
-\screenshot{rockbox_interface/images/ss-playlist-menu}{The Current Playlist Submenu}{}
-The \setting{Current Playlist Submenu} is a submenu in the \setting{Context Menu} (see
+\subsubsection{\label{ref:playingnext_submenu}Adding music to a dynamic playlist}
+\screenshot{rockbox_interface/images/ss-playlist-menu}{The Playing Next Submenu}{}
+The \setting{Playing Next Submenu} is a submenu in the \setting{Context Menu} (see
 \reference{ref:Contextmenu}), it allows you to put tracks into a
 ``dynamic playlist''. The place in which the newly
 selected tracks are added to the playlist is determined by these
@@ -133,10 +133,10 @@ The latter can also be put into its own submenu.  Simply go to
 $\rightarrow$ \setting{Current Playlist} and select either \setting{Show Shuffled Adding Options}
 or \setting{Show Queue Options} to customize the displayed set of options.}
 
-The \setting{Current Playlist Submenu}  can be used to add either single tracks or
-entire directories to a playlist. If the \setting{Current Playlist Submenu} is
+The \setting{Playing Next Submenu}  can be used to add either single tracks or
+entire directories to a playlist. If the \setting{Playing Next Submenu} is
 invoked on a single track, it will put only that track into the playlist.
-On the other hand, if the \setting{Current Playlist Submenu} is invoked on a
+On the other hand, if the \setting{Playing Next Submenu} is invoked on a
 directory, Rockbox adds all of the tracks in that directory to the
 playlist.
 
@@ -157,13 +157,13 @@ were before shutdown.
 
 \subsection{Modifying playlists}
 \subsubsection{Reshuffling}
-Reshuffling the current playlist is easily done from the \setting{Playlist}
+Reshuffling the current playlist is easily done from the \setting{Current Playlist}
 sub menu in the WPS, just select \setting{Reshuffle}.
 
 \subsubsection{Moving and removing tracks}
 To move or remove a track from the current playlist enter the
 \setting{Playlist Viewer} by selecting \setting{View Current Playlist} in the
-\setting{Playlist} submenu in the WPS context menu or the \setting{Main Menu}.
+\setting{Current Playlist} submenu in the WPS context menu or the \setting{Main Menu}.
 Once in the \setting{Playlist Viewer} open the context menu on the track you
 want to move or remove. If you want to move the track, select \setting{Move} in
 the context menu and then move the blinking cursor to the place where you want
@@ -171,10 +171,10 @@ the track to be moved and confirm with \ActionStdOk. To remove a track, simply
 select \setting{Remove} in the context menu.
 
 \subsection{Saving playlists}
-To save the current playlist either enter the \setting{Playlist} submenu
+To save the current playlist either enter the \setting{Current Playlist} submenu
 in the \setting{WPS Context Menu} (see \reference{sec:contextmenu}) and
-select \setting{Save Current Playlist} or enter the
-\setting{Playlist Options} menu in the \setting{Main Menu} and select
+select \setting{Save Current Playlist} or enter the context menu for the
+\setting{Playlist catalogue} in the \setting{Main Menu} and select
 \setting{Save Current Playlist}.
 Either method will bring you to the \setting{Virtual Keyboard} (see
 \reference{sec:virtual_keyboard}), enter a filename for your playlist and