diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json index 437cc09c861..264ee83f9eb 100644 --- a/doc/cascadia/profiles.schema.json +++ b/doc/cascadia/profiles.schema.json @@ -1709,7 +1709,7 @@ }, "startOnUserLogin": { "default": false, - "description": "When set to true, this enables the launch of Windows Terminal at startup. Setting this to false will disable the startup task entry. If the Windows Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect.", + "description": "When set to true, this enables the launch of Terminal at startup. Setting this to false will disable the startup task entry. If the Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect.", "type": "boolean" }, "firstWindowPreference": { diff --git a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest index 20c75fd5bba..ae79b594e89 100644 --- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest @@ -20,7 +20,7 @@ Version="0.0.1.0" /> - Windows Terminal Dev + ms-resource:TerminalApp/ContextMenu/AppNameDev A Lone Developer Images\StoreLogo.png @@ -38,8 +38,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -47,7 +47,7 @@ Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" - ShortName="ms-resource:AppShortNameDev"> + ShortName="ms-resource:TerminalApp/ContextMenu/AppShortNameDev"> @@ -66,7 +66,7 @@ + DisplayName="ms-resource:TerminalApp/ContextMenu/AppNameDev" /> @@ -87,7 +87,7 @@ diff --git a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest index 3c0dc42e2be..a42af36f8d1 100644 --- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest @@ -21,7 +21,7 @@ Version="0.5.0.0" /> - Windows Terminal Preview + ms-resource:TerminalApp/ContextMenu/AppNamePre Microsoft Corporation Images\StoreLogo.png @@ -39,8 +39,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -48,7 +48,7 @@ Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" - ShortName="ms-resource:AppShortNamePre"> + ShortName="ms-resource:TerminalApp/ContextMenu/AppShortNamePre"> @@ -72,7 +72,7 @@ + DisplayName="ms-resource:TerminalApp/ContextMenu/AppNamePre" /> diff --git a/src/cascadia/CascadiaPackage/Package.appxmanifest b/src/cascadia/CascadiaPackage/Package.appxmanifest index 7b3ad6e4c12..6cfa72fb54e 100644 --- a/src/cascadia/CascadiaPackage/Package.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package.appxmanifest @@ -21,7 +21,7 @@ Version="1.0.0.0" /> - Windows Terminal + ms-resource:TerminalApp/ContextMenu/AppName Microsoft Corporation Images\StoreLogo.png @@ -39,8 +39,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -48,7 +48,7 @@ Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" - ShortName="ms-resource:AppShortName"> + ShortName="ms-resource:TerminalApp/ContextMenu/AppShortName"> @@ -72,7 +72,7 @@ + DisplayName="ms-resource:TerminalApp/ContextMenu/AppName" /> diff --git a/src/cascadia/CascadiaPackage/Resources/Resources.resw b/src/cascadia/CascadiaPackage/Resources/Resources.resw index 94a910fd0e9..07e77609519 100644 --- a/src/cascadia/CascadiaPackage/Resources/Resources.resw +++ b/src/cascadia/CascadiaPackage/Resources/Resources.resw @@ -117,22 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Windows Terminal - - - Windows Terminal Dev - - - Windows Terminal Preview - - - Terminal - - - Terminal Dev - - - Terminal Preview - - \ No newline at end of file + diff --git a/src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw b/src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw index c2d6436947f..07e77609519 100644 --- a/src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw +++ b/src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw @@ -117,13 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - The New Windows Terminal - - - The Windows Terminal, but Unofficial - - - Windows Terminal with a preview of upcoming features - - \ No newline at end of file + diff --git a/src/cascadia/TerminalApp/AppLogic.cpp b/src/cascadia/TerminalApp/AppLogic.cpp index cdf97cfd099..f89de412560 100644 --- a/src/cascadia/TerminalApp/AppLogic.cpp +++ b/src/cascadia/TerminalApp/AppLogic.cpp @@ -1074,18 +1074,18 @@ namespace winrt::TerminalApp::implementation // Method Description: // - Gets the title of the currently focused terminal control. If there - // isn't a control selected for any reason, returns "Windows Terminal" + // isn't a control selected for any reason, returns "Terminal" // Arguments: // - // Return Value: - // - the title of the focused control if there is one, else "Windows Terminal" + // - the title of the focused control if there is one, else "Terminal" hstring AppLogic::Title() { if (_root) { return _root->Title(); } - return { L"Windows Terminal" }; + return { L"Terminal" }; } // Method Description: diff --git a/src/cascadia/TerminalApp/Resources/en-US/ContextMenu.resw b/src/cascadia/TerminalApp/Resources/en-US/ContextMenu.resw index d2f7c335235..cf9897c484b 100644 --- a/src/cascadia/TerminalApp/Resources/en-US/ContextMenu.resw +++ b/src/cascadia/TerminalApp/Resources/en-US/ContextMenu.resw @@ -117,6 +117,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Terminal + + + Terminal Dev + {Locked} The dev build will never be seen in multiple languages + + + Terminal Preview + + + Terminal + + + Terminal Dev + {Locked} The dev build will never be seen in multiple languages + + + Terminal Preview + + + The New Windows Terminal + + + The Windows Terminal, but Unofficial + {Locked} The dev build will never be seen in multiple languages + + + Windows Terminal with a preview of upcoming features + Open in Terminal (Dev) {Locked} The dev build will never be seen in multiple languages diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index 44daf5679d1..7a5d5cb36f9 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -1894,11 +1894,11 @@ namespace winrt::TerminalApp::implementation // Method Description: // - Gets the title of the currently focused terminal control. If there - // isn't a control selected for any reason, returns "Windows Terminal" + // isn't a control selected for any reason, returns "Terminal" // Arguments: // - // Return Value: - // - the title of the focused control if there is one, else "Windows Terminal" + // - the title of the focused control if there is one, else "Terminal" hstring TerminalPage::Title() { if (_settings.GlobalSettings().ShowTitleInTitlebar()) @@ -1916,7 +1916,7 @@ namespace winrt::TerminalApp::implementation CATCH_LOG(); } } - return { L"Windows Terminal" }; + return { L"Terminal" }; } // Method Description: diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw index 25af7bfbe4c..cacbffb70fd 100644 --- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw @@ -384,7 +384,7 @@ Header for a control to toggle whether the terminal's title is shown as the application title, or not. - When disabled, the title bar will be 'Windows Terminal'. + When disabled, the title bar will be 'Terminal'. A description for what the "show title in titlebar" setting does. Presented near "Globals_ShowTitleInTitlebar.Header".{Locked="Windows"} @@ -408,7 +408,7 @@ Header for a control to toggle whether the app should launch when the user's machine starts up, or not. - When enabled, this enables the launch of Windows Terminal at machine startup. + When enabled, this enables the launch of Terminal at machine startup. A description for what the "start on user login" setting does. Presented near "Globals_StartOnUserLogin.Header". @@ -416,7 +416,7 @@ Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled). - Windows Terminal will always be the topmost window on the desktop. + Terminal will always be the topmost window on the desktop. A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header". @@ -848,7 +848,7 @@ A supplementary setting to the "starting directory" setting. "Parent" refers to the parent process of the current process. - If enabled, this profile will spawn in the directory from which Windows Terminal was launched. + If enabled, this profile will spawn in the directory from which Terminal was launched. A description for what the supplementary "use parent process directory" setting does. Presented near "Profile_StartingDirectoryUseParentCheckbox". diff --git a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw index ef1a25c33ec..1f883be9738 100644 --- a/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw @@ -127,7 +127,7 @@ Split Pane... - Windows Terminal (Unpackaged) + Terminal (Unpackaged) This display name is used when the application's name cannot be determined