From 38b4a858c98ee471fc90265a3df16f1feb2a7832 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Thu, 27 Jan 2022 17:34:06 -0600 Subject: [PATCH] Rename "Windows Terminal" -> "Terminal" (#12264) This should be most of the surfaces that we really care about for displaying "Windows Terminal". There's a pile of other references in code, but I couldn't find any other resources that mention it. I left a lot of the references to Windows Terminal throughout. Seemed like it was fine to keep calling it that in most places, just these localized strings that are going to be displayed in the Shell that should be changed. Rough compare: ![image](https://user-images.githubusercontent.com/18356694/151248506-edf9a6ab-d93f-438f-8755-cdf6ae643736.png) The strings were also moved to the Context Menu resources file, because that's localized into more languages. @DHowett we may want to spin a full build to make sure this works and I didn't miss anything * [x] Closes #12091 (cherry picked from commit a66a1c0cf5751d99ceaa9b2c0f5f0594043a945e) --- doc/cascadia/profiles.schema.json | 2 +- .../CascadiaPackage/Package-Dev.appxmanifest | 12 ++++---- .../CascadiaPackage/Package-Pre.appxmanifest | 12 ++++---- .../CascadiaPackage/Package.appxmanifest | 12 ++++---- .../CascadiaPackage/Resources/Resources.resw | 20 +------------ .../Resources/en-US/Resources.resw | 11 +------ src/cascadia/TerminalApp/AppLogic.cpp | 6 ++-- .../Resources/en-US/ContextMenu.resw | 30 +++++++++++++++++++ src/cascadia/TerminalApp/TerminalPage.cpp | 6 ++-- .../Resources/en-US/Resources.resw | 8 ++--- .../Resources/en-US/Resources.resw | 2 +- 11 files changed, 62 insertions(+), 59 deletions(-) diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json index 03453022125..a21c92d1b9c 100644 --- a/doc/cascadia/profiles.schema.json +++ b/doc/cascadia/profiles.schema.json @@ -1541,7 +1541,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 f73f4c62f48..71a3b9880fd 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 f4123a10eb3..c0fcf64599f 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 b73a6453b5b..a4038f569c9 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 d93766b6798..7d2636477b9 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 e7ec35e519d..7d2636477b9 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 882d7b13615..9d8221d0d7e 100644 --- a/src/cascadia/TerminalApp/AppLogic.cpp +++ b/src/cascadia/TerminalApp/AppLogic.cpp @@ -1077,18 +1077,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 e6d55488986..b7d4cb40b76 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -1800,11 +1800,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()) @@ -1822,7 +1822,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 a912895ff02..7278db6e428 100644 --- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw @@ -380,7 +380,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"} @@ -404,7 +404,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". @@ -412,7 +412,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". @@ -836,7 +836,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 8bbbbfb7f52..66efba9f09b 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