diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
index 3c128e671..b41dd2a94 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
@@ -306,9 +306,7 @@ class HomeFragment :
         if (unit == null) {
             return
         }
-        findNavController().navigateSafe(
-            HomeFragmentDirections.chooseLocations()
-        )
+        findNavController().navigateSafe(HomeFragmentDirections.chooseLocations())
         homeModel.chooseMusicLocations.consume()
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
index ca9b5cd9e..0638f770e 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
@@ -83,9 +83,7 @@ class AlbumListFragment :
 
         binding.homeNoMusicMsg.text = getString(R.string.lng_no_albums)
 
-        binding.homeChooseMusicSources.setOnClickListener {
-            homeModel.startChooseMusicLocations()
-        }
+        binding.homeChooseMusicSources.setOnClickListener { homeModel.startChooseMusicLocations() }
 
         collectImmediately(homeModel.albumList, musicModel.indexingState, ::updateAlbums)
         collectImmediately(listModel.selected, ::updateSelection)
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
index 5e0290428..1d1096ace 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
@@ -78,9 +78,7 @@ class ArtistListFragment :
 
         binding.homeNoMusicMsg.text = getString(R.string.lng_no_artists)
 
-        binding.homeChooseMusicSources.setOnClickListener {
-            homeModel.startChooseMusicLocations()
-        }
+        binding.homeChooseMusicSources.setOnClickListener { homeModel.startChooseMusicLocations() }
 
         collectImmediately(homeModel.artistList, musicModel.indexingState, ::updateArtists)
         collectImmediately(listModel.selected, ::updateSelection)
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
index 86a8bc795..99f26526f 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
@@ -77,9 +77,7 @@ class GenreListFragment :
 
         binding.homeNoMusicMsg.text = getString(R.string.lng_no_genres)
 
-        binding.homeChooseMusicSources.setOnClickListener {
-            homeModel.startChooseMusicLocations()
-        }
+        binding.homeChooseMusicSources.setOnClickListener { homeModel.startChooseMusicLocations() }
 
         collectImmediately(homeModel.genreList, musicModel.indexingState, ::updateGenres)
         collectImmediately(listModel.selected, ::updateSelection)
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt
index ecfd99065..17ebd73f6 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt
@@ -75,9 +75,7 @@ class PlaylistListFragment :
 
         binding.homeNoMusicMsg.text = getString(R.string.lng_no_playlists)
 
-        binding.homeChooseMusicSources.setOnClickListener {
-            homeModel.startChooseMusicLocations()
-        }
+        binding.homeChooseMusicSources.setOnClickListener { homeModel.startChooseMusicLocations() }
 
         collectImmediately(homeModel.playlistList, musicModel.indexingState, ::updatePlaylists)
         collectImmediately(listModel.selected, ::updateSelection)
@@ -126,7 +124,8 @@ class PlaylistListFragment :
 
     private fun updatePlaylists(playlists: List<Playlist>, indexingState: IndexingState?) {
         requireBinding().apply {
-            homeRecycler.isInvisible = indexingState is IndexingState.Indexing || playlists.isEmpty()
+            homeRecycler.isInvisible =
+                indexingState is IndexingState.Indexing || playlists.isEmpty()
             homeNoMusic.isInvisible = playlists.isEmpty()
         }
         playlistAdapter.update(playlists, homeModel.playlistInstructions.consume())
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
index a48e18218..c8c34c432 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
+ 
 package org.oxycblt.auxio.home.list
 
 import android.os.Bundle
@@ -81,15 +81,12 @@ class SongListFragment :
 
         binding.homeNoMusicMsg.text = getString(R.string.lng_no_songs)
 
-        binding.homeChooseMusicSources.setOnClickListener {
-            homeModel.startChooseMusicLocations()
-        }
+        binding.homeChooseMusicSources.setOnClickListener { homeModel.startChooseMusicLocations() }
 
         collectImmediately(homeModel.songList, musicModel.indexingState, ::updateSongs)
         collectImmediately(listModel.selected, ::updateSelection)
         collectImmediately(
-            playbackModel.song, playbackModel.parent, playbackModel.isPlaying, ::updatePlayback
-        )
+            playbackModel.song, playbackModel.parent, playbackModel.isPlaying, ::updatePlayback)
     }
 
     override fun onDestroyBinding(binding: FragmentHomeListBinding) {
@@ -127,12 +124,11 @@ class SongListFragment :
                 val dateAddedMillis = song.dateAdded.secsToMs()
                 formatterSb.setLength(0)
                 DateUtils.formatDateRange(
-                    context,
-                    formatter,
-                    dateAddedMillis,
-                    dateAddedMillis,
-                    DateUtils.FORMAT_ABBREV_ALL
-                )
+                        context,
+                        formatter,
+                        dateAddedMillis,
+                        dateAddedMillis,
+                        DateUtils.FORMAT_ABBREV_ALL)
                     .toString()
             }
 
@@ -159,7 +155,6 @@ class SongListFragment :
             homeNoMusic.isInvisible = songs.isEmpty()
         }
         songAdapter.update(songs, homeModel.songInstructions.consume())
-
     }
 
     private fun updateSelection(selection: List<Music>) {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt
index acd985780..c3805f9cd 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt
@@ -24,7 +24,6 @@ import androidx.core.content.edit
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.music.dirs.MusicDirectories
 import org.oxycblt.auxio.music.stack.explore.fs.DocumentPathFactory
 import org.oxycblt.auxio.settings.Settings
 import timber.log.Timber as L
@@ -35,8 +34,7 @@ import timber.log.Timber as L
  * @author Alexander Capehart (OxygenCobalt)
  */
 interface MusicSettings : Settings<MusicSettings.Listener> {
-    /** The configuration on how to handle particular directories in the music library. */
-    var musicDirs: MusicDirectories
+    /** The locations of music to load. */
     var musicLocations: List<Uri>
     /** Whether to exclude non-music audio files from the music library. */
     val excludeNonMusic: Boolean
@@ -61,25 +59,27 @@ constructor(
     @ApplicationContext context: Context,
     private val documentPathFactory: DocumentPathFactory
 ) : Settings.Impl<MusicSettings.Listener>(context), MusicSettings {
-    override var musicDirs: MusicDirectories
-        get() {
-            val dirs =
-                (sharedPreferences.getStringSet(getString(R.string.set_key_music_dirs), null)
-                        ?: emptySet())
-                    .mapNotNull(documentPathFactory::fromDocumentId)
-            return MusicDirectories(
-                dirs,
-                sharedPreferences.getBoolean(getString(R.string.set_key_music_dirs_include), false))
-        }
-        set(value) {
-            sharedPreferences.edit {
-                putStringSet(
-                    getString(R.string.set_key_music_dirs),
-                    value.dirs.map(documentPathFactory::toDocumentId).toSet())
-                putBoolean(getString(R.string.set_key_music_dirs_include), value.shouldInclude)
-                apply()
-            }
-        }
+    //    override var musicDirs: MusicDirectories
+    //        get() {
+    //            val dirs =
+    //                (sharedPreferences.getStringSet(getString(R.string.set_key_music_dirs), null)
+    //                        ?: emptySet())
+    //                    .mapNotNull(documentPathFactory::fromDocumentId)
+    //            return MusicDirectories(
+    //                dirs,
+    //                sharedPreferences.getBoolean(getString(R.string.set_key_music_dirs_include),
+    // false))
+    //        }
+    //        set(value) {
+    //            sharedPreferences.edit {
+    //                putStringSet(
+    //                    getString(R.string.set_key_music_dirs),
+    //                    value.dirs.map(documentPathFactory::toDocumentId).toSet())
+    //                putBoolean(getString(R.string.set_key_music_dirs_include),
+    // value.shouldInclude)
+    //                apply()
+    //            }
+    //        }
 
     override var musicLocations: List<Uri>
         get() {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/dirs/DirectoryAdapter.kt b/app/src/main/java/org/oxycblt/auxio/music/dirs/DirectoryAdapter.kt
deleted file mode 100644
index 4daa379b6..000000000
--- a/app/src/main/java/org/oxycblt/auxio/music/dirs/DirectoryAdapter.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2021 Auxio Project
- * DirectoryAdapter.kt is part of Auxio.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package org.oxycblt.auxio.music.dirs
-
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import org.oxycblt.auxio.databinding.ItemMusicDirBinding
-import org.oxycblt.auxio.list.recycler.DialogRecyclerView
-import org.oxycblt.auxio.music.stack.explore.fs.Path
-import org.oxycblt.auxio.util.context
-import org.oxycblt.auxio.util.inflater
-import timber.log.Timber as L
-
-/**
- * [RecyclerView.Adapter] that manages a list of [Path] music directory instances.
- *
- * @param listener A [DirectoryAdapter.Listener] to bind interactions to.
- * @author Alexander Capehart (OxygenCobalt)
- */
-class DirectoryAdapter(private val listener: Listener) :
-    RecyclerView.Adapter<MusicDirViewHolder>() {
-    private val _dirs = mutableListOf<Path>()
-    /** The current list of [Path]s, may not line up with [MusicDirectories] due to removals. */
-    val dirs: List<Path> = _dirs
-
-    override fun getItemCount() = dirs.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
-        MusicDirViewHolder.from(parent)
-
-    override fun onBindViewHolder(holder: MusicDirViewHolder, position: Int) =
-        holder.bind(dirs[position], listener)
-
-    /**
-     * Add a [Path] to the end of the list.
-     *
-     * @param path The [Path] to add.
-     */
-    fun add(path: Path) {
-        if (_dirs.contains(path)) return
-        L.d("Adding $path")
-        _dirs.add(path)
-        notifyItemInserted(_dirs.lastIndex)
-    }
-
-    /**
-     * Add a list of [Path] instances to the end of the list.
-     *
-     * @param path The [Path] instances to add.
-     */
-    fun addAll(path: List<Path>) {
-        L.d("Adding ${path.size} directories")
-        val oldLastIndex = path.lastIndex
-        _dirs.addAll(path)
-        notifyItemRangeInserted(oldLastIndex, path.size)
-    }
-
-    /**
-     * Remove a [Path] from the list.
-     *
-     * @param path The [Path] to remove. Must exist in the list.
-     */
-    fun remove(path: Path) {
-        L.d("Removing $path")
-        val idx = _dirs.indexOf(path)
-        _dirs.removeAt(idx)
-        notifyItemRemoved(idx)
-    }
-
-    /** A Listener for [DirectoryAdapter] interactions. */
-    interface Listener {
-        /** Called when the delete button on a directory item is clicked. */
-        fun onRemoveDirectory(dir: Path)
-    }
-}
-
-/**
- * A [RecyclerView.Recycler] that displays a [Path]. Use [from] to create an instance.
- *
- * @author Alexander Capehart (OxygenCobalt)
- */
-class MusicDirViewHolder private constructor(private val binding: ItemMusicDirBinding) :
-    DialogRecyclerView.ViewHolder(binding.root) {
-    /**
-     * Bind new data to this instance.
-     *
-     * @param path The new [Path] to bind.
-     * @param listener A [DirectoryAdapter.Listener] to bind interactions to.
-     */
-    fun bind(path: Path, listener: DirectoryAdapter.Listener) {
-        binding.dirPath.text = path.resolve(binding.context)
-        binding.dirDelete.setOnClickListener { listener.onRemoveDirectory(path) }
-    }
-
-    companion object {
-        /**
-         * Create a new instance.
-         *
-         * @param parent The parent to inflate this instance from.
-         * @return A new instance.
-         */
-        fun from(parent: View) =
-            MusicDirViewHolder(ItemMusicDirBinding.inflate(parent.context.inflater))
-    }
-}
diff --git a/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirectories.kt b/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirectories.kt
deleted file mode 100644
index 9a39d54fa..000000000
--- a/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirectories.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2023 Auxio Project
- * MusicDirectories.kt is part of Auxio.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package org.oxycblt.auxio.music.dirs
-
-import org.oxycblt.auxio.music.stack.explore.fs.Path
-
-/**
- * Represents the configuration for specific directories to filter to/from when loading music.
- *
- * @param dirs A list of directory [Path] instances. How these are interpreted depends on
- *   [shouldInclude]
- * @param shouldInclude True if the library should only load from the [Path] instances, false if the
- *   library should not load from the [Path] instances.
- * @author Alexander Capehart (OxygenCobalt)
- */
-data class MusicDirectories(val dirs: List<Path>, val shouldInclude: Boolean)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt b/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt
new file mode 100644
index 000000000..bbcefd0ca
--- /dev/null
+++ b/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2021 Auxio Project
+ * LocationAdapter.kt is part of Auxio.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package org.oxycblt.auxio.music.locations
+
+import android.net.Uri
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import org.oxycblt.auxio.databinding.ItemMusicLocationBinding
+import org.oxycblt.auxio.list.recycler.DialogRecyclerView
+import org.oxycblt.auxio.music.stack.explore.fs.Path
+import org.oxycblt.auxio.util.context
+import org.oxycblt.auxio.util.inflater
+import timber.log.Timber as L
+
+/**
+ * [RecyclerView.Adapter] that manages a list of [MusicLocation] music directory instances.
+ *
+ * @param listener A [LocationAdapter.Listener] to bind interactions to.
+ * @author Alexander Capehart (OxygenCobalt)
+ */
+class LocationAdapter(private val listener: Listener) : RecyclerView.Adapter<MusicDirViewHolder>() {
+    private val _locations = mutableListOf<MusicLocation>()
+    /**
+     * The current list of [MusicLocation]s, may not line up with [MusicLocation]s due to removals.
+     */
+    val locations: List<MusicLocation> = _locations
+
+    override fun getItemCount() = locations.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        MusicDirViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: MusicDirViewHolder, position: Int) =
+        holder.bind(locations[position], listener)
+
+    /**
+     * Add a [MusicLocation] to the end of the list.
+     *
+     * @param location The [MusicLocation] to add.
+     */
+    fun add(location: MusicLocation) {
+        if (_locations.contains(location)) return
+        L.d("Adding $location")
+        _locations.add(location)
+        notifyItemInserted(_locations.lastIndex)
+    }
+
+    /**
+     * Add a list of [MusicLocation] instances to the end of the list.
+     *
+     * @param locations The [MusicLocation] instances to add.
+     */
+    fun addAll(locations: List<MusicLocation>) {
+        L.d("Adding ${locations.size} locations")
+        val oldLastIndex = locations.lastIndex
+        _locations.addAll(locations)
+        notifyItemRangeInserted(oldLastIndex, locations.size)
+    }
+
+    /**
+     * Remove a [MusicLocation] from the list.
+     *
+     * @param location The [MusicLocation] to remove. Must exist in the list.
+     */
+    fun remove(location: MusicLocation) {
+        L.d("Removing $location")
+        val idx = _locations.indexOf(location)
+        _locations.removeAt(idx)
+        notifyItemRemoved(idx)
+    }
+
+    /** A Listener for [LocationAdapter] interactions. */
+    interface Listener {
+        /** Called when the delete button on a directory item is clicked. */
+        fun onRemoveLocation(location: MusicLocation)
+    }
+}
+
+data class MusicLocation(val uri: Uri, val path: Path)
+
+/**
+ * A [RecyclerView.Recycler] that displays a [MusicLocation]. Use [from] to create an instance.
+ *
+ * @author Alexander Capehart (OxygenCobalt)
+ */
+class MusicDirViewHolder private constructor(private val binding: ItemMusicLocationBinding) :
+    DialogRecyclerView.ViewHolder(binding.root) {
+    /**
+     * Bind new data to this instance.
+     *
+     * @param location The new [MusicLocation] to bind.
+     * @param listener A [LocationAdapter.Listener] to bind interactions to.
+     */
+    fun bind(location: MusicLocation, listener: LocationAdapter.Listener) {
+        binding.locationPath.text = location.path.resolve(binding.context)
+        binding.locationDelete.setOnClickListener { listener.onRemoveLocation(location) }
+    }
+
+    companion object {
+        /**
+         * Create a new instance.
+         *
+         * @param parent The parent to inflate this instance from.
+         * @return A new instance.
+         */
+        fun from(parent: View) =
+            MusicDirViewHolder(ItemMusicLocationBinding.inflate(parent.context.inflater))
+    }
+}
diff --git a/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt
similarity index 51%
rename from app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt
rename to app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt
index 0c14abd65..0bbe30fa9 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/dirs/MusicDirsDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021 Auxio Project
- * MusicDirsDialog.kt is part of Auxio.
+ * MusicSourcesDialog.kt is part of Auxio.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.music.dirs
+package org.oxycblt.auxio.music.locations
 
 import android.content.ActivityNotFoundException
 import android.net.Uri
@@ -31,49 +31,51 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.DialogMusicDirsBinding
+import org.oxycblt.auxio.databinding.DialogMusicLocationsBinding
 import org.oxycblt.auxio.music.MusicSettings
 import org.oxycblt.auxio.music.stack.explore.fs.DocumentPathFactory
-import org.oxycblt.auxio.music.stack.explore.fs.Path
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
 import org.oxycblt.auxio.util.showToast
 import timber.log.Timber as L
 
 /**
- * Dialog that manages the music dirs setting.
+ * Dialog that manages the music locations setting.
  *
  * @author Alexander Capehart (OxygenCobalt)
  */
 @AndroidEntryPoint
-class MusicDirsDialog :
-    ViewBindingMaterialDialogFragment<DialogMusicDirsBinding>(), DirectoryAdapter.Listener {
-    private val dirAdapter = DirectoryAdapter(this)
+class MusicSourcesDialog :
+    ViewBindingMaterialDialogFragment<DialogMusicLocationsBinding>(), LocationAdapter.Listener {
+    private val locationAdapter = LocationAdapter(this)
     private var openDocumentTreeLauncher: ActivityResultLauncher<Uri?>? = null
     @Inject lateinit var documentPathFactory: DocumentPathFactory
     @Inject lateinit var musicSettings: MusicSettings
 
     override fun onCreateBinding(inflater: LayoutInflater) =
-        DialogMusicDirsBinding.inflate(inflater)
+        DialogMusicLocationsBinding.inflate(inflater)
 
     override fun onConfigDialog(builder: AlertDialog.Builder) {
         builder
-            .setTitle(R.string.set_dirs)
+            .setTitle(R.string.set_locations)
             .setNegativeButton(R.string.lbl_cancel, null)
             .setPositiveButton(R.string.lbl_save) { _, _ ->
-                val newDirs = MusicDirectories(dirAdapter.dirs, isUiModeInclude(requireBinding()))
-                if (musicSettings.musicDirs != newDirs) {
+                val newDirs = locationAdapter.locations.map { it.uri }
+                if (musicSettings.musicLocations != newDirs) {
                     L.d("Committing changes")
-                    musicSettings.musicDirs = newDirs
+                    musicSettings.musicLocations = newDirs
                 }
             }
     }
 
-    override fun onBindingCreated(binding: DialogMusicDirsBinding, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(
+        binding: DialogMusicLocationsBinding,
+        savedInstanceState: Bundle?
+    ) {
         openDocumentTreeLauncher =
             registerForActivityResult(
                 ActivityResultContracts.OpenDocumentTree(), ::addDocumentTreeUriToDirs)
 
-        binding.dirsAdd.apply {
+        binding.locationsAdd.apply {
             ViewCompat.setTooltipText(this, contentDescription)
             setOnClickListener {
                 L.d("Opening launcher")
@@ -91,98 +93,65 @@ class MusicDirsDialog :
             }
         }
 
-        binding.dirsRecycler.apply {
-            adapter = dirAdapter
+        binding.locationsRecycler.apply {
+            adapter = locationAdapter
             itemAnimator = null
         }
 
-        var dirs = musicSettings.musicDirs
-        if (savedInstanceState != null) {
-            val pendingDirs = savedInstanceState.getStringArrayList(KEY_PENDING_DIRS)
-            if (pendingDirs != null) {
-                dirs =
-                    MusicDirectories(
-                        pendingDirs.mapNotNull(documentPathFactory::fromDocumentId),
-                        savedInstanceState.getBoolean(KEY_PENDING_MODE))
+        val locationUris =
+            savedInstanceState?.getStringArrayList(KEY_PENDING_LOCATIONS)?.map { Uri.parse(it) }
+                ?: musicSettings.musicLocations
+        val locations =
+            locationUris.mapNotNull {
+                MusicLocation(
+                    it, documentPathFactory.unpackDocumentTreeUri(it) ?: return@mapNotNull null)
             }
-        }
 
-        dirAdapter.addAll(dirs.dirs)
-        requireBinding().dirsEmpty.isVisible = dirs.dirs.isEmpty()
-
-        binding.folderModeGroup.apply {
-            check(
-                if (dirs.shouldInclude) {
-                    R.id.dirs_mode_include
-                } else {
-                    R.id.dirs_mode_exclude
-                })
-
-            updateMode()
-            addOnButtonCheckedListener { _, _, _ -> updateMode() }
-        }
+        locationAdapter.addAll(locations)
+        requireBinding().locationsEmpty.isVisible = locations.isEmpty()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putStringArrayList(
-            KEY_PENDING_DIRS, ArrayList(dirAdapter.dirs.map(documentPathFactory::toDocumentId)))
-        outState.putBoolean(KEY_PENDING_MODE, isUiModeInclude(requireBinding()))
+            KEY_PENDING_LOCATIONS, ArrayList(locationAdapter.locations.map { it.uri.toString() }))
     }
 
-    override fun onDestroyBinding(binding: DialogMusicDirsBinding) {
+    override fun onDestroyBinding(binding: DialogMusicLocationsBinding) {
         super.onDestroyBinding(binding)
         openDocumentTreeLauncher = null
-        binding.dirsRecycler.adapter = null
+        binding.locationsRecycler.adapter = null
     }
 
-    override fun onRemoveDirectory(dir: Path) {
-        dirAdapter.remove(dir)
-        requireBinding().dirsEmpty.isVisible = dirAdapter.dirs.isEmpty()
+    override fun onRemoveLocation(location: MusicLocation) {
+        locationAdapter.remove(location)
+        requireBinding().locationsEmpty.isVisible = locationAdapter.locations.isEmpty()
     }
 
     /**
-     * Add a Document Tree [Uri] chosen by the user to the current [MusicDirectories] instance.
+     * Add a Document Tree [Uri] chosen by the user to the current [MusicLocation]s.
      *
      * @param uri The document tree [Uri] to add, chosen by the user. Will do nothing if the [Uri]
      *   is null or not valid.
      */
     private fun addDocumentTreeUriToDirs(uri: Uri?) {
         if (uri == null) {
-            // A null URI means that the user left the file picker without picking a directory
+            // A null URI means that the user left the file picker without picking a locationectory
             L.d("No URI given (user closed the dialog)")
             return
         }
 
-        val dir = documentPathFactory.unpackDocumentTreeUri(uri)
+        val path = documentPathFactory.unpackDocumentTreeUri(uri)
 
-        if (dir != null) {
-            dirAdapter.add(dir)
-            requireBinding().dirsEmpty.isVisible = false
+        if (path != null) {
+            locationAdapter.add(MusicLocation(uri, path))
+            requireBinding().locationsEmpty.isVisible = false
         } else {
-            requireContext().showToast(R.string.err_bad_dir)
+            requireContext().showToast(R.string.err_bad_location)
         }
     }
 
-    private fun updateMode() {
-        val binding = requireBinding()
-        if (isUiModeInclude(binding)) {
-            binding.dirsModeExclude.icon = null
-            binding.dirsModeInclude.setIconResource(R.drawable.ic_check_24)
-            binding.dirsModeDesc.setText(R.string.set_dirs_mode_include_desc)
-        } else {
-            binding.dirsModeExclude.setIconResource(R.drawable.ic_check_24)
-            binding.dirsModeInclude.icon = null
-            binding.dirsModeDesc.setText(R.string.set_dirs_mode_exclude_desc)
-        }
-    }
-
-    /** Get if the UI has currently configured [MusicDirectories.shouldInclude] to be true. */
-    private fun isUiModeInclude(binding: DialogMusicDirsBinding) =
-        binding.folderModeGroup.checkedButtonId == R.id.dirs_mode_include
-
     private companion object {
-        const val KEY_PENDING_DIRS = BuildConfig.APPLICATION_ID + ".key.PENDING_DIRS"
-        const val KEY_PENDING_MODE = BuildConfig.APPLICATION_ID + ".key.SHOULD_INCLUDE"
+        const val KEY_PENDING_LOCATIONS = BuildConfig.APPLICATION_ID + ".key.PENDING_LOCATIONS"
     }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt
index 849e25188..e094b0ee3 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/Library.kt
@@ -22,7 +22,7 @@ import org.oxycblt.auxio.music.Library
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.Playlist
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.music.stack.explore.fs.Pathi
+import org.oxycblt.auxio.music.stack.explore.fs.Path
 
 interface MutableLibrary : Library {
     suspend fun createPlaylist(name: String, songs: List<Song>): MutableLibrary
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/RootPreferenceFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/RootPreferenceFragment.kt
index 689bf9a05..39a523c0c 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/RootPreferenceFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/RootPreferenceFragment.kt
@@ -52,7 +52,8 @@ class RootPreferenceFragment : BasePreferenceFragment(R.xml.preferences_root) {
 
     override fun onOpenDialogPreference(preference: WrappedDialogPreference) {
         if (preference.key == getString(R.string.set_key_music_dirs)) {
-            findNavController().navigateSafe(RootPreferenceFragmentDirections.musicDirsSettings())
+            findNavController()
+                .navigateSafe(RootPreferenceFragmentDirections.musicLocationsSettings())
         }
     }
 
diff --git a/app/src/main/res/layout/dialog_music_dirs.xml b/app/src/main/res/layout/dialog_music_dirs.xml
deleted file mode 100644
index 0885dbc22..000000000
--- a/app/src/main/res/layout/dialog_music_dirs.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Widget.Auxio.Dialog.NestedScrollView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/dirs_mode_header"
-            style="@style/Widget.Auxio.TextView.Header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingEnd="@dimen/spacing_large"
-            android:text="@string/set_dirs_mode"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/folder_mode_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_large"
-            android:layout_marginTop="@dimen/spacing_tiny"
-            android:layout_marginEnd="@dimen/spacing_large"
-            android:gravity="center"
-            app:checkedButton="@+id/dirs_mode_exclude"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_mode_header"
-            app:selectionRequired="true"
-            app:singleSelection="true">
-
-            <org.oxycblt.auxio.ui.RippleFixMaterialButton
-                android:id="@+id/dirs_mode_exclude"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/set_dirs_mode_exclude"
-                tools:icon="@drawable/ic_check_24" />
-
-            <org.oxycblt.auxio.ui.RippleFixMaterialButton
-                android:id="@+id/dirs_mode_include"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/set_dirs_mode_include" />
-
-        </com.google.android.material.button.MaterialButtonToggleGroup>
-
-        <TextView
-            android:id="@+id/dirs_mode_desc"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_large"
-            android:layout_marginTop="@dimen/spacing_tiny"
-            android:layout_marginEnd="@dimen/spacing_large"
-            android:textAlignment="viewStart"
-            app:layout_constraintTop_toBottomOf="@+id/folder_mode_group"
-            tools:text="Mode description" />
-
-        <com.google.android.material.divider.MaterialDivider
-            android:id="@+id/dirs_list_header_divider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_medium"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_mode_desc" />
-
-        <TextView
-            android:id="@+id/dirs_list_header"
-            style="@style/Widget.Auxio.TextView.Header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingEnd="@dimen/spacing_large"
-            android:text="@string/set_dirs_list"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_list_header_divider" />
-
-        <org.oxycblt.auxio.ui.RippleFixMaterialButton
-            android:id="@+id/dirs_add"
-            style="@style/Widget.Auxio.Button.Icon.Small"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_mid_large"
-            android:contentDescription="@string/lbl_add"
-            app:icon="@drawable/ic_add_24"
-            app:layout_constraintEnd_toEndOf="@+id/dirs_list_header"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_list_header_divider" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/dirs_recycler"
-            style="@style/Widget.Auxio.RecyclerView.Linear"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:clipToPadding="false"
-            android:overScrollMode="never"
-            app:layout_constraintTop_toBottomOf="@+id/dirs_list_header"
-            tools:listitem="@layout/item_music_dir" />
-
-        <TextView
-            android:id="@+id/dirs_empty"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/spacing_large"
-            android:paddingTop="@dimen/spacing_medium"
-            android:paddingEnd="@dimen/spacing_large"
-            android:paddingBottom="@dimen/spacing_medium"
-            android:text="@string/err_no_dirs"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
-            android:textColor="?android:attr/textColorSecondary"
-            app:layout_constraintTop_toTopOf="@+id/dirs_recycler" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_music_locations.xml b/app/src/main/res/layout/dialog_music_locations.xml
new file mode 100644
index 000000000..0792b51c0
--- /dev/null
+++ b/app/src/main/res/layout/dialog_music_locations.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Widget.Auxio.Dialog.NestedScrollView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/locations_list_header"
+            style="@style/Widget.Auxio.TextView.Header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
+            android:text="@string/set_locations_list"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.oxycblt.auxio.ui.RippleFixMaterialButton
+            android:id="@+id/locations_add"
+            style="@style/Widget.Auxio.Button.Icon.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/spacing_mid_large"
+            android:contentDescription="@string/lbl_add"
+            app:icon="@drawable/ic_add_24"
+            app:layout_constraintBottom_toTopOf="@+id/locations_recycler"
+            app:layout_constraintEnd_toEndOf="@+id/locations_list_header"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/locations_recycler"
+            style="@style/Widget.Auxio.RecyclerView.Linear"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:clipToPadding="false"
+            android:overScrollMode="never"
+            app:layout_constraintTop_toBottomOf="@+id/locations_list_header"
+            tools:listitem="@layout/item_music_location" />
+
+        <TextView
+            android:id="@+id/locations_empty"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingTop="@dimen/spacing_medium"
+            android:paddingEnd="@dimen/spacing_large"
+            android:paddingBottom="@dimen/spacing_medium"
+            android:text="@string/err_no_locations"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
+            android:textColor="?android:attr/textColorSecondary"
+            app:layout_constraintTop_toTopOf="@+id/locations_recycler" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_music_dir.xml b/app/src/main/res/layout/item_music_location.xml
similarity index 89%
rename from app/src/main/res/layout/item_music_dir.xml
rename to app/src/main/res/layout/item_music_location.xml
index ae1082de6..45d427155 100644
--- a/app/src/main/res/layout/item_music_dir.xml
+++ b/app/src/main/res/layout/item_music_location.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="@dimen/spacing_small">
 
     <TextView
-        android:id="@+id/dir_path"
+        android:id="@+id/location_path"
         style="@style/Widget.Auxio.TextView.Item.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -23,13 +23,13 @@
         tools:text="primary:path/to/music" />
 
     <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/dir_delete"
+        android:id="@+id/location_delete"
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginEnd="@dimen/spacing_mid_large"
-        android:contentDescription="@string/desc_music_dir_delete"
+        android:contentDescription="@string/desc_music_location_delete"
         app:icon="@drawable/ic_delete_24"
         app:tint="?attr/colorControlNormal" />
 
diff --git a/app/src/main/res/navigation/inner.xml b/app/src/main/res/navigation/inner.xml
index 13f90102b..2f8b7a6f8 100644
--- a/app/src/main/res/navigation/inner.xml
+++ b/app/src/main/res/navigation/inner.xml
@@ -89,7 +89,7 @@
             app:destination="@id/error_details_dialog" />
         <action
             android:id="@+id/choose_locations"
-            app:destination="@id/music_dirs_dialog" />
+            app:destination="@id/music_locations_dialog" />
     </fragment>
 
     <dialog
@@ -569,8 +569,8 @@
     </dialog>
 
     <dialog
-        android:id="@+id/music_dirs_dialog"
-        android:name="org.oxycblt.auxio.music.dirs.MusicDirsDialog"
-        android:label="music_dirs_dialog"
-        tools:layout="@layout/dialog_music_dirs" />
+        android:id="@+id/music_locations_dialog"
+        android:name="org.oxycblt.auxio.music.locations.MusicSourcesDialog"
+        android:label="music_locations_dialog"
+        tools:layout="@layout/dialog_music_locations" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/outer.xml b/app/src/main/res/navigation/outer.xml
index 63adfa466..503172f3b 100644
--- a/app/src/main/res/navigation/outer.xml
+++ b/app/src/main/res/navigation/outer.xml
@@ -34,8 +34,8 @@
             android:id="@+id/audio_peferences"
             app:destination="@id/audio_preferences_fragment" />
         <action
-            android:id="@+id/music_dirs_settings"
-            app:destination="@id/music_dirs_dialog" />
+            android:id="@+id/music_locations_settings"
+            app:destination="@id/music_locations_dialog" />
     </fragment>
 
     <fragment
@@ -90,14 +90,14 @@
         android:label="pre_amp_dialog"
         tools:layout="@layout/dialog_pre_amp" />
     <dialog
-        android:id="@+id/music_dirs_dialog"
-        android:name="org.oxycblt.auxio.music.dirs.MusicDirsDialog"
-        android:label="music_dirs_dialog"
-        tools:layout="@layout/dialog_music_dirs" />
+        android:id="@+id/music_locations_dialog"
+        android:name="org.oxycblt.auxio.music.locations.MusicSourcesDialog"
+        android:label="music_locations_dialog"
+        tools:layout="@layout/dialog_music_locations" />
     <dialog
         android:id="@+id/separators_dialog"
         android:name="org.oxycblt.auxio.music.metadata.SeparatorsDialog"
-        android:label="music_dirs_dialog"
+        android:label="separators_dialog"
         tools:layout="@layout/dialog_separators" />
 
     <fragment
diff --git a/app/src/main/res/values-ar-rIQ/strings.xml b/app/src/main/res/values-ar-rIQ/strings.xml
index 38792d7c1..6f826f7bb 100644
--- a/app/src/main/res/values-ar-rIQ/strings.xml
+++ b/app/src/main/res/values-ar-rIQ/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_album_details">أذهب إلى الالبوم</string>
     <string name="lbl_add">أضف</string>
     <string name="lbl_save">حفظ</string>
-    <string name="err_no_dirs">لا مجلد</string>
+    <string name="err_no_locations">لا مجلد</string>
     <string name="lbl_about">حول</string>
     <string name="lbl_version">الإصدار</string>
     <string name="lbl_code">عرض على الكود في Github</string>
@@ -75,7 +75,7 @@
     <string name="err_index_failed">فشل تحميل الموسيقى</string>
     <string name="err_no_perms">اوكسيو يحتاج إلى صلاحيات لقراءة للاطلاع على مكتبتك للموسيقى</string>
     <string name="err_no_app">لا يوجد تطبيق لفتح هذا الرابط</string>
-    <string name="err_bad_dir">هذا المجلد غير مدعوم</string>
+    <string name="err_bad_location">هذا المجلد غير مدعوم</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">البحث في مكتبتك…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -90,7 +90,7 @@
     <string name="desc_song_handle">نقل اغنية من الطابور</string>
     <string name="desc_tab_handle">تحريك التبويت</string>
     <string name="desc_clear_search">إزالة كلمة البحث</string>
-    <string name="desc_music_dir_delete">إزالة المجلد المستبعد</string>
+    <string name="desc_music_location_delete">إزالة المجلد المستبعد</string>
     <string name="desc_auxio_icon">ايقونة اوكسيو</string>
     <string name="desc_no_cover">غلاف الالبوم</string>
     <string name="desc_album_cover">غلاف الالبوم لـ %s</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 9e162c19a..c2ac9d5ce 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -109,7 +109,7 @@
     </plurals>
     <string name="set_hide_collaborators_desc">إظهار فقط الفنانين المُعتمدين مباشرة على الألبوم (يعمل بشكل أفضل في المكتبات المعروفة بتوسيماتها الجيدة)</string>
     <string name="set_content">المحتوى</string>
-    <string name="set_dirs_list">مجلدات</string>
+    <string name="set_locations_list">مجلدات</string>
     <string name="set_hide_collaborators">إخفاء المتعاونين</string>
     <string name="set_audio_desc">ضبط سلوك وصوت التشغيل</string>
     <string name="set_rewind_prev">إعادة التشغيل قبل الانتقال للوراء</string>
@@ -130,7 +130,7 @@
     <string name="set_action_mode_next">الانتقال إلى التالي</string>
     <string name="desc_no_cover">غلاف الألبوم</string>
     <string name="err_export_failed">غير قادر على تصدير قائمة التشغيل إلى هذا الملف</string>
-    <string name="desc_music_dir_delete">إزالة المجلد</string>
+    <string name="desc_music_location_delete">إزالة المجلد</string>
     <string name="desc_auxio_icon">رمز مساعد</string>
     <string name="fmt_list">%1$s، %2$s</string>
     <string name="clr_dynamic">متحرك</string>
@@ -169,8 +169,8 @@
     <string name="lbl_single_remix">اغنية فردية ريميكس</string>
     <string name="set_images">الصور</string>
     <string name="set_reindex_desc">إعادة تحميل مكتبة الموسيقى، باستخدام العلامات المخزنة مؤقتًا عند الإمكان</string>
-    <string name="err_no_dirs">لا توجد مجلدات</string>
-    <string name="err_bad_dir">هذا المجلد غير مدعوم</string>
+    <string name="err_no_locations">لا توجد مجلدات</string>
+    <string name="err_bad_location">هذا المجلد غير مدعوم</string>
     <string name="desc_shuffle_all">خلط جميع الأغاني</string>
     <string name="clr_cyan">ازرق سماوي</string>
     <string name="fmt_editing">تحرير %s</string>
@@ -225,8 +225,8 @@
     <string name="set_audio">صوت</string>
     <string name="set_pre_amp_warning">تحذير: تغيير مكبر الصوت المسبق إلى قيمة إيجابية عالية قد يؤدي إلى ظهور ذروات صوتية على بعض المسارات الصوتية.</string>
     <string name="set_library">مكتبة</string>
-    <string name="set_dirs">مجلدات الموسيقى</string>
-    <string name="set_dirs_desc">إدارة موقع تحميل الموسيقى</string>
+    <string name="set_locations">مجلدات الموسيقى</string>
+    <string name="set_locations_desc">إدارة موقع تحميل الموسيقى</string>
     <string name="set_dirs_mode_exclude_desc">الموسيقى لن تتم تحميلها من المجلدات التي تقوم بإضافتها.</string>
     <string name="set_dirs_mode_include_desc">الموسيقى ستتم تحميلها فقط من المجلدات التي تقوم بإضافتها.</string>
     <string name="desc_skip_prev">الانتقال إلى الأغنية الأخيرة</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index d3c595384..d64ea439f 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -97,7 +97,7 @@
     <string name="set_cover_mode_quality">Падвышанай якасці (павольная загрузка)</string>
     <string name="set_replay_gain_mode_dynamic">Аддайце перавагу альбому, калі ён гучыць</string>
     <string name="set_pre_amp_without">Карэкціроўка без тэгаў</string>
-    <string name="set_dirs">Тэчкі з музыкай</string>
+    <string name="set_locations">Тэчкі з музыкай</string>
     <string name="set_headset_autoplay">Аўтапрайграванне гарнітуры</string>
     <string name="set_audio_desc">Наладзьце гук і паводзіны прайгравання</string>
     <string name="set_headset_autoplay_desc">Заўсёды пачынаць гульню, калі падключана гарнітура (можа працаваць не на ўсіх прыладах)</string>
@@ -113,8 +113,8 @@
     <string name="set_replay_gain_mode_album">Аддайце перавагу альбому</string>
     <string name="set_pre_amp">Папярэдні ўзмацняльнік ReplayGain</string>
     <string name="set_library">Бібліятэка</string>
-    <string name="set_dirs_desc">Кіруйце месцам загрузкі музыкі</string>
-    <string name="set_dirs_list">Тэчкі</string>
+    <string name="set_locations_desc">Кіруйце месцам загрузкі музыкі</string>
+    <string name="set_locations_list">Тэчкі</string>
     <string name="set_dirs_mode">Рэжым</string>
     <string name="set_dirs_mode_exclude">Выключэнні</string>
     <string name="set_dirs_mode_exclude_desc">Музыка <b>не</b> будзе загружана з выбраных тэчак.</string>
@@ -126,8 +126,8 @@
     <string name="err_no_perms">Auxio патрабуецца дазвол на чытанне вашай музычнай бібліятэкі</string>
     <string name="err_no_music">Музыка не знойдзена</string>
     <string name="err_index_failed">Памылка загрузкі музыкі</string>
-    <string name="err_no_dirs">Няма тэчак</string>
-    <string name="err_bad_dir">Гэтая папка не падтрымліваецца</string>
+    <string name="err_no_locations">Няма тэчак</string>
+    <string name="err_bad_location">Гэтая папка не падтрымліваецца</string>
     <string name="desc_track_number">Кампазіцыя %d</string>
     <string name="desc_song_handle">Перамясціць песню ў чаргу</string>
     <string name="err_no_app">Не знойдзена прыкладання, якое можа справіцца з гэтай задачай</string>
@@ -142,7 +142,7 @@
     <string name="desc_exit">Спыніць прайграванне</string>
     <string name="desc_queue_bar">Адкрыйце чаргу</string>
     <string name="desc_clear_search">Ачысціць пошукавы запыт</string>
-    <string name="desc_music_dir_delete">Выдаліць тэчку</string>
+    <string name="desc_music_location_delete">Выдаліць тэчку</string>
     <string name="desc_no_cover">Вокладка альбома</string>
     <string name="desc_album_cover">Вокладка альбома %s</string>
     <string name="desc_artist_image">Выява выканаўцы для %s</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index eacbfb1f5..da701efc5 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -208,9 +208,9 @@
     <string name="set_pre_amp_with">Регулиране с етикети</string>
     <string name="set_pre_amp_without">Корекция без етикети</string>
     <string name="set_library">Библиотека</string>
-    <string name="set_dirs">Музикални папки</string>
-    <string name="set_dirs_desc">Управлявайте откъде да се зарежда музиката</string>
-    <string name="set_dirs_list">Папки</string>
+    <string name="set_locations">Музикални папки</string>
+    <string name="set_locations_desc">Управлявайте откъде да се зарежда музиката</string>
+    <string name="set_locations_list">Папки</string>
     <string name="set_dirs_mode">Режим</string>
     <string name="set_dirs_mode_exclude">Изключете</string>
     <string name="set_dirs_mode_exclude_desc">Музиката <b>няма</b> да се зарежда от папките, които добавяте.</string>
@@ -221,7 +221,7 @@
     <string name="err_no_perms">Auxio се нуждае от разрешение, за да чете вашата музикална библиотека</string>
     <string name="err_export_failed">Плейлиста не може да се изнесе в този файл</string>
     <string name="err_no_app">Няма намерено приложение, което да може да се справи с тази задача</string>
-    <string name="err_no_dirs">Няма папки</string>
+    <string name="err_no_locations">Няма папки</string>
     <string name="desc_play_pause">Изпълни или пауза</string>
     <string name="desc_skip_next">Премини към следваща песен</string>
     <string name="desc_skip_prev">Премини към последна песен</string>
@@ -236,9 +236,9 @@
     <string name="desc_tab_handle">Премести този раздел</string>
     <string name="set_pre_amp_warning">Предупреждение: Промяната на пред усилвателя на висока положителна стойност може да доведе до пикове на някои аудио записи.</string>
     <string name="desc_clear_search">Изчисти заявката за търсене</string>
-    <string name="desc_music_dir_delete">Премахни папка</string>
+    <string name="desc_music_location_delete">Премахни папка</string>
     <string name="err_import_failed">Не може да се внесе плейлист от този файл</string>
-    <string name="err_bad_dir">Тази папка не се поддържа</string>
+    <string name="err_bad_location">Тази папка не се поддържа</string>
     <string name="desc_auxio_icon">Auxio икона</string>
     <string name="desc_no_cover">Обложка на албум</string>
     <string name="set_dirs_mode_include">Включете</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0561c6730..181c6b102 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -94,8 +94,8 @@
     <string name="err_index_failed">Načítání hudby selhalo</string>
     <string name="err_no_perms">Auxio potřebuje oprávnění ke čtení vaší hudební knihovny</string>
     <string name="err_no_app">Nebyla nalezena žádná aplikace, která by dokázala vykonat tuto akci</string>
-    <string name="err_no_dirs">Žádné složky</string>
-    <string name="err_bad_dir">Tato složka není podporována</string>
+    <string name="err_no_locations">Žádné složky</string>
+    <string name="err_bad_location">Tato složka není podporována</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">Prohledat vaší knihovnu…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -110,7 +110,7 @@
     <string name="desc_song_handle">Přesunout tuto skladbu ve frontě</string>
     <string name="desc_tab_handle">Přesunout tuto kartu</string>
     <string name="desc_clear_search">Vymazat hledání</string>
-    <string name="desc_music_dir_delete">Odebrat složku</string>
+    <string name="desc_music_location_delete">Odebrat složku</string>
     <string name="desc_auxio_icon">Ikona Auxio</string>
     <string name="desc_no_cover">Obal alba</string>
     <string name="desc_album_cover">Obal alba %s</string>
@@ -178,7 +178,7 @@
     <string name="fmt_bitrate">%d kbps</string>
     <string name="fmt_sample_rate">%d Hz</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_locations_desc">Spravovat, odkud by měla být načítána hudba</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>
@@ -186,7 +186,7 @@
     <string name="lbl_size">Velikost</string>
     <string name="lbl_bitrate">Přenosová rychlost</string>
     <string name="lbl_sample_rate">Vzorkovací frekvence</string>
-    <string name="set_dirs">Složky s hudbou</string>
+    <string name="set_locations">Složky s hudbou</string>
     <string name="lbl_observing">Monitorování hudební knihovny</string>
     <string name="set_observing">Automatické znovunačítání</string>
     <string name="lng_observing">Sledování změn v hudební knihovně…</string>
@@ -251,7 +251,7 @@
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Obnovit</string>
-    <string name="set_dirs_list">Složky</string>
+    <string name="set_locations_list">Složky</string>
     <string name="set_replay_gain">Normalizace hlasitosti</string>
     <string name="set_behavior">Chování</string>
     <string name="set_ui_desc">Změnit motiv a barvy aplikace</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 691a6e407..08ea32375 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_track">Trac</string>
     <string name="lbl_sort">Didoli</string>
     <string name="lbl_sort_mode">Didoli gan</string>
-    <string name="set_dirs_list">Ffolderi</string>
+    <string name="set_locations_list">Ffolderi</string>
     <string name="set_dirs_mode_exclude">Allgáu</string>
     <string name="lbl_playlists">Rhestri chwarae</string>
     <string name="lbl_new_playlist">Rhestr chwarae newydd</string>
@@ -87,7 +87,7 @@
     <string name="set_audio">Sain</string>
     <string name="set_replay_gain_mode_off">I ffwrdd</string>
     <string name="set_library">Llyfrgell</string>
-    <string name="set_dirs">Ffolderi cerddoriaeth</string>
+    <string name="set_locations">Ffolderi cerddoriaeth</string>
     <string name="set_dirs_mode">Modd</string>
     <string name="set_dirs_mode_include">Cynnwys</string>
     <string name="set_reindex">Adnewyddu cerddoriaeth</string>
@@ -206,7 +206,7 @@
     <string name="err_index_failed">Methwyd llwytho cerddoriaeth</string>
     <string name="err_no_perms">Mae ar Auxio angen caniatâd i ddarllen eich llyfrgell gerddoriaeth</string>
     <string name="err_no_app">Methwyd dod o hyd ap sydd yn gallu gwneud y tasg hon</string>
-    <string name="err_no_dirs">Dim ffolderi</string>
+    <string name="err_no_locations">Dim ffolderi</string>
     <string name="desc_skip_next">Neidio i\'r gân nesaf</string>
     <string name="desc_skip_prev">Neidio i\'r gân ddiwethaf</string>
     <string name="desc_change_repeat">Newid y modd ail-chwarae</string>
@@ -237,7 +237,7 @@
     <string name="err_export_failed">Methwyd allforio\'r rhestr chwarae i\'r ffeil hon</string>
     <string name="desc_tab_handle">Symud y tab hwn</string>
     <string name="desc_clear_search">Clirio\'r ymholiad chwilio</string>
-    <string name="desc_music_dir_delete">Tynnu ffolder</string>
+    <string name="desc_music_location_delete">Tynnu ffolder</string>
     <string name="desc_auxio_icon">Eicon Auxio</string>
     <string name="desc_album_cover">Clawr albwm %s</string>
     <string name="desc_artist_image">Llun artist %s</string>
@@ -291,7 +291,7 @@
     <string name="set_headset_autoplay">Chwarae\'n awtomatig gyda chlustffon</string>
     <string name="set_rescan">Ail-sganio cerddoriaeth</string>
     <string name="fmt_list">%1$s, %2$s</string>
-    <string name="set_dirs_desc">Rheoli o ble i lwytho cerddoriaeth</string>
+    <string name="set_locations_desc">Rheoli o ble i lwytho cerddoriaeth</string>
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
     <string name="set_personalize_desc">Addasu rheolaethau\'r UI ac ymarweddiad</string>
     <string name="set_bar_action">Gweithred addasedig ar y bar chwarae</string>
@@ -303,7 +303,7 @@
     <string name="set_dirs_mode_include_desc">Bydd cerddoriaeth yn cael ei llwytho <b>dim ond</b> o\'r ffolderi rydych yn eu hychwanegu.</string>
     <string name="set_reindex_desc">Ail-lwytho\'r llyfrgell cerddoriaeth, gan ddefnyddio tagiau wedi\'u cadw\'n barod pan fo modd</string>
     <string name="set_rescan_desc">Dileu\'r tagiau wedi\'u cadw\'n barod ac ail-lwytho\'r llyfrgell gerddoriaeth yn llawn (yn arafach, ond yn fwy cyflawn)</string>
-    <string name="err_bad_dir">Ni chefnogir y ffolder hon</string>
+    <string name="err_bad_location">Ni chefnogir y ffolder hon</string>
     <string name="cdc_aac">Advanced Audio Coding (AAC)</string>
     <string name="lbl_replaygain_album">Addasu Albwm ReplayGain</string>
     <string name="lbl_replaygain_track">Addasu Trac ReplayGain</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2ef6e71df..c1b28cbad 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -26,7 +26,7 @@
     <string name="lbl_album_details">Zum Album gehen</string>
     <string name="lbl_add">Hinzufügen</string>
     <string name="lbl_save">Speichern</string>
-    <string name="err_no_dirs">Keine Ordner</string>
+    <string name="err_no_locations">Keine Ordner</string>
     <string name="lbl_about">Über</string>
     <string name="lbl_version">Version</string>
     <string name="lbl_code">Quellcode</string>
@@ -68,7 +68,7 @@
     <string name="err_index_failed">Laden der Musik fehlgeschlagen</string>
     <string name="err_no_perms">Auxio benötigt die Berechtigung, um deine Musikbibliothek zu lesen</string>
     <string name="err_no_app">Es konnte keine App gefunden werden, die diese Aufgabe übernehmen kann</string>
-    <string name="err_bad_dir">Das Verzeichnis wird nicht unterstützt</string>
+    <string name="err_bad_location">Das Verzeichnis wird nicht unterstützt</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">Musikbibliothek durchsuchen…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -123,7 +123,7 @@
     <string name="set_repeat_pause_desc">Pausieren, wenn ein Song wiederholt wird</string>
     <string name="desc_shuffle">Zufällig an- oder ausschalten</string>
     <string name="desc_song_handle">Lied in der Warteschlange verschieben</string>
-    <string name="desc_music_dir_delete">Verzechnis entfernen</string>
+    <string name="desc_music_location_delete">Verzechnis entfernen</string>
     <string name="desc_no_cover">Albumcover</string>
     <string name="def_playback">Keine Musik wird gespielt</string>
     <string name="set_lib_tabs">Bibliotheks-Registerkarten</string>
@@ -152,8 +152,8 @@
     <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_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_locations">Musikordner</string>
+    <string name="set_locations_desc">Verwalten, von wo die Musik geladen werden soll</string>
     <string name="set_dirs_mode">Modus</string>
     <string name="set_dirs_mode_exclude">Ausschließen</string>
     <string name="set_dirs_mode_exclude_desc">Musik wird <b>nicht</b> aus den von dir hinzugefügten Ordnern geladen.</string>
@@ -249,7 +249,7 @@
     <string name="set_music">Musik</string>
     <string name="set_images">Bilder</string>
     <string name="set_library">Bibliothek</string>
-    <string name="set_dirs_list">Ordner</string>
+    <string name="set_locations_list">Ordner</string>
     <string name="set_playback">Wiedergabe</string>
     <string name="set_audio_desc">Ton und Wiedergabeverhalten konfigurieren</string>
     <string name="set_replay_gain">Lautstärkenormalisierung</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2f8fe6285..6f379565b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -69,7 +69,7 @@
     <string name="fmt_indexing">Φόρτωση της συλλογής μουσικής σας… (%1$d/%2$d)</string>
     <string name="fmt_lib_genre_count">Είδη που φορτώθηκαν: %d</string>
     <string name="lbl_song_count">Αριθμός τραγουδιών</string>
-    <string name="err_bad_dir">Αυτός ο φάκελος δεν υποστηρίζεται</string>
+    <string name="err_bad_location">Αυτός ο φάκελος δεν υποστηρίζεται</string>
     <string name="fmt_disc_no">Δίσκος %d</string>
     <string name="fmt_lib_album_count">Album που φορτώθηκαν: %d</string>
     <string name="fmt_lib_artist_count">Καλλιτέχνες που φορτώθηκαν: %d</string>
@@ -95,7 +95,7 @@
     <string name="lbl_name">Όνομα</string>
     <string name="lbl_duration">Διάρκεια</string>
     <string name="fmt_lib_total_duration">Συνολική διάρκεια: %s</string>
-    <string name="err_no_dirs">Καθόλου φάκελοι</string>
+    <string name="err_no_locations">Καθόλου φάκελοι</string>
     <string name="info_app_desc">Μια απλή, λογική εφαρμογή αναπαραγωγής μουσικής για Android.</string>
     <string name="lbl_indexer">Φόρτωση μουσικής</string>
     <string name="lng_widget">Προβολή και έλεγχος αναπαραγωγής μουσικής</string>
@@ -121,7 +121,7 @@
     <string name="set_reindex">Επαναφόρτωση μουσικής</string>
     <string name="lbl_soundtrack">Σάουντρακ</string>
     <string name="lbl_live_group">Ζωντανά</string>
-    <string name="set_dirs">Φάκελοι μουσικής</string>
+    <string name="set_locations">Φάκελοι μουσικής</string>
     <string name="lbl_track">Μουσικο κομματι</string>
     <string name="lbl_compilation_live">Σύνθεση ζωντανών κομματιών</string>
     <string name="lbl_compilation_remix">Σύνθεση ρεμίξ</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f63a21a68..3f86f40b1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_album_details">Ir al álbum</string>
     <string name="lbl_add">Agregar</string>
     <string name="lbl_save">Guardar</string>
-    <string name="err_no_dirs">Sin carpetas</string>
+    <string name="err_no_locations">Sin carpetas</string>
     <string name="lbl_about">Acerca de</string>
     <string name="lbl_version">Versión</string>
     <string name="lbl_code">Código fuente</string>
@@ -77,7 +77,7 @@
     <string name="err_index_failed">Falló la carga de música</string>
     <string name="err_no_perms">Auxio necesita permiso para leer su biblioteca de música</string>
     <string name="err_no_app">No se encontró ninguna aplicación que pueda manejar esta tarea</string>
-    <string name="err_bad_dir">Directorio no soportado</string>
+    <string name="err_bad_location">Directorio no soportado</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">Buscar en la biblioteca…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -92,7 +92,7 @@
     <string name="desc_song_handle">Mover canción en la cola</string>
     <string name="desc_tab_handle">Mover pestaña</string>
     <string name="desc_clear_search">Borrar búsqueda</string>
-    <string name="desc_music_dir_delete">Quitar carpeta</string>
+    <string name="desc_music_location_delete">Quitar carpeta</string>
     <string name="desc_auxio_icon">Icono de Auxio</string>
     <string name="desc_no_cover">Carátula de álbum</string>
     <string name="desc_album_cover">Carátula de álbum para %s</string>
@@ -172,8 +172,8 @@
     <string name="lbl_sample_rate">Frecuencia de muestreo</string>
     <string name="lbl_cancel">Cancelar</string>
     <string name="set_headset_autoplay">Reproducción automática con auriculares</string>
-    <string name="set_dirs">Carpetas de música</string>
-    <string name="set_dirs_desc">Gestionar de dónde se cargará la música</string>
+    <string name="set_locations">Carpetas de música</string>
+    <string name="set_locations_desc">Gestionar de dónde se cargará la música</string>
     <string name="set_dirs_mode_include_desc">La música <b>solo</b> se cargará de las carpetas que añadas.</string>
     <string name="clr_dynamic">Dinámico</string>
     <string name="fmt_disc_no">Disco %d</string>
@@ -253,7 +253,7 @@
     <string name="set_images">Imágenes</string>
     <string name="set_audio_desc">Configurar el comportamiento del sonido y la reproducción</string>
     <string name="set_playback">Reproducción</string>
-    <string name="set_dirs_list">Carpetas</string>
+    <string name="set_locations_list">Carpetas</string>
     <string name="set_ui_desc">Cambiar el tema y los colores de la aplicación</string>
     <string name="set_personalize_desc">Personalizar los controles y el comportamiento de la interfaz de usuario</string>
     <string name="set_library">Biblioteca</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index d5a256a6d..2344da85a 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -241,9 +241,9 @@
     <string name="set_pre_amp_without">Kohandamine ilma siltides leiduvate väärtusteta</string>
     <string name="set_pre_amp_warning">Hoiatus: kui muudad eelvõimenduse väärtuse suureks positiivseks väärtuseks, siis mõnede lugude puhul võib see tähendada liiga kõrgeid toone.</string>
     <string name="set_library">Muusikakogu</string>
-    <string name="set_dirs">Muusika kaustad</string>
-    <string name="set_dirs_desc">Halda kaustu, kust otsime ja laadime muusikat</string>
-    <string name="set_dirs_list">Kaustad</string>
+    <string name="set_locations">Muusika kaustad</string>
+    <string name="set_locations_desc">Halda kaustu, kust otsime ja laadime muusikat</string>
+    <string name="set_locations_list">Kaustad</string>
     <string name="set_dirs_mode">Kaustade loogika</string>
     <string name="set_dirs_mode_exclude">Välista</string>
     <string name="set_dirs_mode_exclude_desc">Sinu määratud kaustadest <b>ei laadita</b> muusikat.</string>
@@ -260,8 +260,8 @@
     <string name="err_export_failed">Sellesse faili ei õnnestu esitusloendit eksportida</string>
     <string name="err_no_app">Ei leidu selle ülesande täitmiseks sobilikku rakendust</string>
     <string name="desc_track_number">Lugu %d</string>
-    <string name="err_no_dirs">Kaustu pole määratud</string>
-    <string name="err_bad_dir">See kaust pole toetatud</string>
+    <string name="err_no_locations">Kaustu pole määratud</string>
+    <string name="err_bad_location">See kaust pole toetatud</string>
     <string name="desc_play_pause">Esita või peata</string>
     <string name="desc_change_repeat">Muuda kordamise režiimi</string>
     <string name="desc_skip_next">Hüppa järgmise pala juurde</string>
@@ -274,7 +274,7 @@
     <string name="desc_remove_song">Eemalda see pala</string>
     <string name="desc_song_handle">Tõsta see pala teise kohta</string>
     <string name="desc_clear_search">Tühjenda otsinguajalugu</string>
-    <string name="desc_music_dir_delete">Eemalda kaust</string>
+    <string name="desc_music_location_delete">Eemalda kaust</string>
     <string name="desc_auxio_icon">Auxio ikoon</string>
     <string name="desc_no_cover">Albumi kaanepilt</string>
     <string name="desc_album_cover">%s albumi kaanepilt</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a3ff24005..eb4f11bf3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -85,21 +85,21 @@
     <string name="set_replay_gain_mode_track">Suosi kappaletta</string>
     <string name="set_pre_amp">ReplayGainin esivahvistus</string>
     <string name="set_library">Kirjasto</string>
-    <string name="set_dirs">Musiikkikansiot</string>
-    <string name="set_dirs_desc">Määritä mistä musiikki tulee ladata</string>
+    <string name="set_locations">Musiikkikansiot</string>
+    <string name="set_locations_desc">Määritä mistä musiikki tulee ladata</string>
     <string name="set_rescan">Läpikäy musiikki uudelleen</string>
     <string name="set_dirs_mode">Tila</string>
     <string name="set_dirs_mode_exclude">Ohita</string>
     <string name="set_dirs_mode_include">Sisällytä</string>
     <string name="set_dirs_mode_include_desc">Musiikkia ladataan <b>vain</b> lisäämistäsi kansioista.</string>
     <string name="err_no_app">Tähän tehtävään kykenevää sovellusta ei löytynyt</string>
-    <string name="err_no_dirs">Ei kansioita</string>
+    <string name="err_no_locations">Ei kansioita</string>
     <string name="desc_track_number">Raita %d</string>
     <string name="desc_skip_next">Siirry seuraavaan kappaleeseen</string>
     <string name="desc_change_repeat">Muuta kertaustilaa</string>
     <string name="desc_exit">Pysäytä toisto</string>
     <string name="desc_queue_bar">Avaa jono</string>
-    <string name="desc_music_dir_delete">Poista kansio</string>
+    <string name="desc_music_location_delete">Poista kansio</string>
     <string name="desc_auxio_icon">Auxion kuvake</string>
     <string name="desc_album_cover">Albumin %s kansi</string>
     <string name="desc_genre_image">Tyylilajin %s kuva</string>
@@ -209,9 +209,9 @@
     <string name="set_headset_autoplay">Automaattitoisto kuulokkeilla</string>
     <string name="set_headset_autoplay_desc">Aloita aina toisto, kun kuulokkeet yhdistetään (ei välttämättä toimi kaikilla laitteilla)</string>
     <string name="desc_skip_prev">Siirry viimeiseen kappaleeseen</string>
-    <string name="set_dirs_list">Kansiot</string>
+    <string name="set_locations_list">Kansiot</string>
     <string name="desc_play_pause">Toista tai keskeytä</string>
-    <string name="err_bad_dir">Tämä kansio ei ole tuettu</string>
+    <string name="err_bad_location">Tämä kansio ei ole tuettu</string>
     <string name="desc_shuffle">Sekoitus päällä/pois</string>
     <string name="desc_shuffle_all">Sekoita kaikki kappaleet</string>
     <string name="desc_tab_handle">Siirry tätä välilehteä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 07ccf50a5..a22378945 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -131,14 +131,14 @@
     <string name="def_genre">Genre inconnu</string>
     <string name="clr_dynamic">Dynamique</string>
     <string name="clr_cyan">Cyan</string>
-    <string name="err_no_dirs">Aucun dossier</string>
-    <string name="desc_music_dir_delete">Supprimer le dossier</string>
+    <string name="err_no_locations">Aucun dossier</string>
+    <string name="desc_music_location_delete">Supprimer le dossier</string>
     <string name="def_artist">Artiste inconnu</string>
     <string name="lbl_compilation_live">Compilation en direct</string>
     <string name="lbl_compilation_remix">Compilation de remix</string>
     <string name="lbl_mixes">Mix DJ</string>
     <string name="lbl_mix">Mix DJ</string>
-    <string name="err_bad_dir">Ce dossier n\'est pas pris en charge</string>
+    <string name="err_bad_location">Ce dossier n\'est pas pris en charge</string>
     <string name="lbl_reset">Réinitialiser</string>
     <string name="cdc_ogg">Ogg audio</string>
     <string name="clr_deep_purple">Violet foncé</string>
@@ -193,14 +193,14 @@
     <string name="set_separators_slash">Barre oblique (/)</string>
     <string name="set_separators_plus">Plus (+)</string>
     <string name="set_pre_amp_with">Ajustement avec étiquettes</string>
-    <string name="set_dirs">Dossiers de musique</string>
-    <string name="set_dirs_desc">Gérer d\'où la musique doit être chargée</string>
+    <string name="set_locations">Dossiers de musique</string>
+    <string name="set_locations_desc">Gérer d\'où la musique doit être chargée</string>
     <string name="set_playback">Lecture</string>
     <string name="set_headset_autoplay_desc">Toujours commencer la lecture lorsqu\'un périphérique audio est connecté (pourrait ne pas fonctionner sur tous les appareils)</string>
     <string name="set_replay_gain_mode">Stratégie de normalisation de volume</string>
     <string name="set_replay_gain_mode_track">Par chanson</string>
     <string name="set_replay_gain_mode_album">Par album</string>
-    <string name="set_dirs_list">Dossiers</string>
+    <string name="set_locations_list">Dossiers</string>
     <string name="set_replay_gain_mode_dynamic">Par album si un album est en lecture</string>
     <string name="set_library">Bibliothèque</string>
     <string name="set_dirs_mode_include_desc">La musique sera <b>uniquement</b> chargée des dossiers ajoutés.</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 9c21f4c8e..526e2d254 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -107,9 +107,9 @@
     </plurals>
     <string name="set_audio">Son</string>
     <string name="set_cover_mode_quality">Alta calidade</string>
-    <string name="set_dirs">Cartafois de música</string>
+    <string name="set_locations">Cartafois de música</string>
     <string name="set_dirs_mode_exclude">Excluír</string>
-    <string name="err_bad_dir">Este cartafol non está soportado</string>
+    <string name="err_bad_location">Este cartafol non está soportado</string>
     <string name="desc_play_pause">Reproducir ou pausar</string>
     <string name="desc_skip_next">Saltar á seguinte canción</string>
     <string name="lbl_observing">Monitorizando a biblioteca de música</string>
@@ -170,7 +170,7 @@
     <string name="desc_exit">Deter a reprodución</string>
     <string name="desc_queue_bar">Abrir a cola</string>
     <string name="desc_clear_search">Borrar o historial de busca</string>
-    <string name="desc_music_dir_delete">Quitar cartafol</string>
+    <string name="desc_music_location_delete">Quitar cartafol</string>
     <string name="desc_auxio_icon">Icona de Auxio</string>
     <string name="desc_no_cover">Portada de álbum</string>
     <string name="desc_album_cover">Portada de álbum para %s</string>
@@ -185,7 +185,7 @@
     <string name="err_index_failed">Fallou a carga de música</string>
     <string name="err_no_perms">Auxio necesita permiso para leer a túa biblioteca de música</string>
     <string name="err_no_app">Non se atopou ningunha aplicación que poda facer esta tarefa</string>
-    <string name="err_no_dirs">Sen cartafois</string>
+    <string name="err_no_locations">Sen cartafois</string>
     <string name="cdc_ogg">Audio ogg</string>
     <string name="cdc_aac">Advanced Audio Coding (AAC)</string>
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
@@ -230,9 +230,9 @@
     <string name="set_separators_plus">Máis (+)</string>
     <string name="set_intelligent_sorting_desc">Ignorar palabras como \"the\" ao ordenar por nome (funciona mellor con música en inglés)</string>
     <string name="set_dirs_mode">Modo</string>
-    <string name="set_dirs_desc">Xestionar dende onde se carga a música</string>
+    <string name="set_locations_desc">Xestionar dende onde se carga a música</string>
     <string name="set_repeat_pause_desc">Pausar cando se repite unha canción</string>
-    <string name="set_dirs_list">Cartafois</string>
+    <string name="set_locations_list">Cartafois</string>
     <string name="def_track">Ningunha pista</string>
     <string name="desc_skip_prev">Saltar á última canción</string>
     <string name="err_no_music">Sen música</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 2080bc707..498d844ef 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -195,7 +195,7 @@
     <string name="cdc_aac">उन्नत ऑडियो कोडिंग (AAC)</string>
     <string name="clr_deep_green">गहरा हरा</string>
     <string name="clr_purple">बैंगनी</string>
-    <string name="set_dirs">संगीत फ़ोल्डर</string>
+    <string name="set_locations">संगीत फ़ोल्डर</string>
     <string name="set_repeat_pause">दोहराने पर विराम</string>
     <string name="set_cover_mode_off">बंद</string>
     <string name="set_square_covers_desc">सभी एल्बम को 1: 1 पहलू अनुपात में कवर करें</string>
@@ -203,10 +203,10 @@
     <string name="set_repeat_pause_desc">जब कोई गीत दोहराया जाता है तो रुक जाएं</string>
     <string name="set_pre_amp">रीप्लेगेन प्री-एम्प</string>
     <string name="set_pre_amp_with">टैग के साथ समायोजन</string>
-    <string name="set_dirs_list">फ़ोल्डर</string>
+    <string name="set_locations_list">फ़ोल्डर</string>
     <string name="set_dirs_mode_exclude">बाहर करें</string>
     <string name="err_index_failed">संगीत लोड करना विफल रहा</string>
-    <string name="err_bad_dir">यह फ़ोल्डर समर्थित नहीं है</string>
+    <string name="err_bad_location">यह फ़ोल्डर समर्थित नहीं है</string>
     <string name="desc_change_repeat">रिपीट मोड बदलें</string>
     <string name="desc_shuffle">शफ़ल चालू या बंद करें</string>
     <string name="desc_shuffle_all">सभी गीत शफ़ल करें</string>
@@ -227,7 +227,7 @@
     <string name="def_date">तिथि नहीं</string>
     <string name="set_dirs_mode_exclude_desc">आपके द्वारा जोड़े गए फ़ोल्डरों से संगीत लोड <b>नहीं</b> किया जाएगा।</string>
     <string name="set_dirs_mode_include_desc">संगीत <b>केवल</b> आपके द्वारा जोड़े गए फ़ोल्डरों से लोड किया जाएगा।</string>
-    <string name="set_dirs_desc">प्रबंधित करें कि संगीत कहाँ से लोड किया जाना चाहिए</string>
+    <string name="set_locations_desc">प्रबंधित करें कि संगीत कहाँ से लोड किया जाना चाहिए</string>
     <string name="desc_artist_image">%s के लिए कलाकार छवि</string>
     <string name="cdc_mp4">MPEG-4 ऑडियो</string>
     <string name="set_images">छवियां</string>
@@ -246,7 +246,7 @@
     <string name="set_hide_collaborators_desc">केवल उन कलाकारों को दिखाएँ जिन्हें सीधे एल्बम पर श्रेय दिया जाता है (अच्छी तरह से टैग की गई लाइब्रेरी पर अच्छा काम करता है)</string>
     <string name="set_cover_mode_media_store">तेज</string>
     <string name="set_cover_mode_quality">उच्च गुणवत्ता</string>
-    <string name="desc_music_dir_delete">फ़ोल्डर हटाएँ</string>
+    <string name="desc_music_location_delete">फ़ोल्डर हटाएँ</string>
     <string name="desc_remove_song">यह गीत हटाओ</string>
     <string name="def_disc">डिस्क नहीं</string>
     <string name="cdc_flac">निःशुल्क दोषरहित ऑडियो कोडेक (FLAC)</string>
@@ -267,7 +267,7 @@
     <string name="set_replay_gain_mode_track">ट्रैक को प्राथमिकता दें</string>
     <string name="set_rescan_desc">टैग कैश साफ़ करें और संगीत लाइब्रेरी को पूरी तरह पुनः लोड करें (धीमी, लेकिन अधिक पूर्ण)</string>
     <string name="err_no_perms">Auxio को आपकी संगीत लाइब्रेरी पढ़ने के लिए अनुमति की आवश्यकता है</string>
-    <string name="err_no_dirs">कोई फ़ोल्डर नहीं</string>
+    <string name="err_no_locations">कोई फ़ोल्डर नहीं</string>
     <string name="clr_brown">भूरा</string>
     <string name="clr_yellow">पीला</string>
     <string name="clr_lime">नींबू रंग</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f3be59096..0dab0e8ae 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -83,8 +83,8 @@
     <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>
-    <string name="set_dirs_desc">Upravljaj odakle će se glazba učitati</string>
+    <string name="set_locations">Mape glazbe</string>
+    <string name="set_locations_desc">Upravljaj odakle će se glazba učitati</string>
     <string name="set_dirs_mode">Način</string>
     <string name="set_dirs_mode_exclude">Isključi</string>
     <string name="set_dirs_mode_exclude_desc">Glazba se <b>neće</b> učitati iz dodanih mapa.</string>
@@ -96,8 +96,8 @@
     <string name="err_index_failed">Greška u učitvanju glazbe</string>
     <string name="err_no_perms">Auxio treba dozvolu za čitanje tvoje zbirke glazbe</string>
     <string name="err_no_app">Nijedna aplikacija ne može obraditi ovaj zadatak</string>
-    <string name="err_no_dirs">Nema mapa</string>
-    <string name="err_bad_dir">Ova mapa nije podržana</string>
+    <string name="err_no_locations">Nema mapa</string>
+    <string name="err_bad_location">Ova mapa nije podržana</string>
     <string name="lng_search_library">Pretraži svoju zbirku …</string>
     <string name="desc_track_number">Zvučni zapis %d</string>
     <string name="desc_shuffle">Omogućite ili onemogućite miješanje</string>
@@ -106,7 +106,7 @@
     <string name="desc_song_handle">Premjesti ovu pjesmu u popisu pjesama</string>
     <string name="desc_tab_handle">Pomakni ovu pločicu</string>
     <string name="desc_clear_search">Izbriši pretražene pojmove</string>
-    <string name="desc_music_dir_delete">Ukloni mapu</string>
+    <string name="desc_music_location_delete">Ukloni mapu</string>
     <string name="desc_auxio_icon">Auxio logotip</string>
     <string name="desc_no_cover">Omot albuma</string>
     <string name="desc_album_cover">Omot albuma za %s</string>
@@ -238,7 +238,7 @@
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Resetiraj</string>
     <string name="set_replay_gain">Normalizacija glasnoće</string>
-    <string name="set_dirs_list">Mape</string>
+    <string name="set_locations_list">Mape</string>
     <string name="lbl_sort_dsc">Silazno</string>
     <string name="set_ui_desc">Promijenite temu i boje aplikacije</string>
     <string name="set_personalize_desc">Prilagodite kontrole i ponašanje korisničkog sučelja</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2ec3f80fd..6ce3badf3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -83,7 +83,7 @@
     <string name="desc_shuffle">Keverés be/ki kapcsolása</string>
     <string name="desc_album_cover">%s album borítója</string>
     <string name="set_replay_gain">Hangerő normalizálás</string>
-    <string name="desc_music_dir_delete">Mappa eltávolítása</string>
+    <string name="desc_music_location_delete">Mappa eltávolítása</string>
     <string name="lbl_playlist_add">Lejátszólistához ad</string>
     <string name="lbl_format">Formátum</string>
     <string name="lbl_wiki">Wiki</string>
@@ -95,7 +95,7 @@
     <string name="set_replay_gain_mode">Visszajátszás stratégia</string>
     <string name="set_replay_gain_mode_album">Inkább album</string>
     <string name="set_replay_gain_mode_track">Inkább hangsáv</string>
-    <string name="err_bad_dir">Ez a mappa nem támogatott</string>
+    <string name="err_bad_location">Ez a mappa nem támogatott</string>
     <string name="desc_playlist_image">%s playlista képe</string>
     <string name="def_track">Nincs hangsáv</string>
     <string name="def_song_count">Nincs dal</string>
@@ -112,7 +112,7 @@
     <string name="lbl_mix">DJ Mix</string>
     <string name="lbl_genre">Műfaj</string>
     <string name="lbl_props">Dal tulajdonságai</string>
-    <string name="err_no_dirs">Nincs mappa</string>
+    <string name="err_no_locations">Nincs mappa</string>
     <string name="set_black_mode_desc">Tiszta fekete sötét téma használata</string>
     <string name="clr_dynamic">Dinamikus</string>
     <string name="set_cover_mode">Album borítók</string>
@@ -163,7 +163,7 @@
     <string name="lbl_rename_playlist">Lejátszólista átnevezés</string>
     <string name="lbl_rename">Átnevez</string>
     <string name="lbl_date_added">Hozzáadás dátuma</string>
-    <string name="set_dirs_list">Mappák</string>
+    <string name="set_locations_list">Mappák</string>
     <string name="lbl_save">Ment</string>
     <string name="lbl_reset">Alaphelyzet</string>
     <string name="lbl_author_name">Fejlesztő Alexander Capehart</string>
@@ -171,7 +171,7 @@
     <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>
+    <string name="set_locations">Zene könyvtárak</string>
     <string name="set_dirs_mode_exclude_desc">A zene <b>nem</b> töltődik be a hozzáadott mappákból.</string>
     <string name="set_dirs_mode_exclude">Kizárva</string>
     <string name="err_index_failed">A zene betöltése sikertelen</string>
@@ -253,7 +253,7 @@
     <string name="set_playback">Lejátszás</string>
     <string name="set_headset_autoplay">Fejhallgató auto. lejátszás</string>
     <string name="set_pre_amp_without">Beállítás címkék nélkül</string>
-    <string name="set_dirs_desc">Kezelje, hogy honnan töltsön be zenét</string>
+    <string name="set_locations_desc">Kezelje, hogy honnan töltsön be zenét</string>
     <string name="set_rescan">Zene újraolvasása</string>
     <string name="set_rescan_desc">A címkék gyorsítótárának törlése és a zenei könyvtár teljes újratöltése (lassabb, de teljesebb)</string>
     <string name="set_dirs_mode_include_desc">A zene <b>csak</b> az Ön által hozzáadott mappákból töltődik be.</string>
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 92e3c0240..ac9007ea2 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -138,14 +138,14 @@
     <string name="set_cover_mode_media_store">Rapide</string>
     <string name="set_playback">Reproduction</string>
     <string name="set_remember_pause">Rememorar le pausa</string>
-    <string name="set_dirs">Dossieres de musica</string>
-    <string name="set_dirs_list">Dossieres</string>
+    <string name="set_locations">Dossieres de musica</string>
+    <string name="set_locations_list">Dossieres</string>
     <string name="set_dirs_mode">Modo</string>
     <string name="set_reindex">Actualisar le musica</string>
     <string name="err_no_music">Nulle musica trovate</string>
     <string name="err_index_failed">Falleva le carga del musica</string>
-    <string name="err_no_dirs">Necun dossieres</string>
-    <string name="err_bad_dir">Iste dossier non es supportate</string>
+    <string name="err_no_locations">Necun dossieres</string>
+    <string name="err_bad_location">Iste dossier non es supportate</string>
     <string name="desc_track_number">Tracia %d</string>
     <string name="desc_play_pause">Reproducer o pausar</string>
     <string name="desc_skip_next">Saltar al canto sequente</string>
@@ -153,7 +153,7 @@
     <string name="desc_change_repeat">Cambiar modo de repetition</string>
     <string name="desc_exit">Stoppar le reproduction</string>
     <string name="desc_queue_bar">Aperir le cauda</string>
-    <string name="desc_music_dir_delete">Remover le dossier</string>
+    <string name="desc_music_location_delete">Remover le dossier</string>
     <string name="desc_auxio_icon">Icone de Auxio</string>
     <string name="desc_album_cover">Copertura de album pro %s</string>
     <string name="def_artist">Artista incognite</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index c57a8f3a5..f30e48bbe 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -100,11 +100,11 @@
     <string name="set_content">Konten</string>
     <string name="set_reindex">Muat ulang musik</string>
     <string name="set_reindex_desc">Muat ulang perpustakaan musik, menggunakan tag yang di-cache jika memungkinkan</string>
-    <string name="set_dirs_desc">Kelola dari mana musik dimuat</string>
+    <string name="set_locations_desc">Kelola dari mana musik dimuat</string>
     <string name="set_dirs_mode_exclude">Kecualikan</string>
     <string name="set_dirs_mode_include">Termasuk</string>
     <string name="err_no_app">Tidak ada aplikasi yang bisa membuka tugas ini</string>
-    <string name="err_bad_dir">Folder ini tidak didukung</string>
+    <string name="err_bad_location">Folder ini tidak didukung</string>
     <string name="desc_tab_handle">Pindahkan tab ini</string>
     <string name="def_track">Tidak ada nomor trek</string>
     <string name="cdc_mp3">Audio MPEG-1</string>
@@ -137,7 +137,7 @@
     <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_locations">Folder musik</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>
@@ -148,9 +148,9 @@
     <string name="err_index_failed">Pemuatan musik gagal</string>
     <string name="desc_album_cover">Sampul album untuk %s</string>
     <string name="def_artist">Artis tidak dikenal</string>
-    <string name="err_no_dirs">Tidak ada folder</string>
+    <string name="err_no_locations">Tidak ada folder</string>
     <string name="desc_skip_next">Loncat ke lagu berikutnya</string>
-    <string name="desc_music_dir_delete">Hapus folder</string>
+    <string name="desc_music_location_delete">Hapus folder</string>
     <string name="desc_auxio_icon">Ikon Auxio</string>
     <string name="desc_no_cover">Sampul album</string>
     <string name="desc_shuffle">Aktifkan atau nonaktifkan acak</string>
@@ -192,7 +192,7 @@
     <string name="set_cover_mode_off">Nonaktif</string>
     <string name="set_cover_mode_media_store">Cepat</string>
     <string name="lbl_album_remix">Album remix</string>
-    <string name="set_dirs_list">Folder</string>
+    <string name="set_locations_list">Folder</string>
     <string name="lbl_indexing">Memuat musik</string>
     <string name="lbl_observing">Memantau pustaka musik</string>
     <string name="lng_observing">Memantau perubahan pada pustaka musik Anda…</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9310cbdb1..d21e0e839 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_album_details">Vai all\'album</string>
     <string name="lbl_add">Aggiungi</string>
     <string name="lbl_save">Salva</string>
-    <string name="err_no_dirs">Nessuna cartella</string>
+    <string name="err_no_locations">Nessuna cartella</string>
     <string name="lbl_about">Informazioni</string>
     <string name="lbl_version">Versione</string>
     <string name="lbl_code">Codice sorgente</string>
@@ -80,7 +80,7 @@
     <string name="err_index_failed">Caricamento musica fallito</string>
     <string name="err_no_perms">Auxio ha bisogno del permesso per leggere la tua libreria musicale</string>
     <string name="err_no_app">Nessuna app può completare questa azione</string>
-    <string name="err_bad_dir">Questa cartella non è supportata</string>
+    <string name="err_bad_location">Questa cartella non è supportata</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">Cerca nella libreria…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -95,7 +95,7 @@
     <string name="desc_song_handle">Sposta questo brano</string>
     <string name="desc_tab_handle">Muove questa scheda</string>
     <string name="desc_clear_search">Cancella la query di ricerca</string>
-    <string name="desc_music_dir_delete">Rimuovi cartella</string>
+    <string name="desc_music_location_delete">Rimuovi cartella</string>
     <string name="desc_auxio_icon">Icona Auxio</string>
     <string name="desc_no_cover">Copertina album</string>
     <string name="desc_album_cover">Copertina album per %s</string>
@@ -159,8 +159,8 @@
     <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_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_locations_desc">Gestisci le cartelle da dove caricare la musica</string>
+    <string name="set_locations">Cartelle musica</string>
     <string name="set_dirs_mode_exclude">Escludi</string>
     <string name="cdc_mka">Matroska audio</string>
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
@@ -247,7 +247,7 @@
     <string name="fmt_list">%1$s, %2$s</string>
     <string name="lbl_reset">Ripristina</string>
     <string name="set_behavior">Comportamento</string>
-    <string name="set_dirs_list">Cartelle</string>
+    <string name="set_locations_list">Cartelle</string>
     <string name="set_music">Musica</string>
     <string name="set_images">Immagini</string>
     <string name="set_library">Collezione</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f0d4d3feb..1dd3788cf 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -165,7 +165,7 @@
     <string name="lbl_confirm_delete_playlist">למחוק את רשימת ההשמעה\?</string>
     <string name="lbl_edit">עריכה</string>
     <string name="clr_orange">כתום</string>
-    <string name="set_dirs">תיקיות מוזיקה</string>
+    <string name="set_locations">תיקיות מוזיקה</string>
     <string name="set_reindex_desc">טעינה מחדש של ספריית המוזיקה, במידה וניתן ייעשה שימוש בתגיות מהמטמון</string>
     <string name="set_rescan">סריקת מוסיקה מחדש</string>
     <string name="err_no_perms">‏ Auxio צריך הרשאות על מנת לקרוא את ספריית המוזיקה שלך</string>
@@ -178,8 +178,8 @@
     <string name="fmt_lib_genre_count">ז\'אנרים טעונים: %d</string>
     <string name="set_library">ספריה</string>
     <string name="err_no_app">לא נמצא יישום שיכול לטפל במשימה זו</string>
-    <string name="err_no_dirs">אין תיקיות</string>
-    <string name="err_bad_dir">תיקייה זו אינה נתמכת</string>
+    <string name="err_no_locations">אין תיקיות</string>
+    <string name="err_bad_location">תיקייה זו אינה נתמכת</string>
     <string name="desc_skip_prev">דילוג לשיר האחרון</string>
     <string name="desc_change_repeat">שינוי מצב חזרה</string>
     <string name="desc_play_pause">ניגון או השהיה</string>
@@ -199,11 +199,11 @@
     <string name="clr_dynamic">דינמי</string>
     <string name="fmt_indexing">המוזיקה שלך בטעינה… (‎%1$d/%2$d)</string>
     <string name="fmt_disc_no">דיסק %d</string>
-    <string name="set_dirs_desc">ניהול המקומות שמהם תיטען מוזיקה</string>
+    <string name="set_locations_desc">ניהול המקומות שמהם תיטען מוזיקה</string>
     <string name="def_song_count">אין שירים</string>
     <string name="clr_pink">ורוד</string>
     <string name="lng_playlist_created">נוצרה רשימת השמעה</string>
-    <string name="set_dirs_list">תיקיות</string>
+    <string name="set_locations_list">תיקיות</string>
     <plurals name="fmt_artist_count">
         <item quantity="one">אומן אחד</item>
         <item quantity="two">שני אומנים</item>
@@ -229,7 +229,7 @@
     <string name="lng_playlist_added">נוסף לרשימת השמעה</string>
     <string name="desc_shuffle_all">ערבוב כל השירים</string>
     <string name="desc_auxio_icon">סמל Auxio</string>
-    <string name="desc_music_dir_delete">הסרת תיקייה</string>
+    <string name="desc_music_location_delete">הסרת תיקייה</string>
     <string name="desc_playlist_image">תמונת רשימת השמעה עבור %s</string>
     <string name="clr_red">אדום</string>
     <string name="clr_green">ירוק</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2c7ce7664..fd5ae2390 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -40,7 +40,7 @@
     <string name="set_lib_tabs_desc">ライブラリタブの視度と順序をカスタマイズ</string>
     <string name="set_hide_collaborators_desc">アルバムで直接クレジットされたアーティストのみを表示 (適正にタグ付けされたライブラリで最適に作動します)</string>
     <string name="set_rewind_prev_desc">前の曲にスキップ前に曲を巻き戻す</string>
-    <string name="set_dirs">音楽フォルダ</string>
+    <string name="set_locations">音楽フォルダ</string>
     <string name="set_separators_plus">プラス (+)</string>
     <string name="lbl_compilation_remix">リミックスコンピレーション</string>
     <string name="lbl_mixes">DJミックス</string>
@@ -76,17 +76,17 @@
     <string name="set_separators_and">アンパサンド (&amp;)</string>
     <string name="set_replay_gain_mode_album">アルバムを優先</string>
     <string name="set_replay_gain_mode_track">トラックを優先</string>
-    <string name="set_dirs_desc">音楽の読み込み元を管理</string>
+    <string name="set_locations_desc">音楽の読み込み元を管理</string>
     <string name="set_dirs_mode_exclude">除外</string>
     <string name="set_reindex">音楽の再読み込み</string>
     <string name="err_no_perms">Auxio は音楽ライブラリを読む許可を必要とします</string>
     <string name="set_dirs_mode_include">追加</string>
-    <string name="err_no_dirs">フォルダがありません</string>
-    <string name="err_bad_dir">このフォルダはサポートされていません</string>
+    <string name="err_no_locations">フォルダがありません</string>
+    <string name="err_bad_location">このフォルダはサポートされていません</string>
     <string name="desc_track_number">トラック %d</string>
     <string name="desc_play_pause">再生またはポーズ</string>
     <string name="desc_remove_song">再生待ちの曲を除去</string>
-    <string name="desc_music_dir_delete">フォルダを除去</string>
+    <string name="desc_music_location_delete">フォルダを除去</string>
     <string name="desc_auxio_icon">Auxio アイコン</string>
     <string name="desc_no_cover">アルバムカバー</string>
     <string name="desc_album_cover">%s のアルバムカバー</string>
@@ -180,7 +180,7 @@
     <string name="set_dirs_mode_exclude_desc">ここに追加したフォルダはからは音楽が<b>読み込まれません</b>。</string>
     <string name="set_library">ライブラリ</string>
     <string name="set_pre_amp_without">タグ無しで調整</string>
-    <string name="set_dirs_list">フォルダ</string>
+    <string name="set_locations_list">フォルダ</string>
     <string name="set_separators_semicolon">セミコロン (;)</string>
     <string name="set_separators_slash">スラッシュ (/)</string>
     <string name="desc_change_repeat">繰り返しモードを変更</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 77b804b10..b2633ef8a 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -92,8 +92,8 @@
     <string name="err_index_failed">음악 불러오기 실패</string>
     <string name="err_no_perms">앱에서 음악 라이브러리를 읽을 수 있는 권한이 필요합니다.</string>
     <string name="err_no_app">이 작업을 처리할 수 있는 앱을 찾을 수 없습니다.</string>
-    <string name="err_no_dirs">폴더 없음</string>
-    <string name="err_bad_dir">지원하지 않는 폴더입니다.</string>
+    <string name="err_no_locations">폴더 없음</string>
+    <string name="err_bad_location">지원하지 않는 폴더입니다.</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">라이브러리에서 검색…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -108,7 +108,7 @@
     <string name="desc_song_handle">이 곡 이동</string>
     <string name="desc_tab_handle">이 탭 이동</string>
     <string name="desc_clear_search">검색 기록 삭제</string>
-    <string name="desc_music_dir_delete">폴더 제거</string>
+    <string name="desc_music_location_delete">폴더 제거</string>
     <string name="desc_auxio_icon">Auxio 아이콘</string>
     <string name="desc_no_cover">앨범 커버</string>
     <string name="desc_album_cover">%s의 앨범 커버</string>
@@ -175,8 +175,8 @@
     <string name="lbl_shuffle_shortcut_short">무작위 재생</string>
     <string name="set_play_song_none">표시된 항목에서 재생</string>
     <string name="lng_indexing">음악 라이브러리 불러오는 중…</string>
-    <string name="set_dirs">음악 폴더</string>
-    <string name="set_dirs_desc">음악을 불러오는 위치 관리</string>
+    <string name="set_locations">음악 폴더</string>
+    <string name="set_locations_desc">음악을 불러오는 위치 관리</string>
     <string name="set_dirs_mode_exclude_desc">추가한 폴더에서 음악을 <b>불러오지 않습니다</b>.</string>
     <string name="set_dirs_mode_include">포함</string>
     <string name="set_separators">다중 값 구분 기호</string>
@@ -245,7 +245,7 @@
     <string name="set_replay_gain">ReplayGain 볼륨 조정</string>
     <string name="set_audio_desc">사운드 및 재생 동작 구성</string>
     <string name="set_playback">재생</string>
-    <string name="set_dirs_list">폴더</string>
+    <string name="set_locations_list">폴더</string>
     <string name="set_ui_desc">앱 테마 및 색상 변경</string>
     <string name="set_music">음악</string>
     <string name="set_library">라이브러리</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 66baf4c87..6f701aa20 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -122,8 +122,8 @@
     <string name="cdc_ogg">Ogg garsas</string>
     <string name="lbl_author_name">Aleksandras Keiphartas (angl. Alexander Capehart)</string>
     <string name="set_replay_gain_mode_track">Pageidauti takeliui</string>
-    <string name="err_no_dirs">Nėra aplankų</string>
-    <string name="err_bad_dir">Šis aplankas nepalaikomas.</string>
+    <string name="err_no_locations">Nėra aplankų</string>
+    <string name="err_bad_location">Šis aplankas nepalaikomas.</string>
     <string name="desc_play_pause">Leisti arba pristabdyti</string>
     <string name="desc_skip_next">Praleisti į kitą dainą</string>
     <string name="desc_skip_prev">Praleisti į paskutinę dainą</string>
@@ -154,7 +154,7 @@
     <string name="set_repeat_pause">Pauzė ant kartojimo</string>
     <string name="set_play_in_list_with">Kai leidžiant iš bibliotekos</string>
     <string name="set_play_in_parent_with">Kai leidžiant iš elemento informacijos</string>
-    <string name="desc_music_dir_delete">Pašalinti aplanką</string>
+    <string name="desc_music_location_delete">Pašalinti aplanką</string>
     <string name="lbl_genre">Žanras</string>
     <string name="lng_search_library">Ieškok savo bibliotekoje…</string>
     <string name="lbl_equalizer">Ekvalaizeris</string>
@@ -192,12 +192,12 @@
     <string name="def_playback">Nėra leidžiamos muzikos</string>
     <string name="set_repeat_pause_desc">Sustabdyk, kai daina kartojasi.</string>
     <string name="set_content">Turinys</string>
-    <string name="set_dirs">Muzikos aplankai</string>
+    <string name="set_locations">Muzikos aplankai</string>
     <string name="set_reindex">Atnaujinti muziką</string>
     <string name="set_reindex_desc">Perkrauk muzikos biblioteką, naudojant podėlio žymes, kai įmanoma.</string>
     <string name="set_bar_action">Pasirinktinis įrašo perklausos juostos veiksmas</string>
     <string name="set_pre_amp">„ReplayGain“ išankstinis stiprintuvas</string>
-    <string name="set_dirs_desc">Tvarkyk, kur muzika turėtų būti įkeliama iš.</string>
+    <string name="set_locations_desc">Tvarkyk, kur muzika turėtų būti įkeliama iš.</string>
     <string name="desc_genre_image">Žanro vaizdas %s</string>
     <string name="desc_shuffle">Įjungti arba išjungti maišymą</string>
     <string name="desc_track_number">%d takelis</string>
@@ -250,7 +250,7 @@
     <string name="set_images">Vaizdai</string>
     <string name="set_playback">Įrašo perklausa</string>
     <string name="set_replay_gain">Garso normalizavimas</string>
-    <string name="set_dirs_list">Aplankai</string>
+    <string name="set_locations_list">Aplankai</string>
     <string name="lbl_sort_dsc">Mažėjantis</string>
     <string name="set_intelligent_sorting_desc">Teisingai surūšiuok pavadinimus, kurie prasideda skaičiais arba žodžiais, tokiais kaip „the“ (geriausiai veikia su anglų kalbos muzika).</string>
     <string name="set_intelligent_sorting">Išmanusis rūšiavimas</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index b50d9dc8c..5a39ace2d 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -87,7 +87,7 @@
     <string name="set_audio_desc">Sett opp lyd- og avspillingsadferd</string>
     <string name="set_audio">Lyd</string>
     <string name="set_replay_gain_mode">ReplayGain-strategi</string>
-    <string name="set_dirs_desc">Håndter hvor musikk lastes inn fra</string>
+    <string name="set_locations_desc">Håndter hvor musikk lastes inn fra</string>
     <string name="set_pre_amp_desc">Forforsterkning brukes for eksisterende justering under avspilling</string>
     <string name="set_dirs_mode">Modus</string>
     <string name="set_rescan_desc">Tøm etiketthurtiglager og last inn hele musikkbiblioteket igjen (tregere, men mer fullstendig)</string>
@@ -110,7 +110,7 @@
     <string name="fmt_lib_song_count">Spor innlastet: %d</string>
     <string name="lbl_date">Dato</string>
     <string name="set_ui_desc">Endre drakten og programfargene</string>
-    <string name="set_dirs_list">Mapper</string>
+    <string name="set_locations_list">Mapper</string>
     <string name="clr_yellow">Gul</string>
     <string name="set_intelligent_sorting">Intelligent sortering</string>
     <string name="lbl_rename">Gi nytt navn</string>
@@ -138,7 +138,7 @@
     <string name="set_rescan">Reskann musikk</string>
     <string name="set_dirs_mode_include_desc">Musikk vil <b>kun</b> innlastes fra mappene du legger til.</string>
     <string name="set_reindex_desc">Last inn musikkbiblioteket igjen, ved bruk av hurtiglagrede etiketter når mulig</string>
-    <string name="err_no_dirs">Ingen mapper</string>
+    <string name="err_no_locations">Ingen mapper</string>
     <string name="fmt_lib_album_count">Album innlastet: %d</string>
     <string name="lbl_library_counts">Bibliotekstatistikk</string>
     <string name="set_cover_mode_off">Av</string>
@@ -147,14 +147,14 @@
     <string name="set_pre_amp_with">Justering med etiketter</string>
     <string name="set_behavior">Adferd</string>
     <string name="set_content">Innhold</string>
-    <string name="set_dirs">Musikkmapper</string>
+    <string name="set_locations">Musikkmapper</string>
     <string name="set_observing_desc">Gjeninnlast musikkbibliotek når det endrer seg (krever vedvarende varsling)</string>
     <string name="err_index_failed">Klarte ikke laste inn musikk</string>
-    <string name="err_bad_dir">Denne mappen støttes ikke</string>
+    <string name="err_bad_location">Denne mappen støttes ikke</string>
     <string name="desc_skip_next">Hopp til neste spor</string>
     <string name="desc_skip_prev">Hopp til siste spor</string>
     <string name="desc_shuffle_all">Omstokk alle spor</string>
-    <string name="desc_music_dir_delete">Fjern mappe</string>
+    <string name="desc_music_location_delete">Fjern mappe</string>
     <string name="def_genre">Ukjent sjanger</string>
     <string name="desc_genre_image">Sjangerbilde for %s</string>
     <string name="def_artist">Ukjent artist</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 334ac114d..d772114fc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -29,7 +29,7 @@
     <string name="lbl_album_details">Ga naar album</string>
     <string name="lbl_add">Voeg toe</string>
     <string name="lbl_save">Bewaar</string>
-    <string name="err_no_dirs">Geen mappen</string>
+    <string name="err_no_locations">Geen mappen</string>
     <string name="lbl_about">Over</string>
     <string name="lbl_version">Versie</string>
     <string name="lbl_code">Broncode</string>
@@ -58,7 +58,7 @@
     <string name="err_index_failed">Laden van muziek mislukt</string>
     <string name="err_no_perms">Auxio heeft toestemming nodig om uw muziekbibliotheek te lezen</string>
     <string name="err_no_app">Geen app gevonden die deze taak kan uitvoeren</string>
-    <string name="err_bad_dir">Deze map wordt niet ondersteund</string>
+    <string name="err_bad_location">Deze map wordt niet ondersteund</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">Zoek in uw bibliotheek…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -68,7 +68,7 @@
     <string name="desc_skip_prev">Ga naar laatste nummer</string>
     <string name="desc_change_repeat">Wijzig herhaalmodus</string>
     <string name="desc_clear_search">Wis zoekopdracht</string>
-    <string name="desc_music_dir_delete">Verwijder map</string>
+    <string name="desc_music_location_delete">Verwijder map</string>
     <string name="desc_auxio_icon">Auxio icoon</string>
     <string name="desc_album_cover">Albumhoes voor %s</string>
     <string name="desc_artist_image">Artiest afbeelding voor %s</string>
@@ -123,10 +123,10 @@
     <string name="set_replay_gain_mode_track">Voorkeur track</string>
     <string name="set_replay_gain_mode_album">Voorkeur album</string>
     <string name="set_pre_amp_desc">De voorversterker wordt toegepast op de bestaande afstelling tijdens weergave</string>
-    <string name="set_dirs">Muziek mappen</string>
+    <string name="set_locations">Muziek mappen</string>
     <string name="set_pre_amp">ReplayGain voorversterker</string>
     <string name="set_dirs_mode">Modus</string>
-    <string name="set_dirs_desc">Beheer waarvan muziek moet worden geladen</string>
+    <string name="set_locations_desc">Beheer waarvan muziek moet worden geladen</string>
     <string name="fmt_lib_total_duration">Totale duur: %s</string>
     <string name="lbl_shuffle_shortcut_long">Shuffle alles</string>
     <string name="lbl_ok">OK</string>
@@ -223,7 +223,7 @@
     <string name="lbl_rename_playlist">Hernoem afspeellijst</string>
     <string name="lbl_confirm_delete_playlist">Verwijder afspeellijst?</string>
     <string name="set_action_mode_repeat">Herhaalmodus</string>
-    <string name="set_dirs_list">Mappen</string>
+    <string name="set_locations_list">Mappen</string>
     <string name="desc_queue_bar">Open de wachtrij</string>
     <string name="fmt_deletion_info">%s verwijderen\? Dit kan niet ongedaan worden gemaakt.</string>
     <string name="set_cover_mode_off">Uit</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 796adecd7..e4c89ad1b 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -186,8 +186,8 @@
     <string name="set_pre_amp_with">Justering med etikettar</string>
     <string name="set_pre_amp_without">Justering utan etikettar</string>
     <string name="set_library">Bibliotek</string>
-    <string name="set_dirs_desc">Handsam kvar musikk skal lastast inn ifrå</string>
-    <string name="set_dirs_list">Mapper</string>
+    <string name="set_locations_desc">Handsam kvar musikk skal lastast inn ifrå</string>
+    <string name="set_locations_list">Mapper</string>
     <string name="set_dirs_mode">Modus</string>
     <string name="set_dirs_mode_include">Inkluder</string>
     <string name="set_reindex">Gjenoppfrisk musikk</string>
@@ -257,7 +257,7 @@
     <string name="set_headset_autoplay_desc">Alltid byrj avspeling når hovudtelefonar vert tilkopla (verkar kanskje ikkje på alle einingar)</string>
     <string name="set_repeat_pause_desc">Pause når eit spor vert gjenteke</string>
     <string name="set_pre_amp_warning">Åtvaring: Å endre forforsterkninga til høge positive verdier, kan forårsake forvrengning ved høge ljodtrykk på nokre spor.</string>
-    <string name="set_dirs">Musikkmapper</string>
+    <string name="set_locations">Musikkmapper</string>
     <string name="set_dirs_mode_include_desc">Musikk vil <b>kun</b> verte lasta inn frå mappene du legg til.</string>
     <string name="set_dirs_mode_exclude">Utelat</string>
     <string name="set_dirs_mode_exclude_desc">Musikk vil <b>ikkje</b> verte lasta inn frå mappene du legg til.</string>
@@ -269,12 +269,12 @@
     <string name="desc_artist_image">Artistbilete for %s</string>
     <string name="err_index_failed">Klarte ikkje å laste inn musikk</string>
     <string name="err_export_failed">Kan ikkje eksportere spelelista til denne fila</string>
-    <string name="err_bad_dir">Denne mappa er ikkje støtta</string>
+    <string name="err_bad_location">Denne mappa er ikkje støtta</string>
     <string name="err_no_app">Ingen app funne som kan handsama denne oppgåva</string>
     <string name="desc_play_pause">Spel av eller pause</string>
     <string name="desc_auxio_icon">Auxio-ikon</string>
     <string name="desc_track_number">Spor %d</string>
-    <string name="err_no_dirs">Ingen mapper</string>
+    <string name="err_no_locations">Ingen mapper</string>
     <string name="desc_shuffle_all">Bland alle spor</string>
     <string name="desc_remove_song">Fjern dette sporet</string>
     <string name="desc_song_handle">Flytt dette sporet</string>
@@ -283,7 +283,7 @@
     <string name="desc_tab_handle">Flytt denne fana</string>
     <string name="desc_clear_search">Tøm søket</string>
     <string name="def_genre">Ukjend sjanger</string>
-    <string name="desc_music_dir_delete">Fjern mappe</string>
+    <string name="desc_music_location_delete">Fjern mappe</string>
     <string name="desc_selection_image">Utvalsbilete</string>
     <string name="def_date">Ingen dato</string>
     <string name="fmt_db_pos">+%.1f dB</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 86de2a45e..21bf380e2 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -119,14 +119,14 @@
     <string name="set_replay_gain_mode_track">ਟਰੈਕ ਨੂੰ ਤਰਜੀਹ</string>
     <string name="set_replay_gain_mode_album">ਐਲਬਮ ਨੂੰ ਤਰਜੀਹ</string>
     <string name="set_pre_amp_without">ਬਿਨਾਂ ਟੈਗਾਂ ਦੇ ਐਡਜਸਟਮੈਂਟ</string>
-    <string name="set_dirs_desc">ਪ੍ਰਬੰਧਿਤ ਕਰੋ ਕਿ ਸੰਗੀਤ ਕਿੱਥੋਂ ਲੋਡ ਕੀਤਾ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ</string>
-    <string name="set_dirs_list">ਫੋਲਡਰ</string>
+    <string name="set_locations_desc">ਪ੍ਰਬੰਧਿਤ ਕਰੋ ਕਿ ਸੰਗੀਤ ਕਿੱਥੋਂ ਲੋਡ ਕੀਤਾ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ</string>
+    <string name="set_locations_list">ਫੋਲਡਰ</string>
     <string name="set_dirs_mode_exclude">ਬਾਹਰ ਰੱਖੋ</string>
     <string name="set_dirs_mode_include">ਸ਼ਾਮਿਲ ਕਰੋ</string>
     <string name="set_reindex">ਸੰਗੀਤ ਤਾਜ਼ਾ-ਤਰੀਨ ਕਰੋ</string>
     <string name="err_no_app">ਕੋਈ ਐਪ ਨਹੀਂ ਮਿਲੀ ਜੋ ਇਸ ਕਾਰਜ ਨੂੰ ਸੰਭਾਲ ਸਕਦੀ ਹੈ</string>
-    <string name="err_no_dirs">ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ</string>
-    <string name="err_bad_dir">ਇਹ ਫੋਲਡਰ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ</string>
+    <string name="err_no_locations">ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ</string>
+    <string name="err_bad_location">ਇਹ ਫੋਲਡਰ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ</string>
     <string name="desc_play_pause">ਚਲਾਓ ਜਾਂ ਰੋਕੋ</string>
     <string name="desc_skip_next">ਅਗਲੇ ਗੀਤ \'ਤੇ ਜਾਓ</string>
     <string name="desc_skip_prev">ਆਖਰੀ ਗੀਤ \'ਤੇ ਜਾਓ</string>
@@ -177,7 +177,7 @@
     <string name="set_rewind_prev_desc">ਪਿਛਲੇ ਗੀਤ \'ਤੇ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਰੀਵਾਈਂਡ ਕਰੋ</string>
     <string name="set_repeat_pause">ਦੁਹਰਾਉਣ \'ਤੇ ਰੁਕੋ</string>
     <string name="set_library">ਲਾਇਬ੍ਰੇਰੀ</string>
-    <string name="set_dirs">ਸੰਗੀਤ ਫੋਲਡਰ</string>
+    <string name="set_locations">ਸੰਗੀਤ ਫੋਲਡਰ</string>
     <string name="desc_queue_bar">ਕਤਾਰ ਖੋਲ੍ਹੋ</string>
     <string name="desc_remove_song">ਇਸ ਕਤਾਰ ਗੀਤ ਨੂੰ ਹਟਾਓ</string>
     <string name="desc_song_handle">ਇਸ ਕਤਾਰ ਗੀਤ ਨੂੰ ਮੂਵ ਕਰੋ</string>
@@ -259,7 +259,7 @@
     </plurals>
     <string name="clr_grey">ਸਲੇਟੀ</string>
     <string name="fmt_lib_total_duration">ਕੁੱਲ ਮਿਆਦ: %s</string>
-    <string name="desc_music_dir_delete">ਫੋਲਡਰ ਹਟਾਓ</string>
+    <string name="desc_music_location_delete">ਫੋਲਡਰ ਹਟਾਓ</string>
     <string name="desc_auxio_icon">Auxio ਆਈਕਾਨ</string>
     <string name="lbl_appears_on">ਉੱਤੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ</string>
     <string name="lbl_playlists">ਪਲੇਅ-ਲਿਸਟਾਂ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 101ef6aa4..b73dd03d5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -129,7 +129,7 @@
     <string name="def_track">Brak utworu</string>
     <string name="lbl_equalizer">Korektor</string>
     <string name="lbl_size">Rozmiar</string>
-    <string name="err_no_dirs">Brak folderów</string>
+    <string name="err_no_locations">Brak folderów</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>
@@ -164,7 +164,7 @@
     <string name="cdc_mp4">MPEG-4</string>
     <string name="cdc_ogg">Ogg</string>
     <string name="info_app_desc">Prosty i praktyczny odtwarzacz muzyki na Androida.</string>
-    <string name="desc_music_dir_delete">Usuń folder</string>
+    <string name="desc_music_location_delete">Usuń folder</string>
     <string name="desc_queue_bar">Pokaż kolejkę</string>
     <string name="cdc_aac">AAC</string>
     <string name="set_observing_desc">Automatycznie odśwież bibliotekę po wykryciu zmian (wymaga stałego powiadomienia)</string>
@@ -182,8 +182,8 @@
     <string name="clr_dynamic">Material You</string>
     <string name="fmt_bitrate">%d kb/s</string>
     <string name="cdc_mka">Matroska</string>
-    <string name="set_dirs">Foldery z muzyką</string>
-    <string name="set_dirs_desc">Wybierz z których folderów importowane są utwory</string>
+    <string name="set_locations">Foldery z muzyką</string>
+    <string name="set_locations_desc">Wybierz z których folderów importowane są utwory</string>
     <string name="set_dirs_mode">Tryb</string>
     <string name="set_rewind_prev">Przewiń przed odtworzeniem poprzedniego utworu</string>
     <string name="set_rewind_prev_desc">Przewiń do początku obecnie odtwarzanego utworu zamiast odtworzenia poprzedniego</string>
@@ -210,7 +210,7 @@
     <string name="set_separators">Znaki oddzielające wartości</string>
     <string name="set_separators_desc">Wybierz znaki oddzielające poszczególne wartości w metadanych</string>
     <string name="err_no_perms">Auxio wymaga zgody na dostęp do twojej biblioteki muzycznej</string>
-    <string name="err_bad_dir">Ten folder nie jest wspierany</string>
+    <string name="err_bad_location">Ten folder nie jest wspierany</string>
     <string name="def_playback">Utwory nie są odtwarzane</string>
     <string name="fmt_indexing">Importuję bibliotekę muzyczną… (%1$d/%2$d)</string>
     <string name="fmt_lib_album_count">Zaimportowane albumy: %d</string>
@@ -239,7 +239,7 @@
     <string name="set_personalize_desc">Dostosuj elementy i funkcje interfejsu</string>
     <string name="set_hide_collaborators_desc">Pokaż tylko artystów bezpośrednio przypisanych do albumu (działa najlepiej w przypadku dobrze otagowanych bibliotek)</string>
     <string name="set_playback">Odtwarzanie</string>
-    <string name="set_dirs_list">Foldery</string>
+    <string name="set_locations_list">Foldery</string>
     <string name="set_images">Obrazy</string>
     <string name="set_audio_desc">Zarządzaj dźwiękiem i odtwarzaniem muzyki</string>
     <string name="fmt_selected">Wybrano %d</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 47afab265..42b9b132b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -80,13 +80,13 @@
     <string name="set_notif_action">Usar player de notificação alternativo</string>
     <string name="set_pre_amp_desc">A pré-amplificação é aplicada em cima da normalização de volume</string>
     <string name="set_pre_amp_warning">Aviso: Alterar a pré-amplificação para um valor positivo muito alto pode resultar em picos de volume em algumas faixas.</string>
-    <string name="set_dirs">Pastas de música</string>
-    <string name="set_dirs_desc">Gerencia de onde as músicas devem ser carregadas</string>
+    <string name="set_locations">Pastas de música</string>
+    <string name="set_locations_desc">Gerencia de onde as músicas devem ser carregadas</string>
     <string name="set_dirs_mode_include">Incluir</string>
     <string name="err_index_failed">Falha ao carregar músicas</string>
     <string name="err_no_app">Nenhum aplicativo encontrado que possa lidar com esta tarefa</string>
-    <string name="err_no_dirs">Sem pastas</string>
-    <string name="err_bad_dir">Esta pasta não é compatível</string>
+    <string name="err_no_locations">Sem pastas</string>
+    <string name="err_bad_location">Esta pasta não é compatível</string>
     <string name="set_reindex_desc">Recarrega a biblioteca de músicas usando metadados salvos em cache quando possível</string>
     <string name="set_rewind_prev">Retroceder antes de voltar</string>
     <string name="set_reindex">Recarregar música</string>
@@ -127,7 +127,7 @@
     <string name="desc_no_cover">Capa do álbum</string>
     <string name="desc_skip_next">Pular para a próxima música</string>
     <string name="desc_shuffle">Ativa ou desativa o modo aleatório</string>
-    <string name="desc_music_dir_delete">Remover pasta</string>
+    <string name="desc_music_location_delete">Remover pasta</string>
     <string name="clr_cyan">Ciano</string>
     <string name="clr_deep_purple">Roxo escuro</string>
     <string name="clr_indigo">Índigo</string>
@@ -254,7 +254,7 @@
     <string name="set_replay_gain">Normalização de volume</string>
     <string name="set_library">Biblioteca</string>
     <string name="set_behavior">Comportamento</string>
-    <string name="set_dirs_list">Pastas</string>
+    <string name="set_locations_list">Pastas</string>
     <string name="lbl_sort_dsc">Decrescente</string>
     <string name="set_intelligent_sorting">Ignorar artigos ao classificar</string>
     <string name="set_intelligent_sorting_desc">Ignore palavras como \"the\" ao classificar por nome (funciona melhor com músicas em inglês)</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a4b818f62..10e5ff7e0 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -96,10 +96,10 @@
     <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>
-    <string name="err_bad_dir">Esta pasta não é compatível</string>
+    <string name="err_no_locations">Sem pastas</string>
+    <string name="err_bad_location">Esta pasta não é compatível</string>
     <string name="desc_song_handle">Mover esta música da fila</string>
-    <string name="desc_music_dir_delete">Remover pasta</string>
+    <string name="desc_music_location_delete">Remover pasta</string>
     <string name="lbl_compilation_remix">Mistura de compilações</string>
     <string name="lbl_compilation_live">Compilação ao vivo</string>
     <string name="lbl_disc">Disco</string>
@@ -137,14 +137,14 @@
     <string name="lbl_duration">Duração</string>
     <string name="lbl_cancel">Cancelar</string>
     <string name="lng_indexing">A carregar biblioteca de músicas…</string>
-    <string name="set_dirs_desc">Configurar onde a música deve ser carregada</string>
+    <string name="set_locations_desc">Configurar onde a música deve ser carregada</string>
     <string name="lbl_genre">Gênero</string>
     <string name="set_keep_shuffle_desc">Mantenha a reprodução aleatória ao reproduzir uma nova música</string>
     <string name="desc_skip_next">Pular para a próxima música</string>
     <string name="set_separators_warning">Aviso: Usar essa configuração pode resultar em algumas etiquetas serem interpretadas incorretamente como tendo múltiplos valores. Pode resolver isso pré-definindo caracteres de separador indesejados com uma barra invertida (\\).</string>
     <string name="cdc_mp3">Áudio MPEG-1</string>
     <string name="set_observing">Recarregamento automático</string>
-    <string name="set_dirs">Pastas de música</string>
+    <string name="set_locations">Pastas de música</string>
     <string name="set_dirs_mode">Modo</string>
     <string name="set_dirs_mode_exclude">Excluir</string>
     <string name="set_dirs_mode_exclude_desc">A música <b>não</b> será carregada das pastas que adicionar.</string>
@@ -252,7 +252,7 @@
     <string name="set_images">Imagens</string>
     <string name="set_audio_desc">Configurar o som e comportamento da reprodução</string>
     <string name="set_playback">Reprodução</string>
-    <string name="set_dirs_list">Pastas</string>
+    <string name="set_locations_list">Pastas</string>
     <string name="set_library">Biblioteca</string>
     <string name="set_separators_and">E comercial (&amp;)</string>
     <string name="set_behavior">Comportamento</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 724f28ea8..329b2d7c8 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -113,8 +113,8 @@
     <string name="lng_playlist_deleted">Lista de reprodução eliminada</string>
     <string name="lng_search_library">Procurar na biblioteca…</string>
     <string name="set_replay_gain_mode_off">Desligado</string>
-    <string name="set_dirs_desc">Configurar onde a música deve ser carregada</string>
-    <string name="set_dirs_list">Pastas</string>
+    <string name="set_locations_desc">Configurar onde a música deve ser carregada</string>
+    <string name="set_locations_list">Pastas</string>
     <string name="set_dirs_mode">Modo</string>
     <string name="desc_shuffle">Ativar ou desativar a reprodução aleatória</string>
     <string name="desc_selection_image">Seleção de imagem</string>
@@ -146,7 +146,7 @@
     <string name="set_rewind_prev_desc">Retrocede a música antes de voltar para a anterior</string>
     <string name="set_repeat_pause">Pausar na repetição</string>
     <string name="set_repeat_pause_desc">Pausar quando uma música é repetida</string>
-    <string name="set_dirs">Pastas de música</string>
+    <string name="set_locations">Pastas de música</string>
     <string name="set_remember_pause">Lembrar pausa</string>
     <string name="set_remember_pause_desc">Continuar a reproduzir/pausado quando ao pular ou editar a fila</string>
     <string name="set_replay_gain_mode">Estratégia do ganho de repetição</string>
@@ -285,8 +285,8 @@
     <string name="err_import_failed">Não foi possível importar uma lista de reprodução deste ficheiro</string>
     <string name="err_export_failed">Incapaz de exportar a lista de reprodução para este ficheiro</string>
     <string name="err_no_app">Nenhuma aplicação encontrada que possa executar esta tarefa</string>
-    <string name="err_no_dirs">Sem pastas</string>
-    <string name="err_bad_dir">Esta pasta não é compatível</string>
+    <string name="err_no_locations">Sem pastas</string>
+    <string name="err_bad_location">Esta pasta não é compatível</string>
     <string name="desc_change_repeat">Alterar o modo de repetição</string>
     <string name="desc_exit">Parar reprodução</string>
     <string name="desc_remove_song">Remover esta música de fila</string>
@@ -294,7 +294,7 @@
     <string name="desc_queue_bar">Abra a fila</string>
     <string name="desc_tab_handle">Mover esta guia</string>
     <string name="desc_clear_search">Limpar consulta de pesquisa</string>
-    <string name="desc_music_dir_delete">Remover pasta</string>
+    <string name="desc_music_location_delete">Remover pasta</string>
     <string name="desc_album_cover">Capa do álbum para %s</string>
     <string name="desc_artist_image">Imagem do artista para %s</string>
     <string name="desc_genre_image">Imagem de gênero para %s</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 153c816f9..e99525fa7 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -207,7 +207,7 @@
         <item quantity="other">%d de artiști</item>
     </plurals>
     <string name="set_hide_collaborators_desc">Arată doar artiști care sunt creditați direct pe albun (Funcționează mai bine pe bibloteci cu taguri puse bine)</string>
-    <string name="err_bad_dir">Dosarul ăsta nu e suportat</string>
+    <string name="err_bad_location">Dosarul ăsta nu e suportat</string>
     <string name="desc_no_cover">Copertă album</string>
     <string name="set_library">Bibliotecă</string>
     <string name="set_separators_slash">Slash (/)</string>
@@ -217,8 +217,8 @@
     <string name="def_artist">Artist necunoscut</string>
     <string name="lbl_show_error_info">Vezi mai mult</string>
     <string name="set_separators_desc">Configurează caracterele care denotă mai multe valori de taguri</string>
-    <string name="set_dirs">Foldere cu muzică</string>
-    <string name="set_dirs_list">Foldere</string>
+    <string name="set_locations">Foldere cu muzică</string>
+    <string name="set_locations_list">Foldere</string>
     <string name="set_dirs_mode_exclude">Exclude</string>
     <string name="set_dirs_mode_exclude_desc">Muzica <b>nu<b> va fi încărcată din dosarele pe care le adaugi aici.</b></b></string>
     <string name="def_song_count">Fără cântece</string>
@@ -239,7 +239,7 @@
     <string name="set_repeat_pause">Pauză la repetare</string>
     <string name="set_audio_desc">Configurează comportamentul sunetului și redării</string>
     <string name="def_track">Fără track</string>
-    <string name="set_dirs_desc">Configurează de unde se încarcă muzica</string>
+    <string name="set_locations_desc">Configurează de unde se încarcă muzica</string>
     <string name="set_reindex">Reîncarcă muzica</string>
     <string name="desc_album_cover">Copertă album pentru %s</string>
     <string name="def_genre">Gen necunoscut</string>
@@ -248,7 +248,7 @@
     <string name="clr_deep_purple">Mov închis</string>
     <string name="set_remember_pause">Ține minte pauza</string>
     <string name="set_remember_pause_desc">Ține minte pauza atunci când dai skip printre cântece</string>
-    <string name="desc_music_dir_delete">Elimină dosarul</string>
+    <string name="desc_music_location_delete">Elimină dosarul</string>
     <string name="desc_selection_image">Imagine selecție</string>
     <string name="clr_indigo">Indigo</string>
     <string name="fmt_selected">%d Selectate</string>
@@ -265,7 +265,7 @@
     <string name="err_index_failed">Încărcarea muzicii a eșuat</string>
     <string name="err_no_perms">Auxio are nevoie de permisiune ca să-ți acceseze biblioteca de muzică</string>
     <string name="desc_song_handle">Mută acest cântec</string>
-    <string name="err_no_dirs">Niciun dosar</string>
+    <string name="err_no_locations">Niciun dosar</string>
     <string name="desc_shuffle">Pornește sau oprește amestecarea</string>
     <string name="desc_exit">Oprește redarea</string>
     <string name="desc_remove_song">Elimină acest cântec</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d93565855..6aea999f2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_album_details">Перейти к альбому</string>
     <string name="lbl_add">Добавить</string>
     <string name="lbl_save">Сохранить</string>
-    <string name="err_no_dirs">Нет папок</string>
+    <string name="err_no_locations">Нет папок</string>
     <string name="lbl_about">О программе</string>
     <string name="lbl_version">Версия</string>
     <string name="lbl_code">Исходный код</string>
@@ -79,7 +79,7 @@
     <string name="err_index_failed">Ошибка чтения библиотеки</string>
     <string name="err_no_perms">Auxio требуется разрешение на чтение музыкальной библиотеки</string>
     <string name="err_no_app">Нет приложений для открытия данной ссылки</string>
-    <string name="err_bad_dir">Эта папка не поддерживается</string>
+    <string name="err_bad_location">Эта папка не поддерживается</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">Найти в библиотеке…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -94,7 +94,7 @@
     <string name="desc_song_handle">Переместить трек в очереди</string>
     <string name="desc_tab_handle">Переместить вкладку</string>
     <string name="desc_clear_search">Очистить поисковый запрос</string>
-    <string name="desc_music_dir_delete">Удалить папку</string>
+    <string name="desc_music_location_delete">Удалить папку</string>
     <string name="desc_auxio_icon">Иконка Auxio</string>
     <string name="desc_no_cover">Обложка альбома</string>
     <string name="desc_album_cover">Обложка альбома %s</string>
@@ -168,7 +168,7 @@
     <string name="set_dirs_mode_exclude">Исключить</string>
     <string name="cdc_aac">AAC</string>
     <string name="set_dirs_mode_exclude_desc">Музыка <b>не</b> будет загружена из указанных папок.</string>
-    <string name="set_dirs_desc">Укажите, откуда надо загружать музыку</string>
+    <string name="set_locations_desc">Укажите, откуда надо загружать музыку</string>
     <string name="fmt_bitrate">%d кбит/с</string>
     <string name="set_observing">Автоматическая перезагрузка</string>
     <string name="cdc_mp3">MPEG-1</string>
@@ -183,7 +183,7 @@
     <string name="lbl_album_live">Концертный альбом</string>
     <string name="lbl_live_group">Концертный</string>
     <string name="lng_observing">Мониторинг изменений в музыкальной библиотеке…</string>
-    <string name="set_dirs">Папки с музыкой</string>
+    <string name="set_locations">Папки с музыкой</string>
     <string name="set_dirs_mode_include">Включить</string>
     <string name="lbl_album_remix">Альбом ремиксов</string>
     <string name="lbl_ep_live">Концертный мини-альбом</string>
@@ -259,7 +259,7 @@
     <string name="set_content_desc">Управляйте загрузкой музыки и изображений</string>
     <string name="set_audio_desc">Настройка звука и поведения при воспроизведении</string>
     <string name="set_playback">Воспроизведение</string>
-    <string name="set_dirs_list">Папки</string>
+    <string name="set_locations_list">Папки</string>
     <string name="lbl_sort_dsc">По убыванию</string>
     <string name="lbl_playlist">Плейлист</string>
     <string name="lbl_playlists">Плейлисты</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 88c22cdae..bc4441eff 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -79,7 +79,7 @@
     <string name="lng_playlist_created">Seznam predavanja ustvarjen</string>
     <string name="fmt_lib_total_duration">Celoten čas predvajanja: %s</string>
     <string name="set_repeat_pause">Pavza ob ponavljanju</string>
-    <string name="set_dirs">Mape za glasbo</string>
+    <string name="set_locations">Mape za glasbo</string>
     <string name="set_keep_shuffle">Zapomni si naključno predvajanje</string>
     <string name="lbl_artist_details">Pojdi na izvajalca</string>
     <string name="fmt_lib_song_count">Naloženih pesmi: %d</string>
@@ -118,9 +118,9 @@
     <string name="set_pre_amp_desc">Pred-ojačevalec se uporablja na obstoječi prilagoditvi med predvajanjem</string>
     <string name="set_play_song_from_album">Predvajaj iz albuma</string>
     <string name="set_music">Glasba</string>
-    <string name="err_bad_dir">Ta mapa ni podprta</string>
+    <string name="err_bad_location">Ta mapa ni podprta</string>
     <string name="lbl_author_name">Razvil Alexander Capehart</string>
-    <string name="desc_music_dir_delete">Odstrani mapo</string>
+    <string name="desc_music_location_delete">Odstrani mapo</string>
     <string name="lbl_copied">Kopirano</string>
     <string name="err_index_failed">Nalaganje glasbe ni uspelo</string>
     <string name="lbl_album">Album</string>
@@ -154,7 +154,7 @@
     <string name="def_song_count">Ni pesmi</string>
     <string name="lbl_ep">Podaljšano</string>
     <string name="lbl_songs">Pesmi</string>
-    <string name="set_dirs_list">Mape</string>
+    <string name="set_locations_list">Mape</string>
     <string name="set_square_covers_desc">Prireži vse naslovnice albumov v razmerje 1:1</string>
     <string name="set_bar_action">Prilagojeno dejanje na vrstici za predvajanje</string>
     <string name="clr_indigo">Indigo modra</string>
@@ -204,7 +204,7 @@
     <string name="desc_tab_handle">Premakni ta zavihek</string>
     <string name="lbl_song">Pesem</string>
     <string name="desc_genre_image">Slika žanra za %s</string>
-    <string name="set_dirs_desc">Nastavitev virov za nalaganje glasbe</string>
+    <string name="set_locations_desc">Nastavitev virov za nalaganje glasbe</string>
     <string name="lbl_mixes">DJ Miksi</string>
     <string name="lbl_confirm_delete_playlist">Odstrani seznam predvajanja\?</string>
     <string name="clr_blue">Modra</string>
@@ -262,7 +262,7 @@
     <string name="set_replay_gain_mode">ReplayGain strategija</string>
     <string name="lbl_code">Izvorna koda</string>
     <string name="set_play_song_from_artist">Predvajaj iz izvajalca</string>
-    <string name="err_no_dirs">Ni map</string>
+    <string name="err_no_locations">Ni map</string>
     <string name="set_personalize_desc">Prilagoditev kontrol uporabniškega vmesnika in obnašanja</string>
     <string name="lbl_sample_rate">Hitrost vzorčenja</string>
     <string name="lbl_queue">Čakalna vrsta</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 1e6a20c7f..e9395ab37 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -213,8 +213,8 @@
         <item quantity="one">%d album</item>
         <item quantity="other">%d albume</item>
     </plurals>
-    <string name="set_dirs">Dosjet e muzikës</string>
-    <string name="err_bad_dir">Kjo dosje nuk mbështetet</string>
+    <string name="set_locations">Dosjet e muzikës</string>
+    <string name="err_bad_location">Kjo dosje nuk mbështetet</string>
     <string name="desc_change_repeat">Ndryshoni mënyrën e përsëritjes</string>
     <string name="desc_remove_song">Hiq këtë këngë</string>
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
@@ -244,8 +244,8 @@
     <string name="set_pre_amp_without">Rregullim pa etiketa</string>
     <string name="set_pre_amp_warning">Kujdes: Ndryshimi i pre-amplitudës në një vlerë të lartë pozitive mund të shkaktojë teprim në disa shtegtarë audio.</string>
     <string name="set_library">Biblioteka</string>
-    <string name="set_dirs_desc">Menaxho se nga ku duhet të ngarkohet muzika</string>
-    <string name="set_dirs_list">Dosjet</string>
+    <string name="set_locations_desc">Menaxho se nga ku duhet të ngarkohet muzika</string>
+    <string name="set_locations_list">Dosjet</string>
     <string name="set_dirs_mode">Mënyrë</string>
     <string name="set_dirs_mode_exclude">Përjashtoni</string>
     <string name="set_dirs_mode_exclude_desc">Muzika <b>nuk</b> do të ngarkohet nga dosjet që shtoni.</string>
@@ -261,7 +261,7 @@
     <string name="err_import_failed">Nuk mund të importoni një listë këngësh nga ky skedar</string>
     <string name="err_export_failed">Nuk mund të eksportoni listën e këngëve në këtë skedar</string>
     <string name="err_no_app">Nuk u gjet asnjë aplikacion që mund ta përballojë këtë detyrë</string>
-    <string name="err_no_dirs">Nuk ka dosje</string>
+    <string name="err_no_locations">Nuk ka dosje</string>
     <string name="desc_track_number">Kënga %d</string>
     <string name="desc_play_pause">Luaj ose ndalo</string>
     <string name="desc_skip_next">Kaloni te kënga tjetër</string>
@@ -272,7 +272,7 @@
     <string name="desc_song_handle">Lëviz këtë këngë</string>
     <string name="desc_queue_bar">Hap radhën</string>
     <string name="desc_clear_search">Pastro kërkimin</string>
-    <string name="desc_music_dir_delete">Hiq dosjen</string>
+    <string name="desc_music_location_delete">Hiq dosjen</string>
     <string name="desc_auxio_icon">Ikona e Auxio</string>
     <string name="desc_no_cover">Kopertina e albumit</string>
     <string name="desc_album_cover">Kopertina e albumit për %s</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4f0762611..e75ac8510 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -173,7 +173,7 @@
     <string name="set_reindex_desc">Läs in musik på nytt, vid möjlighet med användning av cachade taggar</string>
     <string name="desc_shuffle_all">Blanda alla låtar</string>
     <string name="desc_clear_search">Rensa sökfrågan</string>
-    <string name="desc_music_dir_delete">Ta bort mapp</string>
+    <string name="desc_music_location_delete">Ta bort mapp</string>
     <string name="desc_genre_image">Genrebild för %s</string>
     <string name="desc_playlist_image">Spellistabild för %s</string>
     <string name="cdc_mp3">MPEG-1-ljud</string>
@@ -198,10 +198,10 @@
     <string name="set_repeat_pause">Pausa vid upprepning</string>
     <string name="set_pre_amp">ReplayGain försteg</string>
     <string name="set_pre_amp_without">Justering utan taggar</string>
-    <string name="set_dirs">Musikmappar</string>
+    <string name="set_locations">Musikmappar</string>
     <string name="set_pre_amp_warning">Varning: Om man ändrar förförstärkaren till ett högt positivt värde kan det leda till toppning på vissa ljudspår.</string>
-    <string name="set_dirs_desc">Hantera vart musik läses in ifrån</string>
-    <string name="set_dirs_list">Mappar</string>
+    <string name="set_locations_desc">Hantera vart musik läses in ifrån</string>
+    <string name="set_locations_list">Mappar</string>
     <string name="set_dirs_mode">Modus</string>
     <string name="set_dirs_mode_exclude">Utesluta</string>
     <string name="set_dirs_mode_include_desc">Musik laddas <b>endast</b> från mapparna som ni lägger till.</string>
@@ -211,7 +211,7 @@
     <string name="err_index_failed">Läsa in musik misslyckades</string>
     <string name="err_no_perms">Auxio måste ges behörighet för att läsa in ditt musikbibliotek</string>
     <string name="err_no_app">Ingen lämplig app kunde hittas</string>
-    <string name="err_bad_dir">Denna mapp stöds inte</string>
+    <string name="err_bad_location">Denna mapp stöds inte</string>
     <string name="desc_track_number">Spår %d</string>
     <string name="desc_play_pause">Spela eller pausa</string>
     <string name="desc_song_handle">Flytta detta spår</string>
@@ -250,7 +250,7 @@
     <string name="set_square_covers_desc">Beskär alla albumomslag till ett 1:1 sidförhållande</string>
     <string name="set_rewind_prev_desc">Spola tillbaka innan att hoppa till föregående låt</string>
     <string name="set_pre_amp_with">Justering med taggar</string>
-    <string name="err_no_dirs">Inga mappar</string>
+    <string name="err_no_locations">Inga mappar</string>
     <string name="desc_exit">Stoppa uppspelning</string>
     <string name="desc_remove_song">Ta bort låt</string>
     <string name="desc_auxio_icon">Auxio-ikon</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 583944f7b..d597944a7 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -92,7 +92,7 @@
     <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_locations">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>
     <string name="desc_artist_image">%s Sanatçısının resmi</string>
@@ -148,8 +148,8 @@
     <string name="set_keep_shuffle_desc">Yeni bir şarkı çalarken karışık çalmayı açık tut</string>
     <string name="set_reindex">Müziği yenile</string>
     <string name="set_reindex_desc">Mümkün olduğunda önbelleğe alınmış etiketleri kullanarak müzik kitaplığını yeniden yükleyin</string>
-    <string name="err_no_dirs">Klasör yok</string>
-    <string name="err_bad_dir">Bu klasör desteklenmiyor</string>
+    <string name="err_no_locations">Klasör yok</string>
+    <string name="err_bad_location">Bu klasör desteklenmiyor</string>
     <string name="desc_skip_next">Sonraki şarkıya geç</string>
     <string name="desc_skip_prev">Son şarkıya geç</string>
     <string name="desc_change_repeat">Tekrarlama modunu değiştir</string>
@@ -157,13 +157,13 @@
     <string name="err_no_perms">Auxio\'nun müzik kitaplığınızı görüntülemek için izne ihtiyacı var</string>
     <string name="err_no_app">Bu görevi yerine getirebilecek bir uygulama bulunamadı</string>
     <string name="desc_shuffle">Karıştırmayı açın veya kapatın</string>
-    <string name="desc_music_dir_delete">Klasörü kaldır</string>
+    <string name="desc_music_location_delete">Klasörü kaldır</string>
     <string name="desc_shuffle_all">Bütün şarkıları karıştır</string>
     <string name="desc_auxio_icon">Auxio simgesi</string>
     <string name="desc_tab_handle">Bu sekmeyi taşı</string>
     <string name="desc_no_cover">Albüm kapağı</string>
     <string name="desc_clear_search">Arama sorgusunu temizle</string>
-    <string name="set_dirs_desc">Müziğin nereden yükleneceğini yönetin</string>
+    <string name="set_locations_desc">Müziğin nereden yükleneceğini yönetin</string>
     <string name="set_dirs_mode">Mod</string>
     <string name="set_dirs_mode_exclude">Hariç tut</string>
     <string name="set_dirs_mode_exclude_desc">Eklediğiniz klasörlerden müzik <b>yüklenmeyecek</b>.</string>
@@ -248,7 +248,7 @@
     <string name="set_library">Kütüphane</string>
     <string name="lbl_sort_dsc">Azalan</string>
     <string name="set_ui_desc">Uygulamanın temasını ve renklerini değiştirin</string>
-    <string name="set_dirs_list">Klasörler</string>
+    <string name="set_locations_list">Klasörler</string>
     <string name="set_personalize_desc">Arayüz kontrollerini ve davranışını özelleştirin</string>
     <string name="set_behavior">Davranış</string>
     <string name="set_replay_gain">Ses yüksekliği dengesi ReplayGain</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c8fc37c5d..39ed40b50 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -85,7 +85,7 @@
     <string name="set_cover_mode_off">Вимкнено</string>
     <string name="set_action_mode_next">Перейти до наступної</string>
     <string name="set_cover_mode_media_store">Швидкі</string>
-    <string name="set_dirs_desc">Вкажіть звідки слід завантажувати музику</string>
+    <string name="set_locations_desc">Вкажіть звідки слід завантажувати музику</string>
     <string name="set_dirs_mode_exclude">Виключити</string>
     <string name="fmt_lib_total_duration">Загальна тривалість: %s</string>
     <string name="lbl_mixtapes">Мікстейпи</string>
@@ -104,7 +104,7 @@
     <string name="set_reindex">Оновити музику</string>
     <string name="lbl_remix_group">Ремікси</string>
     <string name="lbl_mixtape">Мікстейп</string>
-    <string name="set_dirs">Папки з музикою</string>
+    <string name="set_locations">Папки з музикою</string>
     <string name="lbl_reset">Скинути</string>
     <string name="set_black_mode">Чорна тема</string>
     <string name="set_lib_tabs_desc">Зміна видимості та порядку вкладок бібліотеки</string>
@@ -180,11 +180,11 @@
     <string name="set_separators_plus">Плюс (+)</string>
     <string name="set_separators_comma">Кома (,)</string>
     <string name="set_separators_semicolon">Крапка з комою (;)</string>
-    <string name="err_bad_dir">Ця папка не підтримується</string>
+    <string name="err_bad_location">Ця папка не підтримується</string>
     <string name="def_artist">Невідомий виконавець</string>
     <string name="clr_lime">Лаймовий</string>
     <string name="set_separators_and">Амперсанд (&amp;)</string>
-    <string name="err_no_dirs">Немає папок</string>
+    <string name="err_no_locations">Немає папок</string>
     <string name="desc_skip_next">Перейти до наступної пісні</string>
     <string name="desc_shuffle">Ввімкніть або вимкніть перемішування</string>
     <string name="desc_exit">Зупинити відтворення</string>
@@ -241,7 +241,7 @@
     <string name="clr_grey">Сірий</string>
     <string name="fmt_disc_no">Диск %d</string>
     <string name="err_index_failed">Не вдалося завантажити музику</string>
-    <string name="desc_music_dir_delete">Видалити папку</string>
+    <string name="desc_music_location_delete">Видалити папку</string>
     <string name="cdc_aac">Розширене кодування звуку (AAC)</string>
     <string name="cdc_mka">Звук Matroska</string>
     <string name="fmt_list">%1$s, %2$s</string>
@@ -256,7 +256,7 @@
     <string name="set_replay_gain">Вирівнювання гучності</string>
     <string name="set_library">Бібліотека</string>
     <string name="set_audio_desc">Налаштуйте звук і поведінку при відтворенні</string>
-    <string name="set_dirs_list">Папки</string>
+    <string name="set_locations_list">Папки</string>
     <string name="lbl_sort_dsc">За спаданням</string>
     <string name="desc_playlist_image">Зображення списку відтворення для %s</string>
     <string name="lbl_playlist">Список відтворення</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 85b55b5e8..3e4c6cadd 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_album_details">查看专辑</string>
     <string name="lbl_add">添加</string>
     <string name="lbl_save">保存</string>
-    <string name="err_no_dirs">没有文件夹</string>
+    <string name="err_no_locations">没有文件夹</string>
     <string name="lbl_about">关于</string>
     <string name="lbl_version">版本</string>
     <string name="lbl_code">源代码</string>
@@ -79,7 +79,7 @@
     <string name="err_index_failed">加载音乐失败</string>
     <string name="err_no_perms">Auxio 需要权限来读取音乐库</string>
     <string name="err_no_app">未找到可以处理此任务的应用</string>
-    <string name="err_bad_dir">该目录不受支持</string>
+    <string name="err_bad_location">该目录不受支持</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="lng_search_library">在曲库中搜索…</string>
     <!-- Description Namespace | Accessibility Strings -->
@@ -94,7 +94,7 @@
     <string name="desc_song_handle">移动队列曲目</string>
     <string name="desc_tab_handle">移动该标签</string>
     <string name="desc_clear_search">清除搜索队列</string>
-    <string name="desc_music_dir_delete">移除文件夹</string>
+    <string name="desc_music_location_delete">移除文件夹</string>
     <string name="desc_auxio_icon">Auxio 图标</string>
     <string name="desc_no_cover">专辑封面</string>
     <string name="desc_album_cover">%s 的专辑封面</string>
@@ -139,8 +139,8 @@
     <string name="set_pre_amp_with">带有标签的调节项</string>
     <string name="set_pre_amp_without">没有标签的调节项</string>
     <string name="set_pre_amp_warning">警告：将前置增益更改为正向高数值或导致某些音轨峰值过高。</string>
-    <string name="set_dirs">音乐文件夹</string>
-    <string name="set_dirs_desc">管理音乐的加载位置</string>
+    <string name="set_locations">音乐文件夹</string>
+    <string name="set_locations_desc">管理音乐的加载位置</string>
     <string name="set_dirs_mode">模式</string>
     <string name="set_dirs_mode_exclude">排除</string>
     <string name="set_dirs_mode_include">包含</string>
@@ -248,7 +248,7 @@
     <string name="set_images">图片</string>
     <string name="set_playback">播放</string>
     <string name="set_library">曲库</string>
-    <string name="set_dirs_list">文件夹</string>
+    <string name="set_locations_list">文件夹</string>
     <string name="set_music">音乐</string>
     <string name="set_audio_desc">配置声音和播放行为</string>
     <string name="lbl_sort_dsc">降序</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 518602a5d..21ecb31a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -311,17 +311,9 @@
     <string name="set_pre_amp_warning">Warning: Changing the pre-amp to a high positive value may result in peaking on some audio tracks.</string>
 
     <string name="set_library">Library</string>
-    <string name="set_dirs">Music folders</string>
-    <string name="set_dirs_desc">Manage where music should be loaded from</string>
-    <string name="set_dirs_list">Folders</string>
-    <!-- As in the mode to be used with the music folders setting -->
-    <string name="set_dirs_mode">Mode</string>
-    <!-- Exclude folders from music loading -->
-    <string name="set_dirs_mode_exclude">Exclude</string>
-    <string name="set_dirs_mode_exclude_desc">Music will <b>not</b> be loaded from the folders you add.</string>
-    <!-- Restrict music loading to selected folders -->
-    <string name="set_dirs_mode_include">Include</string>
-    <string name="set_dirs_mode_include_desc">Music will <b>only</b> be loaded from the folders you add.</string>
+    <string name="set_locations">Music folders</string>
+    <string name="set_locations_desc">Manage where music should be loaded from</string>
+    <string name="set_locations_list">Folders</string>
     <string name="set_reindex">Refresh music</string>
     <string name="set_reindex_desc">Reload the music library, using cached tags when possible</string>
     <!-- Different from "Reload music" -->
@@ -336,8 +328,8 @@
     <string name="err_export_failed">Unable to export the playlist to this file</string>
     <string name="err_no_app">No app found that can handle this task</string>
     <!-- No folders in the "Music Folders" setting -->
-    <string name="err_no_dirs">No folders</string>
-    <string name="err_bad_dir">This folder is not supported</string>
+    <string name="err_no_locations">No folders</string>
+    <string name="err_bad_location">This folder is not supported</string>
 
     <!-- Description Namespace | Accessibility Strings -->
 
@@ -356,7 +348,7 @@
     <string name="desc_queue_bar">Open the queue</string>
     <string name="desc_tab_handle">Move this tab</string>
     <string name="desc_clear_search">Clear search query</string>
-    <string name="desc_music_dir_delete">Remove folder</string>
+    <string name="desc_music_location_delete">Remove folder</string>
 
     <string name="desc_auxio_icon">Auxio icon</string>
     <string name="desc_no_cover">Album cover</string>
diff --git a/app/src/main/res/xml/preferences_root.xml b/app/src/main/res/xml/preferences_root.xml
index 64b8ebafc..5c004cb4c 100644
--- a/app/src/main/res/xml/preferences_root.xml
+++ b/app/src/main/res/xml/preferences_root.xml
@@ -30,8 +30,8 @@
 
         <org.oxycblt.auxio.settings.ui.WrappedDialogPreference
             app:key="@string/set_key_music_dirs"
-            app:summary="@string/set_dirs_desc"
-            app:title="@string/set_dirs" />
+            app:summary="@string/set_locations_desc"
+            app:title="@string/set_locations" />
 
         <Preference
             app:key="@string/set_key_reindex"