tidy up the powershell module a little bit; perhaps add some of my helpers

## Summary of the Pull Request
Pretty straightforward

## Validation Steps Performed
✅ Selection markers are present after scrolling them out of view and
scrolling back

Closes #17135

README.md

@@ -15,7 +15,6 @@
     - [Via Chocolatey (unofficial)](#via-chocolatey-unofficial)
     - [Via Scoop (unofficial)](#via-scoop-unofficial)
 - [Installing Windows Terminal Canary](#installing-windows-terminal-canary)
-- [Windows Terminal Roadmap](#windows-terminal-roadmap)
 - [Terminal \& Console Overview](#terminal--console-overview)
   - [Windows Terminal](#windows-terminal)
   - [The Windows Console Host](#the-windows-console-host)
@@ -178,11 +177,6 @@ _Learn more about the [types of Windows Terminal distributions](https://learn.mi
 
 ---
 
-## Windows Terminal Roadmap
-
-The plan for the Windows Terminal [is described here](/doc/roadmap-2023.md) and
-will be updated as the project proceeds.
-
 ## Terminal & Console Overview
 
 Please take a few minutes to review the overview below before diving into the

build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml

@@ -56,9 +56,10 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
-– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
-– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr
+– Endlich die Möglichkeit, nach beliebigen Einstellungen zu suchen!
+– Ein neuer nativer Editor für Tastenkombinationen, Aktionen und Einträge in der Befehlspalette.
+– Neue Community-Übersetzungen für Serbisch und Ukrainisch
+– Unterstützung für das „Kitty“-Tastaturprotokoll für hochauflösende Eingabecodierung
 
 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/en-US/PDP.xml

@@ -54,11 +54,12 @@ This is an open source project and we welcome community participation. To partic
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Version __VERSION_NUMBER__
 
-- A whole new Extensions page that shows what has been installed into your Terminal
-- Command Palette now shows up in your native language as well as English
-- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
+- Finally, the ability to search for any setting!
+- A new native editor for key bindings, actions and command palette entries.
+- New community localizations to Serbian and Ukrainian
+- Support for the "Kitty" keyboard protocol for high-fidelity input encoding
 
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml

@@ -54,11 +54,12 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
     
   </DevStudio>
   <ReleaseNotes>
-    Versión __VERSION_NUMBER__
+    Version __VERSION_NUMBER__
 
-- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
-- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
-- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más
+- Por último, la capacidad de buscar cualquier configuración.
+- Nuevo editor nativo para asignaciones de teclas, acciones y entradas de la paleta de comandos.
+- Nuevas localizaciones comunitarias para serbio y ucraniano
+- Soporte para el protocolo de teclado "Kitty" para codificación de entrada de alta fidelidad
 
 Consulta la página de versiones de GitHub para más información.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml

@@ -56,11 +56,12 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Une toute nouvelle page Extensions qui montre ce qui a été installé dans votre terminal
-- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
-- Nouvelles fonctionnalités VT telles que le rendu synchronisé, de nouveaux schémas de couleurs, la configuration pour des actions rapides de la souris comme le zoom, et plus encore
+- Enfin, la possibilité de rechercher n’importe quel paramètre !
+- Un nouvel éditeur natif pour les raccourcis clavier, les actions et les entrées de la palette de commandes.
+- De nouvelles localisations communautaires en serbe et en ukrainien
+- Une prise en charge du protocole clavier « Kitty » pour un encodage d’entrée à haute fidélité
 
-Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
+Consultez notre page des versions de GitHub pour plus de détails.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml

@@ -54,11 +54,12 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__ 
+    Versione __VERSION_NUMBER__
 
-- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
-- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
-- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora
+- Finalmente è possibile cercare qualsiasi impostazione
+- Nuovo editor nativo per le associazioni di tasti, le azioni e le voci del riquadro comandi.
+- Nuove localizzazioni della community in serbo e ucraino
+- Supporto per il protocollo di tastiera "Kitty" per una codifica dell'input ad alta fedeltà
 
 Per altri dettagli, vedi la pagina delle release di GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml

@@ -56,9 +56,10 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- ターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
-- コマンド パレットがネイティブ言語と英語で表示されるようになりました
-- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
+- 最後に、任意の設定を検索する機能です。
+- キー バインド、アクション、コマンド パレット エントリ用の新しいネイティブ エディター。
+- セルビア語とウクライナ語への新しいコミュニティ ローカライズ
+- 高忠実度入力エンコード用の "Kitty" キーボード プロトコルのサポート
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml

@@ -56,11 +56,12 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
-- 명령 팔레트가 이제 영어뿐만 아니라 모국어로도 표시
-- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능이 추가
+- 드디어 모든 설정을 검색할 수 있게 되었어요!
+- 키 바인딩, 작업, 명령 팔레트 항목을 위한 새로운 기본 편집기가 추가되었습니다.
+- 세르비아어와 우크라이나어 커뮤니티 지역화를 새롭게 지원합니다.
+- 고품질 입력 인코딩을 위해 "Kitty" 키보드 프로토콜을 지원합니다.
 
-자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
+자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml

@@ -56,9 +56,10 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
-– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
-– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais
+- Finalmente, a possibilidade de pesquisar qualquer configuração!
+- Um novo editor nativo para combinações de teclas, ações e entradas na paleta de comandos.
+- Novas localizações da comunidade para sérvio e ucraniano
+- Suporte para o protocolo de teclado "Kitty" para codificação de entrada de alta fidelidade
 
 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml

@@ -56,9 +56,10 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
-– Палитра команд теперь доступна на вашем языке, а также на английском
-– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
+– Наконец-то появилась возможность поиска любых параметров!
+– Новый собственный редактор для настраиваемых сочетаний клавиш, действий и записей палитры команд.
+– Новые локализации сообщества на сербский и украинский языки
+– Поддержка протокола клавиатуры Kitty для высокоточного кодирования ввода
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/sr-Cyrl-RS/PDP.xml

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
+  <AppStoreName _locID="App_AppStoreName">
+    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
+    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
+    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
+    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
+    <!-- Windows Terminal -->
+  </AppStoreName>
+  <Keywords>
+    <!-- Valid length: 30 character limit, up to 7 elements -->
+    <Keyword _locID="App_keyword1">
+      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
+    <Keyword _locID="App_keyword2">
+      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
+    <Keyword _locID="App_keyword3">
+      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
+    </Keyword>
+    <Keyword _locID="App_keyword4">
+      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
+    </Keyword>
+    <Keyword _locID="App_keyword5">
+      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
+    </Keyword>
+    <Keyword _locID="App_keyword6">
+      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
+    </Keyword>
+    <Keyword _locID="App_keyword7">
+      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
+    </Keyword>
+  </Keywords>
+  <Description _locID="App_Description">
+    <!-- _locComment_text="{MaxLength=10000} App Description" -->Ово је изградња прегледа апликације Windows терминал. Она садржи најновије могућности које се још увек развијају. Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
+
+Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
+  <ShortDescription _locID="App_ShortDescription">
+    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
+    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
+  </ShortDescription>
+  <ShortTitle _locID="App_ShortTitle">
+    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
+    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
+  </ShortTitle>
+  <SortTitle _locID="App_SortTitle">
+    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
+    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
+  </SortTitle>
+  <VoiceTitle _locID="App_VoiceTitle">
+    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
+    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
+  </VoiceTitle>
+  <DevStudio _locID="App_DevStudio">
+    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
+    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
+  </DevStudio>
+  <ReleaseNotes _locID="App_ReleaseNotes">
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Верзија __VERSION_NUMBER__
+
+- Коначно, могућност претраге било ког подешавања!
+- Нови својствени едитор ставки пречица на тастатури, акција и командне палете
+- Нова локализација заједнице на српски и украјински језик
+- Подршка за „Kitty” протокол тастатуре који омогућава верно кодирање уноса
+
+За више детаља, молимо вас да посетите нашу GitHub страницу издања.
+  </ReleaseNotes>
+  <ScreenshotCaptions>
+    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
+    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
+    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
+      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
+    </Caption>
+    <Caption DesktopImage="panes.png" _locID="App_caption2">
+      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
+    </Caption>
+    <Caption DesktopImage="htop.png" _locID="App_caption3">
+      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
+    </Caption>
+  </ScreenshotCaptions>
+  <AdditionalAssets>
+    <!-- Valid elements:-->
+    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
+    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
+    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
+    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
+    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
+    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
+    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
+    <PosterArt FileName="Store Poster Art.png" />
+    <BoxArt FileName="Store Box Art.png" />
+    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
+  </AdditionalAssets>
+  <Trailers>
+    <!-- Maximum number of trailers permitted: 15 -->
+    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
+      <Title _locID="App_trailerTitle1">
+        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
+      <Images>
+        <!-- Current maximum of 1 image per trailer permitted. -->
+        <Image FileName="Store Thumbnail.png">
+          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
+        </Image>
+      </Images>
+    </Trailer>
+  </Trailers>
+  <AppFeatures>
+    <!-- Valid length: 200 character limit, up to 20 elements -->
+    <AppFeature _locID="App_feature1">
+      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
+    <AppFeature _locID="App_feature2">
+      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
+    <AppFeature _locID="App_feature3">
+      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
+    <AppFeature _locID="App_feature4">
+      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
+    <AppFeature _locID="App_feature5">
+      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
+    <AppFeature _locID="App_feature6">
+      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature7">
+      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature8">
+      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature9">
+      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature10">
+      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature11">
+      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature12">
+      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature13">
+      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature14">
+      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature15">
+      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature16">
+      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature17">
+      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature18">
+      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature19">
+      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature20">
+      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
+    </AppFeature>
+  </AppFeatures>
+  <RecommendedHardware>
+    <!-- Valid length: 200 character limit, up to 11 elements -->
+    <Recommendation _locID="App_RecommendedHW1">
+      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
+  </RecommendedHardware>
+  <MinimumHardware>
+    <!-- Valid length: 200 character limit, up to 11 elements -->
+  </MinimumHardware>
+  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
+    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
+  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
+    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
+  </AdditionalLicenseTerms>
+  <WebsiteURL _locID="App_WebsiteURL">
+    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
+  <SupportContactInfo _locID="App_SupportContactInfo">
+    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
+  <PrivacyPolicyURL _locID="App_PrivacyURL">
+    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
+</ProductDescription>

build/StoreSubmission/Preview/PDPs/uk-UA/PDP.xml

@@ -56,9 +56,10 @@
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
 
-- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому терміналі
-- Палітра команд тепер відображається вашою рідною мовою, а також англійською
-- Нові функції віртуального автомата, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
+- Нарешті, можливість пошуку будь-якого налаштування!
+- Новий вбудований редактор для прив'язки клавіш, дій та палітри команд.
+- Нові локалізації спільноти на сербську та українську мови.
+- Підтримка протоколу клавіатури "Kitty" для високоточного кодування введення.
 
 Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml

@@ -56,9 +56,10 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 一个全新的“扩展”页，显示已安装到终端的内容
-- 命令面板现在以你的母语和英语显示
-- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
+- 终于可以搜索任何设置了!
+- 新增用于键绑定、操作和命令面板条目的原生编辑器。
+- 新增塞尔维亚语和乌克兰语社区本地化支持
+- 支持 "Kitty" 键盘协议，实现高保真输入编码
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml

@@ -56,9 +56,10 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
-- 命令選擇區現在以您的母語和英文顯示
-- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
+- 終於，提供可搜尋任何設定的功能!
+- 全新原生編輯器，支援按鍵繫結、動作及命令選擇區項目。
+- 新增社群本地語系化，包含塞爾維亞語與烏克蘭語
+- 支援高保真度輸入編碼的「Kitty」鍵盤通訊協定
 
 如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml

@@ -56,9 +56,9 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Wir haben der Benutzeroberfläche Dutzende von Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs „Neue Registerkarte“!
-– Wir haben die Fensterverwaltung umgestaltet, um die Zuverlässigkeit zu verbessern. Melden Sie alle Fehler, die beim alias „wt.exe“ auftreten
-– Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf Programme verweisen, die deinstalliert wurden.
+– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
+– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
+– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr
 
 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/en-US/PDP.xml

@@ -56,9 +56,9 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__
 
-- We've added dozens of settings to the UI that once only existed in the JSON file, including a new page for customizing the layout of your New Tab menu!
-- We have rearchitected window management to improve reliability; please file any bugs you encounter with the wt.exe alias
-- Profiles now show an icon if they've been hidden or refer to programs which were uninstalled.
+- A whole new Extensions page that shows what has been installed into your Terminal
+- Command Palette now shows up in your native language as well as English
+- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
 
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml

@@ -56,9 +56,9 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- Hemos añadido decenas de configuraciones a la interfaz de usuario que antes solo existían en el archivo JSON, incluida una nueva página para personalizar el diseño del menú Nueva pestaña.
-- Hemos reestructurado la gestión de ventanas para mejorar la fiabilidad; informe de cualquier error que encuentre con el alias wt.exe
-- Ahora, los perfiles muestran un icono si han sido ocultados o hacen referencia a programas que han sido desinstalados.
+- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
+- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
+- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más
 
 Consulte la página de versiones de GitHub para más información.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml

@@ -56,11 +56,11 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Nous avons ajouté des dizaines de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet.
-- Nous avons fait une refonte de la gestion des fenêtres pour améliorer la fiabilité. Veuillez signaler les bogues que vous rencontrez avec l’alias wt.exe.
-- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.
+- Une toute nouvelle page Extensions qui affiche ce qui a été installé dans votre Terminal
+- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
+- De nouvelles fonctionnalités VT, telles que le rendu synchronisé, de nouveaux schémas de couleurs, une configuration pour des actions rapides de la souris comme le zoom, et bien plus encore
 
-Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
+Consultez notre page des versions de GitHub pour plus de détails.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml

@@ -56,9 +56,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
   <ReleaseNotes>
     Versione __VERSION_NUMBER__
 
-- Abbiamo aggiunto decine di impostazioni all'interfaccia utente che in precedenza esistevano solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
-- Abbiamo riprogettato la gestione delle finestre per migliorarne l'affidabilità; segnala eventuali bug riscontrati con l'alias wt.exe
-- I profili ora mostrano un'icona se sono stati nascosti o se fanno riferimento a programmi disinstallati.
+- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
+- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
+- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora
 
 Per altri dettagli, vedi la pagina delle release di GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- 新しいタブ メニューのレイアウトをカスタマイズするための新しいページなど、以前は JSON ファイルにしかなかった設定が UI に多数追加されました。
-- 信頼性を向上させるために、ウィンドウ管理を再設計しました。wt.exe エイリアスで発生したバグを報告してください
-- プロファイルが非表示になっている場合や、アンインストールされたプログラムを参照している場合に、アイコンが表示されるようになりました。
+- お使いのターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
+- コマンド パレットがネイティブ言語と英語で表示されるようになりました
+- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에만 존재했던 수십 개의 설정을 UI에 추가
-- 안정성을 개선하기 위해 창 관리 구조를 재구성했습니다. wt.exe 별칭과 관련하여 발생한 버그 신고
-- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.
+- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
+- 이제 영어뿐만 아니라 모국어로도 표시되는 명령 팔레트
+- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능 추가
 
-자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
+자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml

@@ -56,9 +56,9 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Adicionamos várias configurações à interface do usuário que antes só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do seu menu Nova Guia!
-– Reestruturamos o gerenciamento de janelas para melhorar a confiabilidade; registre os bugs que você encontrar com o alias wt.exe
-– Os perfis agora exibem um ícone se estiverem ocultos ou se referirem a programas que foram desinstalados.
+– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
+– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
+– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais
 
 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Мы добавили в пользовательский интерфейс десятки параметров, которые ранее существовали только в JSON-файле, включая новую страницу для настройки макета меню новой вкладки.
-– Мы переработали управление окнами для повышения надежности. Сообщайте о любых ошибках, которые вы обнаружите с псевдонимом wt.exe
-– Профили теперь отображают значок, если они были скрыты или ссылаются на программы, которые были удалены.
+– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
+– Палитра команд теперь доступна на вашем языке, а также на английском
+– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/sr-Cyrl-RS/PDP.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
+  <AppStoreName _locID="App_AppStoreName">
+    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
+    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
+    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
+    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
+    <!-- Windows Terminal -->
+  </AppStoreName>
+  <Keywords>
+    <!-- Valid length: 30 character limit, up to 7 elements -->
+    <Keyword _locID="App_keyword1">
+      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
+    <Keyword _locID="App_keyword2">
+      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
+    <Keyword _locID="App_keyword3">
+      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
+    </Keyword>
+    <Keyword _locID="App_keyword4">
+      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
+    </Keyword>
+    <Keyword _locID="App_keyword5">
+      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
+    </Keyword>
+    <Keyword _locID="App_keyword6">
+      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
+    </Keyword>
+    <Keyword _locID="App_keyword7">
+      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
+    </Keyword>
+  </Keywords>
+  <Description _locID="App_Description">
+    <!-- _locComment_text="{MaxLength=10000} App Description" -->Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
+
+Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
+  <ShortDescription _locID="App_ShortDescription">
+    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
+    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
+  </ShortDescription>
+  <ShortTitle _locID="App_ShortTitle">
+    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
+    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
+  </ShortTitle>
+  <SortTitle _locID="App_SortTitle">
+    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
+    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
+  </SortTitle>
+  <VoiceTitle _locID="App_VoiceTitle">
+    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
+    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
+  </VoiceTitle>
+  <DevStudio _locID="App_DevStudio">
+    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
+    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
+  </DevStudio>
+  <ReleaseNotes _locID="App_ReleaseNotes">
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Верзија __VERSION_NUMBER__
+
+- Попуно нова страница Проширења која приказује шта је све инсталирано у ваш Терминал
+- Палета команди се сада приказује и на вашем матерњем језику, као и на енглеском
+- Нове VT функционалности као што су синхронизовано исцртавање, нове шеме боја, конфигурација за брзе акције мишем, као што је зумирање, и још тога
+
+За више детаља, молимо вас да посетите нашу GitHub страницу издања.
+  </ReleaseNotes>
+  <ScreenshotCaptions>
+    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
+    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
+    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
+      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
+    </Caption>
+    <Caption DesktopImage="panes.png" _locID="App_caption2">
+      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
+    </Caption>
+    <Caption DesktopImage="htop.png" _locID="App_caption3">
+      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
+    </Caption>
+  </ScreenshotCaptions>
+  <AdditionalAssets>
+    <!-- Valid elements:-->
+    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
+    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
+    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
+    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
+    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
+    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
+    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
+    <PosterArt FileName="Store Poster Art.png" />
+    <BoxArt FileName="Store Box Art.png" />
+    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
+  </AdditionalAssets>
+  <Trailers>
+    <!-- Maximum number of trailers permitted: 15 -->
+    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
+      <Title _locID="App_trailerTitle1">
+        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
+      <Images>
+        <!-- Current maximum of 1 image per trailer permitted. -->
+        <Image FileName="Store Thumbnail.png">
+          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
+        </Image>
+      </Images>
+    </Trailer>
+  </Trailers>
+  <AppFeatures>
+    <!-- Valid length: 200 character limit, up to 20 elements -->
+    <AppFeature _locID="App_feature1">
+      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
+    <AppFeature _locID="App_feature2">
+      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
+    <AppFeature _locID="App_feature3">
+      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
+    <AppFeature _locID="App_feature4">
+      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
+    <AppFeature _locID="App_feature5">
+      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
+    <AppFeature _locID="App_feature6">
+      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature7">
+      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature8">
+      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature9">
+      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature10">
+      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature11">
+      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature12">
+      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature13">
+      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature14">
+      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature15">
+      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature16">
+      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature17">
+      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature18">
+      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature19">
+      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
+    </AppFeature>
+    <AppFeature _locID="App_feature20">
+      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
+    </AppFeature>
+  </AppFeatures>
+  <RecommendedHardware>
+    <!-- Valid length: 200 character limit, up to 11 elements -->
+    <Recommendation _locID="App_RecommendedHW1">
+      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
+  </RecommendedHardware>
+  <MinimumHardware>
+    <!-- Valid length: 200 character limit, up to 11 elements -->
+  </MinimumHardware>
+  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
+    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
+  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
+    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
+  </AdditionalLicenseTerms>
+  <WebsiteURL _locID="App_WebsiteURL">
+    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
+  <SupportContactInfo _locID="App_SupportContactInfo">
+    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
+  <PrivacyPolicyURL _locID="App_PrivacyURL">
+    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
+</ProductDescription>

build/StoreSubmission/Stable/PDPs/uk-UA/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
 
-- Ми додали десятки налаштувань до інтерфейсу користувача, які раніше існували лише у файлі JSON, включаючи нову сторінку для налаштування макета меню «Нова вкладка»!
-- Ми переробили архітектуру керування вікнами для підвищення надійності; будь ласка, повідомляйте про будь-які помилки, з якими ви зіткнулися, за допомогою псевдоніма wt.exe.
-- Профілі тепер відображають значок, якщо вони були приховані, або посилаються на програми, які було видалено.
+- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому Терміналі
+- Палітра команд тепер відображається вашою рідною мовою, так само, як і англійською
+- Нові VT функції, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
 
 Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 我们向用户界面添加了许多之前仅存在于 JSON 文件中的设置，包括用于自定义“新建标签页”菜单布局的新页面!
-- 我们已重新架构窗口管理以提高可靠性; 请使用 wt.exe 别名提交您遇到的任何错误
-- 配置文件如果已被隐藏或引用了已卸载的程序，现在会显示一个图标。
+- 一个全新的“扩展”页，显示已安装到终端的内容
+- 命令面板现在以你的母语和英语显示
+- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 我們已在使用者介面中新增數十個曾經僅存在於 JSON 檔案中的設定，包括一個可自訂新索引標籤選單版面配置的新頁面!
-- 我們已重新架構視窗管理以提升可靠性; 如果您在使用 wt.exe 別名時遇到任何錯誤，請提交錯誤回報
-- 如果設定檔已隱藏或參照已解除安裝的程式，現在會顯示圖示。
+- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
+- 命令選擇區現在以您的母語和英文顯示
+- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
 
 如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
   </ReleaseNotes>

build/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.25</PGOBranch>
+    <PGOBranch>main</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>25</VersionMinor>
+    <VersionMinor>26</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
     <VersionInfoCulture>1033</VersionInfoCulture>
     <!-- The default has a spacing problem -->

src/buffer/out/Row.cpp

@@ -1143,13 +1143,6 @@ til::CoordType ROW::GetTrailingColumnAtCharOffset(const ptrdiff_t offset) const
     return _createCharToColumnMapper(offset).GetTrailingColumnAt(offset);
 }
 
-uint16_t ROW::GetCharOffset(til::CoordType col) const noexcept
-{
-    const auto columns = GetReadableColumnCount();
-    const auto colBeg = clamp(col, 0, columns);
-    return _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
-}
-
 DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
 {
     const auto col = _clampedColumn(column);

src/buffer/out/Row.hpp

@@ -172,7 +172,6 @@ public:
     std::wstring_view GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept;
     til::CoordType GetLeadingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
     til::CoordType GetTrailingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
-    uint16_t GetCharOffset(til::CoordType col) const noexcept;
     DelimiterClass DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept;
 
     auto AttrBegin() const noexcept { return _attr.begin(); }

src/buffer/out/textBuffer.cpp

@@ -1141,7 +1141,20 @@ DelimiterClass TextBuffer::_GetDelimiterClassAt(const til::point pos, const std:
     return GetRowByOffset(realPos.y).DelimiterClassAt(realPos.x, wordDelimiters);
 }
 
-til::point TextBuffer::GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
+// Method Description:
+// - Get the start of the word at or before the given position
+// - When includeWhitespace is false, returns the start of the current delimiter class run
+//   (selection behavior: stops at non-wrapped row boundaries)
+// - When includeWhitespace is true, also skips backward past any leading ControlChars
+//   to include the preceding word (accessibility/UIA behavior: crosses all row boundaries)
+// Arguments:
+// - pos - the buffer position to start from
+// - wordDelimiters - characters considered as DelimiterClass::DelimiterChar
+// - includeWhitespace - when true, skip past leading whitespace to find the word start
+// - limitOptional - (optional) the last possible position in the buffer that can be explored
+// Return Value:
+// - The position of the first character of the word (inclusive)
+til::point TextBuffer::GetWordStart(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
 {
     const auto bufferSize{ GetSize() };
     const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
@@ -1174,7 +1187,7 @@ til::point TextBuffer::GetWordStart2(til::point pos, const std::wstring_view wor
     // 1. move to the beginning of the delimiter class run
     // 2. (includeWhitespace) if we were on a ControlChar, go back one more delimiter class run
     const auto initialDelimiter = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
+    pos = _GetDelimiterClassRunStart(pos, wordDelimiters, includeWhitespace);
     if (!includeWhitespace || pos.x == bufferSize.Left())
     {
         // Special case:
@@ -1185,12 +1198,26 @@ til::point TextBuffer::GetWordStart2(til::point pos, const std::wstring_view wor
     else if (initialDelimiter == DelimiterClass::ControlChar)
     {
         bufferSize.DecrementInExclusiveBounds(pos);
-        pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
+        pos = _GetDelimiterClassRunStart(pos, wordDelimiters, includeWhitespace);
     }
     return pos;
 }
 
-til::point TextBuffer::GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
+// Method Description:
+// - Get the exclusive end of the word at or after the given position
+// - When includeWhitespace is false, returns the exclusive end of the current delimiter class run
+//   (selection behavior: stops at non-wrapped row boundaries)
+// - When includeWhitespace is true, also skips forward past any trailing ControlChars
+//   to include trailing whitespace (accessibility/UIA behavior: crosses all row boundaries)
+// - The result is clamped to limitOptional when provided
+// Arguments:
+// - pos - the buffer position to start from
+// - wordDelimiters - characters considered as DelimiterClass::DelimiterChar
+// - includeWhitespace - when true, skip past trailing whitespace to find the next word boundary
+// - limitOptional - (optional) the last possible position in the buffer that can be explored
+// Return Value:
+// - The exclusive end position of the word
+til::point TextBuffer::GetWordEnd(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional) const
 {
     const auto bufferSize{ GetSize() };
     const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
@@ -1223,8 +1250,12 @@ til::point TextBuffer::GetWordEnd2(til::point pos, const std::wstring_view wordD
     // So the heuristic we use is:
     // 1. move to the end of the delimiter class run
     // 2. (includeWhitespace) if the next delimiter class run is a ControlChar, go forward one more delimiter class run
-    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters);
-    if (!includeWhitespace || pos.x == bufferSize.RightExclusive())
+    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters, includeWhitespace);
+    if (pos >= limit)
+    {
+        return limit;
+    }
+    else if (!includeWhitespace || pos.x == bufferSize.RightExclusive())
     {
         // Special case:
         // we're at the right boundary (and end of a delimiter class run),
@@ -1235,7 +1266,8 @@ til::point TextBuffer::GetWordEnd2(til::point pos, const std::wstring_view wordD
     if (const auto nextDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
         nextDelimClass == DelimiterClass::ControlChar)
     {
-        return _GetDelimiterClassRunEnd(pos, wordDelimiters);
+        pos = _GetDelimiterClassRunEnd(pos, wordDelimiters, includeWhitespace);
+        return std::min(pos, limit);
     }
     return pos;
 }
@@ -1288,29 +1320,48 @@ bool TextBuffer::IsWordBoundary(const til::point pos, const std::wstring_view wo
     return prevDelimiterClass != currentDelimiterClass && currentDelimiterClass != DelimiterClass::ControlChar;
 }
 
-til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const
+// Method Description:
+// - Get the start position for the current delimiter class run, scanning backward
+// - Stops when the delimiter class changes or a row boundary is reached
+// - When accessibilityMode is true, freely crosses non-wrapped row boundaries
+// - When accessibilityMode is false, only crosses wrap-forced row boundaries
+// Arguments:
+// - pos - the buffer position to start scanning from
+// - wordDelimiters - what characters are we considering for the separation of words
+// - accessibilityMode - when true, cross non-wrapped row boundaries freely
+// Return Value:
+// - The position of the first character in the current delimiter class run (inclusive)
+til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode) const
 {
     const auto bufferSize = GetSize();
     const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    for (auto nextPos = pos; nextPos != bufferSize.Origin(); pos = nextPos)
+    auto nextPos = pos;
+    while (nextPos != bufferSize.Origin())
     {
         bufferSize.DecrementInExclusiveBounds(nextPos);
 
         if (nextPos.x == bufferSize.RightExclusive())
         {
-            // wrapped onto previous line,
-            // check if it was forced to wrap
+            // wrapped onto previous line
             const auto& row = GetRowByOffset(nextPos.y);
-            if (!row.WasWrapForced())
+            if (!row.WasWrapForced() && !accessibilityMode)
             {
                 return pos;
             }
+            // In accessibility mode (or if row was wrap-forced), continue
+            // across the row boundary. The actual last character of the
+            // previous row will be checked on the next iteration.
+            // Don't update pos to avoid storing a transient position
         }
         else if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
         {
             // if we changed delim class, we're done (don't apply move)
             return pos;
         }
+        else
+        {
+            pos = nextPos;
+        }
     }
     return pos;
 }
@@ -1320,7 +1371,8 @@ til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wst
 // Arguments:
 // - pos - the buffer position being within the current delimiter class
 // - wordDelimiters - what characters are we considering for the separation of words
-til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const
+// - accessibilityMode - when true, cross non-wrapped row boundaries freely
+til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode) const
 {
     const auto bufferSize = GetSize();
     const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
@@ -1333,7 +1385,16 @@ til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstri
             // wrapped onto next line,
             // check if it was forced to wrap or switched delimiter class
             const auto& row = GetRowByOffset(pos.y);
-            if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
+            if (accessibilityMode)
+            {
+                // In accessibility mode, always cross row boundaries,
+                // but still stop if the delimiter class changes
+                if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
+                {
+                    return nextPos;
+                }
+            }
+            else if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
             {
                 return pos;
             }
@@ -1348,283 +1409,6 @@ til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstri
     return pos;
 }
 
-// Method Description:
-// - Get the til::point for the beginning of the word you are on
-// Arguments:
-// - target - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// - accessibilityMode - when enabled, we continue expanding left until we are at the beginning of a readable word.
-//                        Otherwise, expand left until a character of a new delimiter class is found
-//                        (or a row boundary is encountered)
-// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
-// Return Value:
-// - The til::point for the first character on the "word" (inclusive)
-til::point TextBuffer::GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode, std::optional<til::point> limitOptional) const
-{
-    // Consider a buffer with this text in it:
-    // "  word   other  "
-    // In selection (accessibilityMode = false),
-    //  a "word" is defined as the range between two delimiters
-    //  so the words in the example include ["  ", "word", "   ", "other", "  "]
-    // In accessibility (accessibilityMode = true),
-    //  a "word" includes the delimiters after a range of readable characters
-    //  so the words in the example include ["word   ", "other  "]
-    // NOTE: the start anchor (this one) is inclusive, whereas the end anchor (GetWordEnd) is exclusive
-
-#pragma warning(suppress : 26496)
-    auto copy{ target };
-    const auto bufferSize{ GetSize() };
-    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
-    if (target == bufferSize.Origin())
-    {
-        // can't expand left
-        return target;
-    }
-    else if (target == bufferSize.EndExclusive())
-    {
-        // GH#7664: Treat EndExclusive as EndInclusive so
-        // that it actually points to a space in the buffer
-        copy = bufferSize.BottomRightInclusive();
-    }
-    else if (bufferSize.CompareInBounds(target, limit, true) >= 0)
-    {
-        // if at/past the limit --> clamp to limit
-        copy = limitOptional.value_or(bufferSize.BottomRightInclusive());
-    }
-
-    if (accessibilityMode)
-    {
-        return _GetWordStartForAccessibility(copy, wordDelimiters);
-    }
-    else
-    {
-        return _GetWordStartForSelection(copy, wordDelimiters);
-    }
-}
-
-// Method Description:
-// - Helper method for GetWordStart(). Get the til::point for the beginning of the word (accessibility definition) you are on
-// Arguments:
-// - target - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// Return Value:
-// - The til::point for the first character on the current/previous READABLE "word" (inclusive)
-til::point TextBuffer::_GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const
-{
-    auto result = target;
-    const auto bufferSize = GetSize();
-
-    // ignore left boundary. Continue until readable text found
-    while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
-    {
-        if (result == bufferSize.Origin())
-        {
-            //looped around and hit origin (no word between origin and target)
-            return result;
-        }
-        bufferSize.DecrementInBounds(result);
-    }
-
-    // make sure we expand to the left boundary or the beginning of the word
-    while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
-    {
-        if (result == bufferSize.Origin())
-        {
-            // first char in buffer is a RegularChar
-            // we can't move any further back
-            return result;
-        }
-        bufferSize.DecrementInBounds(result);
-    }
-
-    // move off of delimiter
-    bufferSize.IncrementInBounds(result);
-
-    return result;
-}
-
-// Method Description:
-// - Helper method for GetWordStart(). Get the til::point for the beginning of the word (selection definition) you are on
-// Arguments:
-// - target - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// Return Value:
-// - The til::point for the first character on the current word or delimiter run (stopped by the left margin)
-til::point TextBuffer::_GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const
-{
-    auto result = target;
-    const auto bufferSize = GetSize();
-
-    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
-    const bool isControlChar = initialDelimiter == DelimiterClass::ControlChar;
-
-    // expand left until we hit the left boundary or a different delimiter class
-    while (result != bufferSize.Origin() && _GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter)
-    {
-        if (result.x == bufferSize.Left())
-        {
-            // Prevent wrapping to the previous line if the selection begins on whitespace
-            if (isControlChar)
-            {
-                break;
-            }
-
-            if (result.y > 0)
-            {
-                // Prevent wrapping to the previous line if it was hard-wrapped (e.g. not forced by us to wrap)
-                const auto& priorRow = GetRowByOffset(result.y - 1);
-                if (!priorRow.WasWrapForced())
-                {
-                    break;
-                }
-            }
-        }
-        bufferSize.DecrementInBounds(result);
-    }
-
-    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
-    {
-        // move off of delimiter
-        bufferSize.IncrementInBounds(result);
-    }
-
-    return result;
-}
-
-// Method Description:
-// - Get the til::point for the beginning of the NEXT word
-// Arguments:
-// - target - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// - accessibilityMode - when enabled, we continue expanding right until we are at the beginning of the next READABLE word
-//                        Otherwise, expand right until a character of a new delimiter class is found
-//                        (or a row boundary is encountered)
-// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
-// Return Value:
-// - The til::point for the last character on the "word" (inclusive)
-til::point TextBuffer::GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode, std::optional<til::point> limitOptional) const
-{
-    // Consider a buffer with this text in it:
-    // "  word   other  "
-    // In selection (accessibilityMode = false),
-    //  a "word" is defined as the range between two delimiters
-    //  so the words in the example include ["  ", "word", "   ", "other", "  "]
-    // In accessibility (accessibilityMode = true),
-    //  a "word" includes the delimiters after a range of readable characters
-    //  so the words in the example include ["word   ", "other  "]
-    // NOTE: the end anchor (this one) is exclusive, whereas the start anchor (GetWordStart) is inclusive
-
-    // Already at/past the limit. Can't move forward.
-    const auto bufferSize{ GetSize() };
-    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
-    if (bufferSize.CompareInBounds(target, limit, true) >= 0)
-    {
-        return target;
-    }
-
-    if (accessibilityMode)
-    {
-        return _GetWordEndForAccessibility(target, wordDelimiters, limit);
-    }
-    else
-    {
-        return _GetWordEndForSelection(target, wordDelimiters);
-    }
-}
-
-// Method Description:
-// - Helper method for GetWordEnd(). Get the til::point for the beginning of the next READABLE word
-// Arguments:
-// - target - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// - limit - the last "valid" position in the text buffer (to improve performance)
-// Return Value:
-// - The til::point for the first character of the next readable "word". If no next word, return one past the end of the buffer
-til::point TextBuffer::_GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const
-{
-    const auto bufferSize{ GetSize() };
-    auto result{ target };
-
-    if (bufferSize.CompareInBounds(target, limit, true) >= 0)
-    {
-        // if we're already on/past the last RegularChar,
-        // clamp result to that position
-        result = limit;
-
-        // make the result exclusive
-        bufferSize.IncrementInBounds(result, true);
-    }
-    else
-    {
-        while (result != limit && result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
-        {
-            // Iterate through readable text
-            bufferSize.IncrementInBounds(result);
-        }
-
-        while (result != limit && result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
-        {
-            // expand to the beginning of the NEXT word
-            bufferSize.IncrementInBounds(result);
-        }
-
-        // Special case: we tried to move one past the end of the buffer
-        // Manually increment onto the EndExclusive point.
-        if (result == bufferSize.BottomRightInclusive())
-        {
-            bufferSize.IncrementInBounds(result, true);
-        }
-    }
-
-    return result;
-}
-
-// Method Description:
-// - Helper method for GetWordEnd(). Get the til::point for the beginning of the NEXT word
-// Arguments:
-// - target - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// Return Value:
-// - The til::point for the last character of the current word or delimiter run (stopped by right margin)
-til::point TextBuffer::_GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const
-{
-    const auto bufferSize = GetSize();
-
-    auto result = target;
-    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
-    const bool isControlChar = initialDelimiter == DelimiterClass::ControlChar;
-
-    // expand right until we hit the right boundary as a ControlChar or a different delimiter class
-    while (result != bufferSize.BottomRightInclusive() && _GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter)
-    {
-        if (result.x == bufferSize.RightInclusive())
-        {
-            // Prevent wrapping to the next line if the selection begins on whitespace
-            if (isControlChar)
-            {
-                break;
-            }
-
-            // Prevent wrapping to the next line if this one was hard-wrapped (e.g. not forced by us to wrap)
-            const auto& row = GetRowByOffset(result.y);
-            if (!row.WasWrapForced())
-            {
-                break;
-            }
-        }
-
-        bufferSize.IncrementInBounds(result);
-    }
-
-    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
-    {
-        // move off of delimiter
-        bufferSize.DecrementInBounds(result);
-    }
-
-    return result;
-}
-
 void TextBuffer::_PruneHyperlinks()
 {
     // Check the old first row for hyperlink references
@@ -1671,57 +1455,6 @@ void TextBuffer::_PruneHyperlinks()
     }
 }
 
-// Method Description:
-// - Update pos to be the position of the first character of the next word. This is used for accessibility
-// Arguments:
-// - pos - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// - limitOptional - (optional) the last possible position in the buffer that can be explored. This can be used to improve performance.
-// Return Value:
-// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
-// - pos - The til::point for the first character on the "word" (inclusive)
-bool TextBuffer::MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional) const
-{
-    // move to the beginning of the next word
-    // NOTE: _GetWordEnd...() returns the exclusive position of the "end of the word"
-    //       This is also the inclusive start of the next word.
-    const auto bufferSize{ GetSize() };
-    const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
-    const auto copy{ _GetWordEndForAccessibility(pos, wordDelimiters, limit) };
-
-    if (bufferSize.CompareInBounds(copy, limit, true) >= 0)
-    {
-        return false;
-    }
-
-    pos = copy;
-    return true;
-}
-
-// Method Description:
-// - Update pos to be the position of the first character of the previous word. This is used for accessibility
-// Arguments:
-// - pos - a til::point on the word you are currently on
-// - wordDelimiters - what characters are we considering for the separation of words
-// Return Value:
-// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
-// - pos - The til::point for the first character on the "word" (inclusive)
-bool TextBuffer::MoveToPreviousWord(til::point& pos, std::wstring_view wordDelimiters) const
-{
-    // move to the beginning of the current word
-    auto copy{ GetWordStart(pos, wordDelimiters, true) };
-
-    if (!GetSize().DecrementInBounds(copy, true))
-    {
-        // can't move behind current word
-        return false;
-    }
-
-    // move to the beginning of the previous word
-    pos = GetWordStart(copy, wordDelimiters, true);
-    return true;
-}
-
 // Method Description:
 // - Update pos to be the beginning of the current glyph/character. This is used for accessibility
 // Arguments:

src/buffer/out/textBuffer.hpp

@@ -172,15 +172,10 @@ public:
     void TriggerNewTextNotification(const std::wstring_view newText);
     void TriggerSelection();
 
-    til::point GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-
-    til::point GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordStart(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
+    til::point GetWordEnd(til::point pos, const std::wstring_view wordDelimiters, bool includeWhitespace, std::optional<til::point> limitOptional = std::nullopt) const;
 
     bool IsWordBoundary(const til::point pos, const std::wstring_view wordDelimiters) const;
-    bool MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToPreviousWord(til::point& pos, const std::wstring_view wordDelimiters) const;
 
     til::point GetGlyphStart(const til::point pos, std::optional<til::point> limitOptional = std::nullopt) const;
     til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
@@ -328,12 +323,8 @@ private:
     void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;
     void _ExpandTextRow(til::inclusive_rect& selectionRow) const;
     DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
-    til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
-    til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
+    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode = false) const;
+    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters, const bool accessibilityMode = false) const;
     void _PruneHyperlinks();
 
     std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive, const bool clipAtCursor = false) const;

src/buffer/out/ut_textbuffer/UTextAdapterTests.cpp

@@ -34,6 +34,16 @@ class UTextAdapterTests
 {
     TEST_CLASS(UTextAdapterTests);
 
+    TEST_CLASS_SETUP(ClassSetup)
+    {
+        wil::unique_hmodule icu{ LoadLibraryExW(L"icu.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32) };
+        if (!icu)
+        {
+            WEX::Logging::Log::Result(WEX::Logging::TestResults::Skipped, L"ICU is not present");
+        }
+        return true;
+    }
+
     TEST_METHOD(Unicode)
     {
         DummyRenderer renderer;

src/buffer/out/ut_textbuffer/sources

@@ -26,6 +26,9 @@ TARGETLIBS = \
     $(CONSOLE_OBJ_PATH)\types\lib\$(O)\ConTypes.lib \
     $(TARGETLIBS) \
 
+DELAYLOAD = \
+    icu.dll \
+
 # -------------------------------------
 # Localization
 # -------------------------------------

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -237,7 +237,6 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
 
   <Extensions>

src/cascadia/TerminalApp/Resources/de-DE/Resources.resw

@@ -672,15 +672,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Dieser Linktyp wird derzeit nicht unterstützt:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Dieser Link kann zu einem unsicheren Speicherort führen. Links können ihren Computer und Ihre Daten beschädigen. Klicken Sie zum Schutz Des Computers nur auf Links aus vertrauenswürdigen Quellen.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Trotzdem öffnen</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
@@ -854,11 +848,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Der aktive Bereich wurde auf die Registerkarte „{0}“ verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Registerkarte „{0}“ wurde in das Fenster „{1}“ verschoben</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Registerkarte „{0}“ in neues Fenster verschoben</value>
@@ -870,7 +864,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Der aktive Bereich wurde in das Fenster "{0}" verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Aktiver Bereich in neues Fenster verschoben</value>

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>This link type is currently not supported:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>This link may lead to an unsafe location. Hyperlinks can be harmful to your computer and data. To protect your computer, only click links from trusted sources.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Open anyway</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Settings</value>
   </data>

src/cascadia/TerminalApp/Resources/es-ES/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Este tipo de vínculo no se admite actualmente:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este vínculo puede dar lugar a una ubicación no segura. Los hipervínculos pueden ser perjudiciales para el equipo y los datos. Para proteger el equipo, haga clic solo en vínculos de orígenes de confianza.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir de todas formas</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Configuración</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Panel activo movido a la pestaña "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>La pestaña "{0}" se ha movido a la ventana "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>La pestaña "{0}" se ha movido a la nueva ventana</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Panel activo movido a la ventana "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Panel activo movido a nueva ventana</value>

src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ce type de lien n’est actuellement pas pris en charge :</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ce lien peut entraîner un emplacement non sécurisé. Les liens hypertexte peuvent endommager votre ordinateur et vos données. Pour protéger votre ordinateur, cliquez uniquement sur des liens provenant de sources fiables.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Ouvrir quand même</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Paramètres</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Onglet « {0} » déplacé vers la fenêtre « {1} »</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Onglet « {0} » déplacé vers une nouvelle fenêtre</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Volet actif déplacé vers une nouvelle fenêtre</value>

src/cascadia/TerminalApp/Resources/it-IT/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Questo tipo di collegamento non è al momento supportato:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Questo collegamento potrebbe causare un percorso non sicuro. I collegamenti ipertestuali possono essere dannosi per il computer e i dati. Per proteggere il computer, fare clic solo su collegamenti da origini attendibili.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Apri comunque</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Impostazioni</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Riquadro attivo spostato nella scheda "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Scheda "{0}" spostata nella finestra "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Scheda "{0}" spostata in una nuova finestra</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Riquadro attivo spostato nella finestra "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Riquadro attivo spostato in una nuova finestra</value>

src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw

@@ -670,15 +670,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>このリンクの種類は現在サポートされていません:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>このリンクは安全でない可能性があります。ハイパーリンクは、コンピューターやデータに問題を起こす可能性があります。コンピューターを保護するには、信頼できるソースからのリンクのみをクリックしてください。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>開く</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>設定</value>
   </data>
@@ -852,11 +846,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>アクティブなペインを [{0}] タブに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>[{0}] タブを "{1}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>[{0}] タブを新しいウィンドウに移動しました</value>
@@ -868,7 +862,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>アクティブなペインを "{0}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>アクティブなペインを新しいウィンドウに移動しました</value>

src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>이 링크 형식은 현재 지원되지 않습니다.</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>이 링크로 인해 안전하지 않은 위치가 발생할 수 있습니다. 하이퍼링크는 컴퓨터와 데이터를 손상시킬 수 있습니다. 컴퓨터를 보호하려면 신뢰할 수 있는 원본의 링크만 클릭하세요.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>열기</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>설정</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>활성 창이 "{0}" 탭으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" 탭이 "{1}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" 탭이 새 창으로 이동됨</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>활성 창이 "{0}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>활성 창이 새 창으로 이동됨</value>

src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Não há suporte para este tipo de link no momento:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este link pode levar a um local não seguro. Hiperlinks podem ser prejudiciais ao computador e aos dados. Para proteger o computador, clique somente em links de fontes confiáveis.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir mesmo assim</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Configurações</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Painel ativo movido para a guia "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Guia "{0}" movida para janela "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Guia "{0}" movida para nova janela</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Painel ativo movido para a janela "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Painel ativo movido para nova janela</value>

src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw

@@ -669,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>

src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw

@@ -669,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>

src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw

@@ -669,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>

src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Этот тип связи в настоящее время не поддерживается:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Эта ссылка может привести к небезопасному расположению. Гиперссылки могут нанести вред компьютеру и данным. Чтобы защитить компьютер, щелкните ссылки только из надежных источников.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Все равно открыть</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Параметры</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Активная область перемещена на вкладку "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Вкладка "{0}" перемещена в окно "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Вкладка "{0}" перемещена в новое окно</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Активная область перемещена в окно "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Активная область перемещена в новое окно</value>

src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>当前不支持此链接类型：</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此链接可能会导致不安全的位置。超链接可能对你的计算机和数据有害。若要保护你的计算机，请仅单击来自受信任源的链接。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>仍然打开</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>设置</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>“{0}”选项卡已移动到“{1}”窗口</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>“{0}”选项卡已移动到新窗口</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>活动窗格已移动到新窗口</value>

src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw

@@ -669,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>目前不支援此連結類型:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此連結可能通往不安全地點。超連結可能對你的電腦和資料造成傷害。為了保護你的電腦，只點擊來自可信來源的連結。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>一律開啟</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>設定</value>
   </data>
@@ -851,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>活動窗格已移動至「{0}」索引標籤</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>「{0}」索引標籤已移至「{1}」視窗</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>「{0}」索引標籤已移至新視窗</value>
@@ -867,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>活動窗格已移動至「{0}」視窗</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>活動窗格已移至新視窗</value>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -2973,11 +2973,7 @@ namespace winrt::TerminalApp::implementation
             text = winrt::hstring{ Utils::TrimPaste(text) };
         }
 
-        // LOAD BEARING: Send an empty bracketed paste even if the clipboard was empty.
-        // Bracketed Paste provides an application a way to know whether the
-        // user pasted, even if there was no applicable content on it. This
-        // behavior is observed in GNOME Terminal, among others.
-        if (!bracketedPaste && text.empty())
+        if (text.empty())
         {
             co_return;
         }
@@ -3086,42 +3082,18 @@ namespace winrt::TerminalApp::implementation
     }
     CATCH_LOG();
 
-    safe_void_coroutine TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
+    void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
     {
         try
         {
-            auto uriString{ eventArgs.Uri() };
-            auto parsed = winrt::Windows::Foundation::Uri(uriString);
+            auto parsed = winrt::Windows::Foundation::Uri(eventArgs.Uri());
             if (_IsUriSupported(parsed))
             {
-                bool shouldLaunch{ _IsUriConsideredSomewhatSafe(parsed) };
-
-                if (!shouldLaunch)
-                {
-                    if (auto presenter{ _dialogPresenter.get() })
-                    {
-                        // FindName needs to be called first to actually load the xaml object
-                        auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
-
-                        // Insert the reason and the URI
-                        unopenedUriDialog.SecondaryButtonText(RS_(L"UnsafeUrlConfirmAllowAction"));
-                        CouldNotOpenUriReason().Text(RS_(L"UnsafeUrlConfirmText"));
-                        UnopenedUri().Text(uriString);
-
-                        // Show the dialog
-                        auto result = co_await presenter.ShowDialog(unopenedUriDialog);
-                        shouldLaunch = result == ContentDialogResult::Secondary;
-                    }
-                }
-
-                if (shouldLaunch)
-                {
-                    ShellExecuteW(nullptr, L"open", uriString.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
-                }
+                ShellExecute(nullptr, L"open", eventArgs.Uri().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
             }
             else
             {
-                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), uriString);
+                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), eventArgs.Uri());
             }
         }
         catch (...)
@@ -3141,10 +3113,9 @@ namespace winrt::TerminalApp::implementation
         if (auto presenter{ _dialogPresenter.get() })
         {
             // FindName needs to be called first to actually load the xaml object
-            auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
+            auto unopenedUriDialog = FindName(L"CouldNotOpenUriDialog").try_as<WUX::Controls::ContentDialog>();
 
             // Insert the reason and the URI
-            unopenedUriDialog.SecondaryButtonText({});
             CouldNotOpenUriReason().Text(reason);
             UnopenedUri().Text(uri);
 
@@ -3197,30 +3168,6 @@ namespace winrt::TerminalApp::implementation
         return true;
     }
 
-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri)
-    {
-        if (parsedUri.SchemeName() == L"http" || parsedUri.SchemeName() == L"https")
-        {
-            return true;
-        }
-        if (parsedUri.SchemeName() == L"file")
-        {
-            static const auto pathext{ wil::TryGetEnvironmentVariableW<std::wstring>(L"PATHEXT") };
-            const auto filename = parsedUri.Path();
-            for (const auto& e : til::split_iterator{ std::wstring_view{ pathext }, L';' })
-            {
-                if (til::ends_with_insensitive_ascii(filename, e))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     // Important! Don't take this eventArgs by reference, we need to extend the
     // lifetime of it to the other side of the co_await!
     safe_void_coroutine TerminalPage::_ControlNoticeRaisedHandler(const IInspectable /*sender*/,
@@ -3795,13 +3742,7 @@ namespace winrt::TerminalApp::implementation
         // for nulls
         if (const auto& connection{ _duplicateConnectionForRestart(paneContent) })
         {
-            // Reset the terminal's VT state before attaching the new connection.
-            // The previous client may have left dirty modes (e.g., bracketed
-            // paste, mouse tracking, alternate buffer, kitty keyboard) that
-            // would corrupt input/output for the new shell process.
-            const auto& termControl = paneContent.GetTermControl();
-            termControl.HardResetWithoutErase();
-            termControl.Connection(connection);
+            paneContent.GetTermControl().Connection(connection);
             connection.Start();
         }
     }

src/cascadia/TerminalApp/TerminalPage.h

@@ -422,9 +422,8 @@ namespace winrt::TerminalApp::implementation
         safe_void_coroutine _PasteFromClipboardHandler(const IInspectable sender,
                                                        const Microsoft::Terminal::Control::PasteFromClipboardEventArgs eventArgs);
 
-        safe_void_coroutine _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
-        static bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
-        static bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri);
+        void _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs);
+        bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri);
 
         void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri);
         bool _CopyText(bool dismissSelection, bool singleLine, bool withControlSequences, Microsoft::Terminal::Control::CopyFormat formats);

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -144,17 +144,17 @@
             </TextBlock>
         </ContentDialog>
 
-        <ContentDialog x:Name="UriErrorDialog"
-                       x:Uid="UriErrorDialog"
+        <ContentDialog x:Name="CouldNotOpenUriDialog"
+                       x:Uid="CouldNotOpenUriDialog"
                        Grid.Row="2"
                        x:Load="False"
-                       DefaultButton="Close">
+                       DefaultButton="Primary">
             <TextBlock IsTextSelectionEnabled="True"
                        TextWrapping="WrapWholeWords">
                 <TextBlock.ContextFlyout>
                     <mtu:TextMenuFlyout />
                 </TextBlock.ContextFlyout>
-                <Run x:Name="CouldNotOpenUriReason" /> <LineBreak /> <LineBreak />
+                <Run x:Name="CouldNotOpenUriReason" /> <LineBreak />
                 <Run x:Name="UnopenedUri"
                      FontFamily="Cascadia Mono" />
             </TextBlock>

src/cascadia/TerminalControl/ControlCore.cpp

@@ -355,12 +355,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         }
     }
 
-    void ControlCore::HardResetWithoutErase()
-    {
-        const auto lock = _terminal->LockForWriting();
-        _terminal->HardResetWithoutErase();
-    }
-
     bool ControlCore::Initialize(const float actualWidth,
                                  const float actualHeight,
                                  const float compositionScale)
@@ -2081,10 +2075,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         //   the selection (we need to reset selection on double-click or
         //   triple-click, so it captures the word or the line, rather than
         //   extending the selection)
-        // - GH#9608: VT mouse mode is enabled. In this mode, Shift is used
-        //   to override mouse input, so Shift+Click should start a fresh
-        //   selection rather than extending the previous one.
-        if (_terminal->IsSelectionActive() && (!shiftEnabled || isOnOriginalPosition || _terminal->IsTrackingMouseInput()))
+        if (_terminal->IsSelectionActive() && (!shiftEnabled || isOnOriginalPosition))
         {
             // Reset the selection
             _terminal->ClearSelection();

src/cascadia/TerminalControl/ControlCore.h

@@ -257,7 +257,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         TerminalConnection::ITerminalConnection Connection();
         void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();
 
         void AnchorContextMenu(til::point viewportRelativeCharacterPosition);
 

src/cascadia/TerminalControl/ControlCore.idl

@@ -98,7 +98,6 @@ namespace Microsoft.Terminal.Control
         void ApplyAppearance(Boolean focused);
 
         Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();
 
         IControlSettings Settings { get; };
         IControlAppearance FocusedAppearance { get; };

src/cascadia/TerminalControl/ControlInteractivity.cpp

@@ -54,20 +54,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 self->Attached.raise(*self, nullptr);
             }
         });
-
-        // GH#14464: Mark mode and quick-edit (shift+arrow) selections update
-        // the selection through ControlCore, bypassing SetEndSelectionPoint.
-        // Listen for selection changes so _selectionNeedsToBeCopied is set
-        // for ALL selection types, not just mouse drag.
-        _core->UpdateSelectionMarkers([weakThis = get_weak()](auto&&, auto&&) {
-            if (auto self{ weakThis.get() })
-            {
-                if (self->_core->HasSelection())
-                {
-                    self->_selectionNeedsToBeCopied = true;
-                }
-            }
-        });
     }
 
     uint64_t ControlInteractivity::Id()
@@ -299,12 +285,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             }
             const auto isOnOriginalPosition = _lastMouseClickPosNoSelection == pixelPosition;
 
-            // Rounded coordinates for text selection.
-            // Don't round in VT mouse mode; cell-level precision matters more.
-            // Only round for single-click: for double/triple-click, rounding
-            // can push the position to the next cell, selecting the wrong word.
-            const auto round = multiClickMapper == 1 && !_core->IsVtMouseModeEnabled();
-            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, round),
+            // Rounded coordinates for text selection
+            _core->LeftClickOnTerminal(_getTerminalPosition(til::point{ pixelPosition }, true),
                                        multiClickMapper,
                                        altEnabled,
                                        shiftEnabled,
@@ -314,15 +296,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             if (_core->HasSelection())
             {
                 // GH#9787: if selection is active we don't want to track the touchdown position
-                // so that dragging the mouse will extend the selection rather than starting the new one.
-                // In VT mouse mode, keep tracking the touchdown point so that PointerMoved
-                // can re-anchor the selection based on drag direction (the dx < 0 adjustment).
-                // Without this, dragging left wouldn't include the initially clicked cell
-                // because floored coordinates place the anchor on the cell's left edge.
-                if (!_core->IsVtMouseModeEnabled())
-                {
-                    _singleClickTouchdownPos = std::nullopt;
-                }
+                // so that dragging the mouse will extend the selection rather than starting the new one
+                _singleClickTouchdownPos = std::nullopt;
             }
         }
         else if (WI_IsFlagSet(buttonState, MouseButtonState::IsRightButtonDown))
@@ -339,18 +314,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             }
             else
             {
-                // GH#19942, GH#14464: Don't re-copy a selection that was
-                // already copied via copyOnSelect on mouse-up. But DO copy
-                // if the selection was made via mark mode or modified with
-                // quick-edit keys (shift+arrow), since those paths never
-                // triggered an automatic copy.
-                const auto copied = (_selectionNeedsToBeCopied || !_core->CopyOnSelect()) &&
-                                    CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
+                // Try to copy the text and clear the selection
+                const auto successfulCopy = CopySelectionToClipboard(shiftEnabled, false, _core->Settings().CopyFormatting());
                 _core->ClearSelection();
-                if (_core->CopyOnSelect() || !copied)
+                if (_core->CopyOnSelect() || !successfulCopy)
                 {
-                    // CopyOnSelect: right-click always pastes.
-                    // Otherwise: no selection → paste.
+                    // CopyOnSelect: right click always pastes!
+                    // Otherwise: no selection --> paste
                     RequestPasteTextFromClipboard();
                 }
             }
@@ -712,9 +682,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - cursorPosition: in pixels, relative to the origin of the control
     void ControlInteractivity::SetEndSelectionPoint(const Core::Point pixelPosition)
     {
-        // Don't round in VT mouse mode; cell-level precision matters more
-        const auto round = !_core->IsVtMouseModeEnabled();
-        _core->SetEndSelectionPoint(_getTerminalPosition(til::point{ pixelPosition }, round));
+        _core->SetEndSelectionPoint(_getTerminalPosition(til::point{ pixelPosition }, true));
         _selectionNeedsToBeCopied = true;
     }
 

src/cascadia/TerminalControl/TermControl.cpp

@@ -532,11 +532,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         _core.Connection(newConnection);
     }
 
-    void TermControl::HardResetWithoutErase()
-    {
-        _core.HardResetWithoutErase();
-    }
-
     void TermControl::_throttledUpdateScrollbar(const ScrollBarUpdate& update)
     {
         if (!_initializedTerminal)
@@ -1795,16 +1790,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return true;
         }
 
-        // While TSF has an active composition, key events must not be forwarded
-        // to the PTY directly. The IME re-injects navigation/confirmation keys
-        // after composition ends, at which point HasActiveComposition() == false
-        // and they are forwarded normally. This mirrors conhost v1 behavior in
-        // src/interactivity/win32/windowio.cpp.
-        if (GetTSFHandle().HasActiveComposition())
-        {
-            return true;
-        }
-
         if (_TrySendKeyEvent(vkey, scanCode, modifiers, keyDown))
         {
             return true;
@@ -1935,6 +1920,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - args: event data
     void TermControl::_TappedHandler(const IInspectable& /*sender*/, const TappedRoutedEventArgs& e)
     {
+        Focus(FocusState::Pointer);
+
         if (e.PointerDeviceType() == Windows::Devices::Input::PointerDeviceType::Touch)
         {
             // Normally TSF would be responsible for showing the touch keyboard, but it's buggy for us:
@@ -2520,9 +2507,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         _updateScrollBar->Run(update);
 
-        // If we have a selection with markers (exposed via selection mode),
-        //   update the position of the markers
-        if (_core.HasSelection() && _core.SelectionMode() >= SelectionInteractionMode::Keyboard)
+        // if we have a selection, update the position of the markers
+        // (they may have been hidden when the endpoint scrolled out of view)
+        if (_core.HasSelection())
         {
             _updateSelectionMarkers(nullptr, winrt::make<UpdateSelectionMarkersEventArgs>(false));
         }
@@ -3086,11 +3073,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             co_return;
         }
 
-        if (const auto hwnd = reinterpret_cast<HWND>(OwningHwnd()))
-        {
-            SetForegroundWindow(hwnd);
-        }
-
         const auto weak = get_weak();
 
         if (e.DataView().Contains(StandardDataFormats::ApplicationLink()))

src/cascadia/TerminalControl/TermControl.h

@@ -192,7 +192,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         TerminalConnection::ITerminalConnection Connection();
         void Connection(const TerminalConnection::ITerminalConnection& connection);
-        void HardResetWithoutErase();
 
         Control::CursorDisplayState CursorVisibility() const noexcept;
         void CursorVisibility(Control::CursorDisplayState cursorVisibility);

src/cascadia/TerminalControl/TermControl.idl

@@ -53,7 +53,6 @@ namespace Microsoft.Terminal.Control
         void SetOverrideColorScheme(Microsoft.Terminal.Core.ICoreScheme scheme);
 
         Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();
 
         UInt64 ContentId{ get; };
 

src/cascadia/TerminalCore/Terminal.cpp

@@ -55,18 +55,6 @@ void Terminal::Create(til::size viewportSize, til::CoordType scrollbackLines, Re
     _stateMachine = std::make_unique<StateMachine>(std::move(engine));
 }
 
-// Method Description:
-// - Resets all VT state to defaults without clearing the buffer content.
-// Called when a connection is restarted so that any dirty modes left
-// behind by a crashed application don't affect the new connection.
-void Terminal::HardResetWithoutErase()
-{
-    _assertLocked();
-    _stateMachine->ResetState();
-    auto& engine = reinterpret_cast<OutputStateMachineEngine&>(_stateMachine->Engine());
-    engine.Dispatch().HardReset(false);
-}
-
 // Method Description:
 // - Initializes the Terminal from the given set of settings.
 // Arguments:
@@ -1534,10 +1522,6 @@ void Terminal::SerializeMainBuffer(HANDLE handle) const
     _mainBuffer->SerializeTo(handle);
 }
 
-void Terminal::UnknownSequence() noexcept
-{
-}
-
 void Terminal::ColorSelection(const TextAttribute& attr, winrt::Microsoft::Terminal::Core::MatchMode matchMode)
 {
     const auto colorSelection = [this](const til::point coordStartInclusive, const til::point coordEndExclusive, const TextAttribute& attr) {

src/cascadia/TerminalCore/Terminal.hpp

@@ -85,7 +85,6 @@ public:
     void Create(til::size viewportSize,
                 til::CoordType scrollbackLines,
                 Microsoft::Console::Render::Renderer& renderer);
-    void HardResetWithoutErase();
 
     void CreateFromSettings(winrt::Microsoft::Terminal::Core::ICoreSettings settings,
                             Microsoft::Console::Render::Renderer& renderer);
@@ -132,9 +131,7 @@ public:
 
 #pragma region ITerminalApi
     // These methods are defined in TerminalApi.cpp
-    void UnknownSequence() noexcept override;
     void ReturnResponse(const std::wstring_view response) override;
-    bool IsConPTY() const noexcept override;
     Microsoft::Console::VirtualTerminal::StateMachine& GetStateMachine() noexcept override;
     BufferState GetBufferAndViewport() noexcept override;
     void SetViewportPosition(const til::point position) noexcept override;

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -28,11 +28,6 @@ void Terminal::ReturnResponse(const std::wstring_view response)
     }
 }
 
-bool Terminal::IsConPTY() const noexcept
-{
-    return false;
-}
-
 Microsoft::Console::VirtualTerminal::StateMachine& Terminal::GetStateMachine() noexcept
 {
     return *_stateMachine;

src/cascadia/TerminalCore/TerminalSelection.cpp

@@ -313,7 +313,7 @@ std::pair<til::point, til::point> Terminal::_ExpandSelectionAnchors(std::pair<ti
         break;
     case SelectionExpansion::Word:
     {
-        start = buffer.GetWordStart2(start, _wordDelimiters, false);
+        start = buffer.GetWordStart(start, _wordDelimiters, false);
 
         // GH#5099: We round to the nearest cell boundary,
         //   so we would normally prematurely expand to the next word
@@ -325,7 +325,7 @@ std::pair<til::point, til::point> Terminal::_ExpandSelectionAnchors(std::pair<ti
         {
             bufferSize.DecrementInExclusiveBounds(end);
         }
-        end = buffer.GetWordEnd2(end, _wordDelimiters, false);
+        end = buffer.GetWordEnd(end, _wordDelimiters, false);
         break;
     }
     case SelectionExpansion::Char:
@@ -435,9 +435,9 @@ void Terminal::ExpandSelectionToWord()
         const auto& buffer = _activeBuffer();
         auto selection{ _selection.write() };
         wil::hide_name _selection;
-        selection->start = buffer.GetWordStart2(selection->start, _wordDelimiters, false);
+        selection->start = buffer.GetWordStart(selection->start, _wordDelimiters, false);
         selection->pivot = selection->start;
-        selection->end = buffer.GetWordEnd2(selection->end, _wordDelimiters, false);
+        selection->end = buffer.GetWordEnd(selection->end, _wordDelimiters, false);
 
         // if we're targeting both endpoints, instead just target "end"
         if (WI_IsFlagSet(_selectionEndpoint, SelectionEndpoint::Start) && WI_IsFlagSet(_selectionEndpoint, SelectionEndpoint::End))
@@ -826,13 +826,13 @@ void Terminal::_MoveByWord(SelectionDirection direction, til::point& pos)
     case SelectionDirection::Left:
     {
         auto nextPos = pos;
-        nextPos = buffer.GetWordStart2(nextPos, _wordDelimiters, true);
+        nextPos = buffer.GetWordStart(nextPos, _wordDelimiters, true);
         if (nextPos == pos)
         {
             // didn't move because we're already at the beginning of a word,
             // so move to the beginning of the previous word
             buffer.GetSize().DecrementInExclusiveBounds(nextPos);
-            nextPos = buffer.GetWordStart2(nextPos, _wordDelimiters, true);
+            nextPos = buffer.GetWordStart(nextPos, _wordDelimiters, true);
         }
         pos = nextPos;
         break;
@@ -841,24 +841,24 @@ void Terminal::_MoveByWord(SelectionDirection direction, til::point& pos)
     {
         const auto mutableViewportEndExclusive = _GetMutableViewport().BottomInclusiveRightExclusive();
         auto nextPos = pos;
-        nextPos = buffer.GetWordEnd2(nextPos, _wordDelimiters, true, mutableViewportEndExclusive);
+        nextPos = buffer.GetWordEnd(nextPos, _wordDelimiters, true, mutableViewportEndExclusive);
         if (nextPos == pos)
         {
             // didn't move because we're already at the end of a word,
             // so move to the end of the next word
             buffer.GetSize().IncrementInExclusiveBounds(nextPos);
-            nextPos = buffer.GetWordEnd2(nextPos, _wordDelimiters, true, mutableViewportEndExclusive);
+            nextPos = buffer.GetWordEnd(nextPos, _wordDelimiters, true, mutableViewportEndExclusive);
         }
         pos = nextPos;
         break;
     }
     case SelectionDirection::Up:
         _MoveByChar(direction, pos);
-        pos = buffer.GetWordStart2(pos, _wordDelimiters, true);
+        pos = buffer.GetWordStart(pos, _wordDelimiters, true);
         break;
     case SelectionDirection::Down:
         _MoveByChar(direction, pos);
-        pos = buffer.GetWordEnd2(pos, _wordDelimiters, true);
+        pos = buffer.GetWordEnd(pos, _wordDelimiters, true);
         break;
     }
 }

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -44,28 +44,6 @@ using namespace winrt::Windows::Foundation::Collections;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    // GH#19927 - Walk the visual tree of the given element to find any
-    // Popups and set the theme on their Child element. In XAML Islands,
-    // popup children render in the PopupRoot (separate from the content
-    // tree), so they don't inherit our page's RequestedTheme
-    static void _setThemeOnPopups(const winrt::Windows::UI::Xaml::DependencyObject& element,
-                                  const winrt::Windows::UI::Xaml::ElementTheme theme)
-    {
-        const auto childCount = winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetChildrenCount(element);
-        for (int32_t i = 0; i < childCount; i++)
-        {
-            const auto child = winrt::Windows::UI::Xaml::Media::VisualTreeHelper::GetChild(element, i);
-            if (const auto popup = child.try_as<winrt::Windows::UI::Xaml::Controls::Primitives::Popup>())
-            {
-                if (const auto popupChild = popup.Child().try_as<winrt::Windows::UI::Xaml::FrameworkElement>())
-                {
-                    popupChild.RequestedTheme(theme);
-                }
-            }
-            _setThemeOnPopups(child, theme);
-        }
-    }
-
     static WUX::Controls::FontIcon _fontIconForNavTag(const std::wstring_view navTag)
     {
         WUX::Controls::FontIcon icon{};
@@ -372,13 +350,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 _Navigate(tag, BreadcrumbSubPage::None);
             }
         }
-
-        // GH#19927 - Theme the search box's internal popup now that the
-        // visual tree is ready and control templates are applied
-        const auto theme = _settingsSource.GlobalSettings().CurrentTheme();
-        const auto hasThemeForSettings{ theme.Settings() != nullptr };
-        const auto requestedTheme = hasThemeForSettings ? theme.Settings().RequestedTheme() : theme.RequestedTheme();
-        _setThemeOnPopups(SettingsSearchBox(), requestedTheme);
     }
 
     // Function Description:
@@ -1127,17 +1098,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             }
         }
 
-        const auto theme = _settingsSource.GlobalSettings().CurrentTheme();
-        const auto hasThemeForSettings{ theme.Settings() != nullptr };
-        const auto appTheme = theme.RequestedTheme();
-        const auto requestedTheme = (hasThemeForSettings) ? theme.Settings().RequestedTheme() : appTheme;
+        const auto& theme = _settingsSource.GlobalSettings().CurrentTheme();
+        const bool hasThemeForSettings{ theme.Settings() != nullptr };
+        const auto& appTheme = theme.RequestedTheme();
+        const auto& requestedTheme = (hasThemeForSettings) ? theme.Settings().RequestedTheme() : appTheme;
 
         RequestedTheme(requestedTheme);
 
-        // GH#19927 - Theme the search box's internal popup so its
-        // dropdown matches the app theme instead of the system theme
-        _setThemeOnPopups(SettingsSearchBox(), requestedTheme);
-
         // Mica gets it's appearance from the app's theme, not necessarily the
         // Page's theme. In the case of dark app, light settings, mica will be a
         // dark color, and the text will also be dark, making the UI _very_ hard

src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Titelleiste ausblenden (Neustart erforderlich)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Wenn diese Option deaktiviert ist, wird die Titelleiste über den Registerkarten angezeigt.</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Startverzeichnis</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Startverzeichnis</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Startverzeichnis</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>Das Verzeichnis, in dem das Profil gestartet wird, wenn es geladen wird.</value>
@@ -1742,7 +1742,7 @@
     <comment>A supplementary setting to the "font face" setting. Toggling this control updates the font face control to show all of the fonts installed.</comment>
   </data>
   <data name="Profile_FontFaceShowAllFonts.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Wenn diese Option aktiviert ist, werden alle installierten Schriftarten in der Liste oben angezeigt. Andernfalls wird nur die Liste der Schriftarten mit fester Breite angezeigt.</value>
+    <value>Wenn diese Option aktiviert ist, werden alle installierten Schriftarten in der Liste oben angezeigt. Andernfalls wird nur die Liste der Festbreitenschriftarten angezeigt.</value>
     <comment>A description for what the supplementary "show all fonts" setting does. Presented near "Profile_FontFaceShowAllFonts".</comment>
   </data>
   <data name="Profile_CreateUnfocusedAppearanceButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Verknüpfung</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Textformatierung</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

@@ -2610,19 +2610,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Ocultar la barra de título (requiere reiniciar)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Cuando está deshabilitada, la barra de título aparecerá encima de las pestañas.</value>
@@ -983,11 +983,11 @@
     <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
   </data>
   <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>Estilo tipográfico</value>
+    <value>Tipo de fuente</value>
     <comment>Header for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Estilo tipográfico</value>
+    <value>Tipo de fuente</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Directorio de inicio</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Directorio de inicio</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Directorio de inicio</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>El directorio en el que se inicia el perfil cuando se carga.</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Acceso directo</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Formato de texto</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Masquer la barre de titre (redémarrage nécessaire)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Une fois désactivée, la barre de titre s’affiche au-dessus des onglets.</value>
@@ -983,11 +983,11 @@
     <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
   </data>
   <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>Style de police</value>
+    <value>Type de police</value>
     <comment>Header for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Style de police</value>
+    <value>Type de police</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Répertoire de démarrage</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Répertoire de démarrage</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Répertoire de démarrage</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>Répertoire dans lequel le shell démarre lorsqu’il est chargé.</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Raccourci</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Mise en forme du texte</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C :\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C :\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Nascondi la barra del titolo (sarà necessario riavviare)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Se disabilitata, la barra del titolo verrà visualizzata sopra le schede.</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Directory iniziale</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Directory iniziale</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Directory iniziale</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>La directory che inizia il profilo durante il caricamento.</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Collegamento</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Formattazione testo</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>タイトル バーを非表示にする (再起動が必要)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>無効にすると、タイトル バーがタブの上に表示されます。</value>
@@ -983,11 +983,11 @@
     <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
   </data>
   <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>フォント スタイル</value>
+    <value>フォント フェイス</value>
     <comment>Header for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>フォント スタイル</value>
+    <value>フォント フェイス</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>開始ディレクトリ</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>開始ディレクトリ</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>開始ディレクトリ</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>プロファイルが読み込まれたときに開始されるディレクトリです。</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>ショートカット</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>テキストの​​書式設定</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw

@@ -293,7 +293,7 @@
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>자리 표시자 "%s"가 검색 쿼리로 바뀝니다.</value>
+    <value>자리 표시자 "%s" 검색 쿼리로 대체됩니다.</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
   <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>제목 표시줄 숨기기(다시 시작해야 함)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>사용하지 않도록 설정하면 제목 표시줄이 탭 위에 표시됩니다.</value>
@@ -983,11 +983,11 @@
     <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
   </data>
   <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>글꼴 스타일</value>
+    <value>글꼴</value>
     <comment>Header for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>글꼴 스타일</value>
+    <value>글꼴</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFace.HelpText" xml:space="preserve">
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>시작 디렉터리</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>시작 디렉터리</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>시작 디렉터리</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>프로필이 로드될 때 시작됩니다.</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>바로 가기</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>텍스트 서식 지정</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL(C:\ 🡒 /mnt/c)</value>
+    <value>WSL(C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin(C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin(C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2(C:\ 🡒 /c)</value>
+    <value>MSYS2(C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW(C:\ 🡒 C:/)</value>
+    <value>MinGW(C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Oculta a barra do título (requer reinicialização)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Quando desabilitada, a barra de título aparecerá acima das guias.</value>
@@ -983,15 +983,15 @@
     <comment>{Locked="‗"} An option to choose from for the "cursor shape" setting. When selected, the cursor will look like a stacked set of two underscores. The character in the parentheses is used to show what it looks like.</comment>
   </data>
   <data name="Profile_FontFace.Header" xml:space="preserve">
-    <value>Variação</value>
+    <value>Tipo de fonte</value>
     <comment>Header for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFaceBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Variação</value>
+    <value>Tipo de fonte</value>
     <comment>Name for a control to select the font for text in the app.</comment>
   </data>
   <data name="Profile_FontFace.HelpText" xml:space="preserve">
-    <value>Você pode usar várias fontes, separando-as com uma vírgula ASCII.</value>
+    <value>Pode utilizar vários tipos de letra separando-os com uma vírgula ASCII.</value>
   </data>
   <data name="Profile_FontSize.Header" xml:space="preserve">
     <value>Tamanho da fonte</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Diretório inicial</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Diretório inicial</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Diretório inicial</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>A pasta em que o perfil começa quando é carregado.</value>
@@ -1742,7 +1742,7 @@
     <comment>A supplementary setting to the "font face" setting. Toggling this control updates the font face control to show all of the fonts installed.</comment>
   </data>
   <data name="Profile_FontFaceShowAllFonts.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>Se ativado, mostra todas as fontes instaladas na lista acima. Caso contrário, mostra apenas as fontes monoespaçadas.</value>
+    <value>Se habilitado, mostrar todas as fontes instaladas na lista acima. Caso contrário, mostrar apenas a lista de fontes com espaçamento mono.</value>
     <comment>A description for what the supplementary "show all fonts" setting does. Presented near "Profile_FontFaceShowAllFonts".</comment>
   </data>
   <data name="Profile_CreateUnfocusedAppearanceButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Atalho</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Formatação de Texto</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw

@@ -293,7 +293,7 @@
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
+    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ѓēφŀāćεđ ẃĩτђ τђе šέªґ¢ħ qύėгў. !!! !!! !!! !!! !!! !!</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
   <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋʼnčћ) !!! !!! !!! !!</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Ŝταяτìлĝ ðĩѓ℮ćτоŗỳ !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Ѕťåřťіπġ đíгëĉţöґγ !!! !!</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Şħōяŧ¢цτ !!</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Ťĕхτ ₣ôямåτţίʼnğ !!! !</value>
@@ -2610,19 +2610,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c) !!! !!!</value>
+    <value>WSL (C:\ -&gt; /mnt/c) !!! !!!</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c) !!! !!! !!</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c) !!! !!! !!</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c) !!! !!</value>
+    <value>MSYS2 (C:\ -&gt; /c) !!! !!</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/) !!! !!</value>
+    <value>MinGW (C:\ -&gt; C:/) !!! !!</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw

@@ -293,7 +293,7 @@
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
+    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ѓēφŀāćεđ ẃĩτђ τђе šέªґ¢ħ qύėгў. !!! !!! !!! !!! !!! !!</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
   <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋʼnčћ) !!! !!! !!! !!</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Ŝταяτìлĝ ðĩѓ℮ćτоŗỳ !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Ѕťåřťіπġ đíгëĉţöґγ !!! !!</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Şħōяŧ¢цτ !!</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Ťĕхτ ₣ôямåτţίʼnğ !!! !</value>
@@ -2610,19 +2610,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c) !!! !!!</value>
+    <value>WSL (C:\ -&gt; /mnt/c) !!! !!!</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c) !!! !!! !!</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c) !!! !!! !!</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c) !!! !!</value>
+    <value>MSYS2 (C:\ -&gt; /c) !!! !!</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/) !!! !!</value>
+    <value>MinGW (C:\ -&gt; C:/) !!! !!</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw

@@ -293,7 +293,7 @@
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ьē ŕěρļąč℮ď ẁїτђ τђέ śеªřсħ qцегỳ. !!! !!! !!! !!! !!! !!!</value>
+    <value>Ţђě рłд¢èнøĺđĕг "%s" щіłĺ ѓēφŀāćεđ ẃĩτђ τђе šέªґ¢ħ qύėгў. !!! !!! !!! !!! !!! !!</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
   <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Ĥìđε тħê τīţĺё ъªř (ŗėqūΐŗêś яеľаϋʼnčћ) !!! !!! !!! !!</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Ẃћèп ðϊŝαъłėð, тнė ťĭτłê вąѓ ẁιĺł ąφφёǻŕ äвöνė ŧħė ťãьś. !!! !!! !!! !!! !!! !</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Ŝταяτìлĝ ðĩѓ℮ćτоŗỳ !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Ѕťåřťіπġ đíгëĉţöґγ !!! !!</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Šтдřтíⁿģ đϊŕёςŧôŗў !!! !!</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>Ţћé đĭŗéçťòŕу τħе рѓøƒĩŀе śťªřťş ïή ẅћĕл îţ ίѕ ŀбдδėď. !!! !!! !!! !!! !!! !</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Şħōяŧ¢цτ !!</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Ťĕхτ ₣ôямåτţίʼnğ !!! !</value>
@@ -2610,19 +2610,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c) !!! !!!</value>
+    <value>WSL (C:\ -&gt; /mnt/c) !!! !!!</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c) !!! !!! !!</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c) !!! !!! !!</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c) !!! !!</value>
+    <value>MSYS2 (C:\ -&gt; /c) !!! !!</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/) !!! !!</value>
+    <value>MinGW (C:\ -&gt; C:/) !!! !!</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>Скрыть заголовок окна (требуется перезапуск)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>Если этот параметр отключен, строка заголовка будет отображаться над вкладками.</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Начальный каталог</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>Запуск каталога</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Начальный каталог</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>Каталог, запускаемый профилем при загрузке.</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Сочетание клавиш</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>Форматирование текста</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw

@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>隐藏标题栏（需要重新启动）</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>禁用后，标题栏将显示在选项卡上方。</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>启动目录</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>启动目录</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>正在启动目录</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>加载配置文件时启动的目录。</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>快捷方式</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>文本格式</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw

@@ -293,7 +293,7 @@
     <comment>Header for a control to set the query URL when using the "search web" action.</comment>
   </data>
   <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>預留位置 "%s" 將以搜尋查詢取代。</value>
+    <value>佔位元 "%s" 將取代為搜尋查詢。</value>
     <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
   </data>
   <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
@@ -507,7 +507,7 @@
   </data>
   <data name="Globals_ShowTitlebar.Header" xml:space="preserve">
     <value>隱藏標題列 (需要重新啟動)</value>
-    <comment>Header for a control to toggle whether or not the title bar should be shown. Changing this setting requires the user to relaunch the app.</comment>
+    <comment>Header for a control to toggle whether the title bar should be shown or not. Changing this setting requires the user to relaunch the app.</comment>
   </data>
   <data name="Globals_ShowTitlebar.HelpText" xml:space="preserve">
     <value>停用時，標題列會出現在索引標籤上方。</value>
@@ -1195,15 +1195,15 @@
   </data>
   <data name="Profile_StartingDirectory.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>起始目錄</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.Header" xml:space="preserve">
     <value>啟動時載入的目錄</value>
-    <comment>Header for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Header for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectoryBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>起始目錄</value>
-    <comment>Name for a control to determine the session's initial directory. This is on a text box that accepts folder paths.</comment>
+    <comment>Name for a control to determine the directory the session opens it at launch. This is on a text box that accepts folder paths.</comment>
   </data>
   <data name="Profile_StartingDirectory.HelpText" xml:space="preserve">
     <value>載入時，設定檔起始的目錄。</value>
@@ -2147,7 +2147,7 @@
   </data>
   <data name="KeyChordListener.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>捷徑</value>
-    <comment>The label for a "key chord listener" control that sets the keys to which a key binding is bound.</comment>
+    <comment>The label for a "key chord listener" control that sets the keys a key binding is bound to.</comment>
   </data>
   <data name="Appearance_TextFormattingHeader.Text" xml:space="preserve">
     <value>文字格式設定</value>
@@ -2606,19 +2606,19 @@
     <comment>An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleWsl.Content" xml:space="preserve">
-    <value>WSL (C:\ 🡒 /mnt/c)</value>
+    <value>WSL (C:\ -&gt; /mnt/c)</value>
     <comment>{Locked="WSL","C:\","/mnt/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleCygwin.Content" xml:space="preserve">
-    <value>Cygwin (C:\ 🡒 /cygdrive/c)</value>
+    <value>Cygwin (C:\ -&gt; /cygdrive/c)</value>
     <comment>{Locked="Cygwin","C:\","/cygdrive/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMsys2.Content" xml:space="preserve">
-    <value>MSYS2 (C:\ 🡒 /c)</value>
+    <value>MSYS2 (C:\ -&gt; /c)</value>
     <comment>{Locked="MSYS2","C:\","/c"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_PathTranslationStyleMinGW.Content" xml:space="preserve">
-    <value>MinGW (C:\ 🡒 C:/)</value>
+    <value>MinGW (C:\ -&gt; C:/)</value>
     <comment>{Locked="MinGW","C:\","C:/"} An option to choose from for the "path translation" setting.</comment>
   </data>
   <data name="Profile_Delete_Orphaned.Header" xml:space="preserve">

src/cascadia/TerminalSettingsModel/VsDevShellGenerator.cpp

@@ -8,16 +8,6 @@
 
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 
-static bool _IsPwshAvailable()
-{
-    // Try to detect if `pwsh.exe` is available in the PATH, if so we want to use that
-    // Allow some extra space in case user put it somewhere odd
-    // We do need to allocate space for the full path even if we don't want to paste the whole thing in
-    wchar_t pwshPath[MAX_PATH] = { 0 };
-    const auto pwshExeName = L"pwsh.exe";
-    return SearchPathW(nullptr, pwshExeName, nullptr, MAX_PATH, pwshPath, nullptr);
-}
-
 void VsDevShellGenerator::GenerateProfiles(const VsSetupConfiguration::VsSetupInstance& instance, bool hidden, std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const
 {
     try
@@ -31,10 +21,9 @@ void VsDevShellGenerator::GenerateProfiles(const VsSetupConfiguration::VsSetupIn
         const winrt::guid profileGuid{ ::Microsoft::Console::Utils::CreateV5Uuid(TERMINAL_PROFILE_NAMESPACE_GUID, std::as_bytes(std::span{ seed })) };
         auto profile = winrt::make_self<implementation::Profile>(profileGuid);
         profile->Name(winrt::hstring{ GetProfileName(instance) });
-        auto isPwsh = _IsPwshAvailable();
-        profile->Commandline(winrt::hstring{ GetProfileCommandLine(instance, isPwsh) });
+        profile->Commandline(winrt::hstring{ GetProfileCommandLine(instance) });
         profile->StartingDirectory(winrt::hstring{ instance.GetInstallationPath() });
-        profile->Icon(winrt::hstring{ GetProfileIconPath(isPwsh) });
+        profile->Icon(winrt::hstring{ GetProfileIconPath() });
         profile->Hidden(hidden);
         profiles.emplace_back(std::move(profile));
     }
@@ -48,15 +37,20 @@ std::wstring VsDevShellGenerator::GetProfileName(const VsSetupConfiguration::VsS
     return name;
 }
 
-std::wstring VsDevShellGenerator::GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance, bool isPwsh) const
+std::wstring VsDevShellGenerator::GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance) const
 {
     // Build this in stages, so reserve space now
     std::wstring commandLine;
     commandLine.reserve(256);
 
-    if (isPwsh)
+    // Try to detect if `pwsh.exe` is available in the PATH, if so we want to use that
+    // Allow some extra space in case user put it somewhere odd
+    // We do need to allocate space for the full path even if we don't want to paste the whole thing in
+    wchar_t pwshPath[MAX_PATH] = { 0 };
+    const auto pwshExeName = L"pwsh.exe";
+    if (SearchPathW(nullptr, pwshExeName, nullptr, MAX_PATH, pwshPath, nullptr))
     {
-        commandLine.append(L"pwsh.exe");
+        commandLine.append(pwshExeName);
     }
     else
     {

src/cascadia/TerminalSettingsModel/VsDevShellGenerator.h

@@ -37,14 +37,13 @@ namespace winrt::Microsoft::Terminal::Settings::Model
             return L"VsDevShell" + instance.GetInstanceId();
         }
 
-        std::wstring GetProfileIconPath(bool isPwsh) const
+        std::wstring GetProfileIconPath() const
         {
-            return isPwsh ? L"ms-appx:///ProfileIcons/vs-pwsh.png" :
-                            L"ms-appx:///ProfileIcons/vs-powershell.png";
+            return L"ms-appx:///ProfileIcons/vs-powershell.png";
         }
 
         std::wstring GetProfileName(const VsSetupConfiguration::VsSetupInstance& instance) const;
-        std::wstring GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance, bool isPwsh) const;
+        std::wstring GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance) const;
         std::wstring GetDevShellModulePath(const VsSetupConfiguration::VsSetupInstance& instance) const;
     };
 };

src/host/_output.cpp

@@ -400,20 +400,16 @@ static FillConsoleResult FillConsoleImpl(SCREEN_INFORMATION& screenInfo, FillCon
         // See FillConsoleOutputCharacterWImpl and its identical code.
         if (enablePowershellShim)
         {
-            auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-            if (const auto writer = gci.GetVtWriterForBuffer(&OutContext))
-            {
-                const auto currentBufferDimensions{ OutContext.GetBufferSize().Dimensions() };
-                const auto wroteWholeBuffer = lengthToWrite == (currentBufferDimensions.area<size_t>());
-                const auto startedAtOrigin = startingCoordinate == til::point{ 0, 0 };
-                const auto wroteSpaces = attribute == (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED);
+            const auto currentBufferDimensions{ OutContext.GetBufferSize().Dimensions() };
+            const auto wroteWholeBuffer = lengthToWrite == (currentBufferDimensions.area<size_t>());
+            const auto startedAtOrigin = startingCoordinate == til::point{ 0, 0 };
+            const auto wroteSpaces = attribute == (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED);
 
-                if (wroteWholeBuffer && startedAtOrigin && wroteSpaces)
-                {
-                    // PowerShell has previously called FillConsoleOutputCharacterW() which triggered a call to WriteClearScreen().
-                    cellsModified = lengthToWrite;
-                    return S_OK;
-                }
+            if (wroteWholeBuffer && startedAtOrigin && wroteSpaces)
+            {
+                // PowerShell has previously called FillConsoleOutputCharacterW() which triggered a call to WriteClearScreen().
+                cellsModified = lengthToWrite;
+                return S_OK;
             }
         }
 
@@ -457,21 +453,23 @@ static FillConsoleResult FillConsoleImpl(SCREEN_INFORMATION& screenInfo, FillCon
         // their entire buffer will be cleared as well.
         if (enablePowershellShim)
         {
-            auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-            if (auto writer = gci.GetVtWriterForBuffer(&OutContext))
-            {
-                const auto currentBufferDimensions{ OutContext.GetBufferSize().Dimensions() };
-                const auto wroteWholeBuffer = lengthToWrite == (currentBufferDimensions.area<size_t>());
-                const auto startedAtOrigin = startingCoordinate == til::point{ 0, 0 };
-                const auto wroteSpaces = character == UNICODE_SPACE;
+            const auto currentBufferDimensions{ OutContext.GetBufferSize().Dimensions() };
+            const auto wroteWholeBuffer = lengthToWrite == (currentBufferDimensions.area<size_t>());
+            const auto startedAtOrigin = startingCoordinate == til::point{ 0, 0 };
+            const auto wroteSpaces = character == UNICODE_SPACE;
 
-                if (wroteWholeBuffer && startedAtOrigin && wroteSpaces)
+            if (wroteWholeBuffer && startedAtOrigin && wroteSpaces)
+            {
+                WriteClearScreen(OutContext);
+
+                auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
+                if (auto writer = gci.GetVtWriterForBuffer(&OutContext))
                 {
-                    WriteClearScreen(OutContext);
                     writer.Submit();
-                    cellsModified = lengthToWrite;
-                    return S_OK;
                 }
+
+                cellsModified = lengthToWrite;
+                return S_OK;
             }
         }
 

src/host/ft_host/testmd.definition

@@ -40,6 +40,12 @@
       "Execution": {
         "AdditionalParameter": "/select:\"@IsPerfTest=true\""
       }
+    },
+    {
+      "Name": "NoAppPlatform",
+      "Execution": {
+        "AdditionalParameter": "/select:\"not(@Name='PolicyTests::*')\""
+      }
     }
   ]
-}
+}

src/host/getset.cpp

@@ -982,23 +982,20 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
         // A null character will get translated to whitespace.
         fillCharacter = Microsoft::Console::VirtualTerminal::VtIo::SanitizeUCS2(fillCharacter);
 
-        if (writer)
+        // GH#3126 - This is a shim for cmd's `cls` function. In the
+        // legacy console, `cls` is supposed to clear the entire buffer.
+        // We always use a VT sequence, even if ConPTY isn't used, because those are faster nowadays.
+        if (enableCmdShim &&
+            source.left <= 0 && source.top <= 0 &&
+            source.right >= bufferSize.RightInclusive() && source.bottom >= bufferSize.BottomInclusive() &&
+            target.x == 0 && target.y <= -bufferSize.BottomExclusive() &&
+            !clip &&
+            fillCharacter == UNICODE_SPACE && fillAttribute == buffer.GetAttributes().GetLegacyAttributes())
+        {
+            WriteClearScreen(context);
+        }
+        else if (writer)
         {
-            // GH#3126 - This is a shim for cmd's `cls` function. In the
-            // legacy console, `cls` is supposed to clear the entire buffer.
-            // We always use a VT sequence, even if ConPTY isn't used, because those are faster nowadays.
-            if (enableCmdShim &&
-                source.left <= 0 && source.top <= 0 &&
-                source.right >= bufferSize.RightInclusive() && source.bottom >= bufferSize.BottomInclusive() &&
-                target.x == 0 && target.y <= -bufferSize.BottomExclusive() &&
-                !clip &&
-                fillCharacter == UNICODE_SPACE && fillAttribute == buffer.GetAttributes().GetLegacyAttributes())
-            {
-                WriteClearScreen(context);
-                writer.Submit();
-                return S_OK;
-            }
-
             const auto clipViewport = clip ? Viewport::FromInclusive(*clip).Clamp(bufferSize) : bufferSize;
             const auto sourceViewport = Viewport::FromInclusive(source);
             const auto fillViewport = sourceViewport.Clamp(clipViewport);
@@ -1084,8 +1081,6 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
                 RETURN_IF_FAILED(WriteConsoleOutputWImplHelper(context, fill, w, fillViewport, writtenViewport));
                 RETURN_IF_FAILED(WriteConsoleOutputWImplHelper(context, backup, w, Viewport::FromDimensions(target, readViewport.Dimensions()).Clamp(clipViewport), writtenViewport));
             }
-
-            writer.Submit();
         }
         else
         {
@@ -1093,6 +1088,11 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
             ScrollRegion(buffer, source, clip, target, fillCharacter, useThisAttr);
         }
 
+        if (writer)
+        {
+            writer.Submit();
+        }
+
         return S_OK;
     }
     CATCH_RETURN();

src/host/outputStream.cpp

@@ -24,22 +24,6 @@ ConhostInternalGetSet::ConhostInternalGetSet(_In_ IIoProvider& io) :
 {
 }
 
-void ConhostInternalGetSet::UnknownSequence() noexcept
-{
-    auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-
-    // VT sequences unknown to us may cause the cursor position to change in a way that
-    // we don't know about. In this case, we need to mark the cursor position as "dirty".
-    //
-    // The worst offender is likely PowerShell. It uses VT sequences but also calls
-    // GetConsoleScreenBufferInfoEx for *every single line of output* (!!!). This prevents
-    // us from using a more conservative solution (e.g. always fetching the cursor position).
-    if (gci.IsInVtIoMode())
-    {
-        gci.GetActiveOutputBuffer().GetActiveBuffer().SetConptyCursorPositionMayBeWrong();
-    }
-}
-
 // - Sends a string response to the input stream of the console.
 // - Used by various commands where the program attached would like a reply to one of the commands issued.
 // - This will generate two "key presses" (one down, one up) for every character in the string and place them into the head of the console's input stream.
@@ -64,12 +48,6 @@ void ConhostInternalGetSet::ReturnResponse(const std::wstring_view response)
     _io.GetActiveInputBuffer()->WriteString(response);
 }
 
-bool ConhostInternalGetSet::IsConPTY() const noexcept
-{
-    const auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    return gci.IsInVtIoMode();
-}
-
 // Routine Description:
 // - Retrieves the state machine for the active output buffer.
 // Arguments:

src/host/outputStream.hpp

@@ -29,10 +29,8 @@ class ConhostInternalGetSet final : public Microsoft::Console::VirtualTerminal::
 public:
     ConhostInternalGetSet(_In_ Microsoft::Console::IIoProvider& io);
 
-    void UnknownSequence() noexcept override;
     void ReturnResponse(const std::wstring_view response) override;
 
-    bool IsConPTY() const noexcept override;
     Microsoft::Console::VirtualTerminal::StateMachine& GetStateMachine() override;
     BufferState GetBufferAndViewport() override;
     void SetViewportPosition(const til::point position) override;

src/host/readDataCooked.cpp

@@ -1313,15 +1313,6 @@ COOKED_READ_DATA::LayoutResult COOKED_READ_DATA::_layoutLine(std::wstring& outpu
             til::CoordType cols = 0;
             const auto len = textBuffer.FitTextIntoColumns(text, columnLimit - column, cols);
 
-            // GH#19922: We need to account for terminals that are just 1 column wide, as we may deadlock otherwise.
-            // `columnLimit - column == 1` will then prevent `FitTextIntoColumns` from fitting any wide glyphs.
-            // We can detect this by checking for `len == 0`, skip the offending glyph and break out of the deadlock.
-            if (len == 0) [[unlikely]]
-            {
-                it += textBuffer.GraphemeNext(text, 0);
-                break;
-            }
-
             output.append(text, 0, len);
             column += cols;
             it += len;

src/host/ut_host/SearchTests.cpp

@@ -18,10 +18,17 @@ class SearchTests
 {
     TEST_CLASS(SearchTests);
 
-    CommonState* m_state;
+    CommonState* m_state{ nullptr };
 
     TEST_CLASS_SETUP(ClassSetup)
     {
+        wil::unique_hmodule icu{ LoadLibraryExW(L"icu.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32) };
+        if (!icu)
+        {
+            Log::Result(TestResults::Skipped, L"ICU is not present");
+            return true;
+        }
+
         m_state = new CommonState();
         m_state->PrepareGlobalScreenBuffer();
         return true;
@@ -29,8 +36,11 @@ class SearchTests
 
     TEST_CLASS_CLEANUP(ClassCleanup)
     {
-        m_state->CleanupGlobalScreenBuffer();
-        delete m_state;
+        if (m_state)
+        {
+            m_state->CleanupGlobalScreenBuffer();
+            delete m_state;
+        }
         return true;
     }
 

src/host/ut_host/TextBufferTests.cpp

@@ -143,7 +143,7 @@ class TextBufferTests
 
     void WriteLinesToBuffer(const std::vector<std::wstring>& text, TextBuffer& buffer);
     TEST_METHOD(GetWordBoundaries);
-    TEST_METHOD(MoveByWord);
+
     TEST_METHOD(GetGlyphBoundaries);
 
     TEST_METHOD(GetTextRects);
@@ -2039,12 +2039,12 @@ void TextBufferTests::GetWordBoundaries()
 
     // Test Data:
     // - til::point - starting position
-    // - til::point - expected result (accessibilityMode = false)
-    // - til::point - expected result (accessibilityMode = true)
+    // - til::point - expected result (includeWhitespace = false)
+    // - til::point - expected result (includeWhitespace = true)
     struct ExpectedResult
     {
-        til::point accessibilityModeDisabled;
-        til::point accessibilityModeEnabled;
+        til::point selectionMode;
+        til::point accessibilityMode;
     };
 
     struct Test
@@ -2056,7 +2056,8 @@ void TextBufferTests::GetWordBoundaries()
     // Set testData for GetWordStart tests
     // clang-format off
     std::vector<Test> testData = {
-        // tests for first line of text
+        // tests for first line of text ("word other" + spaces)
+        //                    selectionMode  accessibilityMode
         { {  0, 0 },    {{  0, 0 },      { 0, 0 }} },
         { {  1, 0 },    {{  0, 0 },      { 0, 0 }} },
         { {  3, 0 },    {{  0, 0 },      { 0, 0 }} },
@@ -2066,7 +2067,7 @@ void TextBufferTests::GetWordBoundaries()
         { { 20, 0 },    {{ 10, 0 },      { 5, 0 }} },
         { { 79, 0 },    {{ 10, 0 },      { 5, 0 }} },
 
-        // tests for second line of text
+        // tests for second line of text ("  more   words" + spaces)
         { {  0, 1 },     {{ 0, 1 },       { 5, 0 }} },
         { {  1, 1 },     {{ 0, 1 },       { 5, 0 }} },
         { {  2, 1 },     {{ 2, 1 },       { 2, 1 }} },
@@ -2082,54 +2083,56 @@ void TextBufferTests::GetWordBoundaries()
     // clang-format on
 
     BEGIN_TEST_METHOD_PROPERTIES()
-        TEST_METHOD_PROPERTY(L"Data:accessibilityMode", L"{false, true}")
+        TEST_METHOD_PROPERTY(L"Data:includeWhitespace", L"{false, true}")
     END_TEST_METHOD_PROPERTIES();
 
-    bool accessibilityMode;
-    VERIFY_SUCCEEDED(TestData::TryGetValue(L"accessibilityMode", accessibilityMode), L"Get accessibility mode variant");
+    bool includeWhitespace;
+    VERIFY_SUCCEEDED(TestData::TryGetValue(L"includeWhitespace", includeWhitespace), L"Get includeWhitespace variant");
 
     const std::wstring_view delimiters = L" ";
     for (const auto& test : testData)
     {
         Log::Comment(NoThrowString().Format(L"til::point (%hd, %hd)", test.startPos.x, test.startPos.y));
-        const auto result = _buffer->GetWordStart(test.startPos, delimiters, accessibilityMode);
-        const auto expected = accessibilityMode ? test.expected.accessibilityModeEnabled : test.expected.accessibilityModeDisabled;
+        const auto result = _buffer->GetWordStart(test.startPos, delimiters, includeWhitespace);
+        const auto expected = includeWhitespace ? test.expected.accessibilityMode : test.expected.selectionMode;
         VERIFY_ARE_EQUAL(expected, result);
     }
 
     // Update testData for GetWordEnd tests
+    // Note: GetWordEnd returns exclusive end positions
     // clang-format off
     testData = {
-        // tests for first line of text
-        { { 0, 0 }, { { 3, 0 }, { 5, 0 } } },
-        { { 1, 0 }, { { 3, 0 }, { 5, 0 } } },
-        { { 3, 0 }, { { 3, 0 }, { 5, 0 } } },
-        { { 4, 0 }, { { 4, 0 }, { 5, 0 } } },
-        { { 5, 0 }, { { 9, 0 }, { 2, 1 } } },
-        { { 6, 0 }, { { 9, 0 }, { 2, 1 } } },
-        { { 20, 0 }, { { 79, 0 }, { 2, 1 } } },
-        { { 79, 0 }, { { 79, 0 }, { 2, 1 } } },
+        // tests for first line of text ("word other" + spaces)
+        //                  selectionMode  accessibilityMode
+        { { 0, 0 }, { {  4, 0 }, {  5, 0 } } },
+        { { 1, 0 }, { {  4, 0 }, {  5, 0 } } },
+        { { 3, 0 }, { {  4, 0 }, {  5, 0 } } },
+        { { 4, 0 }, { {  5, 0 }, {  5, 0 } } },
+        { { 5, 0 }, { { 10, 0 }, {  2, 1 } } },
+        { { 6, 0 }, { { 10, 0 }, {  2, 1 } } },
+        { { 20, 0 }, { { 80, 0 }, { 2, 1 } } },
+        { { 79, 0 }, { { 80, 0 }, { 2, 1 } } },
 
-        // tests for second line of text
-        { { 0, 1 }, { { 1, 1 }, { 2, 1 } } },
-        { { 1, 1 }, { { 1, 1 }, { 2, 1 } } },
-        { { 2, 1 }, { { 5, 1 }, { 9, 1 } } },
-        { { 3, 1 }, { { 5, 1 }, { 9, 1 } } },
-        { { 5, 1 }, { { 5, 1 }, { 9, 1 } } },
-        { { 6, 1 }, { { 8, 1 }, { 9, 1 } } },
-        { { 7, 1 }, { { 8, 1 }, { 9, 1 } } },
-        { { 9, 1 }, { { 13, 1 }, { 0, 9001 } } },
-        { { 10, 1 }, { { 13, 1 }, { 0, 9001 } } },
-        { { 20, 1 }, { { 79, 1 }, { 0, 9001 } } },
-        { { 79, 1 }, { { 79, 1 }, { 0, 9001 } } },
+        // tests for second line of text ("  more   words" + spaces)
+        { { 0, 1 }, { {  2, 1 }, {  2, 1 } } },
+        { { 1, 1 }, { {  2, 1 }, {  2, 1 } } },
+        { { 2, 1 }, { {  6, 1 }, {  9, 1 } } },
+        { { 3, 1 }, { {  6, 1 }, {  9, 1 } } },
+        { { 5, 1 }, { {  6, 1 }, {  9, 1 } } },
+        { { 6, 1 }, { {  9, 1 }, {  9, 1 } } },
+        { { 7, 1 }, { {  9, 1 }, {  9, 1 } } },
+        { { 9, 1 }, { { 14, 1 }, { 80, 9000 } } },
+        { { 10, 1 }, { { 14, 1 }, { 80, 9000 } } },
+        { { 20, 1 }, { { 80, 1 }, { 80, 9000 } } },
+        { { 79, 1 }, { { 80, 1 }, { 80, 9000 } } },
     };
     // clang-format on
 
     for (const auto& test : testData)
     {
         Log::Comment(NoThrowString().Format(L"til::point (%hd, %hd)", test.startPos.x, test.startPos.y));
-        auto result = _buffer->GetWordEnd(test.startPos, delimiters, accessibilityMode);
-        const auto expected = accessibilityMode ? test.expected.accessibilityModeEnabled : test.expected.accessibilityModeDisabled;
+        auto result = _buffer->GetWordEnd(test.startPos, delimiters, includeWhitespace);
+        const auto expected = includeWhitespace ? test.expected.accessibilityMode : test.expected.selectionMode;
         VERIFY_ARE_EQUAL(expected, result);
     }
 
@@ -2161,6 +2164,7 @@ void TextBufferTests::GetWordBoundaries()
 
     // clang-format off
     testData = {
+        //                  selectionMode  accessibilityMode
         { { 0, 0 }, { { 0, 0 }, { 0, 0 } } },
         { { 1, 0 }, { { 0, 0 }, { 0, 0 } } },
         { { 4, 0 }, { { 4, 0 }, { 0, 0 } } },
@@ -2173,11 +2177,11 @@ void TextBufferTests::GetWordBoundaries()
 
         { { 0, 2 }, { { 0, 2 }, { 0, 2 } } },
         { { 9, 2 }, { { 0, 2 }, { 0, 2 } } },
-                                  // v accessibility does not consider wrapping
+
         { { 0, 3 }, { { 0, 3 }, { 0, 2 } } },
         { { 7, 3 }, { { 6, 3 }, { 0, 2 } } },
-                                  // v accessibility does not consider wrapping
-        { { 1, 4 }, { { 0, 4 }, { 0, 2 } } },
+                                  // v selection mode now also crosses wrapped rows for ControlChar
+        { { 1, 4 }, { { 6, 3 }, { 0, 2 } } },
         { { 4, 4 }, { { 4, 4 }, { 4, 4 } } },
         { { 8, 4 }, { { 4, 4 }, { 4, 4 } } },
 
@@ -2188,8 +2192,8 @@ void TextBufferTests::GetWordBoundaries()
     for (const auto& test : testData)
     {
         Log::Comment(NoThrowString().Format(L"Testing til::point (%hd, %hd)", test.startPos.x, test.startPos.y));
-        const auto result = _buffer->GetWordStart(test.startPos, delimiters, accessibilityMode);
-        const auto expected = accessibilityMode ? test.expected.accessibilityModeEnabled : test.expected.accessibilityModeDisabled;
+        const auto result = _buffer->GetWordStart(test.startPos, delimiters, includeWhitespace);
+        const auto expected = includeWhitespace ? test.expected.accessibilityMode : test.expected.selectionMode;
         VERIFY_ARE_EQUAL(expected, result);
     }
 
@@ -2205,123 +2209,43 @@ void TextBufferTests::GetWordBoundaries()
     // clang-format off
     testData = {
         // tests for first line of text
-        { { 0, 0 }, { { 3, 0 }, { 5, 0 } } },
-        { { 1, 0 }, { { 3, 0 }, { 5, 0 } } },
-        { { 4, 0 }, { { 4, 0 }, { 5, 0 } } },
-        { { 5, 0 }, { { 7, 1 }, { 0, 2 } } },
-        { { 7, 0 }, { { 7, 1 }, { 0, 2 } } },
+        //                  selectionMode  accessibilityMode
+        { { 0, 0 }, { {  4, 0 }, { 5, 0 } } },
+        { { 1, 0 }, { {  4, 0 }, { 5, 0 } } },
+        { { 4, 0 }, { {  5, 0 }, { 5, 0 } } },
+        { { 5, 0 }, { {  8, 1 }, { 0, 2 } } },
+        { { 7, 0 }, { {  8, 1 }, { 0, 2 } } },
 
-        { { 4, 1 }, { { 7, 1 }, { 0, 2 } } },
-        { { 7, 1 }, { { 7, 1 }, { 0, 2 } } },
-        { { 9, 1 }, { { 9, 1 }, { 0, 2 } } },
+        { { 4, 1 }, { {  8, 1 }, { 0, 2 } } },
+        { { 7, 1 }, { {  8, 1 }, { 0, 2 } } },
+        { { 9, 1 }, { { 10, 1 }, { 0, 2 } } },
 
-        { { 0, 2 }, { { 9, 2 }, { 4, 4 } } },
-        { { 9, 2 }, { { 9, 2 }, { 4, 4 } } },
+        { { 0, 2 }, { { 10, 2 }, { 4, 4 } } },
+        { { 9, 2 }, { { 10, 2 }, { 4, 4 } } },
 
-        { { 0, 3 }, { { 5, 3 }, { 4, 4 } } },
-        { { 7, 3 }, { { 9, 3 }, { 4, 4 } } },
+        { { 0, 3 }, { {  6, 3 }, { 4, 4 } } },
+        { { 7, 3 }, { {  4, 4 }, { 4, 4 } } },
 
-        { { 1, 4 }, { { 3, 4 }, { 4, 4 } } },
-        { { 4, 4 }, { { 0, 5 }, { 2, 5 } } },
-        { { 8, 4 }, { { 0, 5 }, { 2, 5 } } },
+        { { 1, 4 }, { {  4, 4 }, { 4, 4 } } },
+        { { 4, 4 }, { {  1, 5 }, { 2, 5 } } },
+        { { 8, 4 }, { {  1, 5 }, { 2, 5 } } },
 
-        { { 0, 5 }, { { 0, 5 }, { 2, 5 } } },
-        { { 1, 5 }, { { 1, 5 }, { 2, 5 } } },
-        { { 4, 5 }, { { 9, 5 }, { 0, 6 } } },
-        { { 9, 5 }, { { 9, 5 }, { 0, 6 } } },
+        { { 0, 5 }, { {  1, 5 }, { 2, 5 } } },
+        { { 1, 5 }, { {  2, 5 }, { 2, 5 } } },
+        { { 4, 5 }, { { 10, 5 }, { 10, 5 } } },
+        { { 9, 5 }, { { 10, 5 }, { 10, 5 } } },
     };
     // clang-format on
 
     for (const auto& test : testData)
     {
         Log::Comment(NoThrowString().Format(L"TestEnd til::point (%hd, %hd)", test.startPos.x, test.startPos.y));
-        auto result = _buffer->GetWordEnd(test.startPos, delimiters, accessibilityMode);
-        const auto expected = accessibilityMode ? test.expected.accessibilityModeEnabled : test.expected.accessibilityModeDisabled;
+        auto result = _buffer->GetWordEnd(test.startPos, delimiters, includeWhitespace);
+        const auto expected = includeWhitespace ? test.expected.accessibilityMode : test.expected.selectionMode;
         VERIFY_ARE_EQUAL(expected, result);
     }
 }
 
-void TextBufferTests::MoveByWord()
-{
-    til::size bufferSize{ 80, 9001 };
-    UINT cursorSize = 12;
-    TextAttribute attr{ 0x7f };
-    auto _buffer = std::make_unique<TextBuffer>(bufferSize, attr, cursorSize, false, &_renderer);
-
-    // Setup: Write lines of text to the buffer
-    const std::vector<std::wstring> text = { L"word other",
-                                             L"  more   words" };
-    WriteLinesToBuffer(text, *_buffer);
-
-    // Test Data:
-    // - til::point - starting position
-    // - til::point - expected result (moving forwards)
-    // - til::point - expected result (moving backwards)
-    struct ExpectedResult
-    {
-        til::point moveForwards;
-        til::point moveBackwards;
-    };
-
-    struct Test
-    {
-        til::point startPos;
-        ExpectedResult expected;
-    };
-
-    // Set testData for GetWordStart tests
-    // clang-format off
-    std::vector<Test> testData = {
-        // tests for first line of text
-        { {  0, 0 },    {{  5, 0 },      { 0, 0 }} },
-        { {  1, 0 },    {{  5, 0 },      { 1, 0 }} },
-        { {  3, 0 },    {{  5, 0 },      { 3, 0 }} },
-        { {  4, 0 },    {{  5, 0 },      { 4, 0 }} },
-        { {  5, 0 },    {{  2, 1 },      { 0, 0 }} },
-        { {  6, 0 },    {{  2, 1 },      { 0, 0 }} },
-        { { 20, 0 },    {{  2, 1 },      { 0, 0 }} },
-        { { 79, 0 },    {{  2, 1 },      { 0, 0 }} },
-
-        // tests for second line of text
-        { {  0, 1 },     {{ 2, 1 },       { 0, 0 }} },
-        { {  1, 1 },     {{ 2, 1 },       { 0, 0 }} },
-        { {  2, 1 },     {{ 9, 1 },       { 5, 0 }} },
-        { {  3, 1 },     {{ 9, 1 },       { 5, 0 }} },
-        { {  5, 1 },     {{ 9, 1 },       { 5, 0 }} },
-        { {  6, 1 },     {{ 9, 1 },       { 5, 0 }} },
-        { {  7, 1 },     {{ 9, 1 },       { 5, 0 }} },
-        { {  9, 1 },     {{ 9, 1 },       { 2, 1 }} },
-        { { 10, 1 },     {{10, 1 },       { 2, 1 }} },
-        { { 20, 1 },     {{20, 1 },       { 2, 1 }} },
-        { { 79, 1 },     {{79, 1 },       { 2, 1 }} },
-    };
-    // clang-format on
-
-    BEGIN_TEST_METHOD_PROPERTIES()
-        TEST_METHOD_PROPERTY(L"Data:movingForwards", L"{false, true}")
-    END_TEST_METHOD_PROPERTIES();
-
-    bool movingForwards;
-    VERIFY_SUCCEEDED(TestData::TryGetValue(L"movingForwards", movingForwards), L"Get movingForwards variant");
-
-    const std::wstring_view delimiters = L" ";
-    const auto lastCharPos = _buffer->GetLastNonSpaceCharacter();
-    for (const auto& test : testData)
-    {
-        Log::Comment(NoThrowString().Format(L"COORD (%hd, %hd)", test.startPos.x, test.startPos.y));
-        auto pos{ test.startPos };
-        const auto result = movingForwards ?
-                                _buffer->MoveToNextWord(pos, delimiters, lastCharPos) :
-                                _buffer->MoveToPreviousWord(pos, delimiters);
-        const auto expected = movingForwards ? test.expected.moveForwards : test.expected.moveBackwards;
-        VERIFY_ARE_EQUAL(expected, pos);
-
-        // if we moved, result is true and pos != startPos.
-        // otherwise, result is false and pos == startPos.
-        VERIFY_ARE_EQUAL(result, pos != test.startPos);
-    }
-}
-
 void TextBufferTests::GetGlyphBoundaries()
 {
     struct ExpectedResult

src/inc/conpty-static.h

@@ -42,7 +42,7 @@ CONPTY_EXPORT HRESULT WINAPI ConptyCreatePseudoConsoleAsUser(HANDLE hToken, COOR
 
 CONPTY_EXPORT HRESULT WINAPI ConptyResizePseudoConsole(HPCON hPC, COORD size);
 CONPTY_EXPORT HRESULT WINAPI ConptyClearPseudoConsole(HPCON hPC, BOOL keepCursorRow);
-CONPTY_EXPORT HRESULT WINAPI ConptyShowHidePseudoConsole(HPCON hPC, BOOL show);
+CONPTY_EXPORT HRESULT WINAPI ConptyShowHidePseudoConsole(HPCON hPC, bool show);
 CONPTY_EXPORT HRESULT WINAPI ConptyReparentPseudoConsole(HPCON hPC, HWND newParent);
 CONPTY_EXPORT HRESULT WINAPI ConptyReleasePseudoConsole(HPCON hPC);
 

src/inc/til/string.h

@@ -241,7 +241,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
     constexpr bool ends_with_insensitive_ascii(const std::basic_string_view<T, Traits>& str, const std::basic_string_view<T, Traits>& suffix) noexcept
     {
 #pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-        return str.size() >= suffix.size() && equals_insensitive_ascii<>({ str.data() + str.size() - suffix.size(), suffix.size() }, suffix);
+        return str.size() >= suffix.size() && equals_insensitive_ascii<>({ str.data() - suffix.size(), suffix.size() }, suffix);
     }
 
     constexpr bool ends_with_insensitive_ascii(const std::string_view& str, const std::string_view& prefix) noexcept
@@ -251,7 +251,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
 
     constexpr bool ends_with_insensitive_ascii(const std::wstring_view& str, const std::wstring_view& prefix) noexcept
     {
-        return ends_with_insensitive_ascii<>(str, prefix);
+        return ends_with<>(str, prefix);
     }
 
     template<typename T, typename Traits>

src/interactivity/onecore/ConIoSrvComm.cpp

@@ -444,7 +444,15 @@ VOID ConIoSrvComm::HandleFocusEvent(const CIS_EVENT* const Event)
                 // TODO: MSFT: 11833883 - Determine action when wait on paint operation via
                 //       DirectX on OneCoreUAP times out while switching console
                 //       applications.
+
+                UnlockConsole();
+                // Teardown may need to wait for an entire frame to finish, but it will not be
+                // able to do so while we are holding the console lock. Relinquish the lock
+                // for as long as it takes to quiesce the render thread, and then take it back
+                // afterwards. This is globally safe because ConIoSrv will not process any other
+                // requests while the focus event is outstanding.
                 Renderer->TriggerTeardown();
+                LockConsole();
 
                 // Relinquish control of the graphics device (only one
                 // DirectX application may control the device at any one

src/interactivity/win32/windowproc.cpp

@@ -951,11 +951,6 @@ LRESULT Window::_HandleGetDpiScaledSize(UINT dpiNew, _Inout_ SIZE* pSizeNew) con
 // - <none>
 void Window::_HandleDrop(const WPARAM wParam) const
 {
-    if (const auto hwnd = GetWindowHandle())
-    {
-        SetForegroundWindow(hwnd);
-    }
-
     const auto drop = reinterpret_cast<HDROP>(wParam);
     Clipboard::Instance().PasteDrop(drop);
     DragFinish(drop);

src/renderer/base/renderer.cpp

@@ -1072,7 +1072,38 @@ void Renderer::_PaintBufferOutput(_In_ IRenderEngine* const pEngine)
             ROW* rowBackup = nullptr;
             if (row == compositionRow)
             {
-                rowBackup = _PaintBufferOutputComposition(buffer, r, activeComposition);
+                auto& scratch = buffer.GetScratchpadRow();
+                scratch.CopyFrom(r);
+                rowBackup = &scratch;
+
+                std::wstring_view text{ activeComposition.text };
+                RowWriteState state{
+                    .columnLimit = r.GetReadableColumnCount(),
+                    .columnEnd = _compositionCache->absoluteOrigin.x,
+                };
+
+                size_t off = 0;
+                for (const auto& range : activeComposition.attributes)
+                {
+                    const auto len = range.len;
+                    auto attr = range.attr;
+
+                    // Use the color at the cursor if TSF didn't specify any explicit color.
+                    if (attr.GetBackground().IsDefault())
+                    {
+                        attr.SetBackground(_compositionCache->baseAttribute.GetBackground());
+                    }
+                    if (attr.GetForeground().IsDefault())
+                    {
+                        attr.SetForeground(_compositionCache->baseAttribute.GetForeground());
+                    }
+
+                    state.text = text.substr(off, len);
+                    state.columnBegin = state.columnEnd;
+                    const_cast<ROW&>(r).ReplaceText(state);
+                    const_cast<ROW&>(r).ReplaceAttributes(state.columnBegin, state.columnEnd, attr);
+                    off += len;
+                }
             }
             const auto restore = wil::scope_exit([&] {
                 if (rowBackup)
@@ -1112,107 +1143,6 @@ void Renderer::_PaintBufferOutput(_In_ IRenderEngine* const pEngine)
     }
 }
 
-ROW* Renderer::_PaintBufferOutputComposition(TextBuffer& buffer, const ROW& r, const Composition& activeComposition)
-{
-    auto& scratch = buffer.GetScratchpadRow();
-    scratch.CopyFrom(r);
-
-    // *Overwrite* the original text with the active composition...
-    til::CoordType compositionEnd = 0;
-    {
-        std::wstring_view text{ activeComposition.text };
-        RowWriteState state{
-            .columnLimit = r.GetReadableColumnCount(),
-            .columnEnd = _compositionCache->absoluteOrigin.x,
-        };
-
-        size_t off = 0;
-        for (const auto& range : activeComposition.attributes)
-        {
-            const auto len = range.len;
-            auto attr = range.attr;
-
-            // Use the color at the cursor if TSF didn't specify any explicit color.
-            if (attr.GetBackground().IsDefault())
-            {
-                attr.SetBackground(_compositionCache->baseAttribute.GetBackground());
-            }
-            if (attr.GetForeground().IsDefault())
-            {
-                attr.SetForeground(_compositionCache->baseAttribute.GetForeground());
-            }
-
-            state.text = text.substr(off, len);
-            state.columnBegin = state.columnEnd;
-            const_cast<ROW&>(r).ReplaceText(state);
-            const_cast<ROW&>(r).ReplaceAttributes(state.columnBegin, state.columnEnd, attr);
-            off += len;
-        }
-
-        compositionEnd = state.columnEnd;
-    }
-
-    // The text we've overwritten may have been crucial to the user,
-    // so copy it back by absorbing available whitespace to the right
-    // and re-inserting the non-whitespace characters instead.
-    const auto compositionWidth = compositionEnd - _compositionCache->absoluteOrigin.x;
-    const auto colLimit = r.GetReadableColumnCount();
-    if (compositionWidth > 0 && compositionEnd < colLimit)
-    {
-        const auto text = scratch.GetText();
-        auto srcCol = _compositionCache->absoluteOrigin.x;
-        auto dstCol = compositionEnd;
-        auto remaining = compositionWidth;
-        size_t i = scratch.GetCharOffset(srcCol);
-
-        while (i < text.size() && dstCol < colLimit)
-        {
-            // Treat whitespace we encounter as a credit towards our composition width.
-            // This loop essentially absorbs the whitespace.
-            while (i < text.size() && til::at(text, i) == L' ' && remaining > 0)
-            {
-                remaining--;
-                srcCol++;
-                i++;
-            }
-            if (remaining <= 0)
-            {
-                break;
-            }
-
-            // Find the end of the non-whitespace span: Our span of text to insert.
-            auto spanEnd = i;
-            while (spanEnd < text.size() && til::at(text, spanEnd) != L' ')
-            {
-                spanEnd++;
-            }
-
-            // Copy the non-whitespace segment from the original text (scratch) back in.
-            RowCopyTextFromState state{
-                .source = scratch,
-                .columnBegin = dstCol,
-                .columnLimit = colLimit,
-                .sourceColumnBegin = srcCol,
-                .sourceColumnLimit = scratch.GetLeadingColumnAtCharOffset(spanEnd),
-            };
-            const_cast<ROW&>(r).CopyTextFrom(state);
-
-            const auto srcBeg = gsl::narrow_cast<uint16_t>(srcCol);
-            const auto srcEnd = gsl::narrow_cast<uint16_t>(state.sourceColumnEnd);
-            const auto attr = scratch.Attributes().slice(srcBeg, srcEnd);
-            const auto dstBeg = gsl::narrow_cast<uint16_t>(dstCol);
-            const auto dstEnd = gsl::narrow_cast<uint16_t>(dstCol + attr.size());
-            const_cast<ROW&>(r).Attributes().replace(dstBeg, dstEnd, attr);
-
-            dstCol = state.columnEnd;
-            srcCol = state.sourceColumnEnd;
-            i = spanEnd;
-        }
-    }
-
-    return &scratch;
-}
-
 static bool _IsAllSpaces(const std::wstring_view v)
 {
     // first non-space char is not found (is npos)

src/renderer/base/renderer.hpp

@@ -121,7 +121,6 @@ namespace Microsoft::Console::Render
         void _scheduleRenditionBlink();
         [[nodiscard]] HRESULT _PaintBackground(_In_ IRenderEngine* const pEngine);
         void _PaintBufferOutput(_In_ IRenderEngine* const pEngine);
-        ROW* _PaintBufferOutputComposition(TextBuffer& buffer, const ROW& r, const Composition& activeComposition);
         void _PaintBufferOutputHelper(_In_ IRenderEngine* const pEngine, TextBufferCellIterator it, const til::point target);
         void _PaintBufferOutputGridLineHelper(_In_ IRenderEngine* const pEngine, const TextAttribute textAttribute, const size_t cchLine, const til::point coordTarget);
         bool _isHoveredHyperlink(const TextAttribute& textAttribute) const noexcept;

src/server/ApiDispatchers.cpp

@@ -595,12 +595,9 @@ constexpr T saturate(auto val)
     RETURN_IF_FAILED(pObjectHandle->GetScreenBuffer(GENERIC_READ, &pObj));
 
     // See ConptyCursorPositionMayBeWrong() for details.
-    auto& activeBuffer = pObj->GetActiveBuffer();
-    // GetConsoleScreenBufferInfoExImpl uses GetActiveBuffer internally, but
-    // under the console lock.
-    if (activeBuffer.ConptyCursorPositionMayBeWrong())
+    if (pObj->ConptyCursorPositionMayBeWrong())
     {
-        activeBuffer.WaitForConptyCursorPositionToBeSynchronized();
+        pObj->WaitForConptyCursorPositionToBeSynchronized();
     }
 
     m->_pApiRoutines->GetConsoleScreenBufferInfoExImpl(*pObj, ex);

src/terminal/adapter/ITermDispatch.hpp

@@ -35,7 +35,6 @@ public:
 #pragma warning(disable : 26432) // suppress rule of 5 violation on interface because tampering with this is fraught with peril
     virtual ~ITermDispatch() = 0;
 
-    virtual void UnknownSequence() noexcept = 0;
     virtual void Print(const wchar_t wchPrintable) = 0;
     virtual void PrintString(const std::wstring_view string) = 0;
 
@@ -140,7 +139,7 @@ public:
     virtual void AnnounceCodeStructure(const VTInt ansiLevel) = 0; // ACS
 
     virtual void SoftReset() = 0; // DECSTR
-    virtual void HardReset(bool erase) = 0; // RIS
+    virtual void HardReset() = 0; // RIS
     virtual void ScreenAlignmentPattern() = 0; // DECALN
 
     virtual void SetCursorStyle(const DispatchTypes::CursorStyle cursorStyle) = 0; // DECSCUSR

src/terminal/adapter/ITerminalApi.hpp

@@ -37,7 +37,6 @@ namespace Microsoft::Console::VirtualTerminal
         ITerminalApi& operator=(const ITerminalApi&) = delete;
         ITerminalApi& operator=(ITerminalApi&&) = delete;
 
-        virtual void UnknownSequence() noexcept = 0;
         virtual void ReturnResponse(const std::wstring_view response) = 0;
 
         struct BufferState
@@ -47,7 +46,6 @@ namespace Microsoft::Console::VirtualTerminal
             bool isMainBuffer;
         };
 
-        virtual bool IsConPTY() const noexcept = 0;
         virtual StateMachine& GetStateMachine() = 0;
         virtual BufferState GetBufferAndViewport() = 0;
         virtual void SetViewportPosition(const til::point position) = 0;

src/terminal/adapter/InteractDispatch.cpp

@@ -166,7 +166,7 @@ void InteractDispatch::MoveCursor(const VTInt row, const VTInt col)
 
     // Unblock any callers inside SCREEN_INFORMATION::WaitForConptyCursorPositionToBeSynchronized().
     // The cursor position has now been updated to the terminal's.
-    info.GetActiveBuffer().ResetConptyCursorPositionMayBeWrong();
+    info.ResetConptyCursorPositionMayBeWrong();
 }
 
 // Routine Description: