diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index ad208a2f55..361c313080 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -545,10 +545,10 @@
Always run as administrator
-
+
Running as user
-
+
Running as adminstrator
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
index 25d0e9f490..9d3e7219d9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
@@ -27,7 +27,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; }
- private ResourceLoader loader = ResourceLoader.GetForCurrentView();
+ private ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
+
+ public readonly string RunningAsUserDefaultText;
+ public readonly string RunningAsAdminDefaultText;
public GeneralViewModel()
{
@@ -97,6 +100,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_autoDownloadUpdates = GeneralSettingsConfigs.AutoDownloadUpdates;
_isElevated = ShellPage.IsElevated;
_runElevated = GeneralSettingsConfigs.RunElevated;
+
+ RunningAsUserDefaultText = loader.GetString("GeneralSettings_RunningAsUserText");
+ RunningAsAdminDefaultText = loader.GetString("GeneralSettings_RunningAsAdminText");
+
_isAdmin = ShellPage.IsUserAnAdmin;
}
@@ -147,17 +154,17 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
}
}
- public string RunningAsAdminText
+ public string RunningAsText
{
get
{
if (!IsElevated)
{
- return loader.GetString("GeneralSettings_Running as Adminstrator_IsNotElevated");
+ return RunningAsUserDefaultText;
}
else
{
- return loader.GetString("GeneralSettings_RunningAsAdminText_IsElevated");
+ return RunningAsAdminDefaultText;
}
}
@@ -182,7 +189,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_isElevated = value;
OnPropertyChanged("IsElevated");
OnPropertyChanged("IsAdminButtonEnabled");
- //OnPropertyChanged("AlwaysRunAsAdminText");
OnPropertyChanged("RunningAsAdminText");
}
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index a5d14b4a4b..e831d074b1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -54,8 +54,8 @@
x:Name="GeneralSettingsView">
-
-