From b2d13f1793b68b17764701e29ef619304bcb6565 Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Tue, 9 Mar 2021 06:45:37 +0100 Subject: UI: Rename "Play Next" to "Clear List & Play Next" The "Play Next" function replaces the current dynamic playlist, so it makes sense to convey that information to the user when displaying the option in a context menu. Change-Id: Ic6e03e4adbd811e28b5cfeba36b64c5e8a7db2f9 --- apps/lang/deutsch.lang | 22 ++++++++++++++++++---- apps/lang/english.lang | 22 ++++++++++++++++++---- apps/onplay.c | 2 +- manual/working_with_playlists/main.tex | 11 ++++++----- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index eb89feb218..131f342a5d 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang @@ -6619,16 +6619,16 @@ id: LANG_REPLACE - desc: in onplay menu. Replace the current playlist with a new one. + desc: deprecated user: core - *: "Play Next" + *: "" - *: "Aktuelle ersetzen" + *: "" - *: "Aktuelle ersetzen" + *: "" @@ -15590,3 +15590,17 @@ *: "Element nach unten verschieben" + + id: LANG_CLEAR_LIST_AND_PLAY_NEXT + desc: in onplay menu. Replace current playlist with selected tracks + user: core + + *: "Clear List & Play Next" + + + *: "Liste löschen & als Nächstes spielen" + + + *: "Liste löschen & als Nächstes spielen" + + diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 8fd482b0ac..65f8575df0 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -6346,16 +6346,16 @@ id: LANG_REPLACE - desc: in onplay menu. Replace the current playlist with a new one. + desc: deprecated user: core - *: "Play Next" + *: "" - *: "Play Next" + *: "" - *: "Play Next" + *: "" @@ -15601,3 +15601,17 @@ *: "Enter USB mass storage mode?" + + id: LANG_CLEAR_LIST_AND_PLAY_NEXT + desc: in onplay menu. Replace current playlist with selected tracks + user: core + + *: "Clear List & Play Next" + + + *: "Clear List & Play Next" + + + *: "Clear List & Play Next" + + diff --git a/apps/onplay.c b/apps/onplay.c index 207c43f0a6..a777807b9f 100644 --- a/apps/onplay.c +++ b/apps/onplay.c @@ -640,7 +640,7 @@ MENUITEM_FUNCTION(q_last_shuf_pl_item, MENU_FUNC_USEPARAM, (intptr_t*)PLAYLIST_INSERT_LAST_SHUFFLED, treeplaylist_callback, Icon_Playlist); /* replace playlist */ -MENUITEM_FUNCTION(replace_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_REPLACE), +MENUITEM_FUNCTION(replace_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_CLEAR_LIST_AND_PLAY_NEXT), playlist_insert_func, (intptr_t*)PLAYLIST_REPLACE, NULL, Icon_Playlist); diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex index dbbeefc7d6..fbc39ab712 100644 --- a/manual/working_with_playlists/main.tex +++ b/manual/working_with_playlists/main.tex @@ -48,10 +48,11 @@ song. rather than erasing the current playlist, see the section below on how to add music to a playlist.} -\subsubsection{By using the Play Next function} -The \setting{Play Next} function as described in \ref{ref:playlist_submenu} will -\emph{replace} the dynamic playlist with the selected tracks. If a track is -currently playing, it is only removed once it’s finished playing. +\subsubsection{By using the Clear List \& Play Next function} +The \setting{Clear List \& Play Next} function as described in +\ref{ref:playlist_submenu} will replace the dynamic playlist with the selected +tracks. If a track is currently playing, it is only removed once it’s finished +playing. \subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue} The \setting{Playlist catalogue} makes it possible to modify and create @@ -111,7 +112,7 @@ options: \item [Queue Last Shuffled.] Queue tracks in a random order at the end of the playlist. -\item [Play Next.] Replaces all tracks in the dynamic playlist. +\item [Clear List \& Play Next.] Replaces all tracks in the dynamic playlist. If a track is currently playing, it is only removed once it’s finished playing. \end{description} -- cgit v1.2.3