diff --git a/app/src/main/res/values-ar-rIQ/strings.xml b/app/src/main/res/values-ar-rIQ/strings.xml
index 82acc6de3..548ee23b7 100644
--- a/app/src/main/res/values-ar-rIQ/strings.xml
+++ b/app/src/main/res/values-ar-rIQ/strings.xml
@@ -3,7 +3,6 @@
 
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">مشغل موسيقى بسيط ومعقول لنظام الاندرويد.</string>
-    <string name="info_playback_channel_name">تشغيل الموسيقى</string>
     <string name="lng_playback">عرض وتحكم بشتغيل الموسيقى</string>
 
     <!-- Label Namespace | Static Labels -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index eeb93d50f..9ad447f39 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2,11 +2,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Jednoduchý, rozumný hudební přehrávač pro Android.</string>
-    <string name="info_playback_channel_name">Přehrávání hudby</string>
     <string name="lbl_indexer">Načítání hudby</string>
     <string name="lng_playback">Zobrazení a ovládání přehrávání hudby</string>
     <!-- Label Namespace | Static Labels -->
-    <string name="lng_indexing_desc">Načítání vaší hudební knihovny…</string>
+    <string name="lng_indexing">Načítání vaší hudební knihovny…</string>
     <string name="lbl_retry">Zkusit znovu</string>
     <string name="lbl_grant">Udělit</string>
     <string name="lbl_genres">Žánry</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 49be45c7b..0a9352c99 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Info namespace | App labels -->
-    <string name="info_playback_channel_name">Musikwiedergabe</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Erneut versuchen</string>
     <string name="lbl_grant">Gewähren</string>
@@ -190,7 +188,7 @@
     <string name="lbl_shuffle_shortcut_short">Mischen</string>
     <string name="lbl_shuffle_shortcut_long">Alle mischen</string>
     <string name="lbl_indexer">Musikwiedergabe</string>
-    <string name="lng_indexing_desc">Lade deine Musikbibliothek…</string>
+    <string name="lng_indexing">Lade deine Musikbibliothek…</string>
     <string name="lbl_sample_rate">Abtastrate</string>
     <string name="lbl_song_detail">Zeige Eigenschaften an</string>
     <string name="lbl_props">Lied-Eigenschaften</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f092a8a81..2a73003db 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -100,7 +100,6 @@
     <string name="fmt_lib_total_duration">Συνολική διάρκεια: %s</string>
     <string name="err_no_dirs">Καθόλου φάκελοι</string>
     <string name="info_app_desc">Μιά απλή, λογική εφαρμογή αναπαραγωγής μουσικής για Android.</string>
-    <string name="info_playback_channel_name">Αναπαραγωγή Μουσικής</string>
     <string name="lbl_indexer">Φόρτωση μουσικής</string>
     <string name="lng_playback">Προβολή και έλεγχος αναπαραγωγής μουσικής</string>
     <string name="lbl_album">Album</string>
@@ -122,16 +121,16 @@
     <string name="set_black_mode_desc">Χρησιμοποίηση ενός καθαρά μαύρο σκοτεινό θέμα</string>
     <string name="lbl_cancel">Ακύρωση</string>
     <string name="lbl_sample_rate">Pυθμός δειγματοληψίας</string>
-    <string name="lng_indexing_desc">Φόρτωση της μουσικής συλλογής σας…</string>
+    <string name="lng_indexing">Φόρτωση της μουσικής συλλογής σας…</string>
     <string name="lbl_observing">Παρακολούθηση της μουσικής συλλογής σας</string>
     <string name="lbl_state_saved">Η κατάσταση αναπαραγωγής αποθηκεύτηκε</string>
-    <string name="set_wipe">Εκκαθάριση κατάστασης αναπαραγωγής</string>
+    <string name="set_wipe_state">Εκκαθάριση κατάστασης αναπαραγωγής</string>
     <string name="set_wipe_desc">Εκκαθάριση της προηγούμενης αποθηκευμένης κατάστασης αναπαραγωγής (αν υπάρχει)</string>
     <string name="lbl_state_wiped">Η κατάσταση αναπαραγωγής εκκαθαρίστηκε</string>
     <string name="lbl_state_restored">Η κατάσταση αναπαραγωγής επαναφέρθηκε</string>
-    <string name="set_save">Αποθήκευση κατάστασης αναπαραγωγής</string>
+    <string name="set_save_state">Αποθήκευση κατάστασης αναπαραγωγής</string>
     <string name="set_save_desc">Αποθήκευση της τωρινής κατάστασης αναπαραγωγής τώρα</string>
-    <string name="set_restore">Αποκατάσταση κατάσταση αναπαραγωγής</string>
+    <string name="set_restore_state">Αποκατάσταση κατάσταση αναπαραγωγής</string>
     <string name="set_reindex">Επαναφόρτωση μουσικής</string>
     <string name="lbl_soundtrack">Σάουντρακ</string>
     <string name="lbl_live_group">Ζωντανά</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d0d4597d8..a8b7362f3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Un reproductor de música simple y racional para Android.</string>
-    <string name="info_playback_channel_name">Reproducción de música</string>
     <string name="lng_playback">Ver y controlar la reproducción musical</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Reintentar</string>
@@ -176,7 +175,7 @@
     <string name="set_observing">Recarga automática</string>
     <string name="set_observing_desc">Recarga tu biblioteca de música cuando cambia (Experimental)</string>
     <string name="err_did_not_restore">No se puedo restaurar ningún estado</string>
-    <string name="lng_indexing_desc">Cargando tu librería de música…</string>
+    <string name="lng_indexing">Cargando tu librería de música…</string>
     <string name="lbl_indexing">Cargando música</string>
     <string name="lbl_observing">Monitorizando la librería de música</string>
     <string name="lng_observing">Monitorizando cambios en tu librería de música…</string>
@@ -233,5 +232,5 @@
     <string name="desc_queue_bar">Abrir la cola</string>
     <string name="lbl_genre">Género</string>
     <string name="lbl_state_wiped">Estado limpiado</string>
-    <string name="set_wipe">Limpiar el estado de reproducción</string>
+    <string name="set_wipe_state">Limpiar el estado de reproducción</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 5daffad48..3272c7dcc 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="set_replay_gain_album">Naisin ang album</string>
     <string name="lbl_retry">Subukan muli</string>
-    <string name="lng_indexing_desc">Nilo-load ang iyong music library…</string>
+    <string name="lng_indexing">Nilo-load ang iyong music library…</string>
     <string name="lng_observing">Tinitignan ang iyong music library para sa mga pagbabago…</string>
     <string name="lbl_all_songs">Lahat ng Kanta</string>
     <string name="lbl_albums">Mga Album</string>
@@ -11,7 +11,6 @@
     <string name="lbl_album_remix">Remix album</string>
     <string name="lbl_ep">EP</string>
     <string name="lbl_indexing">Nilo-load ang music</string>
-    <string name="info_playback_channel_name">Pagtugtog ng kanta</string>
     <string name="lbl_indexer">Pagload ng kanta</string>
     <string name="lbl_eps">Mga EP</string>
     <string name="lbl_observing">Tinitignan ang music library</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 012b45eca..b6e307f68 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -98,10 +98,9 @@
     <string name="set_quality_covers_desc">Augmente la qualité de la pochette de l\'album mais entraîne des temps de chargement plus longs et une utilisation accrue de la mémoire</string>
     <string name="set_alt_repeat">Préférer l\'action en mode répétition</string>
     <string name="info_app_desc">Un lecteur de musique simple et rationnel pour Android.</string>
-    <string name="info_playback_channel_name">Lecture de musique</string>
     <string name="lbl_indexer">Chargement de musique</string>
     <string name="lng_playback">Afficher et contrôler la lecture de la musique</string>
-    <string name="lng_indexing_desc">Chargement de votre bibliothèque musicale…</string>
+    <string name="lng_indexing">Chargement de votre bibliothèque musicale…</string>
     <string name="lbl_sort_name">Nom</string>
     <string name="lbl_artist">Artiste</string>
     <string name="lbl_album">Album</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index dab68db7c..fd010bb3f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="lbl_indexing">Učitavanje glazbe</string>
-    <string name="lng_indexing_desc">Učitavanje tvoje zbirke glazbe …</string>
+    <string name="lng_indexing">Učitavanje tvoje zbirke glazbe …</string>
     <string name="lbl_observing">Nadgledavanje zbirke glazbe</string>
     <string name="lng_observing">Nadgledavanje tvoje zbirke glazbe u slučaju promjena …</string>
     <string name="lbl_songs">Pjesme</string>
@@ -179,7 +179,6 @@
         <item quantity="few">%d albuma</item>
         <item quantity="other">%d albuma</item>
     </plurals>
-    <string name="info_playback_channel_name">Reprodukcija glazbe</string>
     <string name="info_app_desc">Jednostavan i racionalan izvođač glazbe za Android.</string>
     <string name="lbl_retry">Pokušaj ponovo</string>
     <string name="lbl_indexer">Učitavanje glazbe</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d8ec34771..0e2a8ffa8 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -73,12 +73,11 @@
     <string name="lbl_size">Ukuran</string>
     <string name="lbl_sample_rate">Tingkat sampel</string>
     <string name="set_lib_tabs">Tab Pustaka</string>
-    <string name="lng_indexing_desc">Memuat perpustakaan musik Anda…</string>
+    <string name="lng_indexing">Memuat perpustakaan musik Anda…</string>
     <string name="lbl_sort_name">Nama</string>
     <string name="lbl_artist">Artis</string>
     <string name="lbl_album">Album</string>
     <string name="info_app_desc">Pemutar musik yang simpel dan rasional untuk android.</string>
-    <string name="info_playback_channel_name">Pemutaran Musik</string>
     <string name="lbl_indexer">Pemuatan Musik</string>
     <string name="lng_playback">Lihat dan kontrol pemutaran musik</string>
     <string name="lbl_sort_year">Tahun</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9df20be4e..7b7f92069 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Un semplice, razionale lettore musicale per android.</string>
-    <string name="info_playback_channel_name">Riproduzione musicale</string>
     <string name="lng_playback">Vedi e gestisci la riproduzione musicale</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Riprova</string>
@@ -182,7 +181,7 @@
     <string name="def_sample_rate">Nessuna frequenza di campionamento</string>
     <string name="fmt_db_neg">-%.1f dB</string>
     <string name="lbl_indexer">Caricamento musica</string>
-    <string name="lng_indexing_desc">Caricamento libreria musicale…</string>
+    <string name="lng_indexing">Caricamento libreria musicale…</string>
     <string name="lbl_sort_duration">Durata</string>
     <string name="lbl_sort_count">Numero canzoni</string>
     <string name="lbl_sort_disc">Disco</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a3d187d55..53b39a4c9 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2,7 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">사용하기 쉽고 실용적인 Android 음악 플레이어입니다.</string>
-    <string name="info_playback_channel_name">음악 재생</string>
     <string name="lng_playback">음악 재생 제어 및 상태 확인</string>
 
     <!-- Label Namespace | Static Labels -->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 79226a2e0..b2aac4cdc 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -49,14 +49,13 @@
     <string name="set_theme">Temos</string>
     <string name="set_black_mode_desc">Naudokti grynai juodą tamsią temą</string>
     <string name="info_app_desc">Paprastas, racionalus „Android“ muzikos grotuvas.</string>
-    <string name="info_playback_channel_name">Muzikos grojimas</string>
     <string name="lbl_indexer">Kraunama muziką</string>
     <string name="lng_playback">Peržiūrėti ir valdyti muzikos grojimą</string>
     <string name="lbl_genres">Žanrai</string>
     <string name="lbl_retry">Bandykite dar kartą</string>
     <string name="lbl_grant">Suteikti</string>
     <string name="lbl_indexing">Kraunama muzika</string>
-    <string name="lng_indexing_desc">Kraunama jūsų muzikos biblioteka…</string>
+    <string name="lng_indexing">Kraunama jūsų muzikos biblioteka…</string>
     <string name="lbl_library_counts">Bibliotekos statistika</string>
     <string name="clr_pink">Rožinis</string>
     <string name="lbl_album">Albumas</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e54c25752..64093661a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Een eenvoudige, rationele muziekspeler voor Android.</string>
-    <string name="info_playback_channel_name">Muziek Afspelen</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Opnieuw proberen</string>
     <string name="lbl_grant">Toestaan</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b4bafe3fc..0eab69943 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -101,7 +101,7 @@
     <string name="set_dirs_mode">Modo</string>
     <string name="err_no_perms">O Auxio precisa de permissão para ler sua biblioteca de músicas</string>
     <string name="info_app_desc">Um leitor de música simples e racional para android.</string>
-    <string name="lng_indexing_desc">Carregando sua biblioteca de músicas…</string>
+    <string name="lng_indexing">Carregando sua biblioteca de músicas…</string>
     <string name="lbl_sort_year">Ano</string>
     <string name="lbl_sort_duration">Duração</string>
     <string name="lbl_sort_count">Contagem de Músicas</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 754255428..84ffa208f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,7 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">Простой и рациональный музыкальный проигрыватель.</string>
-    <string name="info_playback_channel_name">Воспроизведение</string>
     <string name="lng_playback">Настройки воспроизведения</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">Повторить попытку</string>
@@ -151,7 +150,7 @@
     </plurals>
     <string name="lbl_indexer">Музыка загружается</string>
     <string name="lbl_indexing">Загрузка музыки</string>
-    <string name="lng_indexing_desc">Загрузка музыкальной библиотеки…</string>
+    <string name="lng_indexing">Загрузка музыкальной библиотеки…</string>
     <string name="lbl_observing">Мониторинг музыкальной библиотеки</string>
     <string name="lbl_shuffle_shortcut_short">Перемешать</string>
     <string name="lbl_shuffle_shortcut_long">Перемешать всё</string>
@@ -186,7 +185,7 @@
     <string name="def_bitrate">Нет битрейта</string>
     <string name="def_sample_rate">Нет частоты дискретизации</string>
     <string name="cdc_aac">AAC</string>
-    <string name="set_wipe">Очистить состояние воспроизведения</string>
+    <string name="set_wipe_state">Очистить состояние воспроизведения</string>
     <string name="set_dirs_mode_exclude_desc">Музыка <b>не</b> будет загружена из указанных папок.</string>
     <string name="set_dirs_desc">Укажите, откуда загружать музыку</string>
     <string name="fmt_bitrate">%d кбит/с</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 54d55d879..954fbd8bc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -72,11 +72,10 @@
     <string name="lbl_size">Boyut</string>
     <string name="lbl_bitrate">Bit hızı</string>
     <string name="lbl_sample_rate">Örnek hızı</string>
-    <string name="info_playback_channel_name">Müzik Çalma</string>
     <string name="lng_playback">Müzik çalmayı görüntüle ve kontrol et</string>
     <string name="info_app_desc">Android için basit, rasyonel bir müzik çalar.</string>
     <string name="lbl_indexer">Müzik Yükleniyor</string>
-    <string name="lng_indexing_desc">Müzik kitaplığınız yükleniyor…</string>
+    <string name="lng_indexing">Müzik kitaplığınız yükleniyor…</string>
     <string name="lbl_sort_name">İsim</string>
     <string name="lbl_artist">Sanatçı</string>
     <string name="lbl_album">Albüm</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 497b36d3b..014bbbece 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">一款简洁、克制的 Android 音乐播放器。</string>
-    <string name="info_playback_channel_name">音乐播放</string>
     <string name="lng_playback">查看并控制音乐播放</string>
     <!-- Label Namespace | Static Labels -->
     <string name="lbl_retry">重试</string>
@@ -182,7 +181,7 @@
     <string name="fmt_lib_album_count">已加载专辑数量：%d</string>
     <string name="def_sample_rate">没有采样率信息</string>
     <string name="lbl_indexer">音乐加载中</string>
-    <string name="lng_indexing_desc">正在加载您的音乐库……</string>
+    <string name="lng_indexing">正在加载您的音乐库……</string>
     <string name="lbl_sort_disc">碟片</string>
     <string name="lbl_sort_duration">时长</string>
     <string name="lbl_sort_count">歌曲计数</string>
@@ -197,10 +196,10 @@
     <string name="lbl_sample_rate">采样率</string>
     <string name="lbl_ok">好的</string>
     <string name="lbl_cancel">取消</string>
-    <string name="set_wipe">清除播放状态</string>
+    <string name="set_wipe_state">清除播放状态</string>
     <string name="set_wipe_desc">清除此前保存的播放状态（如果有）</string>
     <string name="err_did_not_restore">没有可以恢复的状态</string>
-    <string name="set_restore">恢复播放状态</string>
+    <string name="set_restore_state">恢复播放状态</string>
     <string name="set_restore_desc">恢复此前保存的播放状态（如果有）</string>
     <string name="set_quality_tags_desc">提高标签质量，但会导致加载时间变长（实验性）</string>
     <string name="set_observing">自动重载中</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 1816caaec..aca5a0088 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -6,7 +6,6 @@
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_two" translatable="false">%1$s • %2$s</string>
     <string name="fmt_three" translatable="false">%1$s • %2$s • %3$s</string>
-    <string name="fmt_four" translatable="false">%1$s • %2$s • %3$s • %4$s</string>
     <string name="fmt_number" translatable="false">%d</string>
     <string name="fmt_path">%1$s/%2$s</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4926afcbe..e20ee9733 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,7 +139,6 @@
     <!-- Long Namespace | Longer Descriptions -->
     <eat-comment />
 
-    <string name="lng_indexer">Load and check for new music</string>
     <string name="lng_playback">View and control music playback</string>
     <string name="lng_indexing">Loading your music library…</string>
     <string name="lng_observing">Monitoring your music library for changes…</string>
@@ -170,7 +169,8 @@
     <string name="set_quality_covers_desc">Increases album cover quality, but results in longer loading times and higher memory usage</string>
     <string name="set_round_mode">Round mode</string>
     <string name="set_round_mode_desc">Enable rounded corners on additional UI elements (Requires album covers to be rounded)</string>
-    <string name="set_bar_action">Playback bar secondary action</string>
+    <string name="set_bar_action">Custom playback bar action</string>
+    <!-- Skip to next (song) -->
     <string name="set_bar_action_next">Skip to next</string>
     <string name="set_bar_action_repeat">Repeat mode</string>
     <string name="set_bar_action_shuffle">@string/lbl_shuffle</string>