diff --git a/app/src/main/java/com/github/damontecres/wholphin/data/ExtrasItem.kt b/app/src/main/java/com/github/damontecres/wholphin/data/ExtrasItem.kt
index ff568a37..30af65cf 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/data/ExtrasItem.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/data/ExtrasItem.kt
@@ -92,18 +92,18 @@ sealed interface ExtrasItem {
 val ExtraType.stringRes: Int
     get() =
         when (this) {
-            ExtraType.UNKNOWN -> R.string.other_extras
-            ExtraType.CLIP -> R.string.clips
+            ExtraType.UNKNOWN -> R.string.other_extras_title
+            ExtraType.CLIP -> R.string.clips_title
             ExtraType.TRAILER -> R.string.trailers
-            ExtraType.BEHIND_THE_SCENES -> R.string.behind_the_scenes
-            ExtraType.DELETED_SCENE -> R.string.deleted_scenes
-            ExtraType.INTERVIEW -> R.string.interviews
-            ExtraType.SCENE -> R.string.scenes
-            ExtraType.SAMPLE -> R.string.samples
-            ExtraType.THEME_SONG -> R.string.theme_songs
-            ExtraType.THEME_VIDEO -> R.string.theme_videos
-            ExtraType.FEATURETTE -> R.string.featurettes
-            ExtraType.SHORT -> R.string.shorts
+            ExtraType.BEHIND_THE_SCENES -> R.string.behind_the_scenes_title
+            ExtraType.DELETED_SCENE -> R.string.deleted_scenes_title
+            ExtraType.INTERVIEW -> R.string.interviews_title
+            ExtraType.SCENE -> R.string.scenes_title
+            ExtraType.SAMPLE -> R.string.samples_title
+            ExtraType.THEME_SONG -> R.string.theme_songs_title
+            ExtraType.THEME_VIDEO -> R.string.theme_videos_title
+            ExtraType.FEATURETTE -> R.string.featurettes_title
+            ExtraType.SHORT -> R.string.shorts_title
         }
 
 /**
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
index 4b03c676..0ca1e89e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
@@ -506,7 +506,7 @@ class HomeSettingsService
                 is HomeRowConfig.Favorite -> {
                     val name =
                         ResProviderStringProvider(
-                            R.string.favorite_items,
+                            R.string.favorite_items_title,
                             ResStringProvider(favoriteOptions[config.kind]!!),
                         )
                     HomeRowConfigDisplay(id, name, config)
@@ -952,7 +952,7 @@ class HomeSettingsService
                 is HomeRowConfig.Favorite -> {
                     val title =
                         ResProviderStringProvider(
-                            R.string.favorite_items,
+                            R.string.favorite_items_title,
                             ResStringProvider(favoriteOptions[row.kind]!!),
                         )
                     if (row.kind == BaseItemKind.PERSON) {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/TrailerService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/TrailerService.kt
index 6be37807..22df106b 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/TrailerService.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/TrailerService.kt
@@ -34,7 +34,7 @@ class TrailerService
                                 // TODO would be nice to clean up the trailer name
 //                                                ?.replace(item.name ?: "", "")
 //                                                ?.removePrefix(" - ")
-                                ?: context.getString(R.string.trailer)
+                                ?: context.resources.getQuantityString(R.plurals.trailers, 1)
                         val subtitle =
                             when (url.toUri().host) {
                                 "youtube.com", "www.youtube.com" -> "YouTube"
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
index 7b64b1a4..aa00f814 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
@@ -203,12 +203,12 @@ fun listToDotString(
 @StringRes
 fun formatTypeName(type: BaseItemKind): Int =
     when (type) {
-        BaseItemKind.MOVIE -> R.string.movies
-        BaseItemKind.SERIES -> R.string.tv_shows
+        BaseItemKind.MOVIE -> R.string.movies_title
+        BaseItemKind.SERIES -> R.string.tv_shows_title
         BaseItemKind.EPISODE -> R.string.episodes
         BaseItemKind.VIDEO -> R.string.videos
         BaseItemKind.PLAYLIST -> R.string.playlists
-        BaseItemKind.PERSON -> R.string.people
+        BaseItemKind.PERSON -> R.string.people_title
         BaseItemKind.BOX_SET -> R.string.collections
         BaseItemKind.AUDIO -> TODO()
         BaseItemKind.CHANNEL -> R.string.channels
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/ExtrasRow.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/ExtrasRow.kt
index 1d9927fe..2bf2bac6 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/ExtrasRow.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/ExtrasRow.kt
@@ -17,7 +17,7 @@ fun ExtrasRow(
     modifier: Modifier = Modifier,
 ) {
     ItemRow(
-        title = stringResource(R.string.extras),
+        title = stringResource(R.string.extras_title),
         items = extras,
         onClickItem = onClickItem,
         onLongClickItem = onLongClickItem,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/PersonRow.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/PersonRow.kt
index 140cc2fd..637aa5cf 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/PersonRow.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/PersonRow.kt
@@ -33,7 +33,7 @@ fun PersonRow(
     people: List<Person>,
     onClick: (Person) -> Unit,
     modifier: Modifier = Modifier,
-    @StringRes title: Int = R.string.people,
+    @StringRes title: Int = R.string.people_title,
     onLongClick: ((Int, Person) -> Unit)? = null,
 ) {
     val firstFocus = remember { FocusRequester() }
@@ -84,7 +84,7 @@ fun DiscoverPersonRow(
     people: List<DiscoverItem>,
     onClick: (DiscoverItem) -> Unit,
     modifier: Modifier = Modifier,
-    @StringRes title: Int = R.string.people,
+    @StringRes title: Int = R.string.people_title,
     onLongClick: ((Int, DiscoverItem) -> Unit)? = null,
 ) {
     val firstFocus = remember { FocusRequester() }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesPage.kt
index f9aedff3..b8e40895 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesPage.kt
@@ -56,12 +56,12 @@ fun FavoritesPage(
     val tabs =
         remember {
             listOf(
-                TabDetails(R.string.movies),
-                TabDetails(R.string.tv_shows),
+                TabDetails(R.string.movies_title),
+                TabDetails(R.string.tv_shows_title),
                 TabDetails(R.string.episodes),
                 TabDetails(R.string.videos),
                 TabDetails(R.string.playlists),
-                TabDetails(R.string.people),
+                TabDetails(R.string.people_title),
             )
         }
     val actions =
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/PersonPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/PersonPage.kt
index 0efb9ae8..218627ae 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/PersonPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/PersonPage.kt
@@ -363,7 +363,7 @@ fun PersonPageContent(
         }
         item {
             LoadingRow(
-                title = rowTitle(stringResource(R.string.movies), movies),
+                title = rowTitle(stringResource(R.string.movies_title), movies),
                 state = movies,
                 rowIndex = MOVIE_ROW,
                 position = position,
@@ -376,7 +376,7 @@ fun PersonPageContent(
         }
         item {
             LoadingRow(
-                title = rowTitle(stringResource(R.string.tv_shows), series),
+                title = rowTitle(stringResource(R.string.tv_shows_title), series),
                 state = series,
                 rowIndex = SERIES_ROW,
                 position = position,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrDiscoverPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrDiscoverPage.kt
index 5825cc13..7e98b5c8 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrDiscoverPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrDiscoverPage.kt
@@ -80,7 +80,7 @@ class SeerrDiscoverViewModel
                 this.copy(
                     movies =
                         DiscoverRowData(
-                            ResStringProvider(R.string.movies),
+                            ResStringProvider(R.string.movies_title),
                             it,
                             DiscoverRequestType.DISCOVER_MOVIES,
                         ),
@@ -90,7 +90,7 @@ class SeerrDiscoverViewModel
                 this.copy(
                     tv =
                         DiscoverRowData(
-                            ResStringProvider(R.string.tv_shows),
+                            ResStringProvider(R.string.tv_shows_title),
                             it,
                             DiscoverRequestType.DISCOVER_TV,
                         ),
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
index aec58ce1..ecb0e74d 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/SearchPage.kt
@@ -682,7 +682,7 @@ fun SearchPage(
                         modifier = Modifier.focusGroup(),
                     ) {
                         searchResultRow(
-                            title = R.string.movies,
+                            title = R.string.movies_title,
                             result = state.movies,
                             rowIndex = MOVIE_ROW,
                             position = position,
@@ -692,7 +692,7 @@ fun SearchPage(
                             modifier = Modifier.fillMaxWidth(),
                         )
                         searchResultRow(
-                            title = R.string.tv_shows,
+                            title = R.string.tv_shows_title,
                             result = state.series,
                             rowIndex = SERIES_ROW,
                             position = position,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt
index 5bf3056d..80b2f6f9 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt
@@ -53,12 +53,12 @@ fun HomeSettingsFavoriteList(
 
 val favoriteOptions by lazy {
     mapOf(
-        BaseItemKind.MOVIE to R.string.movies,
-        BaseItemKind.SERIES to R.string.tv_shows,
+        BaseItemKind.MOVIE to R.string.movies_title,
+        BaseItemKind.SERIES to R.string.tv_shows_title,
         BaseItemKind.EPISODE to R.string.episodes,
         BaseItemKind.VIDEO to R.string.videos,
         BaseItemKind.PLAYLIST to R.string.playlists,
-        BaseItemKind.PERSON to R.string.people,
+        BaseItemKind.PERSON to R.string.people_title,
         BaseItemKind.MUSIC_ARTIST to R.string.artists,
         BaseItemKind.MUSIC_ALBUM to R.string.albums,
     )
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt
index ee8fa341..22a55f12 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt
@@ -413,7 +413,7 @@ class HomeSettingsViewModel
                         id = id,
                         title =
                             ResProviderStringProvider(
-                                R.string.favorite_items,
+                                R.string.favorite_items_title,
                                 ResStringProvider(favoriteOptions[type]!!),
                             ),
                         config = HomeRowConfig.Favorite(type),
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0bfa6343..4cbadd03 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -164,7 +164,7 @@
     </plurals>
     <string name="official_rating">التصنيف العمري</string>
     <string name="runtime_sort">مدة العرض</string>
-    <string name="extras">إضافات</string>
+    <string name="extras_title">إضافات</string>
     <plurals name="other_extras">
         <item quantity="zero">أخرى</item>
     </plurals>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e41bd2b5..0f63eb14 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -149,7 +149,6 @@
     <string name="switch_servers">Přepnout servery</string>
     <string name="switch_user">Přepnout</string>
     <string name="top_unwatched">Nejlépe hodnocené Nezhlédnuté</string>
-    <string name="trailer">Upoutávka</string>
     <plurals name="trailers">
         <item quantity="one">Upoutávky</item>
         <item quantity="few"/>
@@ -188,7 +187,7 @@
     <string name="background">Pozadí</string>
     <string name="success">Úspěch</string>
     <string name="official_rating">Rodičovské hodnocení</string>
-    <string name="extras">Doplňky</string>
+    <string name="extras_title">Doplňky</string>
     <plurals name="other_extras">
         <item quantity="one">Jiný</item>
         <item quantity="few"/>
@@ -512,7 +511,7 @@
     <string name="display_presets">Zobrazit předvolby</string>
     <string name="display_presets_description">Vestavěné předvolby pro rychlou úpravu všech řádků</string>
     <string name="customize_home_summary">Vyberte řádky a obrázky na domovské stránce</string>
-    <string name="favorite_items">Oblíbené %s</string>
+    <string name="favorite_items_title">Oblíbené %s</string>
     <string name="content_scale_fit">Přizpůsobit</string>
     <string name="content_scale_crop">Oříznout</string>
     <string name="content_scale_fill">Vyplnit</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 7fdb5d82..7803eb49 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -148,7 +148,6 @@
     <string name="switch_servers">Skift servere</string>
     <string name="switch_user">Skift</string>
     <string name="top_unwatched">Bedst bedømte usete</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailere</item>
         <item quantity="other"/>
@@ -184,7 +183,7 @@
     <string name="success">Succes</string>
     <string name="official_rating">Aldersgrænse</string>
     <string name="runtime_sort">Spilletid</string>
-    <string name="extras">Ekstra</string>
+    <string name="extras_title">Ekstra</string>
     <plurals name="other_extras">
         <item quantity="one">Andet</item>
         <item quantity="other"/>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9c784fdb..77c93b6a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -25,14 +25,14 @@
     <string name="died">Gestorben</string>
     <string name="director">Regisseur</string>
     <string name="more">Mehr</string>
-    <string name="movies">Filme</string>
+    <string name="movies_title">Filme</string>
     <string name="name">Name</string>
     <string name="no_data">Keine Daten</string>
     <string name="no_results">Keine Ergebnisse</string>
     <string name="no_scheduled_recordings">Keine geplanten Aufnahmen</string>
     <string name="no_update_available">Kein Update verfügbar</string>
     <string name="path">Pfad</string>
-    <string name="people">Darsteller</string>
+    <string name="people_title">Darsteller</string>
     <string name="recently_added_in">Zuletzt hinzugefügt in %1$s</string>
     <string name="recently_added">Zuletzt hinzugefügt</string>
     <string name="recently_recorded">Zuletzt aufgenommen</string>
@@ -46,21 +46,20 @@
     <string name="select_user">Benutzer auswählen</string>
     <string name="subtitles">Untertitel</string>
     <string name="switch_servers">Server wechseln</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailer</item>
         <item quantity="other"/>
     </plurals>
     <string name="tv_season">Staffel</string>
     <string name="tv_seasons">Staffeln</string>
-    <string name="tv_shows">Serien</string>
+    <string name="tv_shows_title">Serien</string>
     <string name="ui_interface">Oberfläche</string>
     <string name="unknown">Unbekannt</string>
     <string name="updates">Aktualisierungen</string>
     <string name="version">Version</string>
     <string name="watch_live">Live ansehen</string>
     <string name="years_old">%1$d Jahre alt</string>
-    <string name="extras">Extras</string>
+    <string name="extras_title">Extras</string>
     <plurals name="scenes">
         <item quantity="one">Szenen</item>
         <item quantity="other"/>
@@ -531,7 +530,7 @@
     <string name="conductor">Dirigent</string>
     <string name="lyricist">Liedtext-Schreiber</string>
     <string name="artist">Künstler</string>
-    <string name="favorite_items">Favorisierte %s</string>
+    <string name="favorite_items_title">Favorisierte %s</string>
     <string name="home_rows">Startseite - Reihen</string>
     <string name="load_from_server">Vom Server Benutzerprofil laden</string>
     <string name="save_to_server">Im Server Benutzerprofil speichern</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6159ff33..daef9929 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="movies">Ταινίες</string>
+    <string name="movies_title">Ταινίες</string>
     <string name="profile">Προφίλ</string>
     <string name="home">Αρχική</string>
     <string name="language">Γλώσσα</string>
@@ -32,7 +32,7 @@
     <string name="font_color">Χρώμα Κειμένου</string>
     <string name="bold_font">Φωτεινότητα κειμένου</string>
     <string name="library">Βιβλιοθήκης</string>
-    <string name="tv_shows">Σειρές</string>
+    <string name="tv_shows_title">Σειρές</string>
     <string name="genres">Είδη</string>
     <string name="collection">Συλλογή</string>
     <string name="collections">Συλλογές</string>
@@ -108,7 +108,7 @@
     <string name="no_update_available">Χωρίς διαθέσιμη ενημέρωση</string>
     <string name="play_from_here">Έναρξη από εδώ</string>
     <string name="play">Έναρξη</string>
-    <string name="people">Άτομα</string>
+    <string name="people_title">Άτομα</string>
     <string name="playback_speed">Ταχύτητα αναπαραγωγής</string>
     <string name="playback">Αναπαραγωγή</string>
     <string name="playlist">Λίστα αναπαραγωγής</string>
@@ -168,7 +168,7 @@
     <string name="success">Επιτυχής</string>
     <string name="official_rating">Γονεική αξιολόγηση</string>
     <string name="runtime_sort">Χρόνος εκτέλεσης</string>
-    <string name="extras">Επιπρόσθετα</string>
+    <string name="extras_title">Επιπρόσθετα</string>
     <plurals name="other_extras">
         <item quantity="one">Άλλο</item>
         <item quantity="other"/>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4e6ba9e6..21a8da59 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -36,7 +36,7 @@
     <string name="no_results">Sin resultados</string>
     <string name="none">Ninguno</string>
     <string name="outro">Créditos finales</string>
-    <string name="people">Personas</string>
+    <string name="people_title">Personas</string>
     <string name="play">Reproducir</string>
     <string name="playback">Reproducción</string>
     <string name="playlist">Lista de reproducción</string>
@@ -63,13 +63,12 @@
     <string name="suggestions">Sugerencias</string>
     <string name="switch_servers">Cambiar servidor</string>
     <string name="switch_user">Cambiar</string>
-    <string name="trailer">Tráiler</string>
     <plurals name="trailers">
         <item quantity="one">Tráiler</item>
         <item quantity="many">Tráilers</item>
         <item quantity="other"/>
     </plurals>
-    <string name="tv_shows">Series</string>
+    <string name="tv_shows_title">Series</string>
     <string name="ui_interface">Interfaz</string>
     <string name="version">Versión</string>
     <string name="video">Vídeo</string>
@@ -83,7 +82,7 @@
     <string name="one_click_pause_summary_on">Pulsa el botón central de la cruceta para reproducir/pausar</string>
     <string name="success">Éxito</string>
     <string name="runtime_sort">Duración</string>
-    <string name="extras">Extras</string>
+    <string name="extras_title">Extras</string>
     <plurals name="other_extras">
         <item quantity="one">Otro</item>
         <item quantity="many">Otros</item>
@@ -134,7 +133,7 @@
     <string name="mark_unwatched">Marcar como no visto</string>
     <string name="mark_watched">Marcar como visto</string>
     <string name="more_like_this">Más como esto</string>
-    <string name="movies">Películas</string>
+    <string name="movies_title">Películas</string>
     <string name="next_up">Siguiente</string>
     <string name="no_data">Sin datos</string>
     <string name="no_scheduled_recordings">Sin grabaciones programadas</string>
@@ -480,7 +479,7 @@
     <string name="display_presets_description">Preajustes integrados para estilizar todas las filas</string>
     <string name="customize_home_summary">Elegir filas e imágenes en la página de inicio</string>
     <string name="recently_released_in">Lanzado recientemente en %1$s</string>
-    <string name="favorite_items">Favoritos%s</string>
+    <string name="favorite_items_title">Favoritos%s</string>
     <string name="content_scale_fit">Ajustar</string>
     <string name="content_scale_crop">Recortar</string>
     <string name="content_scale_fill">Rellenar</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 339ec1c6..35fc6d46 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -62,7 +62,7 @@
     <string name="max_bitrate">Suurim bitikiirus</string>
     <string name="more_like_this">Veel sarnaseid</string>
     <string name="more">Veel</string>
-    <string name="movies">Filmid</string>
+    <string name="movies_title">Filmid</string>
     <string name="name">Nimi</string>
     <string name="next_up">Järgmisena esitamisel</string>
     <string name="no_data">Andmed puuduvad</string>
@@ -72,7 +72,7 @@
     <string name="none">Määramata</string>
     <string name="outro">Väljajuhatus</string>
     <string name="path">Rada</string>
-    <string name="people">Inimesed</string>
+    <string name="people_title">Inimesed</string>
     <string name="play_count">Esitusi</string>
     <string name="play_from_here">Esita siit kohast</string>
     <string name="play">Esita</string>
@@ -123,7 +123,7 @@
     <string name="success">Valmis</string>
     <string name="official_rating">Vanemlik hinnang</string>
     <string name="runtime_sort">Kestus</string>
-    <string name="extras">Lisad</string>
+    <string name="extras_title">Lisad</string>
     <plurals name="other_extras">
         <item quantity="one">Muu</item>
         <item quantity="other">Muud</item>
@@ -220,14 +220,13 @@
     <string name="record_program">Salvesta programm</string>
     <string name="record_series">Salvesta telesari</string>
     <string name="top_unwatched">Parima hinnanguga vaatamata sisu</string>
-    <string name="trailer">Treiler</string>
     <plurals name="trailers">
         <item quantity="one">Treilerid</item>
         <item quantity="other"/>
     </plurals>
     <string name="tv_dvr_schedule">DVR-i kava</string>
     <string name="tv_guide">Telekava</string>
-    <string name="tv_shows">Telesaated</string>
+    <string name="tv_shows_title">Telesaated</string>
     <string name="video_scale">Video skaleerimine</string>
     <string name="video">Video</string>
     <string name="videos">Videod</string>
@@ -463,7 +462,7 @@
     <string name="display_presets">Kuvamise eelseadistused</string>
     <string name="display_presets_description">Rakenduses kaasasolevad eelseadistused kõikide ridade kiireks muutmiseks</string>
     <string name="customize_home_summary">Vali kodulehe/avalehe read ja pildid</string>
-    <string name="favorite_items">Märgi %s lemmikuks</string>
+    <string name="favorite_items_title">Märgi %s lemmikuks</string>
     <plurals name="minutes">
         <item quantity="one">%s minut</item>
         <item quantity="other">%s minutit</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b0c7dcd7..19b40df2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -48,7 +48,7 @@
     <string name="mark_unwatched">Marquer comme non vu</string>
     <string name="mark_watched">Marquer comme vu</string>
     <string name="max_bitrate">Débit maximal</string>
-    <string name="movies">Films</string>
+    <string name="movies_title">Films</string>
     <string name="name">Nom</string>
     <string name="next_up">À suivre</string>
     <string name="no_data">Aucune donnée</string>
@@ -58,7 +58,7 @@
     <string name="none">Aucun</string>
     <string name="outro">Générique de fin</string>
     <string name="path">Chemin</string>
-    <string name="people">Personnes</string>
+    <string name="people_title">Personnes</string>
     <string name="play_from_here">Lire à partir d’ici</string>
     <string name="play">Lire</string>
     <string name="playback_speed">Vitesse de lecture</string>
@@ -98,7 +98,6 @@
     <string name="suggestions">Suggestions</string>
     <string name="switch_servers">Changer de serveur</string>
     <string name="switch_user">Changer</string>
-    <string name="trailer">Bande-annonce</string>
     <plurals name="trailers">
         <item quantity="one">Bandes-annonces</item>
         <item quantity="many"/>
@@ -106,7 +105,7 @@
     </plurals>
     <string name="tv_season">Saison</string>
     <string name="tv_seasons">Saisons</string>
-    <string name="tv_shows">Séries TV</string>
+    <string name="tv_shows_title">Séries TV</string>
     <string name="unknown">Inconnu</string>
     <string name="updates">Mises à jour</string>
     <string name="version">Version</string>
@@ -182,7 +181,7 @@
     <string name="years_old">%1$d ans</string>
     <string name="italic_font">Mettre la police en italique</string>
     <string name="official_rating">Classification parentale</string>
-    <string name="extras">Bonus</string>
+    <string name="extras_title">Bonus</string>
     <plurals name="behind_the_scenes">
         <item quantity="one">Dans les coulisses</item>
         <item quantity="many"/>
@@ -479,7 +478,7 @@
     <string name="display_presets">Afficher les préréglages</string>
     <string name="display_presets_description">Préréglages intégrés pour styliser rapidement toutes les lignes</string>
     <string name="customize_home_summary">Choisissez des lignes et des images sur la page d\'accueil</string>
-    <string name="favorite_items">Favori %s</string>
+    <string name="favorite_items_title">Favori %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minute</item>
         <item quantity="many">%s minutes</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index f292b891..44730910 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -62,7 +62,7 @@
     <string name="max_bitrate">Maximális bitráta</string>
     <string name="more_like_this">Hasonlóak</string>
     <string name="more">Továbbiak</string>
-    <string name="movies">Filmek</string>
+    <string name="movies_title">Filmek</string>
     <string name="name">Név</string>
     <string name="next_up">Következő</string>
     <string name="no_data">Nincs adat</string>
@@ -72,7 +72,7 @@
     <string name="none">Nincs</string>
     <string name="outro">Stáblista</string>
     <string name="path">Elérési út</string>
-    <string name="people">Stábtagok</string>
+    <string name="people_title">Stábtagok</string>
     <string name="play_count">Lejátszások száma</string>
     <string name="play_from_here">Lejátszás innen</string>
     <string name="play">Lejátszás</string>
@@ -120,7 +120,6 @@
     <string name="switch_servers">Váltás másik szerverre</string>
     <string name="switch_user">Váltás</string>
     <string name="top_unwatched">Legjobbra értékelt, nem megnézett</string>
-    <string name="trailer">Előzetes</string>
     <plurals name="trailers">
         <item quantity="one">Előzetesek</item>
         <item quantity="other"/>
@@ -129,7 +128,7 @@
     <string name="tv_guide">Műsorújság</string>
     <string name="tv_season">Évad</string>
     <string name="tv_seasons">Évadok</string>
-    <string name="tv_shows">Sorozatok</string>
+    <string name="tv_shows_title">Sorozatok</string>
     <string name="ui_interface">Kezelőfelület</string>
     <string name="unknown">Ismeretlen</string>
     <string name="updates">Frissítések</string>
@@ -152,7 +151,7 @@
     <string name="success">Sikeres</string>
     <string name="official_rating">Korhatár-besorolás</string>
     <string name="runtime_sort">Hossz</string>
-    <string name="extras">Extrák</string>
+    <string name="extras_title">Extrák</string>
     <plurals name="other_extras">
         <item quantity="one">Egyéb</item>
         <item quantity="other">Egyebek</item>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index c5199c5b..ae0e29de 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -62,7 +62,7 @@
     <string name="max_bitrate">Bitrate maks</string>
     <string name="more_like_this">Tampilkan yang serupa</string>
     <string name="more">Lainnya</string>
-    <string name="movies">Film</string>
+    <string name="movies_title">Film</string>
     <string name="name">Nama</string>
     <string name="next_up">Selanjutnya</string>
     <string name="no_data">Tidak ada data</string>
@@ -72,7 +72,7 @@
     <string name="none">Tidak ada</string>
     <string name="outro">Outro</string>
     <string name="path">Berkas</string>
-    <string name="people">Orang</string>
+    <string name="people_title">Orang</string>
     <string name="play_count">Total Pemutaran</string>
     <string name="play_from_here">Putar dari sini</string>
     <string name="play">Putar</string>
@@ -121,7 +121,6 @@
     <string name="switch_servers">Ganti Server</string>
     <string name="switch_user">Ganti</string>
     <string name="top_unwatched">Terbaik Belum Ditonton</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="other">Trailer</item>
     </plurals>
@@ -129,7 +128,7 @@
     <string name="tv_guide">Panduan</string>
     <string name="tv_season">Season</string>
     <string name="tv_seasons">Season</string>
-    <string name="tv_shows">Acara TV</string>
+    <string name="tv_shows_title">Acara TV</string>
     <string name="ui_interface">Antarmuka</string>
     <string name="unknown">Tidak Diketahui</string>
     <string name="updates">Pembaruan</string>
@@ -152,7 +151,7 @@
     <string name="success">Berhasil</string>
     <string name="official_rating">Rating Orang Tua</string>
     <string name="runtime_sort">Durasi</string>
-    <string name="extras">Ekstra</string>
+    <string name="extras_title">Ekstra</string>
     <plurals name="other_extras">
         <item quantity="other">Lainnya</item>
     </plurals>
@@ -446,7 +445,7 @@
     <string name="display_presets">Preset tampilan</string>
     <string name="display_presets_description">Preset bawaan untuk kustomisasi cepat semua baris</string>
     <string name="customize_home_summary">Pilih baris dan gambar di halaman beranda</string>
-    <string name="favorite_items">Favoritkan %s</string>
+    <string name="favorite_items_title">Favoritkan %s</string>
     <string name="artist">Artis</string>
     <plurals name="minutes">
         <item quantity="other">%s menit</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4c017645..5790b179 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="loading">Caricamento…</string>
     <string name="library">Libreria</string>
     <string name="live_tv">Diretta TV</string>
-    <string name="movies">Film</string>
+    <string name="movies_title">Film</string>
     <string name="no_results">Nessun risultato</string>
     <string name="max_bitrate">Bitrate massimo</string>
     <string name="mark_unwatched">Segna come non visto</string>
@@ -69,7 +69,7 @@
     <string name="sort_by_random">Casuale</string>
     <string name="tv_season">Stagione</string>
     <string name="tv_seasons">Stagioni</string>
-    <string name="tv_shows">Serie TV</string>
+    <string name="tv_shows_title">Serie TV</string>
     <string name="ui_interface">Interfaccia</string>
     <string name="unknown">Sconosciuto</string>
     <string name="updates">Aggiornamenti</string>
@@ -122,7 +122,7 @@
     <string name="hide_debug_info">Nascondi informazioni debug</string>
     <string name="font_color">Colore testo</string>
     <string name="font_opacity">Opacità testo</string>
-    <string name="extras">Extra</string>
+    <string name="extras_title">Extra</string>
     <plurals name="other_extras">
         <item quantity="one">Altro</item>
         <item quantity="many">Altri</item>
@@ -164,7 +164,7 @@
     <string name="name">Nome</string>
     <string name="next_up">Prossimo Episodio</string>
     <string name="no_scheduled_recordings">Nessuna registrazione programmata</string>
-    <string name="people">Persone</string>
+    <string name="people_title">Persone</string>
     <string name="show_debug_info">Mostra informazioni debug</string>
     <string name="sort_by_date_added">Data di Aggiunta</string>
     <string name="sort_by_date_played">Data di riproduzione</string>
@@ -174,7 +174,6 @@
     <string name="suggestions">Suggerimenti</string>
     <string name="switch_servers">Cambia server</string>
     <string name="switch_user">Cambia</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">I trailer</item>
         <item quantity="many"/>
@@ -480,7 +479,7 @@
     <string name="load_from_web_client">Carica dal client web</string>
     <string name="use_series">Usa immagine delle serie</string>
     <string name="customize_home_summary">Scegli righe e immagini nella home page</string>
-    <string name="favorite_items">Preferito %s</string>
+    <string name="favorite_items_title">Preferito %s</string>
     <string name="content_scale_fit">Adatta</string>
     <string name="content_scale_crop">Ritaglia</string>
     <string name="content_scale_fill">Riempi</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f2efcdb9..e6027e7a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -51,7 +51,6 @@
     </plurals>
     <string name="tv_seasons">עונות</string>
     <string name="tv_season">עונה</string>
-    <string name="trailer">טריילר</string>
     <plurals name="trailers">
         <item quantity="one">טריילר</item>
         <item quantity="two">טריילרים</item>
@@ -231,7 +230,7 @@
     <string name="success">הצלחה</string>
     <string name="official_rating">דירוג הורים</string>
     <string name="runtime_sort">אורך</string>
-    <string name="extras">תכנים נוספים</string>
+    <string name="extras_title">תכנים נוספים</string>
     <plurals name="other_extras">
         <item quantity="one">אחר</item>
     </plurals>
@@ -265,7 +264,7 @@
     <plurals name="shorts">
         <item quantity="one">קטעים קצרים</item>
     </plurals>
-    <string name="favorite_items">מועדפים: %s</string>
+    <string name="favorite_items_title">מועדפים: %s</string>
     <string name="ac3_supported">המכשיר תומך ב־AC3/Dolby Digital</string>
     <string name="advanced_settings">הגדרות מתקדמות</string>
     <string name="advanced_ui">ממשק מתקדם</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index adb54e50..299e3501 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -150,7 +150,6 @@
     <string name="switch_servers">Mainīt serverus</string>
     <string name="switch_user">Pārslēgt</string>
     <string name="top_unwatched">Augstāk novērtētie un neredzētie</string>
-    <string name="trailer">Treileris</string>
     <plurals name="trailers">
         <item quantity="zero">Treileri</item>
         <item quantity="one"/>
@@ -188,7 +187,7 @@
     <string name="success">Veiksmīgi</string>
     <string name="official_rating">Vecuma ierobežojums</string>
     <string name="runtime_sort">Ilgums</string>
-    <string name="extras">Ekstras</string>
+    <string name="extras_title">Ekstras</string>
     <plurals name="other_extras">
         <item quantity="zero">Cits</item>
         <item quantity="one"/>
@@ -244,7 +243,7 @@
         <item quantity="one"/>
         <item quantity="other"/>
     </plurals>
-    <string name="favorite_items">Izlase %s</string>
+    <string name="favorite_items_title">Izlase %s</string>
     <plurals name="downloads">
         <item quantity="zero">%s lejupielāžu</item>
         <item quantity="one">%s lejupielāde</item>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d892ebf3..6b21a3ea 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -59,7 +59,7 @@
     <string name="max_bitrate">Maks bitrate</string>
     <string name="more_like_this">Mer som dette</string>
     <string name="more">Mer</string>
-    <string name="movies">Filmer</string>
+    <string name="movies_title">Filmer</string>
     <string name="name">Navn</string>
     <string name="next_up">Neste</string>
     <string name="no_data">Ingen data</string>
@@ -70,7 +70,7 @@
     <string name="none">Ingen</string>
     <string name="outro">Outro</string>
     <string name="path">Filbane</string>
-    <string name="people">Personer</string>
+    <string name="people_title">Personer</string>
     <string name="play_count">Antall avspillinger</string>
     <string name="play_from_here">Spill av herfra</string>
     <string name="play">Spill av</string>
@@ -119,7 +119,6 @@
     <string name="switch_servers">Bytt server</string>
     <string name="switch_user">Bytt bruker</string>
     <string name="top_unwatched">Best vurderte usette</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailere</item>
         <item quantity="other"/>
@@ -128,7 +127,7 @@
     <string name="tv_guide">Programoversikt</string>
     <string name="tv_season">Sesong</string>
     <string name="tv_seasons">Sesonger</string>
-    <string name="tv_shows">TV-serier</string>
+    <string name="tv_shows_title">TV-serier</string>
     <string name="ui_interface">Grensesnitt</string>
     <string name="unknown">Ukjent</string>
     <string name="updates">Oppdateringer</string>
@@ -152,7 +151,7 @@
     <string name="success">Fullført</string>
     <string name="official_rating">Aldersgrense</string>
     <string name="runtime_sort">Spilletid</string>
-    <string name="extras">Ekstramateriale</string>
+    <string name="extras_title">Ekstramateriale</string>
     <plurals name="other_extras">
         <item quantity="one">Annet</item>
         <item quantity="other"/>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1c0fdb70..ee1c3734 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -62,7 +62,7 @@
     <string name="max_bitrate">Max. bitsnelheid</string>
     <string name="more_like_this">Soortgelijk</string>
     <string name="more">Meer</string>
-    <string name="movies">Films</string>
+    <string name="movies_title">Films</string>
     <string name="name">Naam</string>
     <string name="next_up">Volgende</string>
     <string name="no_data">Geen informatie</string>
@@ -72,7 +72,7 @@
     <string name="none">Geen</string>
     <string name="outro">Aftiteling</string>
     <string name="path">Locatie</string>
-    <string name="people">Personen</string>
+    <string name="people_title">Personen</string>
     <string name="play_count">Aantal keer bekeken</string>
     <string name="play_from_here">Vanaf hier afspelen</string>
     <string name="play">Afspelen</string>
@@ -121,7 +121,6 @@
     <string name="switch_servers">Andere server kiezen</string>
     <string name="switch_user">Kiezen</string>
     <string name="top_unwatched">Best beoordeeld niet-bekeken</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailer</item>
         <item quantity="other">Trailers</item>
@@ -130,7 +129,7 @@
     <string name="tv_guide">Gids</string>
     <string name="tv_season">Seizoen</string>
     <string name="tv_seasons">Seizoenen</string>
-    <string name="tv_shows">Series</string>
+    <string name="tv_shows_title">Series</string>
     <string name="ui_interface">Vormgeving</string>
     <string name="unknown">Onbekend</string>
     <string name="updates">Updates</string>
@@ -153,7 +152,7 @@
     <string name="success">Voltooid</string>
     <string name="official_rating">Kijkwijzer</string>
     <string name="runtime_sort">Duur</string>
-    <string name="extras">Extra\'s</string>
+    <string name="extras_title">Extra\'s</string>
     <plurals name="other_extras">
         <item quantity="one">Overig</item>
         <item quantity="other"/>
@@ -362,7 +361,7 @@
     <string name="zoom_out">Zoom uit</string>
     <string name="skip_ignore">Negeren</string>
     <string name="skip_ask">Vraag om overslaan</string>
-    <string name="favorite_items">Favoriete %s</string>
+    <string name="favorite_items_title">Favoriete %s</string>
     <string name="duration">Duur</string>
     <string name="add_row">Rij toevoegen</string>
     <string name="for_all_ages">Alle leeftijden</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index db921e51..995e26f5 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -64,7 +64,7 @@
     <string name="max_bitrate">Maks bitrate</string>
     <string name="more_like_this">Meir som dette</string>
     <string name="more">Meir</string>
-    <string name="movies">Filmar</string>
+    <string name="movies_title">Filmar</string>
     <string name="name">Namn</string>
     <string name="next_up">Neste</string>
     <string name="no_data">Ingen data</string>
@@ -74,7 +74,7 @@
     <string name="no_update_available">Ingen oppdatering tilgjengeleg</string>
     <string name="outro">Outro</string>
     <string name="path">Filveg</string>
-    <string name="people">Folk</string>
+    <string name="people_title">Folk</string>
     <string name="play_count">Antall avspelingar</string>
     <string name="play_from_here">Spel av herfrå</string>
     <string name="play">Spel av</string>
@@ -122,7 +122,6 @@
     <string name="switch_servers">Byt servar</string>
     <string name="switch_user">Byt brukar</string>
     <string name="top_unwatched">Best vurderte usette</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailerar</item>
         <item quantity="other"/>
@@ -131,7 +130,7 @@
     <string name="tv_guide">Programoversikt</string>
     <string name="tv_season">Sesong</string>
     <string name="tv_seasons">Sesongar</string>
-    <string name="tv_shows">TV-seriar</string>
+    <string name="tv_shows_title">TV-seriar</string>
     <string name="ui_interface">Grensesnitt</string>
     <string name="unknown">Ukjend</string>
     <string name="updates">Oppdateringar</string>
@@ -155,7 +154,7 @@
     <string name="success">Fullført</string>
     <string name="official_rating">Aldersgrense</string>
     <string name="runtime_sort">Speltid</string>
-    <string name="extras">Ekstra</string>
+    <string name="extras_title">Ekstra</string>
     <plurals name="other_extras">
         <item quantity="one">Anna</item>
         <item quantity="other"/>
@@ -378,7 +377,7 @@
     <string name="voice_error_start_failed">Klarte ikkje starta talegjenkjenning</string>
     <string name="voice_error_timeout">Tidsavbrot for talegjenkjenning</string>
     <string name="retry">Prøv på nytt</string>
-    <string name="favorite_items">Favoritt %s</string>
+    <string name="favorite_items_title">Favoritt %s</string>
     <string name="resolution_switching">Oppløysingsbyte</string>
     <string name="local">Lokal</string>
     <string name="play_trailer">Spel trailer</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5eebccae..c83a91bd 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -20,7 +20,7 @@
     <string name="max_bitrate">Maksymalny bitrate</string>
     <string name="more_like_this">Podobne</string>
     <string name="more">Więcej</string>
-    <string name="movies">Filmy</string>
+    <string name="movies_title">Filmy</string>
     <string name="next_up">Następnie</string>
     <string name="no_data">Brak danych</string>
     <string name="no_results">Brak wyników</string>
@@ -33,7 +33,7 @@
     <string name="skip">Pomiń</string>
     <string name="sort_by_date_added">Data dodania</string>
     <string name="sort_by_date_episode_added">Data dodania odcinka</string>
-    <string name="tv_shows">Seriale</string>
+    <string name="tv_shows_title">Seriale</string>
     <string name="tv_season">Sezon</string>
     <string name="tv_seasons">Sezony</string>
     <string name="subtitle">Napisy</string>
@@ -42,7 +42,6 @@
     <string name="switch_servers">Zmień serwer</string>
     <string name="switch_user">Zmień</string>
     <string name="top_unwatched">Najlepiej oceniane nieobejrzane</string>
-    <string name="trailer">Zwiastun</string>
     <plurals name="trailers">
         <item quantity="one">Zwiastun</item>
         <item quantity="few">Zwiastuny</item>
@@ -261,13 +260,13 @@
     <string name="video_scale">Skalowanie obrazu</string>
     <string name="font_opacity">Przezroczystość czcionki</string>
     <string name="update_url_summary">Adres URL do sprawdzenia aktualizacji</string>
-    <string name="people">Obsada</string>
+    <string name="people_title">Obsada</string>
     <string name="none">Brak</string>
     <string name="unknown">Nieznany</string>
     <string name="years_old">%1$d lat temu</string>
     <string name="success">Powodzenie</string>
     <string name="official_rating">Ocena rodzicielska</string>
-    <string name="extras">Dodatki</string>
+    <string name="extras_title">Dodatki</string>
     <plurals name="other_extras">
         <item quantity="one">Inne</item>
         <item quantity="few"/>
@@ -433,7 +432,7 @@
     <string name="seerr_login">Zaloguj się do Seerr</string>
     <string name="seerr_jellyfin_user">Użytkownik Jellyfin</string>
     <string name="seerr_local_user">Użytkownik lokalny</string>
-    <string name="favorite_items">Ulubione %s</string>
+    <string name="favorite_items_title">Ulubione %s</string>
     <plurals name="days">
         <item quantity="one">%s dzień</item>
         <item quantity="few">%s dni</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bf4a7c94..83649b09 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -149,7 +149,6 @@
     <string name="switch_servers">Trocar de servidores</string>
     <string name="switch_user">Trocar</string>
     <string name="top_unwatched">Não assistidos com melhor avaliação</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailer</item>
         <item quantity="many">Trailers</item>
@@ -187,7 +186,7 @@
     <string name="success">Sucesso</string>
     <string name="official_rating">Classificação Parental</string>
     <string name="runtime_sort">Duração</string>
-    <string name="extras">Extras</string>
+    <string name="extras_title">Extras</string>
     <plurals name="other_extras">
         <item quantity="one">Outro</item>
         <item quantity="many">Outros</item>
@@ -238,7 +237,7 @@
         <item quantity="many">Curtas</item>
         <item quantity="other">Curtas</item>
     </plurals>
-    <string name="favorite_items">Favoritar %s</string>
+    <string name="favorite_items_title">Favoritar %s</string>
     <plurals name="downloads">
         <item quantity="one">%s download</item>
         <item quantity="many">%s downloads</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index fd038556..0c6ac0d7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -59,7 +59,7 @@
     <string name="max_bitrate">Bitrate Máximo</string>
     <string name="more_like_this">Mais como isto</string>
     <string name="more">Mais</string>
-    <string name="movies">Filmes</string>
+    <string name="movies_title">Filmes</string>
     <string name="name">Nome</string>
     <string name="next_up">A Seguir</string>
     <string name="no_data">Sem dados</string>
@@ -68,7 +68,7 @@
     <string name="no_update_available">Nenhuma atualização disponível</string>
     <string name="none">Nenhum</string>
     <string name="outro">Créditos finais</string>
-    <string name="people">Pessoas</string>
+    <string name="people_title">Pessoas</string>
     <string name="play_count">Reproduções</string>
     <string name="play_from_here">Reproduzir a partir daqui</string>
     <string name="play">Reproduzir</string>
@@ -119,7 +119,6 @@
     <string name="switch_servers">Mudar Servidores</string>
     <string name="switch_user">Mudar</string>
     <string name="top_unwatched">Mais Votados Não Assistidos</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailer</item>
         <item quantity="many">Trailers</item>
@@ -129,7 +128,7 @@
     <string name="tv_guide">Guia</string>
     <string name="tv_season">Temporada</string>
     <string name="tv_seasons">Temporadas</string>
-    <string name="tv_shows">Séries TV</string>
+    <string name="tv_shows_title">Séries TV</string>
     <string name="ui_interface">Interface</string>
     <string name="unknown">Desconhecido</string>
     <string name="updates">Atualizações</string>
@@ -152,7 +151,7 @@
     <string name="success">Êxito</string>
     <string name="official_rating">Classificação Parental</string>
     <string name="runtime_sort">Duração</string>
-    <string name="extras">Extras</string>
+    <string name="extras_title">Extras</string>
     <plurals name="other_extras">
         <item quantity="one">Outro</item>
         <item quantity="many">Outros</item>
@@ -480,7 +479,7 @@
     <string name="display_presets_description">Predefinições embarcadas para definir todas as linhas rapidamente</string>
     <string name="customize_home_summary">Escolha as linhas e imagens na página inicial</string>
     <string name="decrease_all_cards_size">Diminuir o tamanho de todos os cartões</string>
-    <string name="favorite_items">Favoritos %s</string>
+    <string name="favorite_items_title">Favoritos %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuto</item>
         <item quantity="many">%s minutos</item>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 46a38847..06643481 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -358,13 +358,13 @@
     </plurals>
     <string name="official_rating">Evaluare parentală</string>
     <string name="runtime_sort">Timp de execuție</string>
-    <string name="extras">Extra</string>
+    <string name="extras_title">Extra</string>
     <plurals name="clips">
         <item quantity="one">Clipuri</item>
         <item quantity="few"></item>
         <item quantity="other"></item>
     </plurals>
-    <string name="favorite_items">%s favorit</string>
+    <string name="favorite_items_title">%s favorit</string>
     <string name="app_theme">Temă aplicație</string>
     <string name="auto_check_for_updates">Verifică automat dacă există actualizări</string>
     <string name="ac3_supported">Dispozitivul acceptă formatele AC3/Dolby Digital</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f94fc36b..254ea466 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -52,14 +52,14 @@
     <string name="mark_watched">Отметить как просмотренное</string>
     <string name="max_bitrate">Максимальный битрейт</string>
     <string name="more_like_this">Похожее</string>
-    <string name="movies">Фильмы</string>
+    <string name="movies_title">Фильмы</string>
     <string name="name">Имя</string>
     <string name="next_up">Далее</string>
     <string name="no_data">Нет информации</string>
     <string name="no_results">Нет результатов</string>
     <string name="no_update_available">Нет доступных обновлений</string>
     <string name="path">Путь</string>
-    <string name="people">Люди</string>
+    <string name="people_title">Люди</string>
     <string name="playback_debug_info">Показать отладочную инфомацию воспроизведения</string>
     <string name="playback_speed">Скорость воспроизведения</string>
     <string name="playback">Воспроизведение</string>
@@ -95,7 +95,6 @@
     <string name="switch_servers">Сменить сервер</string>
     <string name="switch_user">Сменить</string>
     <string name="top_unwatched">Лучшее непросмотренное</string>
-    <string name="trailer">Трейлер</string>
     <plurals name="trailers">
         <item quantity="one">Трейлер</item>
         <item quantity="few">Трейлера</item>
@@ -105,7 +104,7 @@
     <string name="tv_guide">Телегид</string>
     <string name="tv_season">Сезон</string>
     <string name="tv_seasons">Сезоны</string>
-    <string name="tv_shows">Телешоу</string>
+    <string name="tv_shows_title">Телешоу</string>
     <string name="unknown">Неизвестно</string>
     <string name="updates">Обновления</string>
     <string name="version">Версия</string>
@@ -124,7 +123,7 @@
     <string name="success">Успех</string>
     <string name="official_rating">Возрастной рейтинг</string>
     <string name="runtime_sort">Продолжительность</string>
-    <string name="extras">Дополнительно</string>
+    <string name="extras_title">Дополнительно</string>
     <plurals name="other_extras">
         <item quantity="one">Другое</item>
         <item quantity="few">Других</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ede412b5..8b8ba7a2 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -61,7 +61,7 @@
     <string name="max_bitrate">Maximálny bitrate</string>
     <string name="more_like_this">Navrhované</string>
     <string name="more">Viac</string>
-    <string name="movies">Filmy</string>
+    <string name="movies_title">Filmy</string>
     <string name="name">Meno</string>
     <string name="next_up">Nasleduje</string>
     <string name="no_data">Žiadne dáta</string>
@@ -71,7 +71,7 @@
     <string name="none">Žiadne</string>
     <string name="outro">Outro</string>
     <string name="path">Cesta</string>
-    <string name="people">Ľudia</string>
+    <string name="people_title">Ľudia</string>
     <string name="play_count">Počet prehrávaní</string>
     <string name="play_from_here">Prehrať odtiaľto</string>
     <string name="play">Prehrať</string>
@@ -143,7 +143,6 @@
     <string name="switch_servers">Zmeniť servery</string>
     <string name="switch_user">Zmeniť</string>
     <string name="top_unwatched">Najlepšie hodnotené Nepozreté</string>
-    <string name="trailer">Trailer</string>
     <plurals name="trailers">
         <item quantity="one">Trailery</item>
         <item quantity="few"/>
@@ -183,7 +182,7 @@
     <string name="success">Úspech</string>
     <string name="official_rating">Rodičovské hodnotenie</string>
     <string name="runtime_sort">Dĺžka</string>
-    <string name="extras">Bonusový materiál</string>
+    <string name="extras_title">Bonusový materiál</string>
     <plurals name="other_extras">
         <item quantity="one">Ostatné</item>
         <item quantity="few"/>
@@ -250,7 +249,7 @@
         <item quantity="many"/>
         <item quantity="other"/>
     </plurals>
-    <string name="favorite_items">Obľúbené %s</string>
+    <string name="favorite_items_title">Obľúbené %s</string>
     <plurals name="downloads">
         <item quantity="one">%s stiahnutý</item>
         <item quantity="few">%s stiahnuté</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 71e1bc71..99719417 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -146,7 +146,6 @@
     <string name="switch_servers">Zamenjaj strežnik</string>
     <string name="switch_user">Preklopi</string>
     <string name="top_unwatched">Najbolje ocenjeno, neogledano</string>
-    <string name="trailer">Napovednik</string>
     <plurals name="trailers">
         <item quantity="one">Napovedniki</item>
     </plurals>
@@ -180,7 +179,7 @@
     <string name="success">Uspeh</string>
     <string name="official_rating">Starševska ocena</string>
     <string name="runtime_sort">Trajanje izvajanja</string>
-    <string name="extras">Dodatki</string>
+    <string name="extras_title">Dodatki</string>
     <plurals name="other_extras">
         <item quantity="one">Ostalo</item>
     </plurals>
@@ -214,7 +213,7 @@
     <plurals name="shorts">
         <item quantity="one">Kratki filmi</item>
     </plurals>
-    <string name="favorite_items">Dodaj %s med priljubljene</string>
+    <string name="favorite_items_title">Dodaj %s med priljubljene</string>
     <plurals name="downloads">
         <item quantity="one">%s prenos</item>
         <item quantity="two">%s prenosa</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 1e44bdf8..6bc35660 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -31,7 +31,7 @@
     <string name="no_results">Inga resultat</string>
     <string name="name">Namn</string>
     <string name="loading">Laddar…</string>
-    <string name="movies">Filmer</string>
+    <string name="movies_title">Filmer</string>
     <string name="play">Spela</string>
     <string name="playlist">Spellista</string>
     <string name="playlists">Spellistor</string>
@@ -73,7 +73,6 @@
     <string name="switch_servers">Byt server</string>
     <string name="switch_user">Byt</string>
     <string name="top_unwatched">Topprankade osedda</string>
-    <string name="trailer">Förhandsvisning</string>
     <plurals name="trailers">
         <item quantity="one">Förhandsvisningar</item>
         <item quantity="other"/>
@@ -82,7 +81,7 @@
     <string name="tv_guide">TV Guide</string>
     <string name="tv_season">Säsong</string>
     <string name="tv_seasons">Säsonger</string>
-    <string name="tv_shows">TV-serier</string>
+    <string name="tv_shows_title">TV-serier</string>
     <string name="ui_interface">Gränssnitt</string>
     <string name="unknown">Okänd</string>
     <string name="updates">Uppdateringar</string>
@@ -105,7 +104,7 @@
     <string name="success">Lyckades</string>
     <string name="official_rating">Åldersgräns</string>
     <string name="runtime_sort">Speltid</string>
-    <string name="extras">Extramaterial</string>
+    <string name="extras_title">Extramaterial</string>
     <plurals name="other_extras">
         <item quantity="one">Annat</item>
         <item quantity="other"/>
@@ -205,7 +204,7 @@
     <string name="none">Ingen</string>
     <string name="outro">Slutsekvens</string>
     <string name="path">Sökväg</string>
-    <string name="people">Medverkande</string>
+    <string name="people_title">Medverkande</string>
     <string name="play_count">Spelningar</string>
     <string name="play_from_here">Spela härifrån</string>
     <string name="playback_debug_info">Visa felsökningsinfo för uppspelning</string>
@@ -541,7 +540,7 @@
     <string name="play_as_type">Spela som?</string>
     <string name="favorite_channels_at_beginning">Visa favoritkanaler först</string>
     <string name="sort_channels_recently_watched">Sortera kanaler efter senaste visade</string>
-    <string name="favorite_items">Favoritmarkera %s</string>
+    <string name="favorite_items_title">Favoritmarkera %s</string>
     <string name="play_slideshow">Spela bildspel</string>
     <string name="songs">Sånger</string>
     <string name="prefer_logos">Föredra att visa logotyper för titlar</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 51760b13..22bc4601 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -147,7 +147,6 @@
     <string name="switch_servers">สลับเซิร์ฟเวอร์</string>
     <string name="switch_user">สวิตช์</string>
     <string name="top_unwatched">รายการที่ได้คะแนนสูงที่ยังไม่ได้ดู</string>
-    <string name="trailer">ตัวอย่าง</string>
     <plurals name="trailers">
         <item quantity="other">ตัวอย่าง</item>
     </plurals>
@@ -181,7 +180,7 @@
     <string name="success">สำเร็จ</string>
     <string name="official_rating">การให้คะแนนโดยผู้ปกครอง</string>
     <string name="runtime_sort">รันไทม์</string>
-    <string name="extras">เพิ่มเติม</string>
+    <string name="extras_title">เพิ่มเติม</string>
     <plurals name="other_extras">
         <item quantity="other">อื่นๆ</item>
     </plurals>
@@ -215,7 +214,7 @@
     <plurals name="shorts">
         <item quantity="other">หนังสั้น</item>
     </plurals>
-    <string name="favorite_items">ชื่นชอบ %s</string>
+    <string name="favorite_items_title">ชื่นชอบ %s</string>
     <string name="ac3_supported">อุปกรณ์รองรับระบบเสียง AC3/Dolby Digital</string>
     <string name="advanced_settings">การตั้งค่าขั้นสูง</string>
     <string name="advanced_ui">UI ขั้นสูง</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7fba3690..aee10d57 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -149,7 +149,6 @@
     <string name="switch_servers">Sunucu değiştir</string>
     <string name="switch_user">Değiştir</string>
     <string name="top_unwatched">İzlenmemiş En İyiler</string>
-    <string name="trailer">Fragman</string>
     <plurals name="trailers">
         <item quantity="one">Fragman</item>
         <item quantity="other">Fragmanlar</item>
@@ -185,7 +184,7 @@
     <string name="success">Başarılı</string>
     <string name="official_rating">Yaş Derecelendirmesi</string>
     <string name="runtime_sort">Süre</string>
-    <string name="extras">Ekstralar</string>
+    <string name="extras_title">Ekstralar</string>
     <plurals name="other_extras">
         <item quantity="one">Diğer Ekstra</item>
         <item quantity="other">Diğer Ekstralar</item>
@@ -471,7 +470,7 @@
     <string name="settings_saved">Ayarlar kaydedildi</string>
     <string name="display_presets">Görüntü ön ayarları</string>
     <string name="display_presets_description">Tüm satırları hızlıca stilize etmek için hazır ayarlar</string>
-    <string name="favorite_items">Favori %s</string>
+    <string name="favorite_items_title">Favori %s</string>
     <string name="customize_home_summary">Ana sayfadaki satırları ve görselleri seçin</string>
     <string name="content_scale_fit">Sığdır</string>
     <string name="content_scale_crop">Kırp</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f7835121..a4bf494f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -153,7 +153,6 @@
     <string name="switch_servers">Перемикнути сервер</string>
     <string name="switch_user">Перемкнути</string>
     <string name="top_unwatched">Топ непереглянутих</string>
-    <string name="trailer">Трейлер</string>
     <plurals name="trailers">
         <item quantity="one">Трейлери</item>
         <item quantity="few"/>
@@ -193,7 +192,7 @@
     <string name="success">Успіх</string>
     <string name="official_rating">Вікова оцінка</string>
     <string name="runtime_sort">Час виконання</string>
-    <string name="extras">Додатково</string>
+    <string name="extras_title">Додатково</string>
     <plurals name="other_extras">
         <item quantity="one">Інше</item>
         <item quantity="few"/>
@@ -475,7 +474,7 @@
     <string name="zoom_out">Зменшити</string>
     <string name="slideshow_duration">Тривалість слайд-шоу</string>
     <string name="play_videos_during_slideshow">Відтворення відео під час слайд-шоу</string>
-    <string name="favorite_items">Улюблені %s</string>
+    <string name="favorite_items_title">Улюблені %s</string>
     <plurals name="days">
         <item quantity="one">день</item>
         <item quantity="few">дні</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 84d69985..8bfd9a08 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -62,7 +62,7 @@
     <string name="max_bitrate">最大比特率</string>
     <string name="more_like_this">类似推荐</string>
     <string name="more">更多</string>
-    <string name="movies">电影</string>
+    <string name="movies_title">电影</string>
     <string name="name">名称</string>
     <string name="next_up">即将播放</string>
     <string name="no_data">无数据</string>
@@ -72,7 +72,7 @@
     <string name="none">无</string>
     <string name="outro">片尾</string>
     <string name="path">路径</string>
-    <string name="people">演职人员</string>
+    <string name="people_title">演职人员</string>
     <string name="play_count">播放次数</string>
     <string name="play_from_here">从此处播放</string>
     <string name="play">播放</string>
@@ -121,7 +121,6 @@
     <string name="switch_servers">切换服务器</string>
     <string name="switch_user">切换</string>
     <string name="top_unwatched">高分未看</string>
-    <string name="trailer">预告片</string>
     <plurals name="trailers">
         <item quantity="other">预告片</item>
     </plurals>
@@ -129,7 +128,7 @@
     <string name="tv_guide">指南</string>
     <string name="tv_season">季</string>
     <string name="tv_seasons">季</string>
-    <string name="tv_shows">电视节目</string>
+    <string name="tv_shows_title">电视节目</string>
     <string name="ui_interface">界面</string>
     <string name="unknown">未知</string>
     <string name="updates">更新</string>
@@ -152,7 +151,7 @@
     <string name="success">成功</string>
     <string name="official_rating">内容分级</string>
     <string name="runtime_sort">播放时长</string>
-    <string name="extras">附加内容</string>
+    <string name="extras_title">附加内容</string>
     <plurals name="other_extras">
         <item quantity="other">其他</item>
     </plurals>
@@ -446,7 +445,7 @@
     <string name="display_presets">显示预设</string>
     <string name="display_presets_description">可快速设置所有行样式的内置预设</string>
     <string name="customize_home_summary">选择首页上的行和图片</string>
-    <string name="favorite_items">收藏的 %s</string>
+    <string name="favorite_items_title">收藏的 %s</string>
     <string name="content_scale_fit">适应</string>
     <string name="content_scale_crop">裁剪</string>
     <string name="content_scale_fill">填充</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4523a787..88da1023 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,7 +9,7 @@
     <string name="loading">載入中…</string>
     <string name="more_like_this">類似作品</string>
     <string name="more">更多</string>
-    <string name="movies">電影</string>
+    <string name="movies_title">電影</string>
     <string name="name">名稱</string>
     <string name="next_up">接下來播放</string>
     <string name="no_data">無資料</string>
@@ -52,7 +52,6 @@
     <string name="suggestions">推薦</string>
     <string name="switch_servers">切換伺服器</string>
     <string name="switch_user">切換</string>
-    <string name="trailer">預告片</string>
     <plurals name="trailers">
         <item quantity="other">預告片</item>
     </plurals>
@@ -189,7 +188,7 @@
     <string name="mark_watched">標記為已觀看</string>
     <string name="max_bitrate">最大位元率</string>
     <string name="outro">片尾</string>
-    <string name="people">演職人員</string>
+    <string name="people_title">演職人員</string>
     <string name="play_from_here">從此處播放</string>
     <string name="playback_debug_info">顯示播放偵錯資訊</string>
     <string name="playback">播放</string>
@@ -202,7 +201,7 @@
     <string name="studios">製作公司</string>
     <string name="top_unwatched">高評分未觀看</string>
     <string name="tv_dvr_schedule">錄影排程</string>
-    <string name="tv_shows">電視劇</string>
+    <string name="tv_shows_title">電視劇</string>
     <string name="ui_interface">介面</string>
     <string name="years_old">%1$d 歲</string>
     <string name="play_with_transcoding">轉碼播放</string>
@@ -243,7 +242,7 @@
     <plurals name="scenes">
         <item quantity="other">精選片段</item>
     </plurals>
-    <string name="extras">特別收錄</string>
+    <string name="extras_title">特別收錄</string>
     <plurals name="samples">
         <item quantity="other">試看片段</item>
     </plurals>
@@ -480,7 +479,7 @@
     <string name="background_style_boxed">長方底框</string>
     <string name="prefer_mpv">優先使用 MPV</string>
     <string name="player_backend_options_subtitles_prefer_mpv">僅 HDR 使用 ExoPlayer 播放</string>
-    <string name="favorite_items">我的最愛的 %s</string>
+    <string name="favorite_items_title">我的最愛的 %s</string>
     <string name="display_preset_default">Wholphin 預設樣式</string>
     <string name="display_preset_compact">Wholphin 緊湊樣式</string>
     <string name="display_preset_series_thumb">劇集縮圖樣式</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd511f29..b060bf82 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,7 +66,7 @@
     <string name="max_bitrate">Max bitrate</string>
     <string name="more_like_this">More like this</string>
     <string name="more">More</string>
-    <string name="movies">Movies</string>
+    <string name="movies_title">Movies</string>
     <string name="name">Name</string>
     <string name="next_up">Next Up</string>
     <string name="no_data">No data</string>
@@ -78,7 +78,7 @@
     <string name="only_forced_subtitles">Only Forced Subtitles</string>
     <string name="outro">Outro</string>
     <string name="path">Path</string>
-    <string name="people">People</string>
+    <string name="people_title">People</string>
     <string name="play_count">Play Count</string>
     <string name="play_from_here">Play from here</string>
     <string name="play">Play</string>
@@ -145,13 +145,12 @@
     <string name="switch_servers">Switch servers</string>
     <string name="switch_user">Switch</string>
     <string name="top_unwatched">Top Rated Unwatched</string>
-    <string name="trailer">Trailer</string>
     <string name="trailers">Trailers</string>
     <string name="tv_dvr_schedule">DVR Schedule</string>
     <string name="tv_guide">Guide</string>
     <string name="tv_season">Season</string>
     <string name="tv_seasons">Seasons</string>
-    <string name="tv_shows">TV Shows</string>
+    <string name="tv_shows_title">TV Shows</string>
     <string name="ui_interface">Interface</string>
     <string name="unknown">Unknown</string>
     <string name="updates">Updates</string>
@@ -176,19 +175,19 @@
     <string name="official_rating">Parental Rating</string>
     <string name="runtime_sort">Runtime</string>
 
-    <string name="extras">Extras</string>
-    <string name="other_extras">Other</string>
-    <string name="behind_the_scenes">Behind the Scenes</string>
-    <string name="theme_songs">Theme Songs</string>
-    <string name="theme_videos">Theme Videos</string>
-    <string name="clips">Clips</string>
-    <string name="deleted_scenes">Deleted Scenes</string>
-    <string name="interviews">Interviews</string>
-    <string name="scenes">Scenes</string>
-    <string name="samples">Samples</string>
-    <string name="featurettes">Featurettes</string>
-    <string name="shorts">Shorts</string>
-    <string name="favorite_items">Favorite %s</string>
+    <string name="extras_title">Extras</string>
+    <string name="other_extras_title">Other</string>
+    <string name="behind_the_scenes_title">Behind the Scenes</string>
+    <string name="theme_songs_title">Theme Songs</string>
+    <string name="theme_videos_title">Theme Videos</string>
+    <string name="clips_title">Clips</string>
+    <string name="deleted_scenes_title">Deleted Scenes</string>
+    <string name="interviews_title">Interviews</string>
+    <string name="scenes_title">Scenes</string>
+    <string name="samples_title">Samples</string>
+    <string name="featurettes_title">Featurettes</string>
+    <string name="shorts_title">Shorts</string>
+    <string name="favorite_items_title">Favorite %s</string>
 
     <plurals name="trailers">
         <item quantity="zero">Trailers</item>
@@ -732,8 +731,8 @@
     </string-array>
 
     <string-array name="screensaver_item_types">
-        <item>@string/movies</item>
-        <item>@string/tv_shows</item>
+        <item>@string/movies_title</item>
+        <item>@string/tv_shows_title</item>
         <item>@string/photos</item>
     </string-array>