procyberian/WSL
2
0
Fork 0
mirror of https://github.com/microsoft/WSL.git synced 2025-07-03 07:23:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Spelling localizations (#12957)

Browse source
This commit is contained in:
Josh Soref 2025-05-21 13:48:14 -04:00 • committed by GitHub
parent be5b31305f
commit 83d14de518
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
localization/strings/en-US/Resources.resw
View file

@ -181,7 +181,7 @@ Install using 'wsl.exe {} <Distro>'.
<data name="MessageExportFailed" xml:space="preserve"> <data name="MessageExportFailed" xml:space="preserve">
<value>Exporting the distribution failed.</value> <value>Exporting the distribution failed.</value>
</data> </data>
<data name="MessageFsUpdgadeNeeded" xml:space="preserve"> <data name="MessageFsUpgradeNeeded" xml:space="preserve">
<value>Performing one-time upgrade of the Windows Subsystem for Linux file system for this distribution...</value> <value>Performing one-time upgrade of the Windows Subsystem for Linux file system for this distribution...</value>
</data> </data>
<data name="MessageHigherIntegrity" xml:space="preserve"> <data name="MessageHigherIntegrity" xml:space="preserve">
@ -813,7 +813,7 @@ For information please visit https://aka.ms/wslinstall</value>
<value>Legacy distribution registrations do not support the --version argument.</value> <value>Legacy distribution registrations do not support the --version argument.</value>
<comment>{Locked="--version "}Command line arguments, file names and string inserts should not be translated</comment> <comment>{Locked="--version "}Command line arguments, file names and string inserts should not be translated</comment>
</data> </data>
<data name="MessageDistributionOverriden" xml:space="preserve"> <data name="MessageDistributionOverridden" xml:space="preserve">
<value>The distribution "{}" is provided by an override manifest.</value> <value>The distribution "{}" is provided by an override manifest.</value>
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment> <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
</data> </data>
@ -923,7 +923,7 @@ Falling back to NAT networking.</value>
<value>The plugin '{}' requires a newer version of WSL. Please run: wsl.exe --update</value> <value>The plugin '{}' requires a newer version of WSL. Please run: wsl.exe --update</value>
<comment>{FixedPlaceholder="{}"}{Locked="--update"}Command line arguments, file names and string inserts should not be translated</comment> <comment>{FixedPlaceholder="{}"}{Locked="--update"}Command line arguments, file names and string inserts should not be translated</comment>
</data> </data>
<data name="MessageSettingOverridenByPolicy" xml:space="preserve"> <data name="MessageSettingOverriddenByPolicy" xml:space="preserve">
<value>The .wslconfig setting '{}' is disabled by the computer policy.</value> <value>The .wslconfig setting '{}' is disabled by the computer policy.</value>
<comment>{FixedPlaceholder="{}"}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated</comment> <comment>{FixedPlaceholder="{}"}{Locked=".wslconfig"}Command line arguments, file names and string inserts should not be translated</comment>
</data> </data>
@ -1212,7 +1212,7 @@ See recovery instructions on: https://aka.ms/wsldiskmountrecovery</value>
</data> </data>
<data name="Settings_CustomSystemDistroPathDescription.Text" xml:space="preserve"> <data name="Settings_CustomSystemDistroPathDescription.Text" xml:space="preserve">
<value>Specify a path to a VHD which will load as a custom system distro, primarily used to power GUI apps in WSL. [Learn more about system distros here].</value> <value>Specify a path to a VHD which will load as a custom system distro, primarily used to power GUI apps in WSL. [Learn more about system distros here].</value>
<comment>{Locked="["}{Locked="]"}The text in between the delimiters [ ] is made into an hyperlink in code, and the delimiters are removed</comment> <comment>{Locked="["}{Locked="]"}The text in between the delimiters [ ] is made into a hyperlink in code, and the delimiters are removed</comment>
</data> </data>
<data name="Settings_CustomSystemDistroPathDescription.NavigateUri" xml:space="preserve"> <data name="Settings_CustomSystemDistroPathDescription.NavigateUri" xml:space="preserve">
<value>https://aka.ms/wslgsystemdistro</value> <value>https://aka.ms/wslgsystemdistro</value>

2
src/windows/common/Distribution.cpp
View file

@ -247,7 +247,7 @@ std::variant<Distribution, ModernDistributionVersion> wsl::windows::common::dist
auto distribution = LookupDistributionInManifest(manifest.OverrideManifest.value(), name, legacy); auto distribution = LookupDistributionInManifest(manifest.OverrideManifest.value(), name, legacy);
if (distribution.has_value()) if (distribution.has_value())
{ {
EMIT_USER_WARNING(wsl::shared::Localization::MessageDistributionOverriden(name)); EMIT_USER_WARNING(wsl::shared::Localization::MessageDistributionOverridden(name));
return distribution.value(); return distribution.value();
} }
} }

2
src/windows/common/WslClient.cpp
View file

@ -695,7 +695,7 @@ int LaunchProcess(_In_opt_ LPCWSTR filename, _In_ int argc, _In_reads_(argc) LPC
{ {
if (result == WSL_E_FS_UPGRADE_NEEDED) if (result == WSL_E_FS_UPGRADE_NEEDED)
{ {
wsl::windows::common::wslutil::PrintMessage(wsl::shared::Localization::MessageFsUpdgadeNeeded(), stderr); wsl::windows::common::wslutil::PrintMessage(wsl::shared::Localization::MessageFsUpgradeNeeded(), stderr);
} }
else else
{ {

6
src/windows/common/WslCoreConfig.cpp
View file

@ -329,7 +329,7 @@ void wsl::core::Config::Initialize(_In_opt_ HANDLE UserToken)
if (value != std::remove_reference_t<decltype(value)>{} && !wsl::windows::policies::IsFeatureAllowed(key.get(), ValueName)) if (value != std::remove_reference_t<decltype(value)>{} && !wsl::windows::policies::IsFeatureAllowed(key.get(), ValueName))
{ {
value = std::remove_reference_t<decltype(value)>{}; value = std::remove_reference_t<decltype(value)>{};
EMIT_USER_WARNING(wsl::shared::Localization::MessageSettingOverridenByPolicy(SettingName)); EMIT_USER_WARNING(wsl::shared::Localization::MessageSettingOverriddenByPolicy(SettingName));
} }
}; };
@ -376,7 +376,7 @@ void wsl::core::Config::Initialize(_In_opt_ HANDLE UserToken)
(NetworkingMode != wsl::core::NetworkingMode::None) && (NetworkingMode != defaultNetworkingMode)) (NetworkingMode != wsl::core::NetworkingMode::None) && (NetworkingMode != defaultNetworkingMode))
{ {
NetworkingMode = defaultNetworkingMode; NetworkingMode = defaultNetworkingMode;
EMIT_USER_WARNING(wsl::shared::Localization::MessageSettingOverridenByPolicy(L"wsl2.networkingMode")); EMIT_USER_WARNING(wsl::shared::Localization::MessageSettingOverriddenByPolicy(L"wsl2.networkingMode"));
} }
} }
else else
@ -391,7 +391,7 @@ void wsl::core::Config::Initialize(_In_opt_ HANDLE UserToken)
!wsl::windows::policies::IsFeatureAllowed(key.get(), wsl::windows::policies::c_allowCustomFirewallUserSetting)) !wsl::windows::policies::IsFeatureAllowed(key.get(), wsl::windows::policies::c_allowCustomFirewallUserSetting))
{ {
FirewallConfig.Enable(); FirewallConfig.Enable();
EMIT_USER_WARNING(wsl::shared::Localization::MessageSettingOverridenByPolicy(L"wsl2.firewall")); EMIT_USER_WARNING(wsl::shared::Localization::MessageSettingOverriddenByPolicy(L"wsl2.firewall"));
} }
} }

4
test/windows/PolicyTests.cpp
View file

@ -201,9 +201,9 @@ class PolicyTest
WslShutdown(); WslShutdown();
const auto kernelWarning = const auto kernelWarning =
std::format(L"wsl: {}\r\n", wsl::shared::Localization::MessageSettingOverridenByPolicy(L"wsl2.kernel")); std::format(L"wsl: {}\r\n", wsl::shared::Localization::MessageSettingOverriddenByPolicy(L"wsl2.kernel"));
const auto modulesWarning = const auto modulesWarning =
std::format(L"wsl: {}\r\n", wsl::shared::Localization::MessageSettingOverridenByPolicy(L"wsl2.kernelModules")); std::format(L"wsl: {}\r\n", wsl::shared::Localization::MessageSettingOverriddenByPolicy(L"wsl2.kernelModules"));
ValidateWarnings(std::format(L"{}{}", kernelWarning, modulesWarning)); ValidateWarnings(std::format(L"{}{}", kernelWarning, modulesWarning));