diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 135fc610..6c9a54a9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -100,7 +100,6 @@
     <string name="pref_header_now_playing_screen">مشغل الآن</string>
     <string name="pref_title_general_theme">السمة العامة</string>
     <string name="pref_header_audio">الصوت</string>
-    <string name="pref_header_general">عام</string>
     <string name="pref_header_images">الصور</string>
     <string name="pref_header_lockscreen">قفل الشاشة</string>
     <string name="pref_title_navigation_bar">شريط تنقل ملون</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 36b6053c..232ac645 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -106,7 +106,6 @@
     <string name="pref_header_now_playing_screen">Текуща песен</string>
     <string name="pref_title_general_theme">Главна тема</string>
     <string name="pref_header_audio">Аудио</string>
-    <string name="pref_header_general">Главни</string>
     <string name="pref_header_images">Изображения</string>
     <string name="pref_header_lockscreen">Заключен екран</string>
     <string name="pref_title_navigation_bar">Оцветени навигационни бутони</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 82f93ce0..2975cc2e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -113,7 +113,6 @@
     <string name="pref_header_now_playing_screen">Přehrávač</string>
     <string name="pref_title_general_theme">Motiv</string>
     <string name="pref_header_audio">Zvuk</string>
-    <string name="pref_header_general">Všeobecné</string>
     <string name="pref_header_images">Obrázky</string>
     <string name="pref_header_lockscreen">Odemykací obrazovka</string>
     <string name="pref_header_playlists">Seznamy skladeb</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0c8fbb68..6e4d9c5a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Aktuelle Wiedergabe</string>
     <string name="pref_title_general_theme">Generelles Design</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">Generell</string>
     <string name="pref_header_images">Bilder</string>
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
     <string name="pref_header_playlists">Wiedergabelisten</string>
@@ -140,7 +139,6 @@
     <string name="remove_action">Entfernen</string>
     <string name="rename_action">Umbenennen</string>
     <string name="create_action">Erstellen</string>
-    <string name="reset_action">Zurücksetzen</string>
     <string name="x_selected">%1$d ausgewählt</string>
     <string name="primary_color">Hauptfarbe</string>
     <string name="accent_color">Akzentfarbe</string>
@@ -162,7 +160,7 @@
     <string name="pref_summary_gapless_playback">"Kann bei einigen Geräten Wiedergabeprobleme verursachen."</string>
     <string name="pref_summary_ignore_media_store_artwork">Kann die Album Cover Qualität verbessern was jedoch die Ladezeit beeinträchtigt. Nur aktivieren falls Probleme mit niedrig aufgelösten Album Covern auftreten.</string>
     <string name="pref_summary_colored_navigation_bar">Färbt die Navigationsleiste mit der Hauptfarbe.</string>
-    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Shortcuts mit der Hauptfarbe</string>
+    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Shortcuts mit der Hauptfarbe.</string>
     <string name="pref_summary_audio_ducking">Benachrichtigungen, Navigation etc.</string>
     <string name="pref_summary_synchronized_lyrics_show">Aktuell werden nur synchronisierte Songtexte im LRC-Format unterstützt, entweder eingebettet oder als separate Datei.</string>
     <string name="could_not_download_album_cover">"Es konnte kein passendes Album Cover heruntergeladen werden."</string>
@@ -285,8 +283,6 @@
     <string name="pref_summary_blacklist">Der Inhalt der Ordner auf der Blacklist wird in deiner Bibliothek verborgen.</string>
     <string name="reset_artist_image">Künstler-Bild zurücksetzen</string>
     <string name="set_artist_image">Künstler-Bild festlegen</string>
-    <string name="library_categories">Bibliothek</string>
+    <string name="library_categories">Bibliotheks Kategorien</string>
     <string name="pref_summary_library_categories">Anzeige und Anordnung der einzelnen Kategorien festlegen.</string>
-    <string name="edit_categories">Kategorien bearbeiten</string>
-    <string name="at_least_one_category_must_be_enabled">Zumindest eine Kategorie muss aktiv sein.</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 61c5a3d4..819ef673 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -107,7 +107,6 @@
     <string name="pref_header_now_playing_screen">Γίνεται αναπαραγωγή</string>
     <string name="pref_title_general_theme">Γενικό θέμα</string>
     <string name="pref_header_audio">Ήχος</string>
-    <string name="pref_header_general">Γενικά</string>
     <string name="pref_header_images">Εικόνες</string>
     <string name="pref_header_lockscreen">Οθόνη κλειδώματος</string>
     <string name="pref_title_navigation_bar">Έγχρωμη μπάρα πλοήγησης</string>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 883e8c1b..868bf076 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Now playing</string>
     <string name="pref_title_general_theme">General theme</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">General</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_lockscreen">Lockscreen</string>
     <string name="pref_header_playlists">Playlists</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 51d783b4..d2b60a40 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -3,7 +3,7 @@
     <string name="what_do_you_want_to_share">What do you want to share?</string>
     <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
     <string name="the_audio_file">The audio file</string>
-    <string name="x_has_been_set_as_ringtone">Set {%1$s} as your ringtone.</string>
+    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
     <string name="action_set_as_ringtone">Set as ringtone</string>
     <string name="action_share">Share</string>
     <string name="action_settings">"Settings"</string>
@@ -64,22 +64,22 @@
     <string name="updated_artist_image">Artist image updated.</string>
     <string name="updating">Updating...</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added {%1$d} titles to the playing queue.</string>
+    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
     <string name="action_remove_from_playlist">Remove from playlist</string>
     <string name="action_grid_size">Grid size</string>
     <string name="action_grid_size_land">Grid size (land)</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted {%1$d} songs into the playlist {%2$s}.</string>
-    <string name="created_playlist_x">Created playlist {%1$s}.</string>
-    <string name="deleted_x_songs">Deleted {%1$d} songs.</string>
-    <string name="playlist_exists">Playlist {%1$s} already exists.</string>
+    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
+    <string name="created_playlist_x">Created playlist %1$s.</string>
+    <string name="deleted_x_songs">Deleted %1$d songs.</string>
+    <string name="playlist_exists">Playlist %1$s already exists.</string>
     <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
-    <string name="delete_playlist_x"><![CDATA[Delete the playlist {<b>}{%1$s}{</b>}?]]></string>
-    <string name="clear_playlist_x"><![CDATA[Clear the playlist {<b>}{%1$s}{</b>}? This can\u2019t be undone!]]></string>
-    <string name="delete_x_playlists"><![CDATA[Delete {<b>}{%1$d}{</b>} playlists?]]></string>
-    <string name="delete_song_x"><![CDATA[Delete the song {<b>}{%1$s}{</b>}?]]></string>
-    <string name="delete_x_songs"><![CDATA[Delete {<b>}{%1$d}{</b>} songs?]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song {<b>}{%1$s}{</b>} from the playlist?]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove {<b>}{%1$d}{</b>} songs from the playlist?]]></string>
+    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
+    <string name="clear_playlist_x"><![CDATA[Clear the playlist <b>%1$s</b>? This can\u2019t be undone!]]></string>
+    <string name="delete_x_playlists"><![CDATA[Delete <b>%1$d</b> playlists?]]></string>
+    <string name="delete_song_x"><![CDATA[Delete the song <b>%1$s</b>?]]></string>
+    <string name="delete_x_songs"><![CDATA[Delete <b>%1$d</b> songs?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
     <string name="delete_song_title">Delete song</string>
     <string name="delete_songs_title">Delete songs</string>
     <string name="remove_song_from_playlist_title">Remove song from playlist</string>
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Now playing</string>
     <string name="pref_title_general_theme">General theme</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">General</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_lockscreen">Lockscreen</string>
     <string name="pref_header_playlists">Playlists</string>
@@ -140,7 +139,7 @@
     <string name="remove_action">Remove</string>
     <string name="rename_action">Rename</string>
     <string name="create_action">Create</string>
-    <string name="x_selected">{%1$d} selected</string>
+    <string name="x_selected">%1$d selected</string>
     <string name="primary_color">Primary colour</string>
     <string name="accent_color">Accent colour</string>
     <string name="primary_color_desc">The primary theme colour, defaults to indigo.</string>
@@ -178,7 +177,7 @@
     <string name="action_set">Set</string>
     <string name="cancel_current_timer">Cancel current timer</string>
     <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for {%d} minutes from now.</string>
+    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
     <string name="action_new_playlist">New playlist…</string>
     <string name="new_playlist_title">New playlist</string>
     <string name="colored_footers">Coloured footers</string>
@@ -222,8 +221,8 @@
     <string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
     <string name="library">Library</string>
     <string name="folders">Folders</string>
-    <string name="saved_playlist_to">Saved playlist to {%s}.</string>
-    <string name="failed_to_save_playlist">Failed to save playlist ({%s}).</string>
+    <string name="saved_playlist_to">Saved playlist to %s.</string>
+    <string name="failed_to_save_playlist">Failed to save playlist (%s).</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
     <string name="nothing_to_scan">Nothing to scan.</string>
     <string name="scanned_files">Scanned %1$d of %2$d files.</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a1cefe3f..7357797a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -30,6 +30,7 @@
     <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
     <string name="albums">Álbumes</string>
     <string name="artists">Artistas</string>
+    <string name="genres">Géneros</string>
     <string name="songs">Canciones</string>
     <string name="playlists">Listas de reproducción</string>
     <string name="unplayable_file">No es posible reproducir esta canci\u00f3n.</string>
@@ -115,7 +116,6 @@
     <string name="pref_header_now_playing_screen">Reproducción actual</string>
     <string name="pref_title_general_theme">Tema general</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
@@ -151,6 +151,7 @@
     <string name="no_albums">No hay álbumes</string>
     <string name="no_songs">No hay canciones</string>
     <string name="no_artists">No hay artistas</string>
+    <string name="no_genres">No hay géneros</string>
     <string name="empty">Vacío</string>
     <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
     <string name="song">Canción</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index de20d665..ed061f95 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Reproduciendo ahora</string>
     <string name="pref_title_general_theme">Tema general</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 990c573b..e1b12ff3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -102,7 +102,6 @@
     <string name="pref_header_now_playing_screen">Toistetaan parhaillaan</string>
     <string name="pref_title_general_theme">Yleinen teema</string>
     <string name="pref_header_audio">Ääni</string>
-    <string name="pref_header_general">Yleinen</string>
     <string name="pref_header_images">Kuvat</string>
     <string name="pref_header_lockscreen">Lukitusnäyttö</string>
     <string name="pref_title_navigation_bar">Värillinen navigointipalkki</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ef2f379b..2e127471 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -114,7 +114,6 @@
     <string name="pref_header_now_playing_screen">Lecture en cours</string>
     <string name="pref_title_general_theme">Thème général</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">Général</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_lockscreen">Écran de verrouillage</string>
     <string name="pref_header_playlists">Listes de lecture</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 78c0402e..75da9ebe 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">מנגן כעת</string>
     <string name="pref_title_general_theme">ערכת נושא כללית</string>
     <string name="pref_header_audio">שמע</string>
-    <string name="pref_header_general">כללי</string>
     <string name="pref_header_images">תמונות</string>
     <string name="pref_header_lockscreen">מסך נעילה</string>
     <string name="pref_header_playlists">רשימת השמעה</string>
@@ -151,6 +150,7 @@
     <string name="no_albums">אין אלבומים</string>
     <string name="no_songs">אין שירים</string>
     <string name="no_artists">אין אמנים</string>
+    <string name="no_genres">אין סגנונות</string>
     <string name="empty">ריק</string>
     <string name="playlist_name_empty">שם רשימת השמעה</string>
     <string name="song">שיר</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 21adc693..de77b105 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -30,6 +30,7 @@
     <string name="action_set_as_start_directory">Postavi kao početni direktorij</string>
     <string name="albums">Albumi</string>
     <string name="artists">Izvođači</string>
+    <string name="genres">Žanrovi</string>
     <string name="songs">Pjesme</string>
     <string name="playlists">Popisi naslova</string>
     <string name="unplayable_file">Nije mogu\u0107e reproducirati ovu pjesmu.</string>
@@ -115,7 +116,6 @@
     <string name="pref_header_now_playing_screen">Trenutna reprodukcija</string>
     <string name="pref_title_general_theme">Općenita tema</string>
     <string name="pref_header_audio">Zvuk</string>
-    <string name="pref_header_general">Općenito</string>
     <string name="pref_header_images">Slike</string>
     <string name="pref_header_lockscreen">Zaključani zaslon</string>
     <string name="pref_header_playlists">Popisi naslova</string>
@@ -151,6 +151,7 @@
     <string name="no_albums">Nema albuma</string>
     <string name="no_songs">Nema pjesama</string>
     <string name="no_artists">Nema izvođača</string>
+    <string name="no_genres">Nema žanrova</string>
     <string name="empty">Prazno</string>
     <string name="playlist_name_empty">Naziv popisa naslova</string>
     <string name="song">Pjesma</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6dd02808..158e1aa1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -114,7 +114,6 @@
     <string name="pref_header_now_playing_screen">Most játszott lista</string>
     <string name="pref_title_general_theme">Téma</string>
     <string name="pref_header_audio">Hang</string>
-    <string name="pref_header_general">Általános</string>
     <string name="pref_header_images">Képek</string>
     <string name="pref_header_lockscreen">Zárképernyő</string>
     <string name="pref_header_playlists">Lejátszási listák</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 6c36527f..5d2e86fb 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -106,7 +106,6 @@
     <string name="pref_header_now_playing_screen">Sedang diputar</string>
     <string name="pref_title_general_theme">Tema umum</string>
     <string name="pref_header_audio">Suara</string>
-    <string name="pref_header_general">Umum</string>
     <string name="pref_header_images">Gambar</string>
     <string name="pref_header_lockscreen">Layar kunci</string>
     <string name="pref_title_navigation_bar">Alat Navigasi Berwarna</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 6c36527f..5d2e86fb 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -106,7 +106,6 @@
     <string name="pref_header_now_playing_screen">Sedang diputar</string>
     <string name="pref_title_general_theme">Tema umum</string>
     <string name="pref_header_audio">Suara</string>
-    <string name="pref_header_general">Umum</string>
     <string name="pref_header_images">Gambar</string>
     <string name="pref_header_lockscreen">Layar kunci</string>
     <string name="pref_title_navigation_bar">Alat Navigasi Berwarna</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bc51bc63..2d2bbeeb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -30,6 +30,7 @@
     <string name="action_set_as_start_directory">Imposta come directory iniziale</string>
     <string name="albums">Album</string>
     <string name="artists">Artisti</string>
+    <string name="genres">Generi</string>
     <string name="songs">Brani</string>
     <string name="playlists">Playlist</string>
     <string name="unplayable_file">Impossibile riprodurre questo brano.</string>
@@ -115,7 +116,6 @@
     <string name="pref_header_now_playing_screen">Schermata in riproduzione</string>
     <string name="pref_title_general_theme">Tema generale</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">Generali</string>
     <string name="pref_header_images">Immagini</string>
     <string name="pref_header_lockscreen">Schermata di blocco</string>
     <string name="pref_header_playlists">Playlist</string>
@@ -151,6 +151,7 @@
     <string name="no_albums">Nessun album</string>
     <string name="no_songs">Nessun brano</string>
     <string name="no_artists">Nessun artista</string>
+    <string name="no_genres">Nessun genere</string>
     <string name="empty">Vuoto</string>
     <string name="playlist_name_empty">Nome playlist</string>
     <string name="song">Brano</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 78c0402e..75da9ebe 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">מנגן כעת</string>
     <string name="pref_title_general_theme">ערכת נושא כללית</string>
     <string name="pref_header_audio">שמע</string>
-    <string name="pref_header_general">כללי</string>
     <string name="pref_header_images">תמונות</string>
     <string name="pref_header_lockscreen">מסך נעילה</string>
     <string name="pref_header_playlists">רשימת השמעה</string>
@@ -151,6 +150,7 @@
     <string name="no_albums">אין אלבומים</string>
     <string name="no_songs">אין שירים</string>
     <string name="no_artists">אין אמנים</string>
+    <string name="no_genres">אין סגנונות</string>
     <string name="empty">ריק</string>
     <string name="playlist_name_empty">שם רשימת השמעה</string>
     <string name="song">שיר</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b27dce18..c1710ed1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">NowPlaying画面の設定</string>
     <string name="pref_title_general_theme">テーマカラー</string>
     <string name="pref_header_audio">オーディオ設定</string>
-    <string name="pref_header_general">一般設定</string>
     <string name="pref_header_images">画像の表示設定</string>
     <string name="pref_header_lockscreen">ロックスクリーンの設定</string>
     <string name="pref_header_playlists">プレイリスト</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ae7d3ff5..915e7b48 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">지금 재생 중</string>
     <string name="pref_title_general_theme">전체 테마</string>
     <string name="pref_header_audio">오디오</string>
-    <string name="pref_header_general">일반</string>
     <string name="pref_header_images">이미지</string>
     <string name="pref_header_lockscreen">잠금 화면</string>
     <string name="pref_header_playlists">재생목록</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7cd518a5..66d58125 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Afspeelscherm</string>
     <string name="pref_title_general_theme">Algemeen thema</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">Algemeen</string>
     <string name="pref_header_images">Illustraties</string>
     <string name="pref_header_lockscreen">Vergrendelscherm</string>
     <string name="pref_header_playlists">Afspeellijst</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 993679d7..cfe66906 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -66,7 +66,6 @@
     <string name="equalizer">Equalizer</string>
     <string name="pref_title_general_theme">Generelt tema</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">Generelt</string>
     <string name="pref_title_navigation_bar">Farga navigasjonslinje</string>
     <string name="pref_title_set_default_start_page">Startside</string>
     <string name="no_equalizer">Ingen equalizer funne</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 343559fa..fb5228bd 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Obecnie Grane</string>
     <string name="pref_title_general_theme">Styl tła motywu</string>
     <string name="pref_header_audio">Dźwięk</string>
-    <string name="pref_header_general">Ogólne</string>
     <string name="pref_header_images">Obrazy</string>
     <string name="pref_header_lockscreen">Ekran blokady</string>
     <string name="pref_header_playlists">Lista odtwarzania</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index deb43f21..b3d59272 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -30,6 +30,7 @@
     <string name="action_set_as_start_directory">Definir como diretório inicial</string>
     <string name="albums">Álbuns</string>
     <string name="artists">Artistas</string>
+    <string name="genres">Gêneros</string>
     <string name="songs">Músicas</string>
     <string name="playlists">Listas de Reprodução</string>
     <string name="unplayable_file">N\u00e3o foi poss\u00edvel reproduzir esta m\u00fasica.</string>
@@ -115,7 +116,6 @@
     <string name="pref_header_now_playing_screen">Tocando agora</string>
     <string name="pref_title_general_theme">Tema geral</string>
     <string name="pref_header_audio">Áudio</string>
-    <string name="pref_header_general">Geral</string>
     <string name="pref_header_images">Imagens</string>
     <string name="pref_header_lockscreen">Bloqueio de tela</string>
     <string name="pref_header_playlists">Listas de Reprodução</string>
@@ -151,6 +151,7 @@
     <string name="no_albums">Nenhum Álbum</string>
     <string name="no_songs">Nenhuma Musica</string>
     <string name="no_artists">Nenhum Artista</string>
+    <string name="no_genres">Nenhum gênero</string>
     <string name="empty">Vazio</string>
     <string name="playlist_name_empty">Nome da Playlist</string>
     <string name="song">Música</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8e474717..72651f15 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -102,7 +102,6 @@
     <string name="pref_header_now_playing_screen">A reproduzir</string>
     <string name="pref_title_general_theme">Tema geral</string>
     <string name="pref_header_audio">Áudio</string>
-    <string name="pref_header_general">Geral</string>
     <string name="pref_header_images">Imagens</string>
     <string name="pref_header_lockscreen">Ecrã de Bloqueio</string>
     <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index da7a4866..01a44a31 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -114,7 +114,6 @@
     <string name="pref_header_now_playing_screen">Redare acum</string>
     <string name="pref_title_general_theme">Temă generală</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imagini</string>
     <string name="pref_header_lockscreen">Ecran blocat</string>
     <string name="pref_header_playlists">Liste de redare</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index af5b0fe7..1143f7d6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Экран воспроизведения</string>
     <string name="pref_title_general_theme">Общая тема</string>
     <string name="pref_header_audio">Аудио</string>
-    <string name="pref_header_general">Общее</string>
     <string name="pref_header_images">Изображения</string>
     <string name="pref_header_lockscreen">Экран блокировки</string>
     <string name="pref_header_playlists">Плейлисты</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b26fecd7..6d6b5b3a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -76,7 +76,6 @@ Vill du radera <b>%1$d</b> låtar?
     <string name="equalizer">Equalizer</string>
     <string name="pref_title_general_theme">Allmänt tema</string>
     <string name="pref_header_audio">Ljud</string>
-    <string name="pref_header_general">Allmänt</string>
     <string name="pref_title_navigation_bar">Färgad navigeringslist</string>
     <string name="pref_title_set_default_start_page">Startsida</string>
     <string name="no_equalizer">Hittar ingen equalizer</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c8af65f7..65cf7204 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">Şuan çalınan</string>
     <string name="pref_title_general_theme">Genel tema</string>
     <string name="pref_header_audio">Ses</string>
-    <string name="pref_header_general">Genel</string>
     <string name="pref_header_images">Görüntüler</string>
     <string name="pref_header_lockscreen">Kilit ekranı</string>
     <string name="pref_header_playlists">Çalma listeleri</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ed819150..d69e4f4c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -102,7 +102,6 @@
     <string name="pref_header_now_playing_screen">Відтворюється</string>
     <string name="pref_title_general_theme">Загальна тема</string>
     <string name="pref_header_audio">Аудіо</string>
-    <string name="pref_header_general">Загальні</string>
     <string name="pref_header_images">Зображення</string>
     <string name="pref_header_lockscreen">Екран блокування</string>
     <string name="pref_title_navigation_bar">Кольорова панель навігації</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ccc1e019..e0bff36b 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -114,7 +114,6 @@
     <string name="pref_header_now_playing_screen">Đang phát</string>
     <string name="pref_title_general_theme">Chủ đề chung</string>
     <string name="pref_header_audio">Âm thanh</string>
-    <string name="pref_header_general">Chung</string>
     <string name="pref_header_images">Hình ảnh</string>
     <string name="pref_header_lockscreen">Màn hình khóa</string>
     <string name="pref_header_playlists">Danh sách nhạc</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 90b9323c..f4aba69c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -115,7 +115,6 @@
     <string name="pref_header_now_playing_screen">正在播放界面</string>
     <string name="pref_title_general_theme">全局主题</string>
     <string name="pref_header_audio">声音</string>
-    <string name="pref_header_general">常规</string>
     <string name="pref_header_images">图片</string>
     <string name="pref_header_lockscreen">锁屏</string>
     <string name="pref_header_playlists">播放列表</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b607912e..a08ebd91 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -107,7 +107,6 @@
     <string name="pref_header_now_playing_screen">播放面板</string>
     <string name="pref_title_general_theme">主題</string>
     <string name="pref_header_audio">音訊</string>
-    <string name="pref_header_general">一般</string>
     <string name="pref_header_images">圖片</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
     <string name="pref_title_navigation_bar">彩色的導航列</string>