playback: use playsong settings

Use PlaySong modeling within settings too. This largely completes the
PlaySong refactor and fully adds the ability to play songs by
themselves as an option.

Resolves #424.

CHANGELOG.md

@@ -4,12 +4,16 @@
 
 #### What's New
 - Menus have been refreshed with a cleaner look
+- Added option to play song by itself in library/item details
 
 #### What's Improved
 - Made "Add to Playlist" action more prominent in selection toolbar
 - Fixed notification album covers not updating after changing the cover
 aspect ratio setting 
 
+#### What's Fixed
+- Playlist detail view now respects playback settings
+
 #### Dev/Meta
 - Unified navigation graph
 

app/src/main/java/org/oxycblt/auxio/IntegerTable.kt

@@ -65,14 +65,14 @@ object IntegerTable {
     const val REPEAT_MODE_ALL = 0xA101
     /** RepeatMode.TRACK */
     const val REPEAT_MODE_TRACK = 0xA102
-    /** PlaybackMode.IN_GENRE */
-    const val PLAYBACK_MODE_IN_GENRE = 0xA103
-    /** PlaybackMode.IN_ARTIST */
-    const val PLAYBACK_MODE_IN_ARTIST = 0xA104
-    /** PlaybackMode.IN_ALBUM */
-    const val PLAYBACK_MODE_IN_ALBUM = 0xA105
-    /** PlaybackMode.ALL_SONGS */
-    const val PLAYBACK_MODE_ALL_SONGS = 0xA106
+    //    /** PlaybackMode.IN_GENRE (No longer used but still reserved) */
+    //    const val PLAYBACK_MODE_IN_GENRE = 0xA103
+    //    /** PlaybackMode.IN_ARTIST (No longer used but still reserved) */
+    //    const val PLAYBACK_MODE_IN_ARTIST = 0xA104
+    //    /** PlaybackMode.IN_ALBUM (No longer used but still reserved) */
+    //    const val PLAYBACK_MODE_IN_ALBUM = 0xA105
+    //    /** PlaybackMode.ALL_SONGS (No longer used but still reserved) */
+    //    const val PLAYBACK_MODE_ALL_SONGS = 0xA106
     /** MusicMode.SONGS */
     const val MUSIC_MODE_SONGS = 0xA10B
     /** MusicMode.ALBUMS */
@@ -121,8 +121,8 @@ object IntegerTable {
     const val COVER_MODE_MEDIA_STORE = 0xA11D
     /** CoverMode.Quality */
     const val COVER_MODE_QUALITY = 0xA11E
-    /** PlaySong.Itself */
-    const val PLAY_SONG_ITSELF = 0xA11F
+    /** PlaySong.ByItself */
+    const val PLAY_SONG_BY_ITSELF = 0xA11F
     /** PlaySong.FromAll */
     const val PLAY_SONG_FROM_ALL = 0xA120
     /** PlaySong.FromAlbum */

app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt

@@ -44,7 +44,6 @@ import org.oxycblt.auxio.list.Menu
 import org.oxycblt.auxio.list.Sort
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Music
-import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.music.MusicParent
 import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.PlaylistDecision
@@ -180,12 +179,7 @@ class AlbumDetailFragment :
     }
 
     override fun onRealClick(item: Song) {
-        val mode = detailModel.playbackMode
-        if (mode != null) {
-            playbackModel.play(item, detailModel.playbackMode ?: MusicMode.ALBUMS)
-        } else {
-            playbackModel.playFromAlbum(item)
-        }
+        playbackModel.play(item, detailModel.playInAlbumWith)
     }
 
     override fun onOpenMenu(item: Song, anchor: View) {

app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt

@@ -179,17 +179,7 @@ class ArtistDetailFragment :
     override fun onRealClick(item: Music) {
         when (item) {
             is Album -> detailModel.showAlbum(item)
-            is Song -> {
-                val playbackMode = detailModel.playbackMode
-                if (playbackMode != null) {
-                    playbackModel.play(item, playbackMode)
-                } else {
-                    // When configured to play from the selected item, we already have an Artist
-                    // to play from.
-                    playbackModel.playFromArtist(
-                        item, unlikelyToBeNull(detailModel.currentArtist.value))
-                }
-            }
+            is Song -> playbackModel.play(item, detailModel.playInArtistWith)
             else -> error("Unexpected datatype: ${item::class.simpleName}")
         }
     }

app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt

@@ -42,18 +42,19 @@ import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Music
-import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicSettings
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.info.ReleaseType
 import org.oxycblt.auxio.music.metadata.AudioProperties
+import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
 import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.logW
+import org.oxycblt.auxio.util.unlikelyToBeNull
 
 /**
  * [ViewModel] that manages the Song, Album, Artist, and Genre detail views. Keeps track of the
@@ -115,6 +116,10 @@ constructor(
             currentAlbum.value?.let { refreshAlbumList(it, true) }
         }
 
+    /** The [PlaySong] instructions to use when playing a [Song] from [Album] details. */
+    val playInAlbumWith
+        get() = playbackSettings.inParentPlaybackMode ?: PlaySong.FromAlbum
+
     // --- ARTIST ---
 
     private val _currentArtist = MutableStateFlow<Artist?>(null)
@@ -139,6 +144,10 @@ constructor(
             currentArtist.value?.let { refreshArtistList(it, true) }
         }
 
+    /** The [PlaySong] instructions to use when playing a [Song] from [Artist] details. */
+    val playInArtistWith
+        get() = playbackSettings.inParentPlaybackMode ?: PlaySong.FromArtist(currentArtist.value)
+
     // --- GENRE ---
 
     private val _currentGenre = MutableStateFlow<Genre?>(null)
@@ -163,6 +172,10 @@ constructor(
             currentGenre.value?.let { refreshGenreList(it, true) }
         }
 
+    /** The [PlaySong] instructions to use when playing a [Song] from [Genre] details. */
+    val playInGenreWith
+        get() = playbackSettings.inParentPlaybackMode ?: PlaySong.FromGenre(currentGenre.value)
+
     // --- PLAYLIST ---
 
     private val _currentPlaylist = MutableStateFlow<Playlist?>(null)
@@ -186,12 +199,11 @@ constructor(
     val editedPlaylist: StateFlow<List<Song>?>
         get() = _editedPlaylist
 
-    /**
-     * The [MusicMode] to use when playing a [Song] from the UI, or null to play from the currently
-     * shown item.
-     */
-    val playbackMode: MusicMode?
-        get() = playbackSettings.inParentPlaybackMode
+    /** The [PlaySong] instructions to use when playing a [Song] from [Genre] details. */
+    val playInPlaylistWith
+        get() =
+            playbackSettings.inParentPlaybackMode
+                ?: PlaySong.FromPlaylist(unlikelyToBeNull(currentPlaylist.value))
 
     init {
         musicRepository.addUpdateListener(this)

app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt

@@ -177,17 +177,7 @@ class GenreDetailFragment :
     override fun onRealClick(item: Music) {
         when (item) {
             is Artist -> detailModel.showArtist(item)
-            is Song -> {
-                val playbackMode = detailModel.playbackMode
-                if (playbackMode != null) {
-                    playbackModel.play(item, playbackMode)
-                } else {
-                    // When configured to play from the selected item, we already have an Genre
-                    // to play from.
-                    playbackModel.playFromGenre(
-                        item, unlikelyToBeNull(detailModel.currentGenre.value))
-                }
-            }
+            is Song -> playbackModel.play(item, detailModel.playInGenreWith)
             else -> error("Unexpected datatype: ${item::class.simpleName}")
         }
     }

app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt

@@ -229,7 +229,7 @@ class PlaylistDetailFragment :
     }
 
     override fun onRealClick(item: Song) {
-        playbackModel.playFromPlaylist(item, unlikelyToBeNull(detailModel.currentPlaylist.value))
+        playbackModel.play(item, detailModel.playInPlaylistWith)
     }
 
     override fun onPickUp(viewHolder: RecyclerView.ViewHolder) {

app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt

@@ -34,6 +34,7 @@ import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicSettings
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.Song
+import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.Event
 import org.oxycblt.auxio.util.MutableEvent
@@ -102,9 +103,9 @@ constructor(
     val playlistsInstructions: Event<UpdateInstructions>
         get() = _playlistsInstructions
 
-    /** The [MusicMode] to use when playing a [Song] from the UI. */
-    val playbackMode: MusicMode
-        get() = playbackSettings.inListPlaybackMode
+    /** The [PlaySong] instructions to use when playing a [Song]. */
+    val playWith
+        get() = playbackSettings.playInListWith
 
     /**
      * A list of [MusicMode] corresponding to the current [Tab] configuration, excluding invisible

app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt

@@ -137,7 +137,7 @@ class SongListFragment :
     }
 
     override fun onRealClick(item: Song) {
-        playbackModel.play(item, homeModel.playbackMode)
+        playbackModel.play(item, homeModel.playWith)
     }
 
     override fun onOpenMenu(item: Song, anchor: View) {

app/src/main/java/org/oxycblt/auxio/playback/PlaySong.kt

@@ -22,18 +22,13 @@ import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Music
-import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.music.Playlist
 
 sealed interface PlaySong {
     val intCode: Int
 
-    object ByItself : PlaySong {
-        override val intCode = IntegerTable.PLAY_SONG_ITSELF
-    }
-
     object FromAll : PlaySong {
-        override val intCode = IntegerTable.PLAY_SONG_ITSELF
+        override val intCode = IntegerTable.PLAY_SONG_FROM_ALL
     }
 
     object FromAlbum : PlaySong {
@@ -52,19 +47,14 @@ sealed interface PlaySong {
         override val intCode = IntegerTable.PLAY_SONG_FROM_PLAYLIST
     }
 
-    companion object {
-        fun fromPlaybackModeTemporary(playbackMode: MusicMode) =
-            when (playbackMode) {
-                MusicMode.SONGS -> FromAll
-                MusicMode.ALBUMS -> FromAlbum
-                MusicMode.ARTISTS -> FromArtist(null)
-                MusicMode.GENRES -> FromGenre(null)
-                MusicMode.PLAYLISTS -> throw IllegalStateException()
-            }
+    object ByItself : PlaySong {
+        override val intCode = IntegerTable.PLAY_SONG_BY_ITSELF
+    }
 
+    companion object {
         fun fromIntCode(intCode: Int, inner: Music?): PlaySong? =
             when (intCode) {
-                IntegerTable.PLAY_SONG_ITSELF -> ByItself
+                IntegerTable.PLAY_SONG_BY_ITSELF -> ByItself
                 IntegerTable.PLAY_SONG_FROM_ALBUM -> FromAlbum
                 IntegerTable.PLAY_SONG_FROM_ARTIST ->
                     if (inner is Artist?) {

app/src/main/java/org/oxycblt/auxio/playback/PlaybackSettings.kt

@@ -24,7 +24,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.playback.replaygain.ReplayGainMode
 import org.oxycblt.auxio.playback.replaygain.ReplayGainPreAmp
 import org.oxycblt.auxio.settings.Settings
@@ -46,16 +45,13 @@ interface PlaybackSettings : Settings<PlaybackSettings.Listener> {
     val replayGainMode: ReplayGainMode
     /** The current ReplayGain pre-amp configuration. */
     var replayGainPreAmp: ReplayGainPreAmp
+    /** How to play a song from a general list of songs, specified by [PlaySong] */
+    val playInListWith: PlaySong
     /**
-     * What type of MusicParent to play from when a Song is played from a list of other items. Null
-     * if to play from all Songs.
+     * How to play a song from a parent item, specified by [PlaySong]. Null if to delegate to the UI
+     * context.
      */
-    val inListPlaybackMode: MusicMode
-    /**
-     * What type of MusicParent to play from when a Song is played from within an item (ex. like in
-     * the detail view). Null if to play from the item it was played in.
-     */
-    val inParentPlaybackMode: MusicMode?
+    val inParentPlaybackMode: PlaySong?
     /** Whether to keep shuffle on when playing a new Song. */
     val keepShuffle: Boolean
     /** Whether to rewind when the skip previous button is pressed before skipping back. */
@@ -75,18 +71,20 @@ interface PlaybackSettings : Settings<PlaybackSettings.Listener> {
 
 class PlaybackSettingsImpl @Inject constructor(@ApplicationContext context: Context) :
     Settings.Impl<PlaybackSettings.Listener>(context), PlaybackSettings {
-    override val inListPlaybackMode: MusicMode
+    override val playInListWith: PlaySong
         get() =
-            MusicMode.fromIntCode(
+            PlaySong.fromIntCode(
                 sharedPreferences.getInt(
-                    getString(R.string.set_key_in_list_playback_mode), Int.MIN_VALUE))
-                ?: MusicMode.SONGS
+                    getString(R.string.set_key_play_in_list_with), Int.MIN_VALUE),
+                null)
+                ?: PlaySong.FromAll
 
-    override val inParentPlaybackMode: MusicMode?
+    override val inParentPlaybackMode: PlaySong?
         get() =
-            MusicMode.fromIntCode(
+            PlaySong.fromIntCode(
                 sharedPreferences.getInt(
-                    getString(R.string.set_key_in_parent_playback_mode), Int.MIN_VALUE))
+                    getString(R.string.set_key_play_in_list_with), Int.MIN_VALUE),
+                null)
 
     override val barAction: ActionMode
         get() =
@@ -132,65 +130,44 @@ class PlaybackSettingsImpl @Inject constructor(@ApplicationContext context: Cont
         get() = sharedPreferences.getBoolean(getString(R.string.set_key_repeat_pause), false)
 
     override fun migrate() {
-        // "Use alternate notification action" was converted to an ActionMode setting in 3.0.0.
-        if (sharedPreferences.contains(OLD_KEY_ALT_NOTIF_ACTION)) {
-            logD("Migrating $OLD_KEY_ALT_NOTIF_ACTION")
-
-            val mode =
-                if (sharedPreferences.getBoolean(OLD_KEY_ALT_NOTIF_ACTION, false)) {
-                    ActionMode.SHUFFLE
-                } else {
-                    ActionMode.REPEAT
-                }
-
-            sharedPreferences.edit {
-                putInt(getString(R.string.set_key_notif_action), mode.intCode)
-                remove(OLD_KEY_ALT_NOTIF_ACTION)
-                apply()
-            }
-        }
-
-        // PlaybackMode was converted to MusicMode in 3.0.0
-
-        fun Int.migratePlaybackMode() =
+        // MusicMode was converted to PlaySong in 3.2.0
+        fun Int.migrateMusicMode() =
             when (this) {
-                // Convert PlaybackMode into MusicMode
-                IntegerTable.PLAYBACK_MODE_ALL_SONGS -> MusicMode.SONGS
-                IntegerTable.PLAYBACK_MODE_IN_ARTIST -> MusicMode.ARTISTS
-                IntegerTable.PLAYBACK_MODE_IN_ALBUM -> MusicMode.ALBUMS
-                IntegerTable.PLAYBACK_MODE_IN_GENRE -> MusicMode.GENRES
+                IntegerTable.MUSIC_MODE_SONGS -> PlaySong.FromAll
+                IntegerTable.MUSIC_MODE_ALBUMS -> PlaySong.FromAlbum
+                IntegerTable.MUSIC_MODE_ARTISTS -> PlaySong.FromArtist(null)
+                IntegerTable.MUSIC_MODE_GENRES -> PlaySong.FromGenre(null)
                 else -> null
             }
 
-        if (sharedPreferences.contains(OLD_KEY_LIB_PLAYBACK_MODE)) {
-            logD("Migrating $OLD_KEY_LIB_PLAYBACK_MODE")
+        if (sharedPreferences.contains(OLD_KEY_LIB_MUSIC_PLAYBACK_MODE)) {
+            logD("Migrating $OLD_KEY_LIB_MUSIC_PLAYBACK_MODE")
 
             val mode =
                 sharedPreferences
-                    .getInt(OLD_KEY_LIB_PLAYBACK_MODE, IntegerTable.PLAYBACK_MODE_ALL_SONGS)
-                    .migratePlaybackMode()
-                    ?: MusicMode.SONGS
+                    .getInt(OLD_KEY_LIB_MUSIC_PLAYBACK_MODE, Int.MIN_VALUE)
+                    .migrateMusicMode()
 
             sharedPreferences.edit {
-                putInt(getString(R.string.set_key_in_list_playback_mode), mode.intCode)
-                remove(OLD_KEY_LIB_PLAYBACK_MODE)
+                putInt(
+                    getString(R.string.set_key_play_in_list_with), mode?.intCode ?: Int.MIN_VALUE)
+                remove(OLD_KEY_LIB_MUSIC_PLAYBACK_MODE)
                 apply()
             }
         }
 
-        if (sharedPreferences.contains(OLD_KEY_DETAIL_PLAYBACK_MODE)) {
-            logD("Migrating $OLD_KEY_DETAIL_PLAYBACK_MODE")
+        if (sharedPreferences.contains(OLD_KEY_DETAIL_MUSIC_PLAYBACK_MODE)) {
+            logD("Migrating $OLD_KEY_DETAIL_MUSIC_PLAYBACK_MODE")
 
             val mode =
                 sharedPreferences
-                    .getInt(OLD_KEY_DETAIL_PLAYBACK_MODE, Int.MIN_VALUE)
-                    .migratePlaybackMode()
+                    .getInt(OLD_KEY_DETAIL_MUSIC_PLAYBACK_MODE, Int.MIN_VALUE)
+                    .migrateMusicMode()
 
             sharedPreferences.edit {
                 putInt(
-                    getString(R.string.set_key_in_parent_playback_mode),
-                    mode?.intCode ?: Int.MIN_VALUE)
-                remove(OLD_KEY_DETAIL_PLAYBACK_MODE)
+                    getString(R.string.set_key_play_in_parent_with), mode?.intCode ?: Int.MIN_VALUE)
+                remove(OLD_KEY_DETAIL_MUSIC_PLAYBACK_MODE)
                 apply()
             }
         }
@@ -216,8 +193,7 @@ class PlaybackSettingsImpl @Inject constructor(@ApplicationContext context: Cont
     }
 
     private companion object {
-        const val OLD_KEY_ALT_NOTIF_ACTION = "KEY_ALT_NOTIF_ACTION"
-        const val OLD_KEY_LIB_PLAYBACK_MODE = "KEY_SONG_PLAY_MODE2"
-        const val OLD_KEY_DETAIL_PLAYBACK_MODE = "auxio_detail_song_play_mode"
+        const val OLD_KEY_LIB_MUSIC_PLAYBACK_MODE = "auxio_library_playback_mode"
+        const val OLD_KEY_DETAIL_MUSIC_PLAYBACK_MODE = "auxio_detail_playback_mode"
     }
 }

app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt

@@ -30,7 +30,6 @@ import kotlinx.coroutines.launch
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
-import org.oxycblt.auxio.music.MusicMode
 import org.oxycblt.auxio.music.MusicParent
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.MusicSettings
@@ -180,10 +179,6 @@ constructor(
 
     // --- PLAYING FUNCTIONS ---
 
-    fun play(song: Song, playbackMode: MusicMode) {
-        play(song, PlaySong.fromPlaybackModeTemporary(playbackMode))
-    }
-
     fun play(song: Song, with: PlaySong) {
         logD("Playing $song with $with")
         playWithImpl(song, with, isImplicitlyShuffled())
@@ -203,10 +198,6 @@ constructor(
         playFromAllImpl(null, true)
     }
 
-    fun playFromAlbum(song: Song) {
-        playFromAlbumImpl(song, isImplicitlyShuffled())
-    }
-
     /**
      * Play a [Song] from one of it's [Artist]s.
      *
@@ -229,34 +220,20 @@ constructor(
         playFromGenreImpl(song, genre, isImplicitlyShuffled())
     }
 
-    /**
-     * Play a [Song] from one of it's [Playlist]s.
-     *
-     * @param song The [Song] to play.
-     * @param playlist The [Playlist] to play from. Must be linked to the [Song].
-     */
-    fun playFromPlaylist(song: Song, playlist: Playlist) {
-        playFromPlaylistImpl(song, playlist, isImplicitlyShuffled())
-    }
-
     private fun isImplicitlyShuffled() =
         playbackManager.queue.isShuffled && playbackSettings.keepShuffle
 
     private fun playWithImpl(song: Song, with: PlaySong, shuffled: Boolean) {
         when (with) {
-            is PlaySong.ByItself -> playItselfImpl(song, shuffled)
             is PlaySong.FromAll -> playFromAllImpl(song, shuffled)
             is PlaySong.FromAlbum -> playFromAlbumImpl(song, shuffled)
             is PlaySong.FromArtist -> playFromArtistImpl(song, with.which, shuffled)
             is PlaySong.FromGenre -> playFromGenreImpl(song, with.which, shuffled)
             is PlaySong.FromPlaylist -> playFromPlaylistImpl(song, with.which, shuffled)
+            is PlaySong.ByItself -> playItselfImpl(song, shuffled)
         }
     }
 
-    private fun playItselfImpl(song: Song, shuffled: Boolean) {
-        playImpl(song, listOf(song), shuffled)
-    }
-
     private fun playFromAllImpl(song: Song?, shuffled: Boolean) {
         playImpl(song, null, shuffled)
     }
@@ -296,6 +273,10 @@ constructor(
         playImpl(song, playlist, shuffled)
     }
 
+    private fun playItselfImpl(song: Song, shuffled: Boolean) {
+        playImpl(song, listOf(song), shuffled)
+    }
+
     private fun startPlaybackDecision(decision: PlaybackDecision) {
         val existing = _playbackDecision.flow.value
         if (existing != null) {

app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt

@@ -174,7 +174,7 @@ class SearchFragment : ListFragment<Music, FragmentSearchBinding>() {
 
     override fun onRealClick(item: Music) {
         when (item) {
-            is Song -> playbackModel.play(item, searchModel.playbackMode)
+            is Song -> playbackModel.play(item, searchModel.playWith)
             is Album -> detailModel.showAlbum(item)
             is Artist -> detailModel.showArtist(item)
             is Genre -> detailModel.showGenre(item)

app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt

@@ -38,6 +38,7 @@ import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.music.device.DeviceLibrary
 import org.oxycblt.auxio.music.user.UserLibrary
+import org.oxycblt.auxio.playback.PlaySong
 import org.oxycblt.auxio.playback.PlaybackSettings
 import org.oxycblt.auxio.util.logD
 
@@ -63,9 +64,9 @@ constructor(
     val searchResults: StateFlow<List<Item>>
         get() = _searchResults
 
-    /** The [MusicMode] to use when playing a [Song] from the UI. */
-    val playbackMode: MusicMode
-        get() = playbackSettings.inListPlaybackMode
+    /** The [PlaySong] instructions to use when playing a [Song]. */
+    val playWith
+        get() = playbackSettings.playInListWith
 
     init {
         musicRepository.addUpdateListener(this)

app/src/main/res/values-ar-rIQ/strings.xml

@@ -23,9 +23,9 @@
     <string name="lbl_playback">يتم التشغيل الان</string>
     <string name="lbl_play">تشغيل</string>
     <string name="lbl_shuffle">عشوائي</string>
-    <string name="set_playback_mode_songs">تشغيل من جميع الاغاني</string>
-    <string name="set_playback_mode_album">تشغيل من البوم</string>
-    <string name="set_playback_mode_artist">تشغيل من فنان</string>
+    <string name="set_play_song_from_all">تشغيل من جميع الاغاني</string>
+    <string name="set_play_song_from_album">تشغيل من البوم</string>
+    <string name="set_play_song_from_artist">تشغيل من فنان</string>
     <string name="lbl_queue">طابور</string>
     <string name="lbl_play_next">شغل الاغنية التالية</string>
     <string name="lbl_queue_add">أضف إلى الطابور</string>
@@ -63,7 +63,7 @@
     <string name="set_replay_gain_mode_album">تفضيل الالبوم</string>
     <string name="set_replay_gain_mode_dynamic">ديناميكي</string>
     <string name="set_personalize">سلوك</string>
-    <string name="set_library_song_playback_mode">عند اختيار اغنية</string>
+    <string name="set_play_in_list_with">عند اختيار اغنية</string>
     <string name="set_keep_shuffle">تذكر الخلط</string>
     <string name="set_keep_shuffle_desc">إبقاء وضع الخلط عند تشغيل اغنية جديدة</string>
     <string name="set_rewind_prev">تشجيع قبل التخطي للخلف</string>

app/src/main/res/values-be/strings.xml

@@ -12,7 +12,7 @@
     <string name="lng_queue_added">Дададзены ў чаргу</string>
     <string name="lng_author">Распрацавана Аляксандрам Кейпхартам</string>
     <string name="set_bar_action">Карыстальніцкае дзеянне панэлі прайгравання</string>
-    <string name="set_playback_mode_album">Прайграць з альбома</string>
+    <string name="set_play_song_from_album">Прайграць з альбома</string>
     <string name="set_separators_comma">Коска (,)</string>
     <string name="set_separators_plus">Плюс (+)</string>
     <string name="set_separators_and">Амперсанд (&amp;)</string>
@@ -234,15 +234,15 @@
     <string name="set_action_mode_next">Перайсці да наступнага</string>
     <string name="set_action_mode_repeat">Рэжым паўтору</string>
     <string name="set_behavior">Паводзіны</string>
-    <string name="set_library_song_playback_mode">Пры прайграванні з бібліятэкі</string>
-    <string name="set_playback_mode_songs">Прайграць усе песні</string>
+    <string name="set_play_in_list_with">Пры прайграванні з бібліятэкі</string>
+    <string name="set_play_song_from_all">Прайграць усе песні</string>
     <string name="set_content_desc">Кіруйце загрузкай музыкі і малюнкаў</string>
     <string name="set_notif_action">Карыстальніцкае дзеянне апавяшчэння</string>
-    <string name="set_detail_song_playback_mode">Пры прайграванні з дэталяў прадмета</string>
-    <string name="set_playback_mode_none">Гуляць з паказанага прадмета</string>
+    <string name="set_play_in_parent_with">Пры прайграванні з дэталяў прадмета</string>
+    <string name="set_play_song_none">Гуляць з паказанага прадмета</string>
     <string name="set_exclude_non_music_desc">Ігнаруйце аўдыяфайлы, якія не з\'яўляюцца музыкай, напрыклад, падкасты</string>
-    <string name="set_playback_mode_artist">Гуляць ад выканаўцы</string>
-    <string name="set_playback_mode_genre">Гуляць з жанру</string>
+    <string name="set_play_song_from_artist">Гуляць ад выканаўцы</string>
+    <string name="set_play_song_from_genre">Гуляць з жанру</string>
     <string name="set_keep_shuffle">Запамінаць перамешванне</string>
     <string name="set_keep_shuffle_desc">Уключайце перамешванне падчас прайгравання новай песні</string>
     <string name="set_content">Кантэнт</string>

app/src/main/res/values-cs/strings.xml

@@ -29,9 +29,9 @@
     <string name="lbl_playback">Právě hraje</string>
     <string name="lbl_play">Přehrát</string>
     <string name="lbl_shuffle">Náhodně</string>
-    <string name="set_playback_mode_songs">Přehrát ze všech skladeb</string>
-    <string name="set_playback_mode_album">Přehrát z alba</string>
-    <string name="set_playback_mode_artist">Přehrát od umělce</string>
+    <string name="set_play_song_from_all">Přehrát ze všech skladeb</string>
+    <string name="set_play_song_from_album">Přehrát z alba</string>
+    <string name="set_play_song_from_artist">Přehrát od umělce</string>
     <string name="lbl_queue">Fronta</string>
     <string name="lbl_play_next">Přehrát další</string>
     <string name="lbl_queue_add">Přidat do fronty</string>
@@ -80,7 +80,7 @@
     <string name="set_pre_amp_without">Přizpůsobení bez štítků</string>
     <string name="set_pre_amp_warning">Varování: Změna předzesilovače na vysokou kladnou hodnotu může u některých zvukových stop vést k příliš vysokým hlasitostem.</string>
     <string name="set_personalize">Chování</string>
-    <string name="set_library_song_playback_mode">Při přehrávání z knihovny</string>
+    <string name="set_play_in_list_with">Při přehrávání z knihovny</string>
     <string name="set_keep_shuffle">Zapamatovat si náhodné přehrávání</string>
     <string name="set_keep_shuffle_desc">Ponechat náhodné přehrávání při přehrávání nové skladby</string>
     <string name="set_rewind_prev">Přetočit před přeskočením zpět</string>
@@ -180,9 +180,9 @@
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
     <string name="fmt_bitrate">%d kbps</string>
     <string name="fmt_sample_rate">%d Hz</string>
-    <string name="set_detail_song_playback_mode">Při přehrávání z podrobností o položce</string>
+    <string name="set_play_in_parent_with">Při přehrávání z podrobností o položce</string>
     <string name="set_dirs_desc">Spravovat, odkud by měla být načítána hudba</string>
-    <string name="set_playback_mode_none">Přehrát ze zobrazené položky</string>
+    <string name="set_play_song_none">Přehrát ze zobrazené položky</string>
     <string name="lbl_song_detail">Zobrazit vlastnosti</string>
     <string name="lbl_props">Vlastnosti skladby</string>
     <string name="lbl_file_name">Název souboru</string>
@@ -263,7 +263,7 @@
     <string name="lbl_play_selected">Přehrát vybrané</string>
     <string name="fmt_selected">Vybráno %d</string>
     <string name="lbl_shuffle_selected">Náhodně přehrát vybrané</string>
-    <string name="set_playback_mode_genre">Přehrát z žánru</string>
+    <string name="set_play_song_from_genre">Přehrát z žánru</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Obnovit</string>

app/src/main/res/values-de/strings.xml

@@ -15,8 +15,8 @@
     <string name="lbl_sort_asc">Aufsteigend</string>
     <string name="lbl_play">Abspielen</string>
     <string name="lbl_shuffle">Zufällig</string>
-    <string name="set_playback_mode_songs">Von allen Lieder abspielen</string>
-    <string name="set_playback_mode_album">Von Album abspielen</string>
+    <string name="set_play_song_from_all">Von allen Lieder abspielen</string>
+    <string name="set_play_song_from_album">Von Album abspielen</string>
     <string name="lbl_playback">Aktuelle Wiedergabe</string>
     <string name="lbl_queue">Warteschlange</string>
     <string name="lbl_play_next">Als Nächstes abspielen</string>
@@ -56,7 +56,7 @@
     <string name="set_replay_gain_mode_track">Titel bevorzugen</string>
     <string name="set_replay_gain_mode_album">Album bevorzugen</string>
     <string name="set_personalize">Personalisieren</string>
-    <string name="set_library_song_playback_mode">Wenn ein Lied aus der Bibliothek abgespielt wird</string>
+    <string name="set_play_in_list_with">Wenn ein Lied aus der Bibliothek abgespielt wird</string>
     <string name="set_keep_shuffle">Zufällig-Einstellung merken</string>
     <string name="set_keep_shuffle_desc">Zufällig anlassen, wenn ein neues Lied abgespielt wird</string>
     <string name="set_rewind_prev" tools:ignore="Typos">Zurückspulen, bevor das Lied zurück geändert wird</string>
@@ -153,8 +153,8 @@
     <string name="fmt_lib_total_duration">Gesamtdauer: %s</string>
     <string name="lbl_cancel">Abbrechen</string>
     <string name="set_pre_amp_warning">Warnung: Das Erhöhen der Vorverstärkung zu einem hohen positiven Wert könnte zu einer Übersteuerung bei einigen Audiospuren führen.</string>
-    <string name="set_detail_song_playback_mode">Wenn ein Lied aus den Elementdetails abgespielt wird</string>
-    <string name="set_playback_mode_none">Vom dargestellten Element abspielen</string>
+    <string name="set_play_in_parent_with">Wenn ein Lied aus den Elementdetails abgespielt wird</string>
+    <string name="set_play_song_none">Vom dargestellten Element abspielen</string>
     <string name="set_dirs">Musikordner</string>
     <string name="set_dirs_desc">Verwalten, von wo die Musik geladen werden soll</string>
     <string name="set_dirs_mode">Modus</string>
@@ -233,7 +233,7 @@
     <string name="set_separators_comma">Komma (,)</string>
     <string name="set_separators_slash">Schrägstrich (/)</string>
     <string name="set_separators_plus">Plus (+)</string>
-    <string name="set_playback_mode_artist">Vom Künstler abspielen</string>
+    <string name="set_play_song_from_artist">Vom Künstler abspielen</string>
     <string name="set_separators_warning">Achtung: Verwenden dieser Einstellung könnte dazu führen, dass einige Tags fälschlicherweise interpretiert werden, als hätten sie mehrere Werte. Das kann gelöst werden, in dem vor ungewollte Trenner ein Backslash (\\) eingefügt wird.</string>
     <string name="set_exclude_non_music">Nicht-Musik ausschließen</string>
     <string name="set_exclude_non_music_desc">Audio-Dateien, die keine Musik sind (wie Podcasts), ignorieren</string>
@@ -254,7 +254,7 @@
     <string name="lbl_play_selected">Ausgewählte abspielen</string>
     <string name="lbl_shuffle_selected">Ausgewählte zufällig abspielen</string>
     <string name="fmt_selected">%d ausgewählt</string>
-    <string name="set_playback_mode_genre">Vom Genre abspielen</string>
+    <string name="set_play_song_from_genre">Vom Genre abspielen</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Zurücksetzen</string>

app/src/main/res/values-es/strings.xml

@@ -23,9 +23,9 @@
     <string name="lbl_playback">En reproducción</string>
     <string name="lbl_play">Reproducir</string>
     <string name="lbl_shuffle">Mezcla</string>
-    <string name="set_playback_mode_songs">Reproducir todo</string>
-    <string name="set_playback_mode_album">Reproducir por álbum</string>
-    <string name="set_playback_mode_artist">Reproducir por artista</string>
+    <string name="set_play_song_from_all">Reproducir todo</string>
+    <string name="set_play_song_from_album">Reproducir por álbum</string>
+    <string name="set_play_song_from_artist">Reproducir por artista</string>
     <string name="lbl_queue">Cola</string>
     <string name="lbl_play_next">Reproducir siguiente</string>
     <string name="lbl_queue_add">Agregar a la cola</string>
@@ -63,7 +63,7 @@
     <string name="set_replay_gain_mode_album">Por álbum</string>
     <string name="set_replay_gain_mode_dynamic">Preferir el álbum si se está en reproducción</string>
     <string name="set_personalize">Comportamiento</string>
-    <string name="set_library_song_playback_mode">Cuando se está reproduciendo de la biblioteca</string>
+    <string name="set_play_in_list_with">Cuando se está reproduciendo de la biblioteca</string>
     <string name="set_keep_shuffle">Recordar mezcla</string>
     <string name="set_keep_shuffle_desc">Mantener mezcla cuando se reproduce una nueva canción</string>
     <string name="set_rewind_prev">Rebobinar atrás</string>
@@ -149,7 +149,7 @@
     <string name="lbl_library_counts">Estadísticas de la biblioteca</string>
     <string name="set_pre_amp_without">Ajuste sin etiquetas</string>
     <string name="set_pre_amp_warning">Advertencia: Cambiar el pre-amp a un valor alto puede resultar en picos en algunas pistas de audio.</string>
-    <string name="set_playback_mode_none">Reproducir desde el elemento que se muestra</string>
+    <string name="set_play_song_none">Reproducir desde el elemento que se muestra</string>
     <string name="set_dirs_mode">Modo</string>
     <string name="set_dirs_mode_exclude">Excluir</string>
     <string name="set_dirs_mode_exclude_desc">La música<b>no</b> se cargará de las carpetas que añadas.</string>
@@ -171,7 +171,7 @@
     <string name="lbl_observing">Monitorizando la librería de música</string>
     <string name="lng_observing">Monitorizando cambios en tu librería de música…</string>
     <string name="cdc_ogg">Audio ogg</string>
-    <string name="set_detail_song_playback_mode">Cuando se reproduce desde los detalles</string>
+    <string name="set_play_in_parent_with">Cuando se reproduce desde los detalles</string>
     <string name="lbl_date_added">Fecha de añadido</string>
     <string name="lbl_props">Propiedades de la canción</string>
     <string name="lbl_sample_rate">Frecuencia de muestreo</string>
@@ -258,7 +258,7 @@
     <string name="lbl_shuffle_selected">Nodo aleatorio seleccionado</string>
     <string name="fmt_selected">%d seleccionado</string>
     <string name="lbl_play_selected">Reproducir los seleccionados</string>
-    <string name="set_playback_mode_genre">Reproducir desde el género</string>
+    <string name="set_play_song_from_genre">Reproducir desde el género</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Restablecer</string>

app/src/main/res/values-fi/strings.xml

@@ -68,12 +68,12 @@
     <string name="set_lib_tabs_desc">Muuta kirjastovälilehtien näkyvyyttä ja järjestystä</string>
     <string name="set_action_mode_next">Siirry seuraavaan</string>
     <string name="set_action_mode_repeat">Kertaustila</string>
-    <string name="set_library_song_playback_mode">Kirjastosta toistettaessa</string>
-    <string name="set_detail_song_playback_mode">Kohteen tiedoista toistettaessa</string>
+    <string name="set_play_in_list_with">Kirjastosta toistettaessa</string>
+    <string name="set_play_in_parent_with">Kohteen tiedoista toistettaessa</string>
     <string name="set_keep_shuffle">Muista sekoitus</string>
-    <string name="set_playback_mode_songs">Toista kaikista kappaleista</string>
-    <string name="set_playback_mode_album">Toista albumilta</string>
-    <string name="set_playback_mode_genre">Toista tyylilajista</string>
+    <string name="set_play_song_from_all">Toista kaikista kappaleista</string>
+    <string name="set_play_song_from_album">Toista albumilta</string>
+    <string name="set_play_song_from_genre">Toista tyylilajista</string>
     <string name="set_separators">Moniarvoerottimet</string>
     <string name="set_exclude_non_music_desc">Ohita äänitiedostot, jotka eivät ole musiikkia, kuten podcastit</string>
     <string name="set_separators_and">Ja-merkki (&amp;)</string>
@@ -238,7 +238,7 @@
     <string name="def_genre">Tuntematon tyylilaji</string>
     <string name="clr_green">Vihreä</string>
     <string name="def_playback">Musiikkia ei toisteta</string>
-    <string name="set_playback_mode_artist">Toista esittäjältä</string>
+    <string name="set_play_song_from_artist">Toista esittäjältä</string>
     <string name="set_exclude_non_music">Ohita muu kuin musiikki</string>
     <string name="set_restore_desc">Palauta aiemmin tallennettu toiston tila (jos olemassa)</string>
     <string name="set_dirs_mode_exclude_desc">Musiikkia <b>ei</b> ladata valitsemistasi kansioista.</string>

app/src/main/res/values-fr/strings.xml

@@ -169,9 +169,9 @@
     <string name="set_observing_desc">Recharger la bibliothèque musicale chaque fois qu\'elle change (nécessite une notification persistante)</string>
     <string name="set_separators_and">Esperluette (&amp;)</string>
     <string name="lbl_playlist">Playlist</string>
-    <string name="set_detail_song_playback_mode">Lors de la lecture à partir des détails de l\'élément</string>
+    <string name="set_play_in_parent_with">Lors de la lecture à partir des détails de l\'élément</string>
     <string name="set_keep_shuffle_desc">Gardez la lecture aléatoire lors de la lecture d\'une nouvelle chanson</string>
-    <string name="set_playback_mode_none">Lire à partir de l\'élément affiché</string>
+    <string name="set_play_song_none">Lire à partir de l\'élément affiché</string>
     <string name="set_keep_shuffle">N\'oubliez pas de mélanger</string>
     <string name="set_content_desc">Contrôlez le chargement de la musique et des images</string>
     <string name="set_music">Musique</string>
@@ -185,18 +185,18 @@
     <string name="set_cover_mode_media_store">Couvertures originales (téléchargement rapide)</string>
     <string name="set_audio_desc">Configurer le son et le comportement de lecture</string>
     <string name="lbl_playlists">Listes de lecture</string>
-    <string name="set_library_song_playback_mode">Lors de la lecture depuis la bibliothèque</string>
+    <string name="set_play_in_list_with">Lors de la lecture depuis la bibliothèque</string>
     <string name="set_separators">Séparateurs multi-valeurs</string>
     <string name="set_observing">Rechargement automatique</string>
-    <string name="set_playback_mode_songs">Jouer à partir de toutes les chansons</string>
-    <string name="set_playback_mode_artist">Jouer de l\'artiste</string>
-    <string name="set_playback_mode_genre">Jouer à partir du genre</string>
+    <string name="set_play_song_from_all">Jouer à partir de toutes les chansons</string>
+    <string name="set_play_song_from_artist">Jouer de l\'artiste</string>
+    <string name="set_play_song_from_genre">Jouer à partir du genre</string>
     <string name="set_separators_comma">Virgule (,)</string>
     <string name="set_separators_semicolon">Point-virgule (;)</string>
     <string name="set_exclude_non_music_desc">Ignorer les fichiers audio qui ne sont pas de la musique, tels que les podcasts</string>
     <string name="set_separators_warning">Avertissement : L\'utilisation de ce paramètre peut entraîner l\'interprétation incorrecte de certaines balises comme ayant plusieurs valeurs. Vous pouvez résoudre ce problème en préfixant les caractères de séparation indésirables avec une barre oblique inverse (\\).</string>
     <string name="set_exclude_non_music">Exclure non-musique</string>
-    <string name="set_playback_mode_album">Lire depuis l\'album</string>
+    <string name="set_play_song_from_album">Lire depuis l\'album</string>
     <string name="set_separators_slash">Barre oblique (/)</string>
     <string name="set_separators_plus">Plus (+)</string>
     <string name="set_wipe_desc">Vider l\'état de lecture précédemment enregistré (si il existe)</string>

app/src/main/res/values-gl/strings.xml

@@ -8,7 +8,7 @@
     <string name="set_root_title">Axustes</string>
     <string name="set_theme_day">Claro</string>
     <string name="set_theme_night">Escuro</string>
-    <string name="set_library_song_playback_mode">Cando se está a reproducir dende a biblioteca</string>
+    <string name="set_play_in_list_with">Cando se está a reproducir dende a biblioteca</string>
     <string name="lbl_artist">Artista</string>
     <string name="info_app_desc">Un reproductor de música simple e racional para android.</string>
     <string name="lbl_singles">Sinxelo</string>
@@ -82,17 +82,17 @@
     <string name="set_observing_desc">Recarga a biblioteca de música cando cambia (require unha notificación persistente)</string>
     <string name="set_notif_action">Acción da notificación personalizada</string>
     <string name="set_action_mode_next">Saltar ao seguinte</string>
-    <string name="set_playback_mode_genre">Reproducir dende xénero</string>
+    <string name="set_play_song_from_genre">Reproducir dende xénero</string>
     <string name="set_keep_shuffle_desc">Manter a mestura ao reproducir unha canción nova</string>
     <string name="set_content">Contido</string>
     <string name="set_action_mode_repeat">Modo de repetición</string>
     <string name="set_behavior">Comportamento</string>
-    <string name="set_playback_mode_artist">Reproducir dende artista</string>
+    <string name="set_play_song_from_artist">Reproducir dende artista</string>
     <string name="set_keep_shuffle">Lembrar a mestura</string>
     <string name="set_music">Música</string>
-    <string name="set_playback_mode_none">Reproducir dende o elemento que se mostra</string>
-    <string name="set_playback_mode_songs">Reproducir dende todas as cancións</string>
-    <string name="set_playback_mode_album">Reproducir dende álbum</string>
+    <string name="set_play_song_none">Reproducir dende o elemento que se mostra</string>
+    <string name="set_play_song_from_all">Reproducir dende todas as cancións</string>
+    <string name="set_play_song_from_album">Reproducir dende álbum</string>
     <string name="set_observing">Recarga automática</string>
     <string name="set_exclude_non_music_desc">Ignorar arquivos de audio que non sexan música, como os pódcasts</string>
     <string name="lbl_all_songs">Todas as cancións</string>
@@ -138,7 +138,7 @@
     <string name="set_lib_tabs">Pestanas de biblioteca</string>
     <string name="set_lib_tabs_desc">Cambiar a visibilidade e a orde das pestanas da biblioteca</string>
     <string name="set_bar_action">Acción personalizada da barra de reprodución</string>
-    <string name="set_detail_song_playback_mode">Cando se reproduce dende os detalles</string>
+    <string name="set_play_in_parent_with">Cando se reproduce dende os detalles</string>
     <string name="set_content_desc">Controla como se carga a música e as imaxes</string>
     <string name="set_separators">Separadores de varios valores</string>
     <string name="set_separators_desc">Configura caracteres que denotan múltiples valores da etiqueta</string>

app/src/main/res/values-hi/strings.xml

@@ -63,7 +63,7 @@
     <string name="lbl_play_next">अगला चलाएं</string>
     <string name="lbl_file_name">फ़ाइल का नाम</string>
     <string name="set_lib_tabs">लायब्रेरी टैब्स</string>
-    <string name="set_playback_mode_album">एल्बम से चलाएं</string>
+    <string name="set_play_song_from_album">एल्बम से चलाएं</string>
     <string name="set_content">सामग्री</string>
     <string name="fmt_selected">%d चयनित</string>
     <string name="lbl_format">प्रारूप</string>
@@ -85,8 +85,8 @@
     <string name="clr_dynamic">गतिशील</string>
     <string name="set_ui">लुक और फील</string>
     <string name="set_round_mode_desc">अतिरिक्त UI तत्वों पर गोल कोनों को सक्षम करें (एल्बम कवर को गोल करने की आवश्यकता है)</string>
-    <string name="set_playback_mode_none">दिखाए गए आइटम से चलाएँ</string>
-    <string name="set_library_song_playback_mode">लाइब्रेरी से चलाते समय</string>
+    <string name="set_play_song_none">दिखाए गए आइटम से चलाएँ</string>
+    <string name="set_play_in_list_with">लाइब्रेरी से चलाते समय</string>
     <string name="set_observing_desc">संगीत लाइब्रेरी को फिर से लोड करें जब भी यह बदलता है (स्थाई नोटीफिकेशन की आवश्यकता होती है)</string>
     <string name="set_exclude_non_music_desc">ऑडियो फ़ाइलों को अनदेखा करें जो संगीत नहीं हैं, जैसे कि पॉडकास्ट</string>
     <string name="lbl_compilation_live">लाइव संकलन</string>
@@ -96,7 +96,7 @@
     <string name="lbl_playlist">प्लेलिस्ट</string>
     <string name="lbl_playlists">प्लेलिस्टें</string>
     <string name="set_round_mode">गोल मोड</string>
-    <string name="set_playback_mode_songs">सभी गीतों से चलाएं</string>
+    <string name="set_play_song_from_all">सभी गीतों से चलाएं</string>
     <string name="fmt_deletion_info">%s हटाएँ\? इसे पूर्ववत नहीं किया जा सकता।</string>
     <string name="fmt_lib_song_count">लोड किए गए गाने: %d</string>
     <string name="lbl_sort_dec">अवरोही</string>
@@ -109,7 +109,7 @@
     <string name="set_personalize_desc">UI नियंत्रण और व्यवहार अनुकूलित करें</string>
     <string name="fmt_lib_artist_count">कलाकार लोड किए गए: %d</string>
     <string name="set_bar_action">कस्टम प्लेबैक बार एक्शन</string>
-    <string name="set_detail_song_playback_mode">आइटम विवरण से चलाते समय</string>
+    <string name="set_play_in_parent_with">आइटम विवरण से चलाते समय</string>
     <string name="lbl_album_live">लाइव एल्बम</string>
     <string name="lbl_album_remix">रीमिक्स एल्बम</string>
     <string name="lbl_ep_live">लाइव EP</string>
@@ -165,8 +165,8 @@
     <string name="lbl_props">गीत के गुणधर्म</string>
     <string name="set_display">डिस्पले</string>
     <string name="set_notif_action">कस्टम नोटीफिकेशन एक्शन</string>
-    <string name="set_playback_mode_artist">कलाकार से चलाएं</string>
-    <string name="set_playback_mode_genre">शैली से चलाएं</string>
+    <string name="set_play_song_from_artist">कलाकार से चलाएं</string>
+    <string name="set_play_song_from_genre">शैली से चलाएं</string>
     <string name="set_keep_shuffle">फेरबदल याद रखें</string>
     <string name="set_keep_shuffle_desc">नया गाना बजाते समय फेरबदल करते रहें</string>
     <string name="set_separators">मल्टी-मूल्य विभाजक</string>

app/src/main/res/values-hr/strings.xml

@@ -82,9 +82,9 @@
     <string name="set_pre_amp_with">Prilagođavanje s oznakama</string>
     <string name="set_pre_amp_without">Prilagođavanje bez oznaka</string>
     <string name="set_pre_amp_warning">Upozorenje: Postavljanje pretpojačala na visoke razine može uzrokovati vrhunce tonova u nekim zvučnim zapisima.</string>
-    <string name="set_library_song_playback_mode">Kada se reproducira iz zbirke</string>
-    <string name="set_detail_song_playback_mode">Kada se reproducira iz detalja predmeta</string>
-    <string name="set_playback_mode_songs">Reproduciraj iz svih pjesama</string>
+    <string name="set_play_in_list_with">Kada se reproducira iz zbirke</string>
+    <string name="set_play_in_parent_with">Kada se reproducira iz detalja predmeta</string>
+    <string name="set_play_song_from_all">Reproduciraj iz svih pjesama</string>
     <string name="set_reindex">Aktualiziraj glazbu</string>
     <string name="set_reindex_desc">Ponovo učitaj glazbenu biblioteku, koristeći predmemorirane oznake kada je to moguće</string>
     <string name="set_dirs">Mape glazbe</string>
@@ -191,10 +191,10 @@
     <string name="set_rewind_prev">Premotaj prije preskakanja natrag</string>
     <string name="set_save_desc">Spremi trenutno stanje reprodukcije</string>
     <string name="desc_skip_next">Preskoči na sljedeću pjesmu</string>
-    <string name="set_playback_mode_none">Reproduciraj iz prikazanog predmeta</string>
+    <string name="set_play_song_none">Reproduciraj iz prikazanog predmeta</string>
     <string name="set_keep_shuffle">Zapamti miješanje glazbe</string>
     <string name="set_restore_desc">Vrati prethodno spremljeno stanje reprodukcije (ako postoji)</string>
-    <string name="set_playback_mode_album">Reproduciraj iz albuma</string>
+    <string name="set_play_song_from_album">Reproduciraj iz albuma</string>
     <string name="set_repeat_pause_desc">Pauziraj čim se pjesma ponovi</string>
     <string name="set_rewind_prev_desc">Premotaj prije vraćanja na prethodnu pjesmu</string>
     <string name="desc_play_pause">Reproduciraj ili pauziraj</string>
@@ -230,7 +230,7 @@
     <string name="set_hide_collaborators">Sakrij suradnike</string>
     <string name="set_cover_mode_off">Isključeno</string>
     <string name="set_exclude_non_music">Isključi sve što nije glazba</string>
-    <string name="set_playback_mode_artist">Reproduciraj iz izvođača</string>
+    <string name="set_play_song_from_artist">Reproduciraj iz izvođača</string>
     <string name="set_cover_mode_quality">Visoka kvaliteta</string>
     <string name="set_cover_mode_media_store">Brzo</string>
     <string name="set_exclude_non_music_desc">Zanemari sve audio datoteke koje nisu glazba, npr. podcast datoteke</string>
@@ -249,7 +249,7 @@
     <string name="fmt_selected">Odabrano: %d</string>
     <string name="lbl_shuffle_selected">Promiješaj odabrane</string>
     <string name="lbl_play_selected">Reproduciraj odabrane</string>
-    <string name="set_playback_mode_genre">Reproduciraj iz žanra</string>
+    <string name="set_play_song_from_genre">Reproduciraj iz žanra</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Resetiraj</string>

app/src/main/res/values-hu/strings.xml

@@ -145,8 +145,8 @@
     <string name="lbl_shuffle_selected">Kiválasztottak keverése</string>
     <string name="set_personalize_desc">UI vezérlők és viselkedés testreszabása</string>
     <string name="set_lib_tabs_desc">A könyvtárfülek láthatóságának és sorrendjének módosítása</string>
-    <string name="set_detail_song_playback_mode">A tétel részleteiből történő lejátszáskor</string>
-    <string name="set_playback_mode_album">Lejátszás albumból</string>
+    <string name="set_play_in_parent_with">A tétel részleteiből történő lejátszáskor</string>
+    <string name="set_play_song_from_album">Lejátszás albumból</string>
     <string name="set_content_desc">A zene és a képek betöltésének vezérlése</string>
     <string name="set_images">Képek</string>
     <string name="lbl_duration">Időtartam</string>
@@ -175,8 +175,8 @@
     <string name="lbl_reset">Alaphelyzet</string>
     <string name="lbl_state_wiped">Állapot törölve</string>
     <string name="lng_author">Fejlesztő Alexander Capehart</string>
-    <string name="set_playback_mode_songs">Lejátszás az összes dalból</string>
-    <string name="set_playback_mode_genre">Lejátszás műfajból</string>
+    <string name="set_play_song_from_all">Lejátszás az összes dalból</string>
+    <string name="set_play_song_from_genre">Lejátszás műfajból</string>
     <string name="set_content">Tartalom</string>
     <string name="set_observing_desc">A zenei könyvtár újratöltése, ha változik (állandó értesítést igényel)</string>
     <string name="set_dirs">Zene könyvtárak</string>
@@ -212,8 +212,8 @@
     <string name="set_dirs_mode">Mód</string>
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
     <string name="set_pre_amp_with">Beállítás címkékkel</string>
-    <string name="set_library_song_playback_mode">A könyvtárból történő lejátszáskor</string>
-    <string name="set_playback_mode_none">Lejátszás a megjelenő elemről</string>
+    <string name="set_play_in_list_with">A könyvtárból történő lejátszáskor</string>
+    <string name="set_play_song_none">Lejátszás a megjelenő elemről</string>
     <string name="fmt_bitrate">%d kbps</string>
     <string name="fmt_lib_genre_count">Betöltött műfaj: %d</string>
     <string name="lbl_indexer">Zene betöltés</string>
@@ -250,7 +250,7 @@
     <string name="lng_playlist_renamed">Playlista átnevezve</string>
     <string name="lng_playlist_deleted">Playlista törölve</string>
     <string name="set_action_mode_next">Ugrás a következőre</string>
-    <string name="set_playback_mode_artist">Lejátszás előadótól</string>
+    <string name="set_play_song_from_artist">Lejátszás előadótól</string>
     <string name="set_music">Zene</string>
     <string name="set_exclude_non_music_desc">A nem zenei fájlok, például podcastok figyelmen kívül hagyása</string>
     <string name="set_separators_desc">Több címkeértéket jelölő karakterek konfigurálása</string>

app/src/main/res/values-in/strings.xml

@@ -93,8 +93,8 @@
     <string name="set_pre_amp_desc">Pre-amp diterapkan ke penyesuaian yang ada selama pemutaran</string>
     <string name="set_pre_amp_with">Penyesuaian dengan tag</string>
     <string name="set_pre_amp_warning">Peringatan: Mengubah pre-amp ke nilai positif yang tinggi dapat mengakibatkan puncak pada beberapa trek audio.</string>
-    <string name="set_playback_mode_none">Putar dari item yang ditampilkan</string>
-    <string name="set_playback_mode_songs">Putar dari semua lagu</string>
+    <string name="set_play_song_none">Putar dari item yang ditampilkan</string>
+    <string name="set_play_song_from_all">Putar dari semua lagu</string>
     <string name="set_keep_shuffle_desc">Tetap mengacak saat memutar lagu baru</string>
     <string name="set_repeat_pause">Jeda pada pengulangan</string>
     <string name="set_rewind_prev">Putar balik sebelum melompat ke belakang</string>
@@ -133,17 +133,17 @@
     <string name="fmt_lib_album_count">Album yang dimuat: %d</string>
     <string name="fmt_lib_artist_count">Artis yang dimuat: %d</string>
     <string name="set_replay_gain_mode_dynamic">Utamakan album jika ada yang diputar</string>
-    <string name="set_library_song_playback_mode">Saat diputar dari pustaka</string>
-    <string name="set_playback_mode_album">Putar dari album</string>
+    <string name="set_play_in_list_with">Saat diputar dari pustaka</string>
+    <string name="set_play_song_from_album">Putar dari album</string>
     <string name="desc_change_repeat">Ubah mode pengulangan</string>
     <string name="desc_artist_image">Gambar Artis untuk %s</string>
-    <string name="set_detail_song_playback_mode">Saat diputar dari keterangan item</string>
+    <string name="set_play_in_parent_with">Saat diputar dari keterangan item</string>
     <string name="set_dirs_mode_exclude_desc">Musik <b>tidak</b> akan dimuat dari folder yang Anda tambahkan.</string>
     <string name="desc_remove_song">Hapus lagu antrian ini</string>
     <string name="desc_clear_search">Hapus kueri pencarian</string>
     <string name="set_pre_amp_without">Penyesuaian tanpa tag</string>
     <string name="set_dirs">Folder musik</string>
-    <string name="set_playback_mode_artist">Putar dari artis</string>
+    <string name="set_play_song_from_artist">Putar dari artis</string>
     <string name="set_dirs_mode">Mode</string>
     <string name="err_no_perms">Auxio memerlukan izin untuk membaca perpustakaan musik Anda</string>
     <string name="desc_skip_prev">Loncat ke lagu terakhir</string>
@@ -193,7 +193,7 @@
     <string name="set_cover_mode_quality">Kualitas tinggi</string>
     <string name="set_separators_semicolon">Titik koma (;)</string>
     <string name="lbl_wiki">Wiki</string>
-    <string name="set_playback_mode_genre">Putar dari aliran</string>
+    <string name="set_play_song_from_genre">Putar dari aliran</string>
     <string name="lbl_genre">Aliran</string>
     <string name="set_cover_mode">Sampul album</string>
     <string name="set_cover_mode_off">Nonaktif</string>

app/src/main/res/values-it/strings.xml

@@ -23,9 +23,9 @@
     <string name="lbl_playback">Ora in riproduzione</string>
     <string name="lbl_play">Riproduci</string>
     <string name="lbl_shuffle">Mescola</string>
-    <string name="set_playback_mode_songs">Riproduci da tutte le canzoni</string>
-    <string name="set_playback_mode_album">Riproduci dall\'album</string>
-    <string name="set_playback_mode_artist">Riproduci dall\'artista</string>
+    <string name="set_play_song_from_all">Riproduci da tutte le canzoni</string>
+    <string name="set_play_song_from_album">Riproduci dall\'album</string>
+    <string name="set_play_song_from_artist">Riproduci dall\'artista</string>
     <string name="lbl_queue">Coda</string>
     <string name="lbl_play_next">Riproduci successivo</string>
     <string name="lbl_queue_add">Accoda</string>
@@ -66,7 +66,7 @@
     <string name="set_replay_gain_mode_album">Preferisci album</string>
     <string name="set_replay_gain_mode_dynamic">Preferisci l\'album se in riproduzione</string>
     <string name="set_personalize">Comportamento</string>
-    <string name="set_library_song_playback_mode">Quando in riproduzione dalla libreria</string>
+    <string name="set_play_in_list_with">Quando in riproduzione dalla libreria</string>
     <string name="set_keep_shuffle">Mantieni mescolamento</string>
     <string name="set_keep_shuffle_desc">Mantiene il mescolamento anche se una nuova canzone è selezionata</string>
     <string name="set_rewind_prev">Riavvolgi prima di saltare indietro</string>
@@ -154,14 +154,14 @@
     <string name="fmt_db_pos">+%.1f dB</string>
     <string name="fmt_sample_rate">%d Hz</string>
     <string name="fmt_indexing">Caricamento libreria musicale… (%1$d/%2$d)</string>
-    <string name="set_detail_song_playback_mode">Quando in riproduzione dai dettagli dell\'elemento</string>
+    <string name="set_play_in_parent_with">Quando in riproduzione dai dettagli dell\'elemento</string>
     <string name="set_pre_amp_warning">Attenzione: impostare valore positivi alti può provocare distorsioni su alcune tracce.</string>
     <string name="set_pre_amp_without">Regolazione senza tag</string>
     <string name="lbl_shuffle_shortcut_short">Mescola</string>
     <string name="lbl_shuffle_shortcut_long">Mescola tutto</string>
     <string name="set_pre_amp_with">Regolazione con tag</string>
     <string name="set_pre_amp_desc">Il pre-amp è applicato alla regolazione esistente durante la riproduzione</string>
-    <string name="set_playback_mode_none">Riproduci dall\'elemento mostrato</string>
+    <string name="set_play_song_none">Riproduci dall\'elemento mostrato</string>
     <string name="set_dirs_desc">Gestisci le cartelle da dove caricare la musica</string>
     <string name="set_dirs">Cartelle musica</string>
     <string name="set_dirs_mode_exclude">Escludi</string>
@@ -258,7 +258,7 @@
     <string name="lbl_shuffle_selected">Mescola selezionati</string>
     <string name="lbl_play_selected">Riproduci selezionati</string>
     <string name="fmt_selected">%d selezionati</string>
-    <string name="set_playback_mode_genre">Riproduci dal genere</string>
+    <string name="set_play_song_from_genre">Riproduci dal genere</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Ripristina</string>

app/src/main/res/values-iw/strings.xml

@@ -87,13 +87,13 @@
     <string name="set_action_mode_next">דילוג לבא</string>
     <string name="set_action_mode_repeat">מצב חזרה</string>
     <string name="set_behavior">התנהגות</string>
-    <string name="set_library_song_playback_mode">כאשר מנוגן מהספרייה</string>
-    <string name="set_detail_song_playback_mode">כאשר מנוגן מפרטי הפריט</string>
-    <string name="set_playback_mode_none">ניגון מהפריט המוצג</string>
-    <string name="set_playback_mode_songs">ניגון מכל השירים</string>
-    <string name="set_playback_mode_album">ניגון מאלבום</string>
-    <string name="set_playback_mode_artist">ניגון מהאומן</string>
-    <string name="set_playback_mode_genre">ניגון מסוגה</string>
+    <string name="set_play_in_list_with">כאשר מנוגן מהספרייה</string>
+    <string name="set_play_in_parent_with">כאשר מנוגן מפרטי הפריט</string>
+    <string name="set_play_song_none">ניגון מהפריט המוצג</string>
+    <string name="set_play_song_from_all">ניגון מכל השירים</string>
+    <string name="set_play_song_from_album">ניגון מאלבום</string>
+    <string name="set_play_song_from_artist">ניגון מהאומן</string>
+    <string name="set_play_song_from_genre">ניגון מסוגה</string>
     <string name="set_keep_shuffle">לזכור ערבוב</string>
     <string name="set_keep_shuffle_desc">המשך ערבוב בעת הפעלת שיר חדש</string>
     <string name="set_content">תוכן</string>

app/src/main/res/values-ja/strings.xml

@@ -54,7 +54,7 @@
     <string name="set_accent">カラースキーム</string>
     <string name="set_black_mode">黒基調</string>
     <string name="set_restore_state">再生状態を復元</string>
-    <string name="set_playback_mode_none">表示されたアイテムから再生</string>
+    <string name="set_play_song_none">表示されたアイテムから再生</string>
     <string name="desc_exit">再生停止</string>
     <string name="clr_red">赤</string>
     <string name="lbl_file_name">ファイル名</string>
@@ -151,11 +151,11 @@
     <string name="set_headset_autoplay_desc">ヘッドセット接続時に常時再生開始 (動作しない機種あり)</string>
     <string name="set_headset_autoplay">ヘッドセット自動再生</string>
     <string name="set_replay_gain">リプレイゲイン</string>
-    <string name="set_playback_mode_songs">すべての曲から再生</string>
-    <string name="set_playback_mode_album">アルバムから再生</string>
-    <string name="set_playback_mode_artist">アーティストから再生</string>
-    <string name="set_library_song_playback_mode">ライブラリからの再生時</string>
-    <string name="set_detail_song_playback_mode">アイテム詳細からの再生時</string>
+    <string name="set_play_song_from_all">すべての曲から再生</string>
+    <string name="set_play_song_from_album">アルバムから再生</string>
+    <string name="set_play_song_from_artist">アーティストから再生</string>
+    <string name="set_play_in_list_with">ライブラリからの再生時</string>
+    <string name="set_play_in_parent_with">アイテム詳細からの再生時</string>
     <string name="set_exclude_non_music">音楽以外を除外</string>
     <string name="set_dirs_mode_include_desc">ここに追加したフォルダから<b>のみ</b>音楽が読み込まれます。</string>
     <string name="set_restore_desc">前回保存された再生状態がある場合、再生状態を復元</string>
@@ -227,7 +227,7 @@
     </plurals>
     <string name="set_action_mode_next">次ヘスキップ</string>
     <string name="set_action_mode_repeat">繰り返しモード</string>
-    <string name="set_playback_mode_genre">ジャンルから再生</string>
+    <string name="set_play_song_from_genre">ジャンルから再生</string>
     <string name="set_keep_shuffle_desc">新しい曲の再生時にシャフルを保持</string>
     <string name="clr_dynamic">ダイナミック</string>
     <string name="err_did_not_wipe">再生状態を解除できません</string>

app/src/main/res/values-ko/strings.xml

@@ -27,9 +27,9 @@
     <string name="lbl_playback">지금 재생 중</string>
     <string name="lbl_play">재생</string>
     <string name="lbl_shuffle">셔플</string>
-    <string name="set_playback_mode_songs">모든 곡에서 재생</string>
-    <string name="set_playback_mode_album">앨범에서 재생</string>
-    <string name="set_playback_mode_artist">아티스트에서 재생</string>
+    <string name="set_play_song_from_all">모든 곡에서 재생</string>
+    <string name="set_play_song_from_album">앨범에서 재생</string>
+    <string name="set_play_song_from_artist">아티스트에서 재생</string>
     <string name="lbl_queue">대기열</string>
     <string name="lbl_play_next">다음 곡 재생</string>
     <string name="lbl_queue_add">대기열에 추가</string>
@@ -78,7 +78,7 @@
     <string name="set_pre_amp_without">태그 없이 조정</string>
     <string name="set_pre_amp_warning">주의: 프리앰프를 높게 설정하면 일부 소리 트랙이 왜곡될 수 있습니다.</string>
     <string name="set_personalize">동작</string>
-    <string name="set_library_song_playback_mode">라이브러리에서 재생할 때</string>
+    <string name="set_play_in_list_with">라이브러리에서 재생할 때</string>
     <string name="set_keep_shuffle">무작위 재생 기억</string>
     <string name="set_keep_shuffle_desc">새로운 곡을 재생할 때 무작위 재생 유지</string>
     <string name="set_rewind_prev">이전 곡으로 가기 전에 되감기</string>
@@ -178,7 +178,7 @@
     <string name="lbl_mixes">DJ믹스</string>
     <string name="lbl_equalizer">이퀄라이저</string>
     <string name="lbl_shuffle_shortcut_short">셔플</string>
-    <string name="set_playback_mode_none">표시된 항목에서 재생</string>
+    <string name="set_play_song_none">표시된 항목에서 재생</string>
     <string name="lng_indexing">음악 라이브러리를 불러오는 중…</string>
     <string name="set_wipe_state">재생 상태 지우기</string>
     <string name="set_restore_state">재생 상태 복원</string>
@@ -238,7 +238,7 @@
     <string name="fmt_indexing">음악 라이브러리를 불러오는 중… (%1$d/%2$d)</string>
     <string name="lbl_genre">장르</string>
     <string name="set_separators_warning">경고: 이 설정을 사용하면 일부 태그가 여러 값을 갖는 것으로 잘못 해석될 수 있습니다. 구분자로 읽히지 않도록 하려면 해당 구분자 앞에 백슬래시 (\\)를 붙입니다.</string>
-    <string name="set_detail_song_playback_mode">항목 세부 정보에서 재생할 때</string>
+    <string name="set_play_in_parent_with">항목 세부 정보에서 재생할 때</string>
     <string name="lng_observing">음악 라이브러리의 변경사항을 추적하는 중…</string>
     <string name="set_action_mode_next">다음 곡으로 건너뛰기</string>
     <string name="set_exclude_non_music_desc">팟캐스트와 같이 음악이 아닌 소리 파일 무시</string>
@@ -256,7 +256,7 @@
     <string name="fmt_selected">%d 선택됨</string>
     <string name="lbl_reset">재설정</string>
     <string name="lbl_wiki">위키</string>
-    <string name="set_playback_mode_genre">장르에서 재생</string>
+    <string name="set_play_song_from_genre">장르에서 재생</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="set_replay_gain">리플레이게인</string>
     <string name="set_audio_desc">사운드 및 재생 동작 구성</string>

app/src/main/res/values-lt/strings.xml

@@ -155,8 +155,8 @@
     <string name="set_rewind_prev">Persukti prieš šokant atgal</string>
     <string name="set_rewind_prev_desc">Persukti atgal prieš peršokant į ankstesnę dainą</string>
     <string name="set_repeat_pause">Pauzė ant kartojamo</string>
-    <string name="set_library_song_playback_mode">Kai grojant iš bibliotekos</string>
-    <string name="set_detail_song_playback_mode">Kai grojant iš elemento detalių</string>
+    <string name="set_play_in_list_with">Kai grojant iš bibliotekos</string>
+    <string name="set_play_in_parent_with">Kai grojant iš elemento detalių</string>
     <string name="desc_music_dir_delete">Pašalinti aplanką</string>
     <string name="lbl_genre">Žanras</string>
     <string name="lng_search_library">Ieškokite savo bibliotekoje…</string>
@@ -174,10 +174,10 @@
     <string name="set_dirs_mode_exclude_desc">Muzika <b>nebus</b> įkeliama iš pridėtų aplankų jūs pridėsite.</string>
     <string name="set_dirs_mode_include">Įtraukti</string>
     <string name="desc_remove_song">Pašalinti šią dainą</string>
-    <string name="set_playback_mode_songs">Groti iš visų dainų</string>
-    <string name="set_playback_mode_none">Groti iš parodyto elemento</string>
-    <string name="set_playback_mode_album">Groti iš albumo</string>
-    <string name="set_playback_mode_artist">Groti iš atlikėjo</string>
+    <string name="set_play_song_from_all">Groti iš visų dainų</string>
+    <string name="set_play_song_none">Groti iš parodyto elemento</string>
+    <string name="set_play_song_from_album">Groti iš albumo</string>
+    <string name="set_play_song_from_artist">Groti iš atlikėjo</string>
     <string name="lbl_state_wiped">Išvalyta būsena</string>
     <string name="set_dirs_mode_exclude">Neįtraukti</string>
     <string name="set_dirs_mode_include_desc">Muzika <b>bus</b> įkeliama iš aplankų jūs pridėsite.</string>
@@ -252,7 +252,7 @@
     <string name="fmt_selected">%d Pasirinkta</string>
     <string name="lbl_play_selected">Groti pasirinktą</string>
     <string name="lbl_shuffle_selected">Pasirinktas maišymas</string>
-    <string name="set_playback_mode_genre">Groti iš žanro</string>
+    <string name="set_play_song_from_genre">Groti iš žanro</string>
     <string name="lbl_wiki">Viki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Nustatyti iš naujo</string>

app/src/main/res/values-nl/strings.xml

@@ -17,9 +17,9 @@
     <string name="lbl_sort_asc">Oplopend</string>
     <string name="lbl_play">Afspelen</string>
     <string name="lbl_shuffle">Shuffle</string>
-    <string name="set_playback_mode_songs">Speel van alle nummers </string>
-    <string name="set_playback_mode_album">Speel af van album </string>
-    <string name="set_playback_mode_artist">Speel van artiest </string>
+    <string name="set_play_song_from_all">Speel van alle nummers </string>
+    <string name="set_play_song_from_album">Speel af van album </string>
+    <string name="set_play_song_from_artist">Speel van artiest </string>
     <string name="lbl_playback">Nu afspelen</string>
     <string name="lbl_queue">Wachtrij</string>
     <string name="lbl_play_next">Afspelen als volgende</string>
@@ -48,7 +48,7 @@
     <string name="set_notif_action">Gebruikt een afternatief notification action</string>
     <string name="set_audio">Audio</string>
     <string name="set_personalize">Gedrag</string>
-    <string name="set_library_song_playback_mode">Bij het afspelen vanuit de bibliotheek</string>
+    <string name="set_play_in_list_with">Bij het afspelen vanuit de bibliotheek</string>
     <string name="set_keep_shuffle">Onthoud shuffle</string>
     <string name="set_keep_shuffle_desc">Houd shuffle aan bij het afspelen van een nieuw nummer</string>
     <string name="set_rewind_prev">Terugspoelen voordat je terugspoelt</string>
@@ -149,7 +149,7 @@
     <string name="set_pre_amp_with">Aanpassing met tags</string>
     <string name="set_pre_amp_without">Aanpassing zonder tags</string>
     <string name="def_playback">Er speelt geen muziek</string>
-    <string name="set_detail_song_playback_mode">Bij het afspelen van item details</string>
+    <string name="set_play_in_parent_with">Bij het afspelen van item details</string>
     <string name="set_round_mode">Ronde modus</string>
     <string name="set_round_mode_desc">Afgeronde hoeken inschakelen voor extra UI-elementen (vereist dat albumhoezen zijn afgerond)</string>
     <string name="lbl_state_restored">Staat gerestaureerd</string>
@@ -158,7 +158,7 @@
     <string name="set_headset_autoplay">Headset automatisch afspelen</string>
     <string name="set_replay_gain_mode">ReplayGain</string>
     <string name="set_pre_amp_warning">Waarschuwing: Als u de voorversterker op een hoge positieve waarde zet, kan dit bij sommige audiotracks tot pieken leiden.</string>
-    <string name="set_playback_mode_none">Afspelen vanaf getoond item</string>
+    <string name="set_play_song_none">Afspelen vanaf getoond item</string>
     <string name="set_restore_state">Afspeelstatus herstellen</string>
     <string name="set_restore_desc">Herstel de eerder opgeslagen afspeelstatus (indien aanwezig)</string>
     <string name="err_did_not_restore">Kan status niet herstellen</string>
@@ -271,7 +271,7 @@
     <string name="lbl_delete">Verwijderen</string>
     <string name="set_separators">Scheiders met meerdere waarden</string>
     <string name="set_hide_collaborators">Verberg bijdragers</string>
-    <string name="set_playback_mode_genre">Speel vanuit genre</string>
+    <string name="set_play_song_from_genre">Speel vanuit genre</string>
     <string name="lbl_date_added">Datum toegevoegd</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="fmt_def_playlist">Afspeellijst %d</string>

app/src/main/res/values-pa/strings.xml

@@ -112,13 +112,13 @@
     <string name="set_action_mode_next">ਅਗਲੇ \'ਤੇ ਜਾਓ</string>
     <string name="set_action_mode_repeat">ਦੁਹਰਾਓ ਮੋਡ</string>
     <string name="set_behavior">ਵਿਵਹਾਰ</string>
-    <string name="set_library_song_playback_mode">ਜਦੋਂ ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਚਲਾਉਂਦੇ ਹਾਂ</string>
-    <string name="set_detail_song_playback_mode">ਜਦੋਂ ਆਈਟਮ ਦੇ ਵੇਰਵਿਆਂ ਤੋਂ ਚਲਾਉਂਦੇ ਹਾਂ</string>
-    <string name="set_playback_mode_none">ਦਿਖਾਈ ਗਈ ਆਈਟਮ ਤੋਂ ਚਲਾਓ</string>
-    <string name="set_playback_mode_songs">ਸਾਰੇ ਗੀਤਾਂ ਤੋਂ ਚਲਾਓ</string>
-    <string name="set_playback_mode_album">ਐਲਬਮ ਤੋਂ ਚਲਾਓ</string>
-    <string name="set_playback_mode_artist">ਕਲਾਕਾਰ ਤੋਂ ਖੇਡੋ</string>
-    <string name="set_playback_mode_genre">ਸ਼ੈਲੀ ਤੋਂ ਖੇਡੋ</string>
+    <string name="set_play_in_list_with">ਜਦੋਂ ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਚਲਾਉਂਦੇ ਹਾਂ</string>
+    <string name="set_play_in_parent_with">ਜਦੋਂ ਆਈਟਮ ਦੇ ਵੇਰਵਿਆਂ ਤੋਂ ਚਲਾਉਂਦੇ ਹਾਂ</string>
+    <string name="set_play_song_none">ਦਿਖਾਈ ਗਈ ਆਈਟਮ ਤੋਂ ਚਲਾਓ</string>
+    <string name="set_play_song_from_all">ਸਾਰੇ ਗੀਤਾਂ ਤੋਂ ਚਲਾਓ</string>
+    <string name="set_play_song_from_album">ਐਲਬਮ ਤੋਂ ਚਲਾਓ</string>
+    <string name="set_play_song_from_artist">ਕਲਾਕਾਰ ਤੋਂ ਖੇਡੋ</string>
+    <string name="set_play_song_from_genre">ਸ਼ੈਲੀ ਤੋਂ ਖੇਡੋ</string>
     <string name="set_keep_shuffle">ਸ਼ਫਲ ਯਾਦ ਰੱਖੋ</string>
     <string name="set_repeat_pause_desc">ਗੀਤ ਦੁਹਰਾਉਣ ਤੇ ਰੋਕੋ</string>
     <string name="set_replay_gain">ਰੀਪਲੇਅ-ਗੇਨ</string>

app/src/main/res/values-pl/strings.xml

@@ -132,8 +132,8 @@
     <string name="lbl_equalizer">Korektor</string>
     <string name="lbl_size">Rozmiar</string>
     <string name="err_no_dirs">Brak folderów</string>
-    <string name="set_playback_mode_songs">Odtwórz wszystkie utwory</string>
-    <string name="set_playback_mode_album">Odtwórz album</string>
+    <string name="set_play_song_from_all">Odtwórz wszystkie utwory</string>
+    <string name="set_play_song_from_album">Odtwórz album</string>
     <string name="set_headset_autoplay_desc">Automatycznie odtwórz muzykę po podłączeniu słuchawek (może nie działać na wszystkich urządzeniach)</string>
     <string name="set_reindex">Odśwież muzykę</string>
     <string name="set_reindex_desc">Odśwież bibliotekę muzyczną używając tagów z pamięci cache, jeśli są dostępne</string>
@@ -157,7 +157,7 @@
     <string name="set_action_mode_repeat">Tryb powtarzania</string>
     <string name="set_replay_gain_mode">Ustawienie ReplayGain</string>
     <string name="set_replay_gain_mode_dynamic">Preferuj album, jeśli jest odtwarzany</string>
-    <string name="set_library_song_playback_mode">Odtwarzanie z widoku biblioteki</string>
+    <string name="set_play_in_list_with">Odtwarzanie z widoku biblioteki</string>
     <string name="set_save_state">Zapisz stan odtwarzania</string>
     <string name="set_separators_comma">Przecinek (,)</string>
     <string name="set_separators_semicolon">Średnik (;)</string>
@@ -215,8 +215,8 @@
     <string name="set_pre_amp_with">Regulacja w oparciu o tagi</string>
     <string name="set_pre_amp_without">Regulacja bez tagów</string>
     <string name="set_pre_amp_desc">Wzmocnienie dźwięku przez preamplifier jest nakładane na wcześniej ustawione wzmocnienie podczas odtwarzania</string>
-    <string name="set_detail_song_playback_mode">Odtwarzanie z widoku szczegółowego</string>
-    <string name="set_playback_mode_none">Odtwórz tylko wybrane</string>
+    <string name="set_play_in_parent_with">Odtwarzanie z widoku szczegółowego</string>
+    <string name="set_play_song_none">Odtwórz tylko wybrane</string>
     <string name="set_repeat_pause_desc">Zatrzymaj odtwarzanie, kiedy utwór się powtórzy</string>
     <string name="set_dirs_mode_include_desc">Muzyka będzie importowana <b>tylko</b> z wybranych folderów.</string>
     <string name="set_separators">Znaki oddzielające wartości</string>
@@ -237,7 +237,7 @@
     <string name="set_keep_shuffle_desc">Kontynuuj odtwarzanie losowe po wybraniu nowego utworu</string>
     <string name="fmt_lib_song_count">Zaimportowane utwory: %d</string>
     <string name="set_exclude_non_music_desc">Ignoruj pliki audio które nie są utworami muzycznymi (np. podcasty)</string>
-    <string name="set_playback_mode_artist">Odtwórz od wykonawcy</string>
+    <string name="set_play_song_from_artist">Odtwórz od wykonawcy</string>
     <string name="set_exclude_non_music">Wyklucz inne pliki dźwiękowe</string>
     <string name="set_cover_mode">Okładki albumów</string>
     <string name="set_cover_mode_off">Wyłączone</string>
@@ -262,7 +262,7 @@
     <string name="lbl_reset">Resetuj</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="set_behavior">Funkcje</string>
-    <string name="set_playback_mode_genre">Odtwórz z gatunku</string>
+    <string name="set_play_song_from_genre">Odtwórz z gatunku</string>
     <string name="set_rescan_desc">Wyczyść pamięć cache z tagami i zaimportuj ponownie bibliotekę (wolniej, ale dokładniej)</string>
     <string name="set_rescan">Zaimportuj ponownie bibliotekę</string>
     <plurals name="fmt_artist_count">

app/src/main/res/values-pt-rBR/strings.xml

@@ -163,8 +163,8 @@
     <string name="set_display">Exibição</string>
     <string name="set_round_mode_desc">Ativa cantos arredondados em elementos adicionais da interface do usuário</string>
     <string name="set_replay_gain_mode">Modo de normalização de volume (ReplayGain)</string>
-    <string name="set_playback_mode_none">Reproduzir a partir do item mostrado</string>
-    <string name="set_playback_mode_songs">Reproduzir de todas as músicas</string>
+    <string name="set_play_song_none">Reproduzir a partir do item mostrado</string>
+    <string name="set_play_song_from_all">Reproduzir de todas as músicas</string>
     <string name="set_replay_gain_mode_album">Preferir álbum</string>
     <string name="set_replay_gain_mode_dynamic">Prefira o álbum se estiver tocando</string>
     <string name="set_observing">Recarregamento automático</string>
@@ -183,7 +183,7 @@
     <string name="lng_observing">Monitorando alterações na sua biblioteca de músicas…</string>
     <string name="set_lib_tabs">Abas da biblioteca</string>
     <string name="lbl_genre">Gênero</string>
-    <string name="set_playback_mode_artist">Reproduzir do artista</string>
+    <string name="set_play_song_from_artist">Reproduzir do artista</string>
     <string name="set_restore_desc">Restaura a lista de reprodução salva anteriormente (se houver)</string>
     <string name="set_pre_amp_with">Ajuste em faixas com metadados</string>
     <string name="lbl_state_wiped">Lista limpa</string>
@@ -193,7 +193,7 @@
     <string name="lbl_observing">Monitorando a biblioteca de músicas</string>
     <string name="set_round_mode">Cantos arredondados</string>
     <string name="set_action_mode_next">Pular para o próximo</string>
-    <string name="set_playback_mode_album">Reproduzir do álbum</string>
+    <string name="set_play_song_from_album">Reproduzir do álbum</string>
     <string name="set_save_state">Salvar lista de reprodução</string>
     <string name="set_wipe_state">Limpar lista de reprodução</string>
     <string name="set_restore_state">Restaurar lista de reprodução</string>
@@ -211,8 +211,8 @@
     <string name="lbl_single_remix">Single remix</string>
     <string name="set_content">Conteúdo</string>
     <string name="lbl_track">Faixa</string>
-    <string name="set_library_song_playback_mode">Ao tocar da biblioteca</string>
-    <string name="set_detail_song_playback_mode">Ao tocar a partir dos detalhes do item</string>
+    <string name="set_play_in_list_with">Ao tocar da biblioteca</string>
+    <string name="set_play_in_parent_with">Ao tocar a partir dos detalhes do item</string>
     <string name="lbl_mixtapes">Mixtapes</string>
     <string name="lbl_mixtape">Mixtape</string>
     <string name="lbl_remix_group">Remixes</string>
@@ -259,7 +259,7 @@
     <string name="lbl_wiki">Wiki</string>
     <string name="lbl_reset">Redefinir</string>
     <string name="fmt_list">%1$s, %2$s</string>
-    <string name="set_playback_mode_genre">Tocar a partir do gênero</string>
+    <string name="set_play_song_from_genre">Tocar a partir do gênero</string>
     <string name="set_audio_desc">Configure o comportamento de som e reprodução</string>
     <string name="set_images">Imagens</string>
     <string name="set_ui_desc">Mude o tema e as cores do aplicativo</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -71,8 +71,8 @@
         <item quantity="many">%d Álbuns</item>
         <item quantity="other">%d Álbuns</item>
     </plurals>
-    <string name="set_playback_mode_none">Reproduzir a partir do item mostrado</string>
-    <string name="set_playback_mode_album">Reproduzir do álbum</string>
+    <string name="set_play_song_none">Reproduzir a partir do item mostrado</string>
+    <string name="set_play_song_from_album">Reproduzir do álbum</string>
     <string name="desc_artist_image">Imagem do artista para %s</string>
     <string name="def_genre">Gênero desconhecido</string>
     <string name="def_track">Nenhuma faixa</string>
@@ -93,7 +93,7 @@
     <string name="set_cover_mode_quality">Qualidade alta</string>
     <string name="set_bar_action">Ação da barra de reprodução personalizada</string>
     <string name="set_action_mode_repeat">Modo de repetição</string>
-    <string name="set_playback_mode_artist">Reproduzir do artista</string>
+    <string name="set_play_song_from_artist">Reproduzir do artista</string>
     <string name="set_repeat_pause">Pausar na repetição</string>
     <string name="err_no_perms">O Auxio precisa de permissão para ler a sua biblioteca de músicas</string>
     <string name="err_no_dirs">Sem pastas</string>
@@ -188,7 +188,7 @@
     <string name="set_replay_gain_mode">Estratégia do ganho de repetição</string>
     <string name="set_replay_gain_mode_album">Preferir álbum</string>
     <string name="set_pre_amp_desc">O pré-amplificador é aplicado ao ajuste existente durante a reprodução</string>
-    <string name="set_playback_mode_songs">Reproduzir de todas as músicas</string>
+    <string name="set_play_song_from_all">Reproduzir de todas as músicas</string>
     <string name="set_repeat_pause_desc">Pausa quando uma música se repete</string>
     <string name="set_wipe_desc">Limpe o estado de reprodução salvo anteriormente (se houver)</string>
     <string name="set_restore_state">Restaurar o estado de reprodução</string>
@@ -239,8 +239,8 @@
     <string name="set_hide_collaborators_desc">Mostrar apenas artistas que foram creditados diretamente no álbum (funciona melhor em músicas com metadados completos)</string>
     <string name="set_replay_gain_mode_track">Preferir faixa</string>
     <string name="set_pre_amp">Pré-amplificação da normalização de volume</string>
-    <string name="set_detail_song_playback_mode">Ao tocar a partir dos detalhes do item</string>
-    <string name="set_playback_mode_genre">Tocar a partir do gênero</string>
+    <string name="set_play_in_parent_with">Ao tocar a partir dos detalhes do item</string>
+    <string name="set_play_song_from_genre">Tocar a partir do gênero</string>
     <string name="set_rewind_prev_desc">Retrocede a música antes de voltar para a anterior</string>
     <string name="set_reindex">Recarregar música</string>
     <string name="fmt_list">%1$s, %2$s</string>
@@ -250,7 +250,7 @@
     <string name="err_did_not_restore">Nenhuma lista pode ser restaurada</string>
     <string name="desc_auxio_icon">Ícone do Auxio</string>
     <string name="lbl_shuffle_shortcut_long">Aleatorizar tudo</string>
-    <string name="set_library_song_playback_mode">Ao tocar da biblioteca</string>
+    <string name="set_play_in_list_with">Ao tocar da biblioteca</string>
     <string name="lbl_singles">Singles</string>
     <string name="lbl_single">Single</string>
     <string name="set_reindex_desc">Recarrega a biblioteca de músicas usando metadados salvos em cache quando possível</string>

app/src/main/res/values-ro/strings.xml

@@ -140,23 +140,23 @@
     <string name="lbl_sort_dec">Descrescător</string>
     <string name="lbl_shuffle_selected">Selecție aleatorie aleasă</string>
     <string name="set_action_mode_next">Treceți la următoarea</string>
-    <string name="set_playback_mode_artist">Redă de la artist</string>
-    <string name="set_playback_mode_genre">Redă din genul</string>
+    <string name="set_play_song_from_artist">Redă de la artist</string>
+    <string name="set_play_song_from_genre">Redă din genul</string>
     <string name="lbl_reset">Resetează</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="lng_widget">Vizualizați și controlați redarea muzicii</string>
     <string name="set_lib_tabs_desc">Schimbă vizibilitatea și ordinea taburilor din bibliotecă</string>
     <string name="set_lib_tabs">Taburi din bibliotecă</string>
     <string name="set_keep_shuffle">Nu uita de shuffle</string>
-    <string name="set_playback_mode_songs">Redă din toate melodiile</string>
-    <string name="set_library_song_playback_mode">În timpul redării din bibliotecă</string>
-    <string name="set_playback_mode_none">Redă de la articolul afișat</string>
+    <string name="set_play_song_from_all">Redă din toate melodiile</string>
+    <string name="set_play_in_list_with">În timpul redării din bibliotecă</string>
+    <string name="set_play_song_none">Redă de la articolul afișat</string>
     <string name="set_content">Conținut</string>
     <string name="set_notif_action">Acțiune de notificare personalizată</string>
     <string name="set_keep_shuffle_desc">Menține funcția shuffle activată la redarea unei melodii noi</string>
     <string name="set_bar_action">Personalizarea acțiunii bării de redare</string>
     <string name="set_action_mode_repeat">Modul de repetare</string>
-    <string name="set_playback_mode_album">Redă din album</string>
-    <string name="set_detail_song_playback_mode">În timpul redării de la detaliile articolului</string>
+    <string name="set_play_song_from_album">Redă din album</string>
+    <string name="set_play_in_parent_with">În timpul redării de la detaliile articolului</string>
     <string name="set_behavior">Comportament</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -23,9 +23,9 @@
     <string name="lbl_playback">Сейчас играет</string>
     <string name="lbl_play">Играть</string>
     <string name="lbl_shuffle">Перемешать</string>
-    <string name="set_playback_mode_songs">Играть все композиции</string>
-    <string name="set_playback_mode_album">Играть альбом</string>
-    <string name="set_playback_mode_artist">Играть исполнителя</string>
+    <string name="set_play_song_from_all">Играть все композиции</string>
+    <string name="set_play_song_from_album">Играть альбом</string>
+    <string name="set_play_song_from_artist">Играть исполнителя</string>
     <string name="lbl_queue">Очередь</string>
     <string name="lbl_play_next">Играть далее</string>
     <string name="lbl_queue_add">Добавить в очередь</string>
@@ -65,7 +65,7 @@
     <string name="set_replay_gain_mode_album">По альбому</string>
     <string name="set_replay_gain_mode_dynamic">Предпочитать по альбому, если он воспроизводится</string>
     <string name="set_personalize">Поведение</string>
-    <string name="set_library_song_playback_mode">При воспроизведении из библиотеки</string>
+    <string name="set_play_in_list_with">При воспроизведении из библиотеки</string>
     <string name="set_keep_shuffle">Запоминать перемешивание</string>
     <string name="set_keep_shuffle_desc">Запоминать режим перемешивания для новых треков</string>
     <string name="set_rewind_prev">Сначала перемотать трек</string>
@@ -146,8 +146,8 @@
     <string name="lbl_shuffle_shortcut_short">Перемешать</string>
     <string name="lbl_shuffle_shortcut_long">Перемешать всё</string>
     <string name="lbl_ok">ОК</string>
-    <string name="set_detail_song_playback_mode">При воспроизведении из сведений</string>
-    <string name="set_playback_mode_none">Воспроизведение с показанного элемента</string>
+    <string name="set_play_in_parent_with">При воспроизведении из сведений</string>
+    <string name="set_play_song_none">Воспроизведение с показанного элемента</string>
     <string name="lbl_song_count">Номер песни</string>
     <string name="lbl_bitrate">Битрейт</string>
     <string name="lbl_disc">Диск</string>
@@ -264,7 +264,7 @@
     <string name="lbl_wiki">Вики</string>
     <string name="lbl_reset">Сбросить</string>
     <string name="fmt_list">%1$s,%2$s</string>
-    <string name="set_playback_mode_genre">Играть жанр</string>
+    <string name="set_play_song_from_genre">Играть жанр</string>
     <string name="set_behavior">Поведение</string>
     <string name="set_replay_gain">Выравнивание громкости ReplayGain</string>
     <string name="set_music">Музыка</string>

app/src/main/res/values-sv/strings.xml

@@ -124,8 +124,8 @@
     <string name="set_action_mode_next">Hoppa till nästa</string>
     <string name="set_action_mode_repeat">Upprepningsmodus</string>
     <string name="set_behavior">Beteende</string>
-    <string name="set_detail_song_playback_mode">När spelar från artikeluppgifter</string>
-    <string name="set_playback_mode_genre">Spela från genre</string>
+    <string name="set_play_in_parent_with">När spelar från artikeluppgifter</string>
+    <string name="set_play_song_from_genre">Spela från genre</string>
     <string name="set_keep_shuffle">Komma ihåg blandningsstatus</string>
     <string name="set_keep_shuffle_desc">Behåll blandning på när spelar en ny låt</string>
     <string name="set_content">Kontent</string>
@@ -141,11 +141,11 @@
     <string name="set_hide_collaborators">Dölj medarbetare</string>
     <string name="set_display">Skärm</string>
     <string name="set_lib_tabs">Bibliotekflikar</string>
-    <string name="set_library_song_playback_mode">När spelar från biblioteket</string>
-    <string name="set_playback_mode_none">Spela från visad artikel</string>
-    <string name="set_playback_mode_songs">Spela från alla låtar</string>
-    <string name="set_playback_mode_artist">Spela från konstnär</string>
-    <string name="set_playback_mode_album">Spela från album</string>
+    <string name="set_play_in_list_with">När spelar från biblioteket</string>
+    <string name="set_play_song_none">Spela från visad artikel</string>
+    <string name="set_play_song_from_all">Spela från alla låtar</string>
+    <string name="set_play_song_from_artist">Spela från konstnär</string>
+    <string name="set_play_song_from_album">Spela från album</string>
     <string name="set_separators_semicolon">Semikolon (;)</string>
     <string name="set_observing_desc">Ladda om musikbiblioteket när det ändras (kräver permanent meddelande)</string>
     <string name="set_separators_comma">Komma (,)</string>

app/src/main/res/values-tr/strings.xml

@@ -92,9 +92,9 @@
     <string name="set_pre_amp_without">Etiketsiz ayarla</string>
     <string name="set_pre_amp_with">Etiket ile ayarla</string>
     <string name="set_pre_amp_warning">Uyarı: Ön amfinin yüksek bir pozitif değere değiştirilmesi bazı ses parçalarında pik yapmaya neden olabilir.</string>
-    <string name="set_playback_mode_none">Gösterilen öğeden çal</string>
-    <string name="set_playback_mode_songs">Tüm şarkılardan çal</string>
-    <string name="set_playback_mode_album">Albümden çal</string>
+    <string name="set_play_song_none">Gösterilen öğeden çal</string>
+    <string name="set_play_song_from_all">Tüm şarkılardan çal</string>
+    <string name="set_play_song_from_album">Albümden çal</string>
     <string name="set_dirs">Müzik klasörleri</string>
     <string name="set_dirs_mode_include_desc">Müzik <b>yalnızca</b> eklediğiniz klasörlerden yüklenecektir.</string>
     <string name="desc_album_cover">%s Albümünün kapağı</string>
@@ -112,9 +112,9 @@
     <string name="clr_lime">Kireç</string>
     <string name="clr_yellow">Sarı</string>
     <string name="clr_orange">Turuncu</string>
-    <string name="set_library_song_playback_mode">Kitaplıktan çalarken</string>
-    <string name="set_detail_song_playback_mode">Öğe ayrıntılarından çalarken</string>
-    <string name="set_playback_mode_artist">Sanatçıdan çal</string>
+    <string name="set_play_in_list_with">Kitaplıktan çalarken</string>
+    <string name="set_play_in_parent_with">Öğe ayrıntılarından çalarken</string>
+    <string name="set_play_song_from_artist">Sanatçıdan çal</string>
     <string name="fmt_lib_artist_count">Yüklenen sanatçılar: %d</string>
     <string name="fmt_lib_genre_count">Yüklenen türler: %d</string>
     <string name="fmt_sample_rate">%d Hz</string>
@@ -248,7 +248,7 @@
     <string name="set_separators_slash">Eğik çizgi (/)</string>
     <string name="desc_queue_bar">Kuyruğu aç</string>
     <string name="set_action_mode_repeat">Tekrar kipi</string>
-    <string name="set_playback_mode_genre">Türden çal</string>
+    <string name="set_play_song_from_genre">Türden çal</string>
     <string name="set_exclude_non_music_desc">Podcast\'ler gibi müzik olmayan ses dosyalarını yok say</string>
     <string name="set_separators_warning">Uyarı: Bu ayarın kullanılması bazı etiketlerin yanlışlıkla birden fazla değere sahip olarak yorumlanmasına neden olabilir. Bunu, istenmeyen ayırıcı karakterlerin önüne ters eğik çizgi (\\) koyarak çözebilirsiniz.</string>
     <string name="set_exclude_non_music">Müzik olmayanları hariç tut</string>

app/src/main/res/values-uk/strings.xml

@@ -143,14 +143,14 @@
     <string name="set_action_mode_repeat">Режим повторення</string>
     <string name="set_dirs_mode">Режим</string>
     <string name="set_pre_amp">Попередній підсилювач ReplayGain</string>
-    <string name="set_playback_mode_album">Відтворити альбом</string>
-    <string name="set_library_song_playback_mode">При відтворенні з бібліотеки</string>
+    <string name="set_play_song_from_album">Відтворити альбом</string>
+    <string name="set_play_in_list_with">При відтворенні з бібліотеки</string>
     <string name="set_replay_gain_mode_dynamic">Віддавати перевагу альбому, якщо він відтворюється</string>
     <string name="lbl_state_wiped">Стан відтворення очищено</string>
     <string name="set_black_mode_desc">Використовувати повністю чорну тему</string>
     <string name="set_hide_collaborators_desc">Показувати лише тих виконавців, які безпосередньо зазначені в альбомі (найкраще працює в добре позначених бібліотеках)</string>
     <string name="set_pre_amp_warning">Увага: Встановлення високих позитивних значень попереднього підсилювача може призвести до спотворення звуку в деяких піснях.</string>
-    <string name="set_detail_song_playback_mode">При відтворенні з деталей предмета</string>
+    <string name="set_play_in_parent_with">При відтворенні з деталей предмета</string>
     <string name="set_rescan_desc">Очистити кеш тегів і повністю перезавантажити музичну бібліотеку (повільніше, але ефективніше)</string>
     <string name="set_observing">Автоматичне перезавантаження</string>
     <string name="set_observing_desc">Перезавантажувати бібліотеку при виявленні змін (потрібне постійне сповіщення)</string>
@@ -164,10 +164,10 @@
     <string name="lng_observing">Відстеження змін в музичній бібліотеці…</string>
     <string name="set_bar_action">Власна дія для панелі відтворення</string>
     <string name="set_pre_amp_without">Регулювання без тегів</string>
-    <string name="set_playback_mode_none">Відтворення з показаного елемента</string>
+    <string name="set_play_song_none">Відтворення з показаного елемента</string>
     <string name="set_keep_shuffle_desc">Продовжити перемішування після вибору нової пісні</string>
-    <string name="set_playback_mode_artist">Відтворити виконавця</string>
-    <string name="set_playback_mode_genre">Відтворити жанр</string>
+    <string name="set_play_song_from_artist">Відтворити виконавця</string>
+    <string name="set_play_song_from_genre">Відтворити жанр</string>
     <string name="set_rewind_prev">Перемотати назад перед відтворенням попередньої пісні</string>
     <string name="set_save_desc">Зберегти поточний стан відтворення</string>
     <string name="set_rescan">Пересканувати музику</string>
@@ -187,7 +187,7 @@
     <string name="set_rewind_prev_desc">Перемотайте на початок пісні перед відтворенням попередньої</string>
     <string name="set_round_mode_desc">Увімкнути заокруглені кути на додаткових елементах інтерфейсу (потрібно заокруглення обкладинок альбомів)</string>
     <string name="set_pre_amp_desc">Попередній підсилювач застосовується до наявних налаштувань під час відтворення</string>
-    <string name="set_playback_mode_songs">Відтворити всі пісні</string>
+    <string name="set_play_song_from_all">Відтворити всі пісні</string>
     <string name="set_reindex_desc">Перезавантажити музичну бібліотеку, використовуючи кешовані теги, коли це можливо</string>
     <string name="set_separators_slash">Скісна риска (/)</string>
     <string name="set_separators_plus">Плюс (+)</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -23,9 +23,9 @@
     <string name="lbl_playback">正在播放</string>
     <string name="lbl_play">播放</string>
     <string name="lbl_shuffle">随机</string>
-    <string name="set_playback_mode_songs">从全部歌曲开始播放</string>
-    <string name="set_playback_mode_album">从专辑开始播放</string>
-    <string name="set_playback_mode_artist">从艺术家播放</string>
+    <string name="set_play_song_from_all">从全部歌曲开始播放</string>
+    <string name="set_play_song_from_album">从专辑开始播放</string>
+    <string name="set_play_song_from_artist">从艺术家播放</string>
     <string name="lbl_queue">播放队列</string>
     <string name="lbl_play_next">作为下一首播放</string>
     <string name="lbl_queue_add">加入播放队列</string>
@@ -65,7 +65,7 @@
     <string name="set_replay_gain_mode_album">偏好专辑</string>
     <string name="set_replay_gain_mode_dynamic">如果已有专辑正在播放则优先增益专辑</string>
     <string name="set_personalize">行为</string>
-    <string name="set_library_song_playback_mode">从音乐库中选择播放时</string>
+    <string name="set_play_in_list_with">从音乐库中选择播放时</string>
     <string name="set_keep_shuffle">记住随机模式</string>
     <string name="set_keep_shuffle_desc">播放新曲目时保留随机播放模式</string>
     <string name="set_rewind_prev">切换上一曲前先倒带</string>
@@ -162,9 +162,9 @@
     <string name="fmt_lib_artist_count">已加载艺术家数量：%d</string>
     <string name="fmt_lib_genre_count">已加载流派数量：%d</string>
     <string name="fmt_lib_total_duration">总计时长：%s</string>
-    <string name="set_playback_mode_none">从展示的项目播放</string>
+    <string name="set_play_song_none">从展示的项目播放</string>
     <string name="set_dirs_mode_include_desc">将<b>仅从</b>您添加的目录中加载音乐。</string>
-    <string name="set_detail_song_playback_mode">从项目详情中选择播放时</string>
+    <string name="set_play_in_parent_with">从项目详情中选择播放时</string>
     <string name="set_dirs_mode_exclude_desc">将 <b>不会</b>从您添加的目录中加载音乐。</string>
     <string name="cdc_aac">高级音乐编码 (AAC)</string>
     <string name="fmt_lib_album_count">已加载专辑数量：%d</string>
@@ -252,7 +252,7 @@
     <string name="lbl_shuffle_selected">随机播放所选</string>
     <string name="lbl_play_selected">播放所选</string>
     <string name="fmt_selected">选中了 %d 首</string>
-    <string name="set_playback_mode_genre">按流派播放</string>
+    <string name="set_play_song_from_genre">按流派播放</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">重置</string>

app/src/main/res/values/settings.xml

@@ -27,8 +27,8 @@
     <string name="set_key_pre_amp_with" translatable="false">auxio_pre_amp_with</string>
     <string name="set_key_pre_amp_without" translatable="false">auxio_pre_amp_without</string>
 
-    <string name="set_key_in_list_playback_mode" translatable="false">auxio_library_playback_mode</string>
-    <string name="set_key_in_parent_playback_mode" translatable="false">auxio_detail_playback_mode</string>
+    <string name="set_key_play_in_list_with" translatable="false">auxio_play_in_list_with</string>
+    <string name="set_key_play_in_parent_with" translatable="false">auxio_play_in_parent_with</string>
     <string name="set_key_keep_shuffle" translatable="false">KEY_KEEP_SHUFFLE</string>
     <string name="set_key_rewind_prev" translatable="false">KEY_PREV_REWIND</string>
     <string name="set_key_repeat_pause" translatable="false">KEY_LOOP_PAUSE</string>
@@ -106,34 +106,38 @@
         <item>@integer/action_mode_shuffle</item>
     </integer-array>
 
-    <string-array name="entries_library_song_playback_mode">
-        <item>@string/set_playback_mode_songs</item>
-        <item>@string/set_playback_mode_artist</item>
-        <item>@string/set_playback_mode_album</item>
-        <item>@string/set_playback_mode_genre</item>
+    <string-array name="entries_play_in_list_with">
+        <item>@string/set_play_song_from_all</item>
+        <item>@string/set_play_song_from_artist</item>
+        <item>@string/set_play_song_from_album</item>
+        <item>@string/set_play_song_from_genre</item>
+        <item>@string/set_play_song_by_itself</item>
     </string-array>
 
-    <integer-array name="values_library_song_playback_mode">
-        <item>@integer/music_mode_songs</item>
-        <item>@integer/music_mode_artist</item>
-        <item>@integer/music_mode_album</item>
-        <item>@integer/music_mode_genre</item>
+    <integer-array name="values_play_in_list_with">
+        <item>@integer/play_song_from_all</item>
+        <item>@integer/play_song_from_album</item>
+        <item>@integer/play_song_from_artist</item>
+        <item>@integer/play_song_from_genre</item>
+        <item>@integer/play_song_itself</item>
     </integer-array>
 
-    <string-array name="entries_detail_song_playback_mode">
-        <item>@string/set_playback_mode_none</item>
-        <item>@string/set_playback_mode_songs</item>
-        <item>@string/set_playback_mode_artist</item>
-        <item>@string/set_playback_mode_album</item>
-        <item>@string/set_playback_mode_genre</item>
+    <string-array name="entries_play_in_parent_with">
+        <item>@string/set_play_song_none</item>
+        <item>@string/set_play_song_from_all</item>
+        <item>@string/set_play_song_from_artist</item>
+        <item>@string/set_play_song_from_album</item>
+        <item>@string/set_play_song_from_genre</item>
+        <item>@string/set_play_song_by_itself</item>
     </string-array>
 
-    <integer-array name="values_detail_song_playback_mode">
-        <item>@integer/music_mode_none</item>
-        <item>@integer/music_mode_songs</item>
-        <item>@integer/music_mode_artist</item>
-        <item>@integer/music_mode_album</item>
-        <item>@integer/music_mode_genre</item>
+    <integer-array name="values_play_in_parent_with">
+        <item>@integer/play_song_none</item>
+        <item>@integer/play_song_from_all</item>
+        <item>@integer/play_song_from_album</item>
+        <item>@integer/play_song_from_artist</item>
+        <item>@integer/play_song_from_genre</item>
+        <item>@integer/play_song_itself</item>
     </integer-array>
 
     <string-array name="entries_replay_gain">
@@ -152,11 +156,12 @@
     <integer name="theme_light">1</integer>
     <integer name="theme_dark">2</integer>
 
-    <integer name="music_mode_none">-2147483648</integer>
-    <integer name="music_mode_genre">0xA108</integer>
-    <integer name="music_mode_artist">0xA109</integer>
-    <integer name="music_mode_album">0xA10A</integer>
-    <integer name="music_mode_songs">0xA10B</integer>
+    <integer name="play_song_none">-2147483648</integer>
+    <integer name="play_song_itself">0xA11F</integer>
+    <integer name="play_song_from_all">0xA120</integer>
+    <integer name="play_song_from_album">0xA121</integer>
+    <integer name="play_song_from_artist">0xA122</integer>
+    <integer name="play_song_from_genre">0xA123</integer>
 
     <integer name="replay_gain_track">0xA111</integer>
     <integer name="replay_gain_album">0xA112</integer>

app/src/main/res/values/strings.xml

@@ -208,13 +208,14 @@
     <string name="set_action_mode_next">Skip to next</string>
     <string name="set_action_mode_repeat">Repeat mode</string>
     <string name="set_behavior">Behavior</string>
-    <string name="set_library_song_playback_mode">When playing from the library</string>
-    <string name="set_detail_song_playback_mode">When playing from item details</string>
-    <string name="set_playback_mode_none">Play from shown item</string>
-    <string name="set_playback_mode_songs">Play from all songs</string>
-    <string name="set_playback_mode_album">Play from album</string>
-    <string name="set_playback_mode_artist">Play from artist</string>
-    <string name="set_playback_mode_genre">Play from genre</string>
+    <string name="set_play_in_list_with">When playing from the library</string>
+    <string name="set_play_in_parent_with">When playing from item details</string>
+    <string name="set_play_song_none">Play from shown item</string>
+    <string name="set_play_song_from_all">Play from all songs</string>
+    <string name="set_play_song_from_album">Play from album</string>
+    <string name="set_play_song_from_artist">Play from artist</string>
+    <string name="set_play_song_from_genre">Play from genre</string>
+    <string name="set_play_song_by_itself">Play song by itself</string>
     <string name="set_keep_shuffle">Remember shuffle</string>
     <string name="set_keep_shuffle_desc">Keep shuffle on when playing a new song</string>
 

app/src/main/res/xml/preferences_personalize.xml

@@ -29,19 +29,19 @@
     <PreferenceCategory android:title="@string/set_behavior">
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
-            app:defaultValue="@integer/music_mode_songs"
-            app:entries="@array/entries_library_song_playback_mode"
-            app:entryValues="@array/values_library_song_playback_mode"
-            app:key="@string/set_key_in_list_playback_mode"
-            app:title="@string/set_library_song_playback_mode"
+            app:defaultValue="@integer/play_song_from_all"
+            app:entries="@array/entries_play_in_list_with"
+            app:entryValues="@array/values_play_in_list_with"
+            app:key="@string/set_key_play_in_list_with"
+            app:title="@string/set_play_in_list_with"
             app:useSimpleSummaryProvider="true" />
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
-            app:defaultValue="@integer/music_mode_none"
-            app:entries="@array/entries_detail_song_playback_mode"
-            app:entryValues="@array/values_detail_song_playback_mode"
-            app:key="@string/set_key_in_parent_playback_mode"
-            app:title="@string/set_detail_song_playback_mode"
+            app:defaultValue="@integer/play_song_none"
+            app:entries="@array/entries_play_in_parent_with"
+            app:entryValues="@array/values_play_in_parent_with"
+            app:key="@string/set_key_play_in_parent_with"
+            app:title="@string/set_play_in_parent_with"
             app:useSimpleSummaryProvider="true" />
 
         <SwitchPreferenceCompat