From 0875f3adac1c4d11241d5c7e5207eef5e52b4b54 Mon Sep 17 00:00:00 2001
From: 1011025m <37438176+1011025m@users.noreply.github.com>
Date: Sun, 3 Dec 2023 01:22:35 +0800
Subject: [PATCH 1/2] Fix some hardcoded strings
---
Bloxstrap/Resources/Strings.Designer.cs | 24 ++++++++++++++++++-
Bloxstrap/Resources/Strings.resx | 8 +++++++
Bloxstrap/UI/Elements/Menu/MainWindow.xaml | 2 +-
.../UI/ViewModels/Menu/AppearanceViewModel.cs | 4 ++--
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index b5fe355..a5499f5 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -278,7 +278,29 @@ namespace Bloxstrap.Resources {
return ResourceManager.GetString("Bootstrapper.WMFNotFound", resourceCulture);
}
}
-
+
+ ///
+ /// Looks up a localized string similar to Style preview - Click the X button at the top right to close.
+ ///
+ public static string Bootstrapper_StylePreview_ImageCancel
+ {
+ get
+ {
+ return ResourceManager.GetString("Bootstrapper.StylePreview.ImageCancel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Style preview - Click Cancel to close.
+ ///
+ public static string Bootstrapper_StylePreview_TextCancel
+ {
+ get
+ {
+ return ResourceManager.GetString("Bootstrapper.StylePreview.TextCancel", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Browse.
///
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index 18b03f3..313453b 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -192,6 +192,14 @@ Your ReShade configuration files will still be saved, and you can locate them by
Roblox requires the use of Windows Media Foundation components. You appear to be missing them, likely because you are using an N edition of Windows. Please install them first, and then launch Roblox.
+
+ Style preview - Click the X button at the top right to close
+ Text for style previews that use an X button. Currently only applies to Byfron
+
+
+ Style preview - Click Cancel to close
+ Text for style previews that use text button that says "Cancel"
+
Browse
diff --git a/Bloxstrap/UI/Elements/Menu/MainWindow.xaml b/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
index edd7a10..ad73178 100644
--- a/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
+++ b/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
@@ -79,7 +79,7 @@
-
+
diff --git a/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
index 3f160e4..8df58df 100644
--- a/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
@@ -23,9 +23,9 @@ namespace Bloxstrap.UI.ViewModels.Menu
IBootstrapperDialog dialog = App.Settings.Prop.BootstrapperStyle.GetNew();
if (App.Settings.Prop.BootstrapperStyle == BootstrapperStyle.ByfronDialog)
- dialog.Message = "Style preview - Click the X button at the top right to close";
+ dialog.Message = Resources.Strings.Bootstrapper_StylePreview_ImageCancel;
else
- dialog.Message = "Style preview - Click Cancel to close";
+ dialog.Message = Resources.Strings.Bootstrapper_StylePreview_TextCancel;
dialog.CancelEnabled = true;
dialog.ShowBootstrapper();
From ca5525f2ef8bfc4f5b989137cb22ab19b2135e2e Mon Sep 17 00:00:00 2001
From: 1011025m <37438176+1011025m@users.noreply.github.com>
Date: Sun, 3 Dec 2023 01:44:20 +0800
Subject: [PATCH 2/2] Reorder and fix the forgotten
eh, might as well...
---
Bloxstrap/Resources/Strings.Designer.cs | 44 +++++++++++--------------
Bloxstrap/Resources/Strings.resx | 18 +++++-----
2 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index a5499f5..d1ad1f1 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -243,6 +243,24 @@ namespace Bloxstrap.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Style preview - Click the X button at the top right to close.
+ ///
+ public static string Bootstrapper_StylePreview_ImageCancel {
+ get {
+ return ResourceManager.GetString("Bootstrapper.StylePreview.ImageCancel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Style preview - Click Cancel to close.
+ ///
+ public static string Bootstrapper_StylePreview_TextCancel {
+ get {
+ return ResourceManager.GetString("Bootstrapper.StylePreview.TextCancel", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Bloxstrap has successfully installed.
///
@@ -278,29 +296,7 @@ namespace Bloxstrap.Resources {
return ResourceManager.GetString("Bootstrapper.WMFNotFound", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to Style preview - Click the X button at the top right to close.
- ///
- public static string Bootstrapper_StylePreview_ImageCancel
- {
- get
- {
- return ResourceManager.GetString("Bootstrapper.StylePreview.ImageCancel", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Style preview - Click Cancel to close.
- ///
- public static string Bootstrapper_StylePreview_TextCancel
- {
- get
- {
- return ResourceManager.GetString("Bootstrapper.StylePreview.TextCancel", resourceCulture);
- }
- }
-
+
///
/// Looks up a localized string similar to Browse.
///
@@ -1448,7 +1444,7 @@ namespace Bloxstrap.Resources {
}
///
- /// Looks up a localized string similar to Bloxstrap is currently running, likely as a background Roblox process. Please note that not all your changes will immediately apply until you close all currently open Roblox instances.".
+ /// Looks up a localized string similar to Bloxstrap is currently running, likely as a background Roblox process. Please note that not all your changes will immediately apply until you close all currently open Roblox instances..
///
public static string Menu_AlreadyRunning {
get {
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index 313453b..a8f5b58 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -180,6 +180,14 @@ Your ReShade configuration files will still be saved, and you can locate them by
Waiting for other instances...
+
+ Style preview - Click the X button at the top right to close
+ Text for style previews that use an X button. Currently only applies to Byfron
+
+
+ Style preview - Click Cancel to close
+ Text for style previews that use text button that says "Cancel"
+
Bloxstrap has successfully installed
@@ -192,14 +200,6 @@ Your ReShade configuration files will still be saved, and you can locate them by
Roblox requires the use of Windows Media Foundation components. You appear to be missing them, likely because you are using an N edition of Windows. Please install them first, and then launch Roblox.
-
- Style preview - Click the X button at the top right to close
- Text for style previews that use an X button. Currently only applies to Byfron
-
-
- Style preview - Click Cancel to close
- Text for style previews that use text button that says "Cancel"
-
Browse
@@ -585,7 +585,7 @@ Would you like to upgrade your currently installed version?
All files
- Bloxstrap is currently running, likely as a background Roblox process. Please note that not all your changes will immediately apply until you close all currently open Roblox instances."
+ Bloxstrap is currently running, likely as a background Roblox process. Please note that not all your changes will immediately apply until you close all currently open Roblox instances.
You can make it look different, retro, or even just like Roblox.