diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw index bf0e85ee8..c6126240d 100644 --- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw @@ -496,7 +496,7 @@ A description for what the "acrylic opacity" setting does. Presented near "Profile_AcrylicOpacity.Header". - Background Opacity + Background opacity Header for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque. @@ -1227,7 +1227,7 @@ Header for a control to how text is formatted - Intense Text Style + Intense text style Header for a control to select how "intense" text is formatted (bold, bright, both or none) diff --git a/src/cascadia/TerminalSettingsModel/JsonUtils.h b/src/cascadia/TerminalSettingsModel/JsonUtils.h index cc72ce143..cea006b2b 100644 --- a/src/cascadia/TerminalSettingsModel/JsonUtils.h +++ b/src/cascadia/TerminalSettingsModel/JsonUtils.h @@ -101,7 +101,7 @@ namespace Microsoft::Terminal::Settings::Model::JsonUtils { public: DeserializationError(const Json::Value& value) : - runtime_error(std::string("failed to deserialize ") + (value.isNull() ? "" : value.asCString())), + runtime_error(std::string("failed to deserialize ") + (value.isNull() ? "" : value.asString())), jsonValue{ value } {} void SetKey(std::string_view newKey) diff --git a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw index 5538d5d22..8bbbbfb7f 100644 --- a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw @@ -433,7 +433,7 @@ Break into the debugger - Open Settings... + Open settings... Rename window to "{0}" @@ -456,15 +456,15 @@ {0} will be replaced with a user-specified number - Clear Buffer + Clear buffer A command to clear the entirety of the Terminal output buffer - Clear Viewport + Clear viewport A command to clear the active viewport of the Terminal - Clear Scrollback + Clear scrollback A command to clear the part of the buffer above the viewport