diff --git a/osu.Game/Localisation/BarHitErrorMeterStrings.cs b/osu.Game/Localisation/HUD/BarHitErrorMeterStrings.cs similarity index 98% rename from osu.Game/Localisation/BarHitErrorMeterStrings.cs rename to osu.Game/Localisation/HUD/BarHitErrorMeterStrings.cs index 171c3e223e..2f77a287a0 100644 --- a/osu.Game/Localisation/BarHitErrorMeterStrings.cs +++ b/osu.Game/Localisation/HUD/BarHitErrorMeterStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.HUD { public static class BarHitErrorMeterStrings { - private const string prefix = @"osu.Game.Resources.Localisation.BarHitErrorMeter"; + private const string prefix = @"osu.Game.Resources.Localisation.HUD.BarHitErrorMeter"; /// /// "Judgement line thickness" diff --git a/osu.Game/Localisation/ColourHitErrorMeterStrings.cs b/osu.Game/Localisation/HUD/ColourHitErrorMeterStrings.cs similarity index 97% rename from osu.Game/Localisation/ColourHitErrorMeterStrings.cs rename to osu.Game/Localisation/HUD/ColourHitErrorMeterStrings.cs index 13682c9c85..8fdcb34a49 100644 --- a/osu.Game/Localisation/ColourHitErrorMeterStrings.cs +++ b/osu.Game/Localisation/HUD/ColourHitErrorMeterStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.HUD { public static class ColourHitErrorMeterStrings { - private const string prefix = @"osu.Game.Resources.Localisation.ColourHitError"; + private const string prefix = @"osu.Game.Resources.Localisation.HUD.ColourHitError"; /// /// "Judgement count" diff --git a/osu.Game/Localisation/GameplayAccuracyCounterStrings.cs b/osu.Game/Localisation/HUD/GameplayAccuracyCounterStrings.cs similarity index 95% rename from osu.Game/Localisation/GameplayAccuracyCounterStrings.cs rename to osu.Game/Localisation/HUD/GameplayAccuracyCounterStrings.cs index c9e936d8af..ec7f4a1af3 100644 --- a/osu.Game/Localisation/GameplayAccuracyCounterStrings.cs +++ b/osu.Game/Localisation/HUD/GameplayAccuracyCounterStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.HUD { public static class GameplayAccuracyCounterStrings { - private const string prefix = @"osu.Game.Resources.Localisation.GameplayAccuracyCounter"; + private const string prefix = @"osu.Game.Resources.Localisation.HUD.GameplayAccuracyCounter"; /// /// "Accuracy display mode" diff --git a/osu.Game/Localisation/JudgementCounterDisplayStrings.cs b/osu.Game/Localisation/HUD/JudgementCounterDisplayStrings.cs similarity index 96% rename from osu.Game/Localisation/JudgementCounterDisplayStrings.cs rename to osu.Game/Localisation/HUD/JudgementCounterDisplayStrings.cs index aeba06b2e7..b1c756e48e 100644 --- a/osu.Game/Localisation/JudgementCounterDisplayStrings.cs +++ b/osu.Game/Localisation/HUD/JudgementCounterDisplayStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.HUD { public static class JudgementCounterDisplayStrings { - private const string prefix = @"osu.Game.Resources.Localisation.JudgementCounterDisplay"; + private const string prefix = @"osu.Game.Resources.Localisation.HUD.JudgementCounterDisplay"; /// /// "Display mode" diff --git a/osu.Game/Localisation/SongProgressStrings.cs b/osu.Game/Localisation/HUD/SongProgressStrings.cs similarity index 93% rename from osu.Game/Localisation/SongProgressStrings.cs rename to osu.Game/Localisation/HUD/SongProgressStrings.cs index 033560ebb0..4c621e8e8c 100644 --- a/osu.Game/Localisation/SongProgressStrings.cs +++ b/osu.Game/Localisation/HUD/SongProgressStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.HUD { public static class SongProgressStrings { - private const string prefix = @"osu.Game.Resources.Localisation.SongProgress"; + private const string prefix = @"osu.Game.Resources.Localisation.HUD.SongProgress"; /// /// "Show difficulty graph" diff --git a/osu.Game/Localisation/BeatmapAttributeTextStrings.cs b/osu.Game/Localisation/SkinComponents/BeatmapAttributeTextStrings.cs similarity index 93% rename from osu.Game/Localisation/BeatmapAttributeTextStrings.cs rename to osu.Game/Localisation/SkinComponents/BeatmapAttributeTextStrings.cs index 1ceb482cf4..b2e2285faf 100644 --- a/osu.Game/Localisation/BeatmapAttributeTextStrings.cs +++ b/osu.Game/Localisation/SkinComponents/BeatmapAttributeTextStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.SkinComponents { public static class BeatmapAttributeTextStrings { - private const string prefix = @"osu.Game.Resources.Localisation.BeatmapAttributeText"; + private const string prefix = @"osu.Game.Resources.Localisation.SkinComponents.BeatmapAttributeText"; /// /// "Attribute" diff --git a/osu.Game/Localisation/FontAdjustableSkinComponentStrings.cs b/osu.Game/Localisation/SkinComponents/FontAdjustableSkinComponentStrings.cs similarity index 88% rename from osu.Game/Localisation/FontAdjustableSkinComponentStrings.cs rename to osu.Game/Localisation/SkinComponents/FontAdjustableSkinComponentStrings.cs index 76f9f2f8b9..8bcc45998a 100644 --- a/osu.Game/Localisation/FontAdjustableSkinComponentStrings.cs +++ b/osu.Game/Localisation/SkinComponents/FontAdjustableSkinComponentStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.SkinComponents { public static class FontAdjustableSkinComponentStrings { - private const string prefix = @"osu.Game.Resources.Localisation.FontAdjustableSkinComponent"; + private const string prefix = @"osu.Game.Resources.Localisation.SkinComponents.FontAdjustableSkinComponent"; /// /// "Font" diff --git a/osu.Game/Localisation/SkinnableSpriteStrings.cs b/osu.Game/Localisation/SkinComponents/SkinnableSpriteStrings.cs similarity index 90% rename from osu.Game/Localisation/SkinnableSpriteStrings.cs rename to osu.Game/Localisation/SkinComponents/SkinnableSpriteStrings.cs index 6192f5e43d..f039c9044f 100644 --- a/osu.Game/Localisation/SkinnableSpriteStrings.cs +++ b/osu.Game/Localisation/SkinComponents/SkinnableSpriteStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.SkinComponents { public static class SkinnableSpriteStrings { - private const string prefix = @"osu.Game.Resources.Localisation.SkinnableSprite"; + private const string prefix = @"osu.Game.Resources.Localisation.SkinComponents.SkinnableSprite"; /// /// "Sprite name" diff --git a/osu.Game/Localisation/TextElementStrings.cs b/osu.Game/Localisation/SkinComponents/TextElementStrings.cs similarity index 90% rename from osu.Game/Localisation/TextElementStrings.cs rename to osu.Game/Localisation/SkinComponents/TextElementStrings.cs index 6257b80d72..6417c1d923 100644 --- a/osu.Game/Localisation/TextElementStrings.cs +++ b/osu.Game/Localisation/SkinComponents/TextElementStrings.cs @@ -3,11 +3,11 @@ using osu.Framework.Localisation; -namespace osu.Game.Localisation +namespace osu.Game.Localisation.SkinComponents { public static class TextElementStrings { - private const string prefix = @"osu.Game.Resources.Localisation.TextElement"; + private const string prefix = @"osu.Game.Resources.Localisation.SkinComponents.TextElement"; /// /// "Text" diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs index 6c5ba52f27..9dce8996c3 100644 --- a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs +++ b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs @@ -8,7 +8,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Configuration; using osu.Game.Graphics; -using osu.Game.Localisation; +using osu.Game.Localisation.HUD; using osu.Game.Rulesets.Objects; namespace osu.Game.Screens.Play.HUD diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs index fccefd49a4..6eed563703 100644 --- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs +++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs @@ -7,7 +7,7 @@ using osu.Framework.Bindables; using osu.Framework.Graphics; using osu.Game.Configuration; using osu.Game.Graphics; -using osu.Game.Localisation; +using osu.Game.Localisation.HUD; using osu.Game.Rulesets.Objects; using osuTK; diff --git a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs index 3a7c97632d..9da032e489 100644 --- a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs +++ b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs @@ -6,7 +6,7 @@ using osu.Framework.Bindables; using osu.Framework.Localisation; using osu.Game.Configuration; using osu.Game.Graphics.UserInterface; -using osu.Game.Localisation; +using osu.Game.Localisation.HUD; using osu.Game.Rulesets.Scoring; namespace osu.Game.Screens.Play.HUD diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs index f380165a66..eb5221aa45 100644 --- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs +++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs @@ -17,7 +17,7 @@ using osu.Game.Configuration; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; -using osu.Game.Localisation; +using osu.Game.Localisation.HUD; using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Scoring; using osuTK; diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs index ac49e9ca5e..5793713fca 100644 --- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs +++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs @@ -11,7 +11,7 @@ using osu.Framework.Graphics.Pooling; using osu.Framework.Graphics.Shapes; using osu.Framework.Localisation; using osu.Game.Configuration; -using osu.Game.Localisation; +using osu.Game.Localisation.HUD; using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Scoring; using osuTK; diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs index 31b0b9ebc5..80d2e0863f 100644 --- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs +++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs @@ -8,7 +8,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Localisation; using osu.Game.Configuration; -using osu.Game.Localisation; +using osu.Game.Localisation.HUD; using osu.Game.Rulesets.Scoring; using osu.Game.Skinning; using osuTK; diff --git a/osu.Game/Skinning/Components/BeatmapAttributeText.cs b/osu.Game/Skinning/Components/BeatmapAttributeText.cs index e8b2d547a9..2c16a67cac 100644 --- a/osu.Game/Skinning/Components/BeatmapAttributeText.cs +++ b/osu.Game/Skinning/Components/BeatmapAttributeText.cs @@ -18,6 +18,7 @@ using osu.Game.Configuration; using osu.Game.Extensions; using osu.Game.Graphics.Sprites; using osu.Game.Localisation; +using osu.Game.Localisation.SkinComponents; using osu.Game.Resources.Localisation.Web; namespace osu.Game.Skinning.Components diff --git a/osu.Game/Skinning/Components/TextElement.cs b/osu.Game/Skinning/Components/TextElement.cs index c160f3f9d0..1e0a0d0ad1 100644 --- a/osu.Game/Skinning/Components/TextElement.cs +++ b/osu.Game/Skinning/Components/TextElement.cs @@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites; using osu.Game.Configuration; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; -using osu.Game.Localisation; +using osu.Game.Localisation.SkinComponents; namespace osu.Game.Skinning.Components { diff --git a/osu.Game/Skinning/FontAdjustableSkinComponent.cs b/osu.Game/Skinning/FontAdjustableSkinComponent.cs index 9c28621d48..11d3e36d9e 100644 --- a/osu.Game/Skinning/FontAdjustableSkinComponent.cs +++ b/osu.Game/Skinning/FontAdjustableSkinComponent.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Game.Configuration; using osu.Game.Graphics; -using osu.Game.Localisation; +using osu.Game.Localisation.SkinComponents; namespace osu.Game.Skinning { diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs index 3deb264bc8..31391755a3 100644 --- a/osu.Game/Skinning/SkinnableSprite.cs +++ b/osu.Game/Skinning/SkinnableSprite.cs @@ -12,7 +12,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Game.Configuration; using osu.Game.Graphics.Sprites; -using osu.Game.Localisation; +using osu.Game.Localisation.SkinComponents; using osu.Game.Overlays.Settings; using osuTK;