Merge branch 'master' into move-difficulty-graph-toggle

osu.Game/Localisation/CommonStrings.cs

@@ -10,14 +10,19 @@ namespace osu.Game.Localisation
         private const string prefix = @"osu.Game.Resources.Localisation.Common";
 
         /// <summary>
-        /// "Cancel"
+        /// "Back"
         /// </summary>
-        public static LocalisableString Cancel => new TranslatableString(getKey(@"cancel"), @"Cancel");
+        public static LocalisableString Back => new TranslatableString(getKey(@"back"), @"Back");
 
         /// <summary>
-        /// "Clear"
+        /// "Next"
         /// </summary>
-        public static LocalisableString Clear => new TranslatableString(getKey(@"clear"), @"Clear");
+        public static LocalisableString Next => new TranslatableString(getKey(@"next"), @"Next");
+
+        /// <summary>
+        /// "Finish"
+        /// </summary>
+        public static LocalisableString Finish => new TranslatableString(getKey(@"finish"), @"Finish");
 
         /// <summary>
         /// "Enabled"

osu.Game/Localisation/DebugLocalisationStore.cs

@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public class DebugLocalisationStore : ILocalisationStore
+    {
+        public string Get(string lookup) => $@"[[{lookup.Substring(lookup.LastIndexOf('.') + 1)}]]";
+
+        public Task<string> GetAsync(string lookup, CancellationToken cancellationToken = default) => Task.FromResult(Get(lookup));
+
+        public Stream GetStream(string name) => throw new NotImplementedException();
+
+        public IEnumerable<string> GetAvailableResources() => throw new NotImplementedException();
+
+        public CultureInfo EffectiveCulture { get; } = CultureInfo.CurrentCulture;
+
+        public void Dispose()
+        {
+        }
+    }
+}

osu.Game/Localisation/FirstRunSetupOverlayStrings.cs

@@ -0,0 +1,53 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class FirstRunSetupOverlayStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.FirstRunSetupOverlay";
+
+        /// <summary>
+        /// "Get started"
+        /// </summary>
+        public static LocalisableString GetStarted => new TranslatableString(getKey(@"get_started"), @"Get started");
+
+        /// <summary>
+        /// "Click to resume first-run setup at any point"
+        /// </summary>
+        public static LocalisableString ClickToResumeFirstRunSetupAtAnyPoint => new TranslatableString(getKey(@"click_to_resume_first_run_setup_at_any_point"), @"Click to resume first-run setup at any point");
+
+        /// <summary>
+        /// "First-run setup"
+        /// </summary>
+        public static LocalisableString FirstRunSetupTitle => new TranslatableString(getKey(@"first_run_setup_title"), @"First-run setup");
+
+        /// <summary>
+        /// "Set up osu! to suit you"
+        /// </summary>
+        public static LocalisableString FirstRunSetupDescription => new TranslatableString(getKey(@"first_run_setup_description"), @"Set up osu! to suit you");
+
+        /// <summary>
+        /// "Welcome"
+        /// </summary>
+        public static LocalisableString WelcomeTitle => new TranslatableString(getKey(@"welcome_title"), @"Welcome");
+
+        /// <summary>
+        /// "Welcome to the first-run setup guide!
+        ///
+        /// osu! is a very configurable game, and diving straight into the settings can sometimes be overwhelming. This guide will help you get the important choices out of the way to ensure a great first experience!"
+        /// </summary>
+        public static LocalisableString WelcomeDescription => new TranslatableString(getKey(@"welcome_description"), @"Welcome to the first-run setup guide!
+
+osu! is a very configurable game, and diving straight into the settings can sometimes be overwhelming. This guide will help you get the important choices out of the way to ensure a great first experience!");
+
+        /// <summary>
+        /// "The size of the osu! user interface can be adjusted to your liking."
+        /// </summary>
+        public static LocalisableString UIScaleDescription => new TranslatableString(getKey(@"ui_scale_description"), @"The size of the osu! user interface can be adjusted to your liking.");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}

osu.Game/Localisation/GeneralSettingsStrings.cs

@@ -29,6 +29,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString PreferOriginalMetadataLanguage => new TranslatableString(getKey(@"prefer_original"), @"Prefer metadata in original language");
 
+        /// <summary>
+        /// "Prefer 24-hour time display"
+        /// </summary>
+        public static LocalisableString Prefer24HourTimeDisplay => new TranslatableString(getKey(@"prefer_24_hour_time_display"), @"Prefer 24-hour time display");
+
         /// <summary>
         /// "Updates"
         /// </summary>
@@ -54,6 +59,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ChangeFolderLocation => new TranslatableString(getKey(@"change_folder_location"), @"Change folder location...");
 
+        /// <summary>
+        /// "Run setup wizard"
+        /// </summary>
+        public static LocalisableString RunSetupWizard => new TranslatableString(getKey(@"run_setup_wizard"), @"Run setup wizard");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }

osu.Game/Localisation/JoystickSettingsStrings.cs

@@ -0,0 +1,24 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class JoystickSettingsStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.JoystickSettings";
+
+        /// <summary>
+        /// "Joystick / Gamepad"
+        /// </summary>
+        public static LocalisableString JoystickGamepad => new TranslatableString(getKey(@"joystick_gamepad"), @"Joystick / Gamepad");
+
+        /// <summary>
+        /// "Deadzone Threshold"
+        /// </summary>
+        public static LocalisableString DeadzoneThreshold => new TranslatableString(getKey(@"deadzone_threshold"), @"Deadzone");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}

osu.Game/Localisation/Language.cs

@@ -110,6 +110,11 @@ namespace osu.Game.Localisation
         // zh_hk,
 
         [Description(@"繁體中文（台灣）")]
-        zh_tw
+        zh_hant,
+
+#if DEBUG
+        [Description(@"Debug (show raw keys)")]
+        debug
+#endif
     }
 }