From b7b836e941a87a44a149775dc33c23a4f001055c Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Thu, 31 Jul 2025 23:10:47 +0200
Subject: [PATCH] Update the names of YT kiosks

---
 .../java/org/schabi/newpipe/util/KioskTranslator.java     | 8 ++++----
 .../main/java/org/schabi/newpipe/util/Localization.java   | 3 ++-
 app/src/main/res/values/strings.xml                       | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index 69cf17639..5aa332159 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -53,13 +53,13 @@ public final class KioskTranslator {
             case "Radio":
                 return c.getString(R.string.radio);
             case "trending_gaming":
-                return c.getString(R.string.gaming);
+                return c.getString(R.string.trending_gaming);
             case "trending_music":
-                return c.getString(R.string.music);
+                return c.getString(R.string.trending_music);
             case "trending_movies_and_shows":
-                return c.getString(R.string.movies);
+                return c.getString(R.string.trending_movies);
             case "trending_podcasts_episodes":
-                return c.getString(R.string.podcasts);
+                return c.getString(R.string.trending_podcasts);
             default:
                 return kioskId;
         }
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index bd5463088..1073afffd 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -388,9 +388,10 @@ public final class Localization {
      *         {@code parsed != null} and the relevant setting is enabled, {@code textual} will
      *         be appended to the returned string for debugging purposes.
      */
+    @Nullable
     public static String relativeTimeOrTextual(@Nullable final Context context,
                                                @Nullable final DateWrapper parsed,
-                                               final String textual) {
+                                               @Nullable final String textual) {
         if (parsed == null) {
             return textual;
         } else if (DEBUG && context != null && PreferenceManager
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c78845472..57f78c221 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -868,8 +868,8 @@
     <string name="migration_info_6_7_message">SoundCloud has discontinued the original Top 50 charts. The corresponding tab has been removed from your main page.</string>
     <string name="migration_info_7_8_title">YouTube combined trending removed</string>
     <string name="migration_info_7_8_message">YouTube has discontinued the combined trending page as of 21st July 2025. NewPipe replaced the default trending page with the trending livestreams.\n\nYou can also select different trending pages in \"Settings > Content > Content of main page\".</string>
-    <string name="gaming">Gaming</string>
-    <string name="music">Music</string>
-    <string name="movies">Movies</string>
-    <string name="podcasts">Podcasts</string>
+    <string name="trending_gaming">Gaming trends</string>
+    <string name="trending_podcasts">Trending podcasts</string>
+    <string name="trending_movies">Trending movies and shows</string>
+    <string name="trending_music">Trending music</string>
 </resources>