summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-03-09 06:45:37 +0100
committerSolomon Peachy <pizza@shaftnet.org>2021-03-09 15:10:58 +0000
commitb2d13f1793b68b17764701e29ef619304bcb6565 (patch)
tree7ce1acb55e1ef18f2374c5f5a53cf7bde19f14c0
parentf4b891e408c16b947d40be6d4cf498eb1c2b4ada (diff)
downloadrockbox-b2d13f1793b68b17764701e29ef619304bcb6565.tar.gz
rockbox-b2d13f1793b68b17764701e29ef619304bcb6565.zip
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
-rw-r--r--apps/lang/deutsch.lang22
-rw-r--r--apps/lang/english.lang22
-rw-r--r--apps/onplay.c2
-rw-r--r--manual/working_with_playlists/main.tex11
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 @@
6619</phrase> 6619</phrase>
6620<phrase> 6620<phrase>
6621 id: LANG_REPLACE 6621 id: LANG_REPLACE
6622 desc: in onplay menu. Replace the current playlist with a new one. 6622 desc: deprecated
6623 user: core 6623 user: core
6624 <source> 6624 <source>
6625 *: "Play Next" 6625 *: ""
6626 </source> 6626 </source>
6627 <dest> 6627 <dest>
6628 *: "Aktuelle ersetzen" 6628 *: ""
6629 </dest> 6629 </dest>
6630 <voice> 6630 <voice>
6631 *: "Aktuelle ersetzen" 6631 *: ""
6632 </voice> 6632 </voice>
6633</phrase> 6633</phrase>
6634<phrase> 6634<phrase>
@@ -15590,3 +15590,17 @@
15590 *: "Element nach unten verschieben" 15590 *: "Element nach unten verschieben"
15591 </voice> 15591 </voice>
15592</phrase> 15592</phrase>
15593<phrase>
15594 id: LANG_CLEAR_LIST_AND_PLAY_NEXT
15595 desc: in onplay menu. Replace current playlist with selected tracks
15596 user: core
15597 <source>
15598 *: "Clear List & Play Next"
15599 </source>
15600 <dest>
15601 *: "Liste löschen & als Nächstes spielen"
15602 </dest>
15603 <voice>
15604 *: "Liste löschen & als Nächstes spielen"
15605 </voice>
15606</phrase>
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 @@
6346</phrase> 6346</phrase>
6347<phrase> 6347<phrase>
6348 id: LANG_REPLACE 6348 id: LANG_REPLACE
6349 desc: in onplay menu. Replace the current playlist with a new one. 6349 desc: deprecated
6350 user: core 6350 user: core
6351 <source> 6351 <source>
6352 *: "Play Next" 6352 *: ""
6353 </source> 6353 </source>
6354 <dest> 6354 <dest>
6355 *: "Play Next" 6355 *: ""
6356 </dest> 6356 </dest>
6357 <voice> 6357 <voice>
6358 *: "Play Next" 6358 *: ""
6359 </voice> 6359 </voice>
6360</phrase> 6360</phrase>
6361<phrase> 6361<phrase>
@@ -15601,3 +15601,17 @@
15601 *: "Enter USB mass storage mode?" 15601 *: "Enter USB mass storage mode?"
15602 </voice> 15602 </voice>
15603</phrase> 15603</phrase>
15604<phrase>
15605 id: LANG_CLEAR_LIST_AND_PLAY_NEXT
15606 desc: in onplay menu. Replace current playlist with selected tracks
15607 user: core
15608 <source>
15609 *: "Clear List & Play Next"
15610 </source>
15611 <dest>
15612 *: "Clear List & Play Next"
15613 </dest>
15614 <voice>
15615 *: "Clear List & Play Next"
15616 </voice>
15617</phrase>
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,
640 (intptr_t*)PLAYLIST_INSERT_LAST_SHUFFLED, 640 (intptr_t*)PLAYLIST_INSERT_LAST_SHUFFLED,
641 treeplaylist_callback, Icon_Playlist); 641 treeplaylist_callback, Icon_Playlist);
642/* replace playlist */ 642/* replace playlist */
643MENUITEM_FUNCTION(replace_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_REPLACE), 643MENUITEM_FUNCTION(replace_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_CLEAR_LIST_AND_PLAY_NEXT),
644 playlist_insert_func, (intptr_t*)PLAYLIST_REPLACE, 644 playlist_insert_func, (intptr_t*)PLAYLIST_REPLACE,
645 NULL, Icon_Playlist); 645 NULL, Icon_Playlist);
646 646
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.
48 rather than erasing the current 48 rather than erasing the current
49 playlist, see the section below on how to add music to a playlist.} 49 playlist, see the section below on how to add music to a playlist.}
50 50
51\subsubsection{By using the Play Next function} 51\subsubsection{By using the Clear List \& Play Next function}
52The \setting{Play Next} function as described in \ref{ref:playlist_submenu} will 52The \setting{Clear List \& Play Next} function as described in
53\emph{replace} the dynamic playlist with the selected tracks. If a track is 53\ref{ref:playlist_submenu} will replace the dynamic playlist with the selected
54currently playing, it is only removed once it’s finished playing. 54tracks. If a track is currently playing, it is only removed once it’s finished
55playing.
55 56
56\subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue} 57\subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue}
57The \setting{Playlist catalogue} makes it possible to modify and create 58The \setting{Playlist catalogue} makes it possible to modify and create
@@ -111,7 +112,7 @@ options:
111 112
112\item [Queue Last Shuffled.] Queue tracks in a random order at the end of the playlist. 113\item [Queue Last Shuffled.] Queue tracks in a random order at the end of the playlist.
113 114
114\item [Play Next.] Replaces all tracks in the dynamic playlist. 115\item [Clear List \& Play Next.] Replaces all tracks in the dynamic playlist.
115If a track is currently playing, it is only removed once it’s finished playing. 116If a track is currently playing, it is only removed once it’s finished playing.
116\end{description} 117\end{description}
117 118