diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 6747acb65..2163721de 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -151,9 +151,7 @@ class MainFragment :
         // Workaround for a bug where fast navigation ends up desynchronizing the current
         // destination in the main navigation graph.
         findNavController().apply {
-            findDestination(R.id.main_fragment)?.let {
-                currentBackStackEntry?.destination = it
-            }
+            findDestination(R.id.main_fragment)?.let { currentBackStackEntry?.destination = it }
         }
 
         // --- VIEWMODEL SETUP ---
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
index e3f2a0abb..d5263da7b 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
@@ -29,7 +29,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
diff --git a/app/src/main/res/values-ar-rIQ/strings.xml b/app/src/main/res/values-ar-rIQ/strings.xml
index 9dc9abb35..97794174f 100644
--- a/app/src/main/res/values-ar-rIQ/strings.xml
+++ b/app/src/main/res/values-ar-rIQ/strings.xml
@@ -145,8 +145,6 @@
     <string name="lbl_size">الحجم</string>
     <string name="lbl_relative_path">المسار</string>
     <string name="lbl_library_counts">إحصائيات المكتبة</string>
-    <string name="lbl_shuffle_selected">تشغي الاغاني المحددة بترتيب عشوائي</string>
-    <string name="lbl_play_selected">تشغيل الموسيقى المحددة</string>
     <string name="lbl_bitrate">معدل البت</string>
     <string name="lbl_file_name">اسم الملف</string>
     <string name="lbl_compilation_live">تجميع مباشر</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fcbf1ee96..ca6f6fafd 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -14,7 +14,6 @@
     <string name="lbl_confirm_delete_playlist">حذف قائمة التشغيل؟</string>
     <string name="lbl_search">بحث</string>
     <string name="lbl_filter">تصفية</string>
-    <string name="lbl_play_selected">تشغيل المختارة</string>
     <string name="lbl_play_next">تشغيل التالي</string>
     <string name="lbl_queue_add">إضافة للطابور</string>
     <string name="lbl_playlist_add">إضافة لقائمة التشغيل</string>
@@ -28,7 +27,6 @@
     <string name="lbl_new_playlist">قائمة تشغيل جديدة</string>
     <string name="lbl_rename_playlist">إعادة تسمية قائمة التشغيل</string>
     <string name="lbl_edit">تعديل</string>
-    <string name="lbl_shuffle_selected">خلط المختارة</string>
     <string name="lbl_queue">طابور</string>
     <string name="lbl_shuffle">خلط</string>
     <string name="lbl_artist_details">اذهب للفنان</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 196cd5357..106d70d59 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -72,7 +72,6 @@
     <string name="lbl_playback">Зараз іграе</string>
     <string name="lbl_play">Гуляць</string>
     <string name="lbl_shuffle">Ператасаваць</string>
-    <string name="lbl_shuffle_selected">Выбрана перамешванне</string>
     <string name="lbl_size">Памер</string>
     <string name="lbl_shuffle_shortcut_short">Ператасаваць</string>
     <string name="lbl_cancel">Адмяніць</string>
@@ -81,7 +80,6 @@
     <string name="lbl_play_next">Гуляць далей</string>
     <string name="lbl_queue_add">Дадаць у чаргу</string>
     <string name="lbl_equalizer">Эквалайзер</string>
-    <string name="lbl_play_selected">Гуляць выбрана</string>
     <string name="lbl_queue">Чарга</string>
     <string name="lbl_album_details">Перайсці да альбома</string>
     <string name="lbl_artist_details">Перайсці да выканаўцы</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 35c984fed..9e55b50e3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -260,9 +260,7 @@
     <string name="err_did_not_wipe">Nepodařilo se vymazat stav</string>
     <string name="set_rescan">Znovu najít hudbu</string>
     <string name="set_rescan_desc">Vymazat mezipaměť značek a znovu úplně znovu načíst hudební knihovnu (pomalejší, ale úplnější)</string>
-    <string name="lbl_play_selected">Přehrát vybrané</string>
     <string name="fmt_selected">Vybráno %d</string>
-    <string name="lbl_shuffle_selected">Náhodně přehrát vybrané</string>
     <string name="set_play_song_from_genre">Přehrát z žánru</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index eec9aa65e..d30ef1144 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -251,8 +251,6 @@
     <string name="err_did_not_save">Zustand konnte nicht gespeichert werden</string>
     <string name="set_rescan">Music neu scannen</string>
     <string name="set_rescan_desc">Tag-Cache leeren und die Musik-Bibliothek vollständig neu laden (langsamer, aber vollständiger)</string>
-    <string name="lbl_play_selected">Ausgewählte abspielen</string>
-    <string name="lbl_shuffle_selected">Ausgewählte zufällig abspielen</string>
     <string name="fmt_selected">%d ausgewählt</string>
     <string name="set_play_song_from_genre">Vom Genre abspielen</string>
     <string name="lbl_wiki">Wiki</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0e7da1415..b5730db8e 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -135,8 +135,6 @@
     <string name="lbl_compilation_live">Σύνθεση ζωντανών κομματιών</string>
     <string name="lbl_compilation_remix">Σύνθεση ρεμίξ</string>
     <string name="lbl_equalizer">Ισοσταθμιστής</string>
-    <string name="lbl_play_selected">Αναπαραγωγή επιλεγμένου</string>
-    <string name="lbl_shuffle_selected">Τυχαία αναπαραγωγή επιλεγμένων</string>
     <string name="lbl_single">Ενιαία κυκλοφορία</string>
     <string name="lbl_singles">Σινγκλ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 70b8b49fc..0712780dd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -255,9 +255,7 @@
     <string name="err_did_not_wipe">No se puede borrar el estado</string>
     <string name="set_rescan_desc">Borrar la caché de las etiquetas y recargar completamente la biblioteca musical (más lento, pero más completo)</string>
     <string name="set_rescan">Volver a escanear la música</string>
-    <string name="lbl_shuffle_selected">Nodo aleatorio seleccionado</string>
     <string name="fmt_selected">%d seleccionado</string>
-    <string name="lbl_play_selected">Reproducir los seleccionados</string>
     <string name="set_play_song_from_genre">Reproducir desde el género</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1f222e0a7..55677cbf1 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -37,7 +37,6 @@
     <string name="lbl_playback">Nyt toistetaan</string>
     <string name="lbl_equalizer">Taajuuskorjain</string>
     <string name="lbl_play">Toista</string>
-    <string name="lbl_play_selected">Toisto valittu</string>
     <string name="lbl_shuffle">Sekoita</string>
     <string name="lbl_queue">Jono</string>
     <string name="lbl_queue_add">Lisää jonoon</string>
@@ -219,7 +218,6 @@
     <string name="set_replay_gain">ReplayGain</string>
     <string name="set_replay_gain_mode_album">Suosi albumia</string>
     <string name="set_replay_gain_mode">ReplayGain-strategia</string>
-    <string name="lbl_shuffle_selected">Sekoitus valittu</string>
     <string name="set_observing">Automaattinen uudelleenlataus</string>
     <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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 822484268..b063a1730 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -134,8 +134,6 @@
     <string name="def_genre">Genre inconnu</string>
     <string name="clr_dynamic">Dynamique</string>
     <string name="clr_cyan">Cyan</string>
-    <string name="lbl_shuffle_selected">Lecture aléatoire sélectionnée</string>
-    <string name="lbl_play_selected">Réinitialiser</string>
     <string name="err_no_dirs">Aucun dossier</string>
     <string name="desc_music_dir_delete">Supprimer le dossier</string>
     <string name="def_artist">Artiste inconnu</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 5c3288e6a..faf684102 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -49,7 +49,6 @@
     <string name="lbl_play">Reproducir</string>
     <string name="lbl_shuffle">Mezcla</string>
     <string name="lbl_play_next">Reproducir seguinte</string>
-    <string name="lbl_play_selected">Reproducir a selección</string>
     <string name="lbl_queue">Cola</string>
     <string name="lbl_queue_add">Engadir á cola</string>
     <string name="set_exclude_non_music">Excluir o que non é música</string>
@@ -126,7 +125,6 @@
     <string name="lbl_sort_asc">Ascendente</string>
     <string name="lbl_sort_dsc">Descendente</string>
     <string name="lbl_equalizer">Ecualizador</string>
-    <string name="lbl_shuffle_selected">Aleatorio seleccionado</string>
     <string name="lbl_sample_rate">Frecuencia de mostraxe</string>
     <string name="lbl_about">Acerca de</string>
     <string name="lng_observing">Monitorizando cambios na túa biblioteca…</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index f4e65894c..97ffbd5ca 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -100,8 +100,6 @@
     <string name="fmt_deletion_info">%s हटाएँ\? इसे पूर्ववत नहीं किया जा सकता।</string>
     <string name="fmt_lib_song_count">लोड किए गए गाने: %d</string>
     <string name="lbl_sort_dsc">अवरोही</string>
-    <string name="lbl_play_selected">चयनित चलाएँ</string>
-    <string name="lbl_shuffle_selected">फेरबदल का चयन किया गया</string>
     <string name="lbl_state_wiped">स्थिति साफ की गई</string>
     <string name="lbl_state_saved">स्थिति सहेजी गई</string>
     <string name="set_lib_tabs_desc">लायब्रेरी टैब की दृश्यता और क्रम बदलें</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2cd6aac4f..fecd2b6f2 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -247,8 +247,6 @@
     <string name="set_rescan">Ponovo pretraži glazbu</string>
     <string name="set_rescan_desc">Izbriši predmemoriju oznaka i ponovo potpuno učitaj glazbenu biblioteku (sporije, ali potpunije)</string>
     <string name="fmt_selected">Odabrano: %d</string>
-    <string name="lbl_shuffle_selected">Promiješaj odabrane</string>
-    <string name="lbl_play_selected">Reproduciraj odabrane</string>
     <string name="set_play_song_from_genre">Reproduciraj iz žanra</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="fmt_list">%1$s, %2$s</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 179bb1a44..cec9b922a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -75,7 +75,6 @@
     <string name="lbl_name">Név</string>
     <string name="lbl_date">Dátum</string>
     <string name="lbl_sort_dsc">Csökkenő</string>
-    <string name="lbl_play_selected">Kiválasztott lejátszása</string>
     <string name="lbl_new_playlist">Új lejátszólista</string>
     <string name="def_genre">Ismeretlen műfaj</string>
     <string name="desc_skip_next">Ugrás a következő dalra</string>
@@ -142,7 +141,6 @@
     <string name="desc_song_handle">Helyezze át ezt a dalt</string>
     <string name="desc_artist_image">%s előadó fotója</string>
     <string name="fmt_lib_total_duration">Teljes időtartam: %s</string>
-    <string name="lbl_shuffle_selected">Kiválasztottak keverése</string>
     <string name="set_personalize_desc">UI vezérlők és viselkedés testreszabása</string>
     <string name="set_lib_tabs_desc">A könyvtárfülek láthatóságának és sorrendjének módosítása</string>
     <string name="set_play_in_parent_with">A tétel részleteiből történő lejátszáskor</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 525ed9115..21f166a7e 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -183,8 +183,6 @@
     <string name="set_observing">Muat ulang otomatis</string>
     <string name="set_observing_desc">Selalu muat ulang pustaka musik saat terjadi perubahan (membutuhkan notifikasi tetap)</string>
     <string name="set_behavior">Perilaku</string>
-    <string name="lbl_play_selected">Putar yang dipilih</string>
-    <string name="lbl_shuffle_selected">Acak yang dipilih</string>
     <string name="set_round_mode">Mode bundar</string>
     <string name="set_round_mode_desc">Aktifkan sudut yang bundar pada elemen UI tambahan (mewajibkan sampul album bersudut bundar)</string>
     <string name="set_separators_comma">Koma (,)</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9e565a356..1a4bf8938 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -255,8 +255,6 @@
     <string name="err_did_not_save">Impossibile salvare</string>
     <string name="set_rescan_desc">Svuota la cache dei tag e ricarica completamente la libreria musicale (più lento, ma più completo)</string>
     <string name="err_did_not_wipe">Impossibile svuotare</string>
-    <string name="lbl_shuffle_selected">Mescola selezionati</string>
-    <string name="lbl_play_selected">Riproduci selezionati</string>
     <string name="fmt_selected">%d selezionati</string>
     <string name="set_play_song_from_genre">Riproduci dal genere</string>
     <string name="lbl_wiki">Wiki</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index ab1393f98..e85f5a07e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -40,9 +40,7 @@
     <string name="lbl_playback">מושמע כעת</string>
     <string name="lbl_equalizer">איקוולייזר</string>
     <string name="lbl_play">ניגון</string>
-    <string name="lbl_play_selected">ניגון נבחרים</string>
     <string name="lbl_shuffle">ערבוב</string>
-    <string name="lbl_shuffle_selected">ערבוב נבחרים</string>
     <string name="lbl_play_next">ניגון הבא</string>
     <string name="lbl_queue_add">הוספה לתור</string>
     <string name="lbl_album_details">מעבר לאלבום</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 21849864b..7c011f04e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -63,7 +63,6 @@
     <string name="lbl_sort_dsc">降順</string>
     <string name="lbl_play">再生</string>
     <string name="lbl_shuffle">シャフル</string>
-    <string name="lbl_shuffle_selected">選択曲をシャフル</string>
     <string name="lbl_play_next">次に再生</string>
     <string name="lbl_queue_add">再生待ちに追加</string>
     <string name="lbl_format">オーディオ形式</string>
@@ -178,7 +177,6 @@
     <string name="lbl_ep_remix">リミックスEP</string>
     <string name="lbl_remix_group">リミックス</string>
     <string name="lbl_genre">ジャンル</string>
-    <string name="lbl_play_selected">選択曲を再生</string>
     <string name="lbl_song_detail">プロパティを見る</string>
     <string name="lbl_queue">再生待ち</string>
     <string name="lbl_library_counts">ライブラリ統計</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 7d54c121c..70aa17ba9 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -251,8 +251,6 @@
         <item quantity="other">%d 아티스트</item>
     </plurals>
     <string name="set_rescan_desc">태그 정보를 지우고 음악 라이브러리를 재생성함(느림, 더 완전함)</string>
-    <string name="lbl_play_selected">선택한 재생</string>
-    <string name="lbl_shuffle_selected">선택한 셔플</string>
     <string name="fmt_selected">%d 선택됨</string>
     <string name="lbl_reset">재설정</string>
     <string name="lbl_wiki">위키</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index e225f4250..cfcbccdcf 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -249,8 +249,6 @@
     <string name="set_rescan">Perskenuoti muziką</string>
     <string name="set_rescan_desc">Išvalyti žymių talpyklą ir pilnai perkrauti muzikos biblioteką (lėčiau, bet labiau išbaigta)</string>
     <string name="fmt_selected">%d pasirinkta</string>
-    <string name="lbl_play_selected">Pasirinktas grojimas</string>
-    <string name="lbl_shuffle_selected">Pasirinktas maišymas</string>
     <string name="set_play_song_from_genre">Groti iš žanro</string>
     <string name="lbl_wiki">Viki</string>
     <string name="fmt_list">%1$s, %2$s</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 82f0ffe92..f1ae5be53 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="lbl_play_selected">തിരഞ്ഞെടുത്തു കളിക്കുക</string>
     <string name="lbl_save">രക്ഷിക്കുക</string>
     <string name="set_behavior">പെരുമാറ്റം</string>
     <string name="set_content">ഉള്ളടക്കം</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 5913008c0..c276bd0bd 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -43,7 +43,6 @@
     <string name="lbl_song_count">Sporantall</string>
     <string name="lbl_queue">Kø</string>
     <string name="lbl_play_next">Spill neste</string>
-    <string name="lbl_shuffle_selected">Omstokking valgt</string>
     <string name="set_library">Bibliotek</string>
     <string name="err_did_not_save">Kunne ikke lagre tilstand</string>
     <plurals name="fmt_artist_count">
@@ -275,7 +274,6 @@
     <string name="lbl_equalizer">Tonekontroll</string>
     <string name="desc_change_repeat">Endre gjentagelsesmodus</string>
     <string name="lbl_play">Spill</string>
-    <string name="lbl_play_selected">Spill valgte</string>
     <string name="lbl_save">Lagre</string>
     <string name="lng_indexing">Laster inn musikkbiblioteket ditt …</string>
     <string name="set_play_in_list_with">Ved avspilling fra bibliotek</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4d29de5df..c0ecc5905 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -209,7 +209,6 @@
     <string name="set_hide_collaborators_desc">Toon alleen artiesten die rechtstreeks op een album worden genoemd (werkt het beste op goed getagde bibliotheken)</string>
     <string name="set_intelligent_sorting_desc">Sorteer namen die beginnen met cijfers of woorden zoals \"de\" correct (werkt het beste met Engelstalige muziek)</string>
     <string name="desc_exit">Stop met afspelen</string>
-    <string name="lbl_play_selected">Geselecteerd afspelen</string>
     <string name="lng_indexing">Uw muziekbibliotheek wordt geladen…</string>
     <string name="set_behavior">Gedrag</string>
     <string name="lbl_compilation_remix">Remix compilatie</string>
@@ -279,7 +278,6 @@
         <item quantity="one">%d artiest</item>
         <item quantity="other">%d artiesten</item>
     </plurals>
-    <string name="lbl_shuffle_selected">Shuffle geselecteerd</string>
     <string name="set_intelligent_sorting">Intelligent sorteren</string>
     <string name="lbl_appears_on">Verschijnt op</string>
     <string name="lbl_playlists">Afspeellijsten</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 8e43996db..175c77cdb 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -49,7 +49,6 @@
     <string name="lbl_equalizer">ਇਕੋਲਾਈਜ਼ਰ</string>
     <string name="lbl_play">ਚਲਾਓ</string>
     <string name="lbl_shuffle">ਸ਼ਫਲ</string>
-    <string name="lbl_shuffle_selected">ਸ਼ਫਲ ਚੁਣਿਆ ਗਿਆ</string>
     <string name="lbl_queue">ਕਤਾਰ</string>
     <string name="lbl_play_next">ਅਗਲਾ ਚਲਾਓ</string>
     <string name="lbl_queue_add">ਕਤਾਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ</string>
@@ -76,7 +75,6 @@
     <string name="lbl_search">ਖੋਜੋ</string>
     <string name="lbl_song_count">ਗੀਤ ਦੀ ਗਿਣਤੀ</string>
     <string name="lbl_sort_dsc">ਘਟਦੇ ਹੋਏ</string>
-    <string name="lbl_play_selected">ਚੁਣਿਆ ਹੋਇਆ ਚਲਾਓ</string>
     <string name="lbl_artist_details">ਕਲਾਕਾਰ \'ਤੇ ਜਾਓ</string>
     <string name="lbl_file_name">ਫਾਈਲ ਦਾ ਨਾਮ</string>
     <string name="lbl_bitrate">ਬਿੱਟ ਰੇਟ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e813bd244..737838fe6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -255,8 +255,6 @@
     <string name="set_state">Stan odtwarzania</string>
     <string name="set_images">Obrazy</string>
     <string name="set_audio_desc">Zarządzaj dźwiękiem i odtwarzaniem muzyki</string>
-    <string name="lbl_play_selected">Odtwórz wybrane</string>
-    <string name="lbl_shuffle_selected">Wybrane losowo</string>
     <string name="fmt_selected">Wybrano %d</string>
     <string name="set_replay_gain">Wyrównanie głośności (ReplayGain)</string>
     <string name="lbl_reset">Resetuj</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ec43dcdc8..ef6191ce3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -253,8 +253,6 @@
     <string name="err_did_not_save">Não foi possível salvar a lista</string>
     <string name="set_hide_collaborators">Ocultar artistas colaboradores</string>
     <string name="set_hide_collaborators_desc">Mostrar apenas artistas que foram creditados diretamente no álbum (funciona melhor em músicas com metadados completos)</string>
-    <string name="lbl_play_selected">Tocar selecionada(s)</string>
-    <string name="lbl_shuffle_selected">Aleatorizar selecionadas</string>
     <string name="fmt_selected">%d Selecionadas</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="lbl_reset">Redefinir</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8140c3ad1..3a297776d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -217,8 +217,6 @@
     <string name="fmt_indexing">A carregar a sua biblioteca de músicas… (%1$d/%2$d)</string>
     <string name="set_rewind_prev">Retroceder antes de voltar</string>
     <string name="desc_exit">Parar reprodução</string>
-    <string name="lbl_play_selected">Reproduzir selecionada(s)</string>
-    <string name="lbl_shuffle_selected">Aleatorizar selecionadas</string>
     <string name="lbl_relative_path">Caminho principal</string>
     <string name="set_round_mode_desc">Ativar cantos arredondados em elementos adicionais da interface do utilizador (requer que as capas dos álbuns sejam arredondadas)</string>
     <string name="fmt_selected">%d Selecionadas</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 793b4ec7d..4351fd565 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -134,11 +134,9 @@
     <string name="set_display">Afişa</string>
     <string name="set_black_mode_desc">Utilizați o temă întunecată pur-negru</string>
     <string name="set_round_mode">Coperți rotunjite ale albumelor</string>
-    <string name="lbl_play_selected">Redare selecție</string>
     <string name="lbl_playlist">Listă de redare</string>
     <string name="lbl_playlists">Liste de redare</string>
     <string name="lbl_sort_dsc">Descrescător</string>
-    <string name="lbl_shuffle_selected">Selecție aleatorie aleasă</string>
     <string name="set_action_mode_next">Treceți la următoarea</string>
     <string name="set_play_song_from_artist">Redă de la artist</string>
     <string name="set_play_song_from_genre">Redă din genul</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 03703707b..6e93fb54f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -258,8 +258,6 @@
     <string name="err_did_not_wipe">Не удалось очистить состояние</string>
     <string name="err_did_not_save">Не удалось сохранить состояние</string>
     <string name="set_separators_warning">Предупреждение: Использование этой настройки может привести к тому, что некоторые теги будут неправильно интерпретироваться как имеющие несколько значений. Вы можете решить эту проблему, добавив к нежелательным символам-разделителям обратную косую черту (\\).</string>
-    <string name="lbl_play_selected">Воспроизвести выбранное</string>
-    <string name="lbl_shuffle_selected">Перемешать выбранное</string>
     <string name="fmt_selected">%d выбрано</string>
     <string name="lbl_wiki">Вики</string>
     <string name="lbl_reset">Сбросить</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index e9547d169..60f9e5c97 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -43,7 +43,6 @@
     <string name="lbl_playback">Nu spelar</string>
     <string name="lbl_equalizer">Utjämnare</string>
     <string name="lbl_play">Spela</string>
-    <string name="lbl_play_selected">Spela utvalda</string>
     <string name="lbl_shuffle">Blanda</string>
     <string name="lbl_queue">Kö</string>
     <string name="lbl_play_next">Spela nästa</string>
@@ -99,7 +98,6 @@
     <string name="lbl_filter_all">Alla</string>
     <string name="lbl_disc">Disk</string>
     <string name="lbl_sort">Sortera</string>
-    <string name="lbl_shuffle_selected">Blanda utvalda</string>
     <string name="lbl_queue_add">Lägg till kö</string>
     <string name="lbl_file_name">Filnamn</string>
     <string name="lbl_add">Lägg till</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 86915531e..559ef2336 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -196,8 +196,6 @@
     <string name="lbl_singles">Tekliler</string>
     <string name="lbl_single">Tekli</string>
     <string name="lbl_mixtape">Karışık kaset</string>
-    <string name="lbl_play_selected">Seçileni çal</string>
-    <string name="lbl_shuffle_selected">Karışık seçildi</string>
     <string name="lbl_compilation_live">Canlı derleme</string>
     <string name="lbl_compilation_remix">Remiks derlemeler</string>
     <string name="lbl_equalizer">Ekolayzır</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index fa3310d1c..ddeb997f0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -54,7 +54,6 @@
         <item quantity="many">%d альбомів</item>
         <item quantity="other">%d альбомів</item>
     </plurals>
-    <string name="lbl_shuffle_selected">Перемішати вибране</string>
     <string name="lbl_file_name">Ім\'я файлу</string>
     <string name="lbl_format">Формат</string>
     <string name="lbl_ok">Добре</string>
@@ -83,7 +82,6 @@
     <string name="lbl_relative_path">Шлях до каталогу</string>
     <string name="set_display">Екран</string>
     <string name="lbl_date">Рік</string>
-    <string name="lbl_play_selected">Відтворити вибране</string>
     <string name="set_cover_mode">Обкладинки альбомів</string>
     <string name="set_hide_collaborators">Приховати співавторів</string>
     <string name="set_cover_mode_off">Вимкнено</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5edb4fc5e..c5e17d0c4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -249,8 +249,6 @@
     <string name="err_did_not_wipe">无法清除状态</string>
     <string name="set_rescan">重新扫描音乐</string>
     <string name="set_rescan_desc">清除标签缓存并完全重新加载音乐库（更慢，但更完整）</string>
-    <string name="lbl_shuffle_selected">随机播放所选</string>
-    <string name="lbl_play_selected">播放所选</string>
     <string name="fmt_selected">选中了 %d 首</string>
     <string name="set_play_song_from_genre">按流派播放</string>
     <string name="lbl_wiki">Wiki</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 852e9eeae..31700900b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -114,9 +114,7 @@
     <string name="lbl_playback">Now playing</string>
     <string name="lbl_equalizer">Equalizer</string>
     <string name="lbl_play">Play</string>
-    <string name="lbl_play_selected">Play selected</string>
     <string name="lbl_shuffle">Shuffle</string>
-    <string name="lbl_shuffle_selected">Shuffle selected</string>
 
     <string name="lbl_queue">Queue</string>
     <string name="lbl_play_next">Play next</string>