From 9813bc95444466b723608aab2b4ae72e0111f7df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Dec 2022 22:46:31 +0900
Subject: [PATCH] Reword disclaimer and fix translation keys

---
 osu.Game/Localisation/BeatmapOverlayStrings.cs        | 11 +++++------
 .../BeatmapListing/BeatmapSearchGeneralFilterRow.cs   |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Localisation/BeatmapOverlayStrings.cs b/osu.Game/Localisation/BeatmapOverlayStrings.cs
index b2625dc0e6..fc818f7596 100644
--- a/osu.Game/Localisation/BeatmapOverlayStrings.cs
+++ b/osu.Game/Localisation/BeatmapOverlayStrings.cs
@@ -12,22 +12,21 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "User content disclaimer"
         /// </summary>
-        public static LocalisableString UserContentDisclaimer => new TranslatableString(getKey(@"user_content_disclaimer"), @"User content disclaimer");
+        public static LocalisableString UserContentDisclaimerHeader => new TranslatableString(getKey(@"user_content_disclaimer"), @"User content disclaimer");
 
         /// <summary>
         /// "By turning off the &quot;Featured Artist&quot; filter, all user-uploaded content will be displayed.
         ///
-        /// This includes content which may not be correctly licensed for use and as such may not be safe for streaming, sharing, or consumption."
+        /// This includes content that may not be correctly licensed for osu! usage. Browse at your own risk."
         /// </summary>
-        public static LocalisableString ByTurningOffTheFeatured => new TranslatableString(getKey(@"by_turning_off_the_featured"),
-            @"By turning off the ""Featured Artist"" filter, all user-uploaded content will be displayed.
+        public static LocalisableString UserContentDisclaimerDescription => new TranslatableString(getKey(@"by_turning_off_the_featured"), @"By turning off the ""Featured Artist"" filter, all user-uploaded content will be displayed.
 
-This includes content which may not be correctly licensed for use and as such may not be safe for streaming, sharing, or consumption.");
+This includes content that may not be correctly licensed for osu! usage. Browse at your own risk.");
 
         /// <summary>
         /// "I understand"
         /// </summary>
-        public static LocalisableString Understood => new TranslatableString(getKey(@"understood"), @"I understand");
+        public static LocalisableString UserContentConfirmButtonText => new TranslatableString(getKey(@"understood"), @"I understand");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs
index 41a78473e5..a4a914db55 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchGeneralFilterRow.cs
@@ -87,8 +87,8 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         public FeaturedArtistConfirmDialog(Action confirm)
         {
-            HeaderText = BeatmapOverlayStrings.UserContentDisclaimer;
-            BodyText = BeatmapOverlayStrings.ByTurningOffTheFeatured;
+            HeaderText = BeatmapOverlayStrings.UserContentDisclaimerHeader;
+            BodyText = BeatmapOverlayStrings.UserContentDisclaimerDescription;
 
             Icon = FontAwesome.Solid.ExclamationTriangle;
 
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
                 new PopupDialogDangerousButton
                 {
-                    Text = BeatmapOverlayStrings.Understood,
+                    Text = BeatmapOverlayStrings.UserContentConfirmButtonText,
                     Action = confirm
                 },
                 new PopupDialogCancelButton