Merge remote-tracking branch 'origin/main' into dev/duhowett/connection-utf8

Make WriteOutput take utf-8 as well
Az: switch some static strings to u8
2026-05-19 21:41:15 +00:00 · 2025-12-17 12:42:08 -06:00 · 2025-12-10 13:08:02 -06:00 · 2025-12-10 12:25:00 -06:00 · 2025-12-10 10:45:08 -06:00 · 2025-12-10 10:45:00 -06:00
394 changed files with 6459 additions and 10052 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true

 contact_links:
  - name: Microsoft Security Response Center 🔐
--- a/.github/actions/spelling/allow/allow.txt
+++ b/.github/actions/spelling/allow/allow.txt
@@ -67,14 +67,11 @@ servicebus
 slnt
 stakeholders
 subpage
-subpages
 sustainability
 sxn
 Tencent
 toolset
-Uids
 UEFI
-UIDs
 uiatextrange
 und
 vsdevcmd
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -141,7 +141,6 @@ BValue
 Cacafire
 CALLCONV
 CANDRABINDU
-CANTCALLOUT
 capslock
 CARETBLINKINGENABLED
 CARRIAGERETURN
@@ -256,6 +255,7 @@ conterm
 contsf
 contypes
 conwinuserrefs
+coordnew
 COPYCOLOR
 COPYDATA
 COPYDATASTRUCT
@@ -572,7 +572,6 @@ FGHIJ
 fgidx
 FGs
 FILEDESCRIPTION
-filehops
 FILESUBTYPE
 FILESYSPATH
 FILEW
@@ -622,6 +621,7 @@ fuzzmap
 fuzzwrapper
 fwdecl
 fwe
+fwlink
 fzf
 gci
 gcx
@@ -808,7 +808,6 @@ INCONTEXT
 INDEXID
 INFOEX
 inheritcursor
-ININPUTSYNCCALL
 INITCOMMONCONTROLSEX
 INITDIALOG
 INITGUID
@@ -865,7 +864,6 @@ KILLACTIVE
 KILLFOCUS
 kinda
 KIYEOK
-KKP
 KLF
 KLMNO
 KOK
@@ -885,7 +883,6 @@ LBUTTONDOWN
 LBUTTONUP
 lcb
 lci
-LCMAP
 LCONTROL
 LCTRL
 lcx
@@ -1020,7 +1017,6 @@ minkernel
 MINMAXINFO
 minwin
 minwindef
-misprediction
 MMBB
 mmcc
 MMCPL
@@ -1065,7 +1061,6 @@ Mypair
 Myval
 NAMELENGTH
 namestream
-NCACTIVATE
 NCCALCSIZE
 NCCREATE
 NCLBUTTONDOWN
@@ -1773,7 +1768,6 @@ uldash
 uldb
 ULONGLONG
 ulwave
-Unaccess
 Unadvise
 unattend
 UNCPRIORITY
--- a/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml
@@ -56,12 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!

-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
+++ b/build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml
@@ -56,11 +56,11 @@
  <ReleaseNotes>
    Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !

- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭŉтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εŉćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !

-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
   </ReleaseNotes>
  <ScreenshotCaptions>
    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
--- a/build/pgo/Terminal.PGO.props
+++ b/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>
--- a/build/pipelines/ob-nightly.yml
+++ b/build/pipelines/ob-nightly.yml
@@ -28,7 +28,7 @@ extends:
    official: true
    branding: Canary
    buildTerminal: true
-    pgoBuildMode: Optimize
+    pgoBuildMode: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
    codeSign: true
    signingIdentity:
      serviceName: $(SigningServiceName)
--- a/build/pipelines/pgo.yml
+++ b/build/pipelines/pgo.yml
@@ -50,7 +50,6 @@ stages:
          buildEverything: true
          pgoBuildMode: Instrument
          artifactStem: -instrumentation
-          keepAllExpensiveBuildOutputs: false # the ARM64 build agent runs out of memory downloading the artifacts...

  - stage: RunPGO
    displayName: Run PGO
--- a/build/pipelines/templates-v2/job-build-package-wpf.yml
+++ b/build/pipelines/templates-v2/job-build-package-wpf.yml
@@ -46,7 +46,6 @@ jobs:
          BuildConfiguration: ${{ config }}
  dependsOn: ${{ parameters.dependsOn }}
  variables:
-    BuildPlatform: Any CPU
    OutputBuildPlatform: AnyCPU
    Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
    JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg
--- a/build/pipelines/templates-v2/job-build-project.yml
+++ b/build/pipelines/templates-v2/job-build-project.yml
@@ -133,11 +133,11 @@ jobs:
          $SignFragments += "wpfdotnet"
        }
        If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\TerminalControl"
+          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
          $SignFragments += "wpf"
        }
        If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
-          $BuildTargets += "Conhost\Host_EXE;Conhost\winconptydll"
+          $BuildTargets += "Conhost\Host_EXE;Conhost\winconpty_DLL"
          $SignFragments += "conpty"
        }
        Write-Host "Targets: $($BuildTargets -Join ";")"
--- a/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
+++ b/build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml
@@ -26,7 +26,6 @@ jobs:
    pgoToolsPath: $(Build.SourcesDirectory)\build\PGO
    nuspecPath: $(pgoToolsPath)\NuSpecs
    nuspecFilename: PGO.nuspec
-    nugetFeed: "https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies/nuget/v3/index.json"

  steps:
  - checkout: self
@@ -46,8 +45,7 @@ jobs:

  - task: NuGetAuthenticate@1
    inputs:
-      azureDevOpsServiceConnection: 'Terminal Public Artifact Feed'
-      feedUrl: $(nugetFeed)
+      nuGetServiceConnections: 'Terminal Public Artifact Feed'

  # In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
  # This should be `task: NuGetCommand@2`
@@ -70,7 +68,15 @@ jobs:
    artifact: pgo-nupkg-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
    displayName: "Publish Pipeline Artifact"

-  - pwsh: |-
-      $nupkg = Get-Item "$(Build.ArtifactStagingDirectory)/*.nupkg"
-      & nuget push -ApiKey az -Source "$(nugetFeed)" "$nupkg"
-    displayName: NuGet push
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet push'
+    inputs:
+      command: push
+      nuGetFeedType: external
+      packagesToPush: $(Build.ArtifactStagingDirectory)/*.nupkg
+      # The actual URL and PAT for this feed is configured at
+      # https://microsoft.visualstudio.com/Dart/_settings/adminservices
+      # This is the name of that connection
+      publishFeedCredentials: 'Terminal Public Artifact Feed'
+      feedsToUse: config
+      nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.config'
--- a/build/pipelines/templates-v2/job-run-pgo-tests.yml
+++ b/build/pipelines/templates-v2/job-run-pgo-tests.yml
@@ -45,10 +45,6 @@ jobs:
    displayName: Extract the unpackaged build for PGO

  - template: steps-ensure-nuget-version.yml
-    parameters:
-      ${{ if eq(parameters.buildPlatform, 'arm64') }}:
-        # The ARM64 agents do not seem to have NuGet installed
-        forceNugetInstallation: true

  - powershell: |-
      $Package = 'Microsoft.Internal.Windows.Terminal.TestContent'
--- a/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml
@@ -210,8 +210,6 @@ extends:
                  ob_createvpack_taskLogVerbosity: Detailed
                  ob_createvpack_verbose: true
                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_createvpack_versionAs: string
-                  ob_createvpack_version: '$(XES_PACKAGEVERSIONNUMBER)'
                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
--- a/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
+++ b/build/pipelines/templates-v2/steps-ensure-nuget-version.yml
@@ -1,10 +1,5 @@
-parameters:
-  - name: forceNugetInstallation
-    type: boolean
-    default: false
-
 steps:
- ${{ if and(ne(parameters.forceNugetInstallation, true), eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564')) }}:
+- ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
  - pwsh: |-
      Write-Host "Assuming NuGet is already installed..."
      & nuget.exe help
@@ -12,6 +7,6 @@ steps:

 - ${{ else }}:
  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 7.0.1
+    displayName: Use NuGet 6.6.1
    inputs:
-      versionSpec: 7.0.1
+      versionSpec: 6.6.1
--- a/custom.props
+++ b/custom.props
@@ -3,7 +3,7 @@
  <!-- This file is read by XES, which we use in our Release builds. -->
  <PropertyGroup Label="Version">
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
    <VersionMinor>25</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
--- a/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+++ b/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
@@ -1,45 +0,0 @@
-From c3be070b7ee42639554555c27dce10c9de7af76c Mon Sep 17 00:00:00 2001
-From: "J. Berger" <mail@janaberger.de>
-Date: Sat, 1 Nov 2025 17:38:30 +0100
-Subject: [PATCH] When using MSVC x86 to compile v12.0.0 or v12.1.0,
- conversions from __int64 to a 32bit unsigned int trigger warnings. (#4594)
-
-This is a follow-up for PR #4572.
---
- include/fmt/format.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4a653007..65e19d2d 100644
--- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -2534,7 +2534,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-     auto grouping = Grouping(loc, specs.localized());
-     size += grouping.count_separators(exp);
-     return write_padded<Char, align::right>(
-        out, specs, to_unsigned(size), [&](iterator it) {
-+        out, specs, static_cast<size_t>(size), [&](iterator it) {
-           if (s != sign::none) *it++ = detail::getsign<Char>(s);
-           it = write_significand(it, f.significand, significand_size, exp,
-                                  decimal_point, grouping);
-@@ -2550,7 +2550,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-   bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
-   size += 1 + (pointy ? 1 : 0) + num_zeros;
-   return write_padded<Char, align::right>(
-      out, specs, to_unsigned(size), [&](iterator it) {
-+      out, specs, static_cast<size_t>(size), [&](iterator it) {
-         if (s != sign::none) *it++ = detail::getsign<Char>(s);
-         *it++ = Char('0');
-         if (!pointy) return it;
-@@ -2594,7 +2594,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-     *it++ = Char(exp_char);
-     return write_exponent<Char>(exp, it);
-   };
-  auto usize = to_unsigned(size);
-+  size_t usize = static_cast<size_t>(size);
-   return specs.width > 0
-              ? write_padded<Char, align::right>(out, specs, usize, write)
-              : base_iterator(out, write(reserve(out, usize)));
-- 
-2.52.0.vfs.0.5
-
--- a/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
+++ b/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88c12148..967b53dd 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
+   join(netfxpath
+        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
+        ".NETFramework\\v4.0")
+-  file(WRITE run-msbuild.bat "
+  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
+     ${MSBUILD_SETUP}
+     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
+ endif ()
--- a/dep/vcpkg-overlay-ports/fmt/portfile.cmake
+++ b/dep/vcpkg-overlay-ports/fmt/portfile.cmake
@@ -2,10 +2,10 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO fmtlib/fmt
    REF "${VERSION}"
-    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
+    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
    HEAD_REF master
    PATCHES
-        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+        fix-write-batch.patch
 )

 vcpkg_cmake_configure(
@@ -22,6 +22,13 @@ vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()

+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
+        "defined(FMT_SHARED)"
+        "1"
+    )
+endif()
+
 file(REMOVE_RECURSE
    "${CURRENT_PACKAGES_DIR}/debug/include"
    "${CURRENT_PACKAGES_DIR}/debug/share"
--- a/dep/vcpkg-overlay-ports/fmt/vcpkg.json
+++ b/dep/vcpkg-overlay-ports/fmt/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "fmt",
-  "version": "12.1.0",
+  "version": "11.1.4",
  "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
  "homepage": "https://github.com/fmtlib/fmt",
  "license": "MIT",
--- a/dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch
+++ b/dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch
@@ -1,57 +0,0 @@
-From fae5556fd4d4850f948aeabee25ddf0280494725 Mon Sep 17 00:00:00 2001
-From: lizz <lizz@sensetime.com>
-Date: Fri, 10 Apr 2020 23:02:21 +0800
-Subject: [PATCH] No trailing space for BuiltStyledStreamWriter
-
-Signed-off-by: lizz <lizz@sensetime.com>
---
- src/lib_json/json_writer.cpp | 10 +++++++++-
- src/test_lib_json/main.cpp   |  4 ++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
-index ee45c43..e22eb17 100644
--- a/src/lib_json/json_writer.cpp
-+++ b/src/lib_json/json_writer.cpp
-@@ -990,7 +990,15 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
-         writeCommentBeforeValue(childValue);
-         writeWithIndent(
-             valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
-        *sout_ << colonSymbol_;
-+        size_t n = colonSymbol_.size();
-+        if ((childValue.type() == objectValue && !childValue.empty()) ||
-+            (childValue.type() == arrayValue && !childValue.empty() &&
-+             ((cs_ == CommentStyle::All) || isMultilineArray(childValue)))) {
-+          // Line-ending colon, so trim any trailing space from it
-+          for (; n && colonSymbol_[n - 1] == ' '; --n)
-+            ;
-+        }
-+        sout_->write(colonSymbol_.data(), n);
-         writeValue(childValue);
-         if (++it == members.end()) {
-           writeCommentAfterValueOnSameLine(childValue);
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
-index 55ab224..28cb043 100644
--- a/src/test_lib_json/main.cpp
-+++ b/src/test_lib_json/main.cpp
-@@ -2533,7 +2533,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNumericValue) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
-                              "\t\"property1\" : \n"
-+                              "\t\"property1\" :\n"
-                               "\t[\n"
-                               "\t\t\"value1\",\n"
-                               "\t\t\"value2\"\n"
-@@ -2553,7 +2553,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNestedObjects) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
-                              "\t\"object1\" : \n"
-+                              "\t\"object1\" :\n"
-                               "\t{\n"
-                               "\t\t\"bool\" : true,\n"
-                               "\t\t\"nested\" : 123\n"
-- 
-2.52.0.vfs.0.5
-
--- a/dep/vcpkg-overlay-ports/jsoncpp/portfile.cmake
+++ b/dep/vcpkg-overlay-ports/jsoncpp/portfile.cmake
@@ -1,36 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO open-source-parsers/jsoncpp
-    REF "${VERSION}"
-    SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
-    HEAD_REF master
-    PATCHES
-        0001-No-trailing-space-for-BuildStyledStreamWriter.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DJSONCPP_WITH_CMAKE_PACKAGE=ON
-        -DBUILD_STATIC_LIBS=${JSONCPP_STATIC}
-        -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT}
-        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON
-        -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-        -DJSONCPP_WITH_TESTS=OFF
-        -DJSONCPP_WITH_EXAMPLE=OFF
-        -DBUILD_OBJECT_LIBS=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_copy_pdbs()
-vcpkg_fixup_pkgconfig()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/dep/vcpkg-overlay-ports/jsoncpp/vcpkg.json
+++ b/dep/vcpkg-overlay-ports/jsoncpp/vcpkg.json
@@ -1,17 +0,0 @@
-{
-  "name": "jsoncpp",
-  "version": "1.9.6",
-  "description": "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.",
-  "homepage": "https://github.com/open-source-parsers/jsoncpp",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
--- a/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
@@ -1,8 +0,0 @@
-# Same as the official arm64-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE arm64)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
--- a/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake
@@ -1,11 +1,6 @@
-# Same as the official arm64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)

-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake
@@ -1,11 +1,6 @@
-# Same as the official x64-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)

-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake
@@ -1,11 +1,6 @@
-# Same as the official x86-windows-static triplet
 set(VCPKG_TARGET_ARCHITECTURE x86)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)

-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
-
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)
--- a/dep/vcpkg-overlay-triplets/x64-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/x64-windows-static.cmake
@@ -1,8 +0,0 @@
-# Same as the official x64-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE x64)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
--- a/dep/vcpkg-overlay-triplets/x86-windows-static.cmake
+++ b/dep/vcpkg-overlay-triplets/x86-windows-static.cmake
@@ -1,8 +0,0 @@
-# Same as the official x86-windows-static triplet
-set(VCPKG_TARGET_ARCHITECTURE x86)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-
-# ...but with explicit platform toolset, so that future toolsets
-# aren't automatically picked up (it defaults to the latest one).
-set(VCPKG_PLATFORM_TOOLSET v143)
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -2407,14 +2407,6 @@
            "console"
          ]
        },
-        "compatibility.ambiguousWidth": {
-          "default": "narrow",
-          "description": "Controls the cell width of East Asian Ambiguous characters.",
-          "enum": [
-            "narrow",
-            "wide"
-          ]
-        },
        "copyFormatting": {
          "default": true,
          "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -2470,13 +2462,6 @@
          },
          "type": "array"
        },
-        "safeUriSchemes": {
-          "description": "Specifies a list of URI schemes that are considered safe. No confirmation will be required to open URIs with these schemes.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
        "rendering.graphicsAPI": {
          "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
          "type": "string",
--- a/Terminal/spec.md
+++ b/Terminal/spec.md
@@ -27,7 +27,6 @@ Two new properties should be added in the json settings file:

 2. Both X value and Y values are optional. If any one of them is missing, or the value is invalid, system default value will be used. Examples:

-       "1000" equals (1000, 1000)
       ", 1000" equals (default, 1000)
       "1000, " equals (1000, default)
       "," equals (default, default)
--- a/src/buffer/out/Row.cpp
+++ b/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);
--- a/src/buffer/out/Row.hpp
+++ b/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(); }
--- a/src/buffer/out/UTextAdapter.cpp
+++ b/src/buffer/out/UTextAdapter.cpp
@@ -390,9 +390,6 @@ Microsoft::Console::ICU::unique_utext Microsoft::Console::ICU::UTextFromTextBuff
    utext_setup(&ut, 0, &status);
    FAIL_FAST_IF(status > U_ZERO_ERROR);

-    rowBeg = std::max<til::CoordType>(0, rowBeg);
-    rowEnd = std::min(textBuffer.GetSize().BottomExclusive(), rowEnd);
-
    ut.providerProperties = (1 << UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE) | (1 << UTEXT_PROVIDER_STABLE_CHUNKS);
    ut.pFuncs = &utextFuncs;
    ut.context = &textBuffer;
--- a/src/buffer/out/ut_textbuffer/ReflowTests.cpp
+++ b/src/buffer/out/ut_textbuffer/ReflowTests.cpp
@@ -600,6 +600,90 @@ namespace
            },
        },
    };
+
+#pragma region TAEF hookup for the test case array above
+    struct ArrayIndexTaefAdapterRow : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataRow>
+    {
+        HRESULT RuntimeClassInitialize(const size_t index)
+        {
+            _index = index;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestData(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            const auto indexString{ wil::str_printf<std::wstring>(L"%zu", _index) };
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto indexBstr{ wil::make_bstr(indexString.c_str()) };
+            (void)SafeArrayPutElement(safeArray, &index, indexBstr.release());
+            *ppData = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetMetadataNames(SAFEARRAY** ppMetadataNames) override
+        {
+            *ppMetadataNames = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetMetadata(BSTR /*pszName*/, SAFEARRAY** ppData) override
+        {
+            *ppData = nullptr;
+            return S_FALSE;
+        }
+
+        STDMETHODIMP GetName(BSTR* ppszRowName) override
+        {
+            *ppszRowName = nullptr;
+            return S_FALSE;
+        }
+
+    private:
+        size_t _index;
+    };
+
+    struct ArrayIndexTaefAdapterSource : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataSource>
+    {
+        STDMETHODIMP Advance(IDataRow** ppDataRow) override
+        {
+            if (_index < std::extent_v<decltype(testCases)>)
+            {
+                Microsoft::WRL::MakeAndInitialize<ArrayIndexTaefAdapterRow>(ppDataRow, _index++);
+            }
+            else
+            {
+                *ppDataRow = nullptr;
+            }
+            return S_OK;
+        }
+
+        STDMETHODIMP Reset() override
+        {
+            _index = 0;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataNames(SAFEARRAY** names) override
+        {
+            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
+            LONG index{ 0 };
+            auto dataNameBstr{ wil::make_bstr(L"index") };
+            (void)SafeArrayPutElement(safeArray, &index, dataNameBstr.release());
+            *names = safeArray;
+            return S_OK;
+        }
+
+        STDMETHODIMP GetTestDataType(BSTR /*name*/, BSTR* type) override
+        {
+            *type = nullptr;
+            return S_OK;
+        }
+
+    private:
+        size_t _index{ 0 };
+    };
+#pragma endregion
 }

 extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)
--- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
+++ b/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>
--- a/src/cascadia/CascadiaPackage/Package.appxmanifest
+++ b/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>
--- a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
@@ -823,7 +823,7 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(3u, command.NestedCommands().Size());
            _logCommandNames(command.NestedCommands());
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -845,7 +845,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -867,7 +867,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -960,8 +960,8 @@ namespace TerminalAppLocalTests

        for (auto name : std::vector<std::wstring>({ L"profile0", L"profile1", L"profile2" }))
        {
-            const auto childCommandName = fmt::format(FMT_COMPILE(L"New tab, profile: {}"), name);
-            auto command = rootCommand.NestedCommands().Lookup(childCommandName);
+            winrt::hstring commandName{ fmt::format(L"New tab, profile: {}", name) };
+            auto command = rootCommand.NestedCommands().Lookup(commandName);
            VERIFY_IS_NOT_NULL(command);
            auto actionAndArgs = command.ActionAndArgs();
            VERIFY_IS_NOT_NULL(actionAndArgs);
@@ -1078,7 +1078,7 @@ namespace TerminalAppLocalTests

            _logCommandNames(command.NestedCommands());
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1100,7 +1100,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: down, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: down, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
@@ -1122,7 +1122,7 @@ namespace TerminalAppLocalTests
                VERIFY_IS_FALSE(childCommand.HasNestedCommands());
            }
            {
-                const auto childCommandName = fmt::format(FMT_COMPILE(L"Split pane, split: right, profile: {}"), name);
+                winrt::hstring childCommandName{ fmt::format(L"Split pane, split: right, profile: {}", name) };
                auto childCommand = command.NestedCommands().Lookup(childCommandName);
                VERIFY_IS_NOT_NULL(childCommand);
                auto childActionAndArgs = childCommand.ActionAndArgs();
--- a/src/cascadia/ShellExtension/OpenTerminalHere.h
+++ b/src/cascadia/ShellExtension/OpenTerminalHere.h
@@ -34,7 +34,7 @@ struct
 #else // DEV
    __declspec(uuid("52065414-e077-47ec-a3ac-1cc5455e1b54"))
 #endif
-    OpenTerminalHere : public RuntimeClass<RuntimeClassFlags<ClassicCom | InhibitFtmBase>, IExplorerCommand, IObjectWithSite>
+        OpenTerminalHere : public RuntimeClass<RuntimeClassFlags<ClassicCom | InhibitFtmBase>, IExplorerCommand, IObjectWithSite>
 {
 #pragma region IExplorerCommand
    STDMETHODIMP Invoke(IShellItemArray* psiItemArray,
--- a/src/cascadia/TerminalApp/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -499,8 +499,8 @@ namespace winrt::TerminalApp::implementation
            }
            else
            {
-                const auto resizeSucceeded = _ResizePane(realArgs.ResizeDirection());
-                args.Handled(resizeSucceeded);
+                _ResizePane(realArgs.ResizeDirection());
+                args.Handled(true);
            }
        }
    }
@@ -903,10 +903,7 @@ namespace winrt::TerminalApp::implementation
            co_return;
        }

-        // ShellExecuteExW may block, so do it on a background thread.
-        //
-        // NOTE: All remaining code of this function doesn't touch `this`, so we don't need weak/strong_ref.
-        // NOTE NOTE: Don't touch `this` when you make changes here.
+        // Hop to the BG thread
        co_await winrt::resume_background();

        // This will get us the correct exe for dev/preview/release. If you
@@ -917,7 +914,7 @@ namespace winrt::TerminalApp::implementation
        // Build the commandline to pass to wt for this set of NewTerminalArgs
        // `-w -1` will ensure a new window is created.
        const auto commandline = terminalArgs.ToCommandline();
-        const auto cmdline = fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline);
+        winrt::hstring cmdline{ fmt::format(FMT_COMPILE(L"-w -1 new-tab {}"), commandline) };

        // Build the args to ShellExecuteEx. We need to use ShellExecuteEx so we
        // can pass the SEE_MASK_NOASYNC flag. That flag allows us to safely
@@ -1459,8 +1456,6 @@ namespace winrt::TerminalApp::implementation

    safe_void_coroutine TerminalPage::_doHandleSuggestions(SuggestionsArgs realArgs)
    {
-        const auto weak = get_weak();
-        const auto dispatcher = Dispatcher();
        const auto source = realArgs.Source();
        std::vector<Command> commandsCollection;
        Control::CommandHistoryContext context{ nullptr };
@@ -1527,12 +1522,7 @@ namespace winrt::TerminalApp::implementation
            }
        }

-        co_await wil::resume_foreground(dispatcher);
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());

        // Open the palette with all these commands in it.
        _OpenSuggestions(_GetActiveControl(),
--- a/src/cascadia/TerminalApp/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/AppLogic.cpp
@@ -149,9 +149,7 @@ namespace winrt::TerminalApp::implementation
            });

        _languageProfileNotifier = winrt::make_self<LanguageProfileNotifier>([this]() {
-            // TODO: This is really bad, because we reset any current user customizations.
-            // See GH#11522.
-            ReloadSettingsThrottled();
+            _reloadSettings->Run();
        });

        // Do this here, rather than at the top of main. This will prevent us from
@@ -331,7 +329,7 @@ namespace winrt::TerminalApp::implementation

                if (modifiedBasename == settingsBasename)
                {
-                    ReloadSettingsThrottled();
+                    _reloadSettings->Run();
                }
            });
    }
@@ -437,11 +435,6 @@ namespace winrt::TerminalApp::implementation
        SettingsChanged.raise(*this, *ev);
    }

-    void AppLogic::ReloadSettingsThrottled()
-    {
-        _reloadSettings->Run();
-    }
-
    // This is a continuation of AppLogic::Create() and includes the more expensive parts.
    void AppLogic::NotifyRootInitialized()
    {
--- a/src/cascadia/TerminalApp/AppLogic.h
+++ b/src/cascadia/TerminalApp/AppLogic.h
@@ -36,7 +36,6 @@ namespace winrt::TerminalApp::implementation
        bool IsRunningElevated() const noexcept;
        bool CanDragDrop() const noexcept;
        void ReloadSettings();
-        void ReloadSettingsThrottled();
        void NotifyRootInitialized();

        bool HasSettingsStartupActions() const noexcept;
@@ -81,6 +80,7 @@ namespace winrt::TerminalApp::implementation
        [[nodiscard]] HRESULT _TryLoadSettings() noexcept;
        void _ProcessLazySettingsChanges();
        void _RegisterSettingsChange();
+        safe_void_coroutine _DispatchReloadSettings();

        void _setupFolderPathEnvVar();

--- a/src/cascadia/TerminalApp/AppLogic.idl
+++ b/src/cascadia/TerminalApp/AppLogic.idl
@@ -25,7 +25,6 @@ namespace TerminalApp
        Boolean HasSettingsStartupActions();

        void ReloadSettings();
-        void ReloadSettingsThrottled();
        Microsoft.Terminal.Settings.Model.CascadiaSettings Settings { get; };

        TerminalWindow CreateNewWindow();
--- a/src/cascadia/TerminalApp/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/CommandPalette.cpp
@@ -928,17 +928,6 @@ namespace winrt::TerminalApp::implementation
    void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
                                            const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
    {
-        // GH#18737: Only respond to this change if we are visible:
-        // _close calls _searchBox().Text(L"") to reset the search text, which lands us
-        // in here after the command palette is dismissed. Since we have a code path here that
-        // could potentially lead to an action being previewed (specifically if there is a
-        // preview-able action as the first entry in the command list), that preview will
-        // appear after the palette is dismissed without this check.
-        if (Visibility() != Visibility::Visible)
-        {
-            return;
-        }
-
        // When we are executing the _SelectNextTab in the TabManagement.cpp, this method
        // is getting triggered because we set up the default value for that CommandPalette
        // with an empty string. Therefore, to avoid the reset of the index when executing
--- a/src/cascadia/TerminalApp/DebugTapConnection.cpp
+++ b/src/cascadia/TerminalApp/DebugTapConnection.cpp
@@ -34,20 +34,14 @@ namespace winrt::Microsoft::TerminalApp::implementation
            // before actually starting the connection to the client app. This
            // will ensure both controls are initialized before the client app
            // is.
-            const auto weak = get_weak();
            co_await winrt::resume_background();
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }
-
            _pairedTap->_start.wait();
+
            _wrappedConnection.Start();
        }
-        void WriteInput(const winrt::array_view<const char16_t> buffer)
+        void WriteInput(const winrt::array_view<const uint8_t> buffer)
        {
-            _pairedTap->_PrintInput(winrt_array_to_wstring_view(buffer));
+            _pairedTap->_PrintInput(winrt_array_to_string_view(buffer));
            _wrappedConnection.WriteInput(buffer);
        }
        void Resize(uint32_t rows, uint32_t columns) { _wrappedConnection.Resize(rows, columns); }
@@ -86,7 +80,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
        _start.count_down();
    }

-    void DebugTapConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void DebugTapConnection::WriteInput(const winrt::array_view<const uint8_t> buffer)
    {
        // If the user types into the tap side, forward it to the input side
        if (auto strongInput{ _inputSide.get() })
@@ -126,25 +120,44 @@ namespace winrt::Microsoft::TerminalApp::implementation
        return ConnectionState::Failed;
    }

-    void DebugTapConnection::_OutputHandler(const winrt::array_view<const char16_t> str)
+    void DebugTapConnection::_OutputHandler(const winrt::array_view<const uint8_t>& str)
    {
-        auto output = til::visualize_control_codes(winrt_array_to_wstring_view(str));
-        // To make the output easier to read, we introduce a line break whenever
-        // an LF control is encountered. But at this point, the LF would have
-        // been converted to U+240A (␊), so that's what we need to search for.
-        for (size_t lfPos = 0; (lfPos = output.find(L'\u240A', lfPos)) != std::wstring::npos;)
+        uint8_t buffer[5] = { 0xe2, 0x90, 0x00, '\r', '\n' };
+        uint32_t i = 0, s = 0;
+        while (i < str.size())
        {
-            output.insert(++lfPos, L"\r\n");
+            while (i < str.size() && str[i] > 0x20 && str[i] != 0x7f)
+            {
+                ++i;
+            }
+            if (i > s)
+            {
+                TerminalOutput.raise(winrt::array_view{ str.data() + s, (i - s) });
+                s = i;
+            }
+            if (i >= str.size())
+                break;
+            auto ch = str[i];
+            if (ch == '\x20')
+                buffer[2] = 0xA3;
+            else if (ch == '\x7f')
+                buffer[2] = 0xA1;
+            else
+                buffer[2] = 0x80 | ch;
+            // If we encountered a LF, emit the extra \r\n from the buffer to pretty print it.
+            TerminalOutput.raise(winrt::array_view{ buffer, ch == '\x0a' ? 5u : 3u });
+            ++i;
+            ++s;
        }
-        TerminalOutput.raise(winrt_wstring_to_array_view(output));
    }

    // Called by the DebugInputTapConnection to print user input
-    void DebugTapConnection::_PrintInput(const std::wstring_view str)
+    void DebugTapConnection::_PrintInput(const std::string_view str)
    {
-        auto clean{ til::visualize_control_codes(str) };
-        auto formatted{ wil::str_printf<std::wstring>(L"\x1b[91m%ls\x1b[m", clean.data()) };
-        TerminalOutput.raise(winrt_wstring_to_array_view(formatted));
+        static constexpr std::string_view buffer{ "\x1b[91m\x1b[m" }; // two escape sequences we need to write, back to back
+        TerminalOutput.raise(winrt_u8string_to_array_view(buffer.substr(0,5)));
+        _OutputHandler(winrt_u8string_to_array_view(str));
+        TerminalOutput.raise(winrt_u8string_to_array_view(buffer.substr(5)));
    }

    // Wire us up so that we can forward input through
--- a/src/cascadia/TerminalApp/DebugTapConnection.h
+++ b/src/cascadia/TerminalApp/DebugTapConnection.h
@@ -13,10 +13,10 @@ namespace winrt::Microsoft::TerminalApp::implementation
    {
    public:
        explicit DebugTapConnection(Microsoft::Terminal::TerminalConnection::ITerminalConnection wrappedConnection);
-        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) {};
+        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
        ~DebugTapConnection();
        void Start();
-        void WriteInput(const winrt::array_view<const char16_t> data);
+        void WriteInput(const winrt::array_view<const uint8_t> data);
        void Resize(uint32_t rows, uint32_t columns);
        void Close();

@@ -30,8 +30,8 @@ namespace winrt::Microsoft::TerminalApp::implementation
        til::typed_event<winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection, winrt::Windows::Foundation::IInspectable> StateChanged;

    private:
-        void _PrintInput(const std::wstring_view data);
-        void _OutputHandler(const winrt::array_view<const char16_t> str);
+        void _PrintInput(const std::string_view data);
+        void _OutputHandler(const winrt::array_view<const uint8_t>& str);

        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::TerminalOutput_revoker _outputRevoker;
        winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::StateChanged_revoker _stateChangedRevoker;
--- a/src/cascadia/TerminalApp/Jumplist.cpp
+++ b/src/cascadia/TerminalApp/Jumplist.cpp
@@ -43,9 +43,6 @@ safe_void_coroutine Jumplist::UpdateJumplist(const CascadiaSettings& settings) n
    // make sure to capture the settings _before_ the co_await
    const auto strongSettings = settings;

-    // Explorer APIs may block, so do it on a background thread.
-    //
-    // NOTE: Jumplist has no members, so we don't need to hold onto `this` here.
    co_await winrt::resume_background();

    try
--- a/src/cascadia/TerminalApp/MarkdownPaneContent.h
+++ b/src/cascadia/TerminalApp/MarkdownPaneContent.h
@@ -25,7 +25,7 @@ namespace winrt::TerminalApp::implementation
 #pragma region IPaneContent
        winrt::Windows::UI::Xaml::FrameworkElement GetRoot();

-        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&) {};
+        void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&){};

        winrt::Windows::Foundation::Size MinimumSize() { return { 1, 1 }; };
        void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic) { reason; };
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.cpp
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.cpp
@@ -88,18 +88,6 @@ namespace winrt::TerminalApp::implementation
        CloseClick.raise(*this, e);
    }

-    bool MinMaxCloseControl::Focused() const
-    {
-        return _focused;
-    }
-
-    void MinMaxCloseControl::Focused(bool focused)
-    {
-        _focused = focused;
-
-        ReleaseButtons();
-    }
-
    void MinMaxCloseControl::SetWindowVisualState(WindowVisualState visualState)
    {
        // Look up the heights we should use for the caption buttons from our
@@ -181,25 +169,25 @@ namespace winrt::TerminalApp::implementation
            // animate the fade in/out transition between colors.
        case CaptionButton::Minimize:
            VisualStateManager::GoToState(MinimizeButton(), L"PointerOver", true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);

            _displayToolTip->Run(MinimizeButton());
            closeToolTipForButton(MaximizeButton());
            closeToolTipForButton(CloseButton());
            break;
        case CaptionButton::Maximize:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
            VisualStateManager::GoToState(MaximizeButton(), L"PointerOver", true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);

            closeToolTipForButton(MinimizeButton());
            _displayToolTip->Run(MaximizeButton());
            closeToolTipForButton(CloseButton());
            break;
        case CaptionButton::Close:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
            VisualStateManager::GoToState(CloseButton(), L"PointerOver", true);

            closeToolTipForButton(MinimizeButton());
@@ -222,17 +210,17 @@ namespace winrt::TerminalApp::implementation
        {
        case CaptionButton::Minimize:
            VisualStateManager::GoToState(MinimizeButton(), L"Pressed", true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
            break;
        case CaptionButton::Maximize:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
            VisualStateManager::GoToState(MaximizeButton(), L"Pressed", true);
-            VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+            VisualStateManager::GoToState(CloseButton(), L"Normal", true);
            break;
        case CaptionButton::Close:
-            VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
-            VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
+            VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+            VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
            VisualStateManager::GoToState(CloseButton(), L"Pressed", true);
            break;
        }
@@ -245,9 +233,9 @@ namespace winrt::TerminalApp::implementation
    void MinMaxCloseControl::ReleaseButtons()
    {
        _displayToolTip->Run(nullptr);
-        VisualStateManager::GoToState(MinimizeButton(), _normalState(), true);
-        VisualStateManager::GoToState(MaximizeButton(), _normalState(), true);
-        VisualStateManager::GoToState(CloseButton(), _normalState(), true);
+        VisualStateManager::GoToState(MinimizeButton(), L"Normal", true);
+        VisualStateManager::GoToState(MaximizeButton(), L"Normal", true);
+        VisualStateManager::GoToState(CloseButton(), L"Normal", true);

        closeToolTipForButton(MinimizeButton());
        closeToolTipForButton(MaximizeButton());
@@ -255,11 +243,4 @@ namespace winrt::TerminalApp::implementation

        _lastPressedButton = std::nullopt;
    }
-
-    const winrt::param::hstring& MinMaxCloseControl::_normalState() const
-    {
-        static const winrt::param::hstring normal = L"Normal";
-        static const winrt::param::hstring unfocused = L"Unfocused";
-        return (_focused ? normal : unfocused);
-    }
 }
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.h
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.h
@@ -21,9 +21,6 @@ namespace winrt::TerminalApp::implementation
        void PressButton(CaptionButton button);
        void ReleaseButtons();

-        bool Focused() const;
-        void Focused(bool focused);
-
        void _MinimizeClick(const winrt::Windows::Foundation::IInspectable& sender,
                            const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
        void _MaximizeClick(const winrt::Windows::Foundation::IInspectable& sender,
@@ -35,12 +32,8 @@ namespace winrt::TerminalApp::implementation
        til::typed_event<TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs> MaximizeClick;
        til::typed_event<TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs> CloseClick;

-        bool _focused{ false };
        std::shared_ptr<ThrottledFunc<winrt::Windows::UI::Xaml::Controls::Button>> _displayToolTip{ nullptr };
        std::optional<CaptionButton> _lastPressedButton{ std::nullopt };
-
-    private:
-        const winrt::param::hstring& _normalState() const;
    };
 }

--- a/src/cascadia/TerminalApp/MinMaxCloseControl.idl
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.idl
@@ -14,7 +14,6 @@ namespace TerminalApp
        void HoverButton(CaptionButton button);
        void PressButton(CaptionButton button);
        void ReleaseButtons();
-        Boolean Focused { get; set; };

        event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MinimizeClick;
        event Windows.Foundation.TypedEventHandler<MinMaxCloseControl, Windows.UI.Xaml.RoutedEventArgs> MaximizeClick;
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
@@ -32,10 +32,6 @@
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
                    <StaticResource x:Key="CaptionButtonForegroundPressed"
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
-                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
-                                    ResourceKey="TextFillColorDisabled" />
-                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
-                                     Color="{ThemeResource CaptionButtonForegroundUnfocusedColor}" />
                    <SolidColorBrush x:Key="CaptionButtonBackground"
                                     Color="Transparent" />
                    <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
@@ -70,10 +66,6 @@
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
                    <StaticResource x:Key="CaptionButtonForegroundPressed"
                                    ResourceKey="SystemControlForegroundBaseHighBrush" />
-                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
-                                    ResourceKey="TextFillColorDisabled" />
-                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
-                                     Color="{ThemeResource CaptionButtonForegroundUnfocusedColor}" />
                    <SolidColorBrush x:Key="CaptionButtonBackground"
                                     Color="Transparent" />
                    <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
@@ -111,10 +103,6 @@
                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
                    <SolidColorBrush x:Key="CaptionButtonForegroundPressed"
                                     Color="{ThemeResource SystemColorHighlightTextColor}" />
-                    <SolidColorBrush x:Key="CaptionButtonForegroundUnfocused"
-                                     Color="{ThemeResource SystemColorButtonTextColor}" />
-                    <StaticResource x:Key="CaptionButtonForegroundUnfocusedColor"
-                                    ResourceKey="SystemColorButtonTextColor" />
                    <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver"
                                     Color="{ThemeResource SystemColorHighlightColor}" />
                    <SolidColorBrush x:Key="CloseButtonForegroundPointerOver"
@@ -201,20 +189,6 @@
                                                                    Duration="0:0:0.1" />
                                                </Storyboard>
                                            </VisualTransition>
-
-                                            <VisualTransition From="PointerOver"
-                                                              To="Unfocused">
-                                                <Storyboard>
-                                                    <ColorAnimation Storyboard.TargetName="ButtonBaseElement"
-                                                                    Storyboard.TargetProperty="(UIElement.Background).(SolidColorBrush.Color)"
-                                                                    To="{ThemeResource CaptionButtonBackgroundColor}"
-                                                                    Duration="0:0:0.15" />
-                                                    <ColorAnimation Storyboard.TargetName="ButtonIcon"
-                                                                    Storyboard.TargetProperty="(UIElement.Foreground).(SolidColorBrush.Color)"
-                                                                    To="{ThemeResource CaptionButtonForegroundUnfocusedColor}"
-                                                                    Duration="0:0:0.1" />
-                                                </Storyboard>
-                                            </VisualTransition>
                                        </VisualStateGroup.Transitions>

                                        <VisualState x:Name="Normal">
@@ -224,13 +198,6 @@
                                            </VisualState.Setters>
                                        </VisualState>

-                                        <VisualState x:Name="Unfocused">
-                                            <VisualState.Setters>
-                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackground}" />
-                                                <Setter Target="ButtonIcon.Foreground" Value="{ThemeResource CaptionButtonForegroundUnfocused}" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-
                                        <VisualState x:Name="PointerOver">
                                            <VisualState.Setters>
                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackgroundPointerOver}" />
--- a/src/cascadia/TerminalApp/Resources/de-DE/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/de-DE/Resources.resw
@@ -152,6 +152,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Beim Laden von Benutzereinstellungen sind Fehler aufgetreten</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Warnung:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>Der "{0}" wird nicht auf Ihrem Computer ausgeführt. Dies kann verhindern, dass die Terminal Tastatur Eingaben empfangen.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -165,9 +171,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>Info</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Feedback</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Einstellungen</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Abbrechen</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Alle schließen</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Beenden</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Mehrere Bereiche</value>
  </data>
@@ -274,6 +292,13 @@
    <value>• Das angegebene "Design" wurde in der Liste der Designs nicht gefunden. Vorübergehender Fallback auf den Standardwert.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Die Eigenschaft "globals" ist veraltet. Möglicherweise müssen Sie Ihre Einstellungen aktualisieren. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>Weitere Informationen hierzu finden Sie auf dieser Webseite.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Fehler beim Erweitern eines Befehls mit "iterateOn". Dieser Befehl wird ignoriert.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -454,12 +479,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>STRG+Klicken, um als Administrator zu öffnen</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Schließen</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Schließen</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Schließen</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Maximieren</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Minimieren</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Minimieren</value>
  </data>
@@ -479,6 +513,10 @@
    <value>Version:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Erste Schritte</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Quellcode</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -672,15 +710,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>
@@ -760,9 +792,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Text exportieren</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Exportieren des Terminalinhalts fehlgeschlagen</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Terminalinhalt wurde erfolgreich exportiert</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Suchen</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Unformatierter Text</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Das Beendigungsverhalten kann in den erweiterten Profileinstellungen konfiguriert werden.</value>
  </data>
@@ -854,11 +895,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>
@@ -868,9 +909,13 @@
    <value>Registerkarte „{0}“ an Position „{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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Der aktive Bereich wurde in "{1}" Fenster auf "{0}" Registerkarte verschoben.</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Encountered errors while loading user settings</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Warning:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>The "{0}" isn't running on your machine. This can prevent the Terminal from receiving keyboard input.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
    <value>Failed to reload settings</value>
  </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
  <data name="AboutMenuItem" xml:space="preserve">
    <value>About</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Feedback</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Settings</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Close all</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Quit</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Multiple panes</value>
  </data>
@@ -271,6 +293,17 @@
    <value>• The specified "theme" was not found in the list of themes. Temporarily falling back to the default value.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>The "globals" property is deprecated - your settings might need updating. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>For more info, see this web page.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Failed to expand a command with "iterateOn" set. This command will be ignored.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+Click to open as administrator</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Close</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Close</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Close</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Maximize</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Minimize</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Minimize</value>
  </data>
@@ -476,6 +518,10 @@
    <value>Version:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Getting started</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Source code</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +715,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>
@@ -757,9 +797,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Export text</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Failed to export terminal content</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Successfully exported terminal content</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Find</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Plain text</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Termination behavior can be configured in advanced profile settings.</value>
  </data>
@@ -865,6 +914,10 @@
    <value>"{0}" tab moved to position "{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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Active pane moved to "{0}" tab in "{1}" window</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </data>
  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
    <value>Active pane moved to "{0}" window</value>
    <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>
@@ -929,4 +982,4 @@
  <data name="InvalidRegex" xml:space="preserve">
    <value>An invalid regular expression was found.</value>
  </data>
-</root>
+</root>
--- a/src/cascadia/TerminalApp/Resources/es-ES/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/es-ES/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Se detectaron errores al cargar la configuración de usuario</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Aceptar</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Advertencia:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>El "{0}" no se está ejecutando en el equipo. Esto puede impedir que el terminal reciba entradas del teclado.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>Acerca de</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Comentarios</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Configuración</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancelar</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Cerrar todo</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Salir</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Varios paneles</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• No se encontró el "tema" especificado en la lista de temas. Revirtiendo temporalmente al valor predeterminado.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>La propiedad "globals" está en desuso, es posible que tengas que actualizar la configuración. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>Para más información, consulta esta página web.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>No se pudo expandir un comando con el conjunto de "iterateOn". Este comando se omitirá.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+Clic para abrir como administrador</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Cerrar</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Cerrar</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Cerrar</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Maximizar</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Minimizar</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Minimizar</value>
  </data>
@@ -476,6 +510,10 @@
    <value>Versión:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Introducción</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Código fuente</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Exportar texto</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>No se pudo exportar el contenido del terminal</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>El contenido del terminal se exportó correctamente</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Buscar</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Texto sin formato</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>El comportamiento de finalización se puede configurar en la configuración avanzada del perfil.</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <value>La pestaña "{0}" se movió a la posición "{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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>El panel activo se movió a la pestaña "{0}" en "{1}" ventana</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Erreurs rencontrées lors du chargement des paramètres utilisateur</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Avertissement :</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>Le "{0}" n’est pas en cours d’exécution sur votre ordinateur. Cela peut empêcher le terminal de recevoir l’entrée au clavier.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>À propos de</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Commentaires</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Paramètres</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Fermer tout</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Quitter</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Volets multiples</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• Le « thème » spécifié est introuvable dans la liste des thèmes. Retour temporaire à la valeur par défaut.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>La propriété "globals" est déconseillée. Vos paramètres nécessiteront peut-être une mise à jour. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>Pour plus d’informations, voir cette page web.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Echec du développement d’une commande avec "iterateOn". Cette commande sera ignorée.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+Clic pour ouvrir en tant qu’administrateur</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Fermer</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Fermer</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Fermer</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Agrandir</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Réduire</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Réduire</value>
  </data>
@@ -476,6 +510,10 @@
    <value>Version :</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Bien démarrer</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Code source</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Exporter le texte</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Échec de l’exportation du contenu du terminal</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Le contenu du terminal a été exporté.</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Rechercher</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Texte brut</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Le comportement d’arrêt peut être configuré dans les paramètres de profil avancés.</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <value>Onglet « {0} » déplacé vers la position « {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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Volet actif déplacé vers l’onglet "{0}" dans "{1}" fenêtre</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/it-IT/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/it-IT/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Si sono verificati errori durante il caricamento delle impostazioni utente</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Avvertenza:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>Il "{0}" non è in esecuzione nel computer. Ciò può impedire al terminale di ricevere l'input da tastiera.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>Informazioni</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Feedback</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Impostazioni</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Annulla</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Chiudi tutto</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Esci</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Più riquadri</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• Impossibile trovare il "tema" specificato nell'elenco dei temi. Fallback temporaneo al valore predefinito.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>La proprietà "globals" è deprecata: potrebbe essere necessario aggiornare le impostazioni. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>Per altre informazioni, visita questa pagina Web.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Impossibile espandere un comando con "iterateOn" impostato. Il comando verrà ignorato.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>CTRL+CLIC per aprire come amministratore</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Chiudi</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Chiudi</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Ingrandisci</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Riduci a icona</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Riduci a icona</value>
  </data>
@@ -476,6 +510,10 @@
    <value>Versione:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Introduzione</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Codice sorgente</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Esporta testo</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Non è stato possibile esportare il contenuto del terminale</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Il contenuto del terminale è stato esportato</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Trova</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Testo normale</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>È possibile configurare il comportamento di terminazione nelle impostazioni avanzate del profilo.</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <value>Scheda "{0}" spostata nella posizione "{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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Riquadro attivo spostato nella scheda "{0}" nella finestra "{1}"</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw
@@ -150,6 +150,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>ユーザー設定の読み込み中にエラーが発生しました</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>警告:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>"{0}" がお使いのマシンで実行されていません。 これにより、ターミナルがキーボード入力を受信できなくなる可能性があります。</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -163,9 +169,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>バージョン情報</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>フィードバック</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>設定</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>キャンセル</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>すべて閉じる</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>終了</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>複数ペイン</value>
  </data>
@@ -272,6 +290,13 @@
    <value>• 指定された "テーマ" がテーマの一覧に見つかりませんでした。一時的に既定値にフォールバックしています。</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>"globals" プロパティは廃止されました。設定を更新する必要がある場合があります。 </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>詳細については、この Web ページを参照してください。</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>"iterateOn" セットを使用してコマンドを展開できませんでした。このコマンドは無視されます。</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -452,12 +477,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl + クリックして管理者として開く</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>閉じる</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>閉じる</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>閉じる</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>最大化</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>最小化</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>最小化</value>
  </data>
@@ -477,6 +511,10 @@
    <value>バージョン:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>はじめに</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>ソース コード</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -670,15 +708,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>
@@ -758,9 +790,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>テキストのエクスポート</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>ターミナルのコンテンツをエクスポートできませんでした</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>ターミナルのコンテンツが正常にエクスポートされました</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>検索する</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>テキスト</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>終了動作は、プロファイルの詳細設定で構成できます。</value>
  </data>
@@ -852,11 +893,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>
@@ -866,9 +907,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>アクティブなペインを "{1}" ウィンドウの [{0}] タブに移動しました</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>사용자 설정을 로드하는 동안 오류가 발생했습니다.</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>확인</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>경고</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>"{0}" 컴퓨터에서 실행되고 있지 않습니다. 단자가 키보드 입력을 수신할 수 없게 됩니다.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>정보</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>피드백</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>설정</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>취소</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>모두 닫기</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>끝내기</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>여러 창</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• 지정한 "테마"를 테마 목록에서 찾을 수 없습니다. 일시적으로 기본값으로 대체됩니다.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>"globals" 속성은 더 이상 사용되지 않습니다. 설정을 업데이트해야 할 수 있습니다. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>추가 정보는 이 웹 페이지를 참조하세요.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>"iterateOn" 집합으로 명령을 확장하지 못했습니다. 이 명령은 무시됩니다.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl 키를 누르고 클릭하여 관리자로 엽니다.</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>닫기</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>닫기</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>닫기</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>최대화</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>최소화</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>최소화</value>
  </data>
@@ -476,6 +510,10 @@
    <value>버전:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>시작</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>원본 코드</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>텍스트 내보내기</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>터미널 콘텐츠를 내보내지 못함</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>터미널 콘텐츠를 내보냄</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>찾기</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>일반 텍스트</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>고급 프로필 설정에서 종료 동작을 구성할 수 있습니다.</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>활성 창이 "{1}" 창의 "{0}" 탭으로 이동되었습니다.</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Erros encontrados durante o carregamento das configurações do usuário</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Aviso:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>O "{0}" não está sendo executado no seu computador. Isso pode impedir que o terminal receba entrada de teclado.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>Sobre</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Comentários</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Configurações</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancelar</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Fechar tudo</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Encerrar</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Vários painéis</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• O "tema" especificado não foi encontrado na lista de temas. Voltando temporariamente para o valor padrão.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>A propriedade "globals" foi preterida - talvez suas configurações precisem ser atualizadas. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>Para saber mais, confira esta página da Web.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Falha ao expandir um comando com conjunto de "iterateOn". Este comando será ignorado.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+Clique para abrir como administrador</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Fechar</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Fechar</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Fechar</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Maximizar</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Minimizar</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Minimizar</value>
  </data>
@@ -476,6 +510,10 @@
    <value>Versão:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Introdução</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Código-fonte</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Exportar texto</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Falha ao exportar o conteúdo do terminal</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Conteúdo do terminal exportado com êxito</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Localizar</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Texto sem formatação</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>O comportamento de término pode ser configurado nas configurações avançadas do perfil.</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <value>Guia "{0}" movida para posição "{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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Painel ativo movido para "{0}" guia na "{1}" janela</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Εŋĉőųņŧзяëď зяѓōяś ŵħΐļê ŀθαðĩήġ ùŝéѓ śзťŧĭпģŝ !!! !!! !!! !!! !</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ÓΚ </value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Ŵаґήĩήģ: !!</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>Ŧħє "{0}" ĭşп'ţ řμллĭиġ оŉ ўόùг мàςĥįńë. Ŧħїś ¢áⁿ φřэνєńτ тнэ Тэґмïñăĺ ƒŕöm ŗеς℮íνίиĝ ķēỳвŏαŗδ ĭⁿрΰţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
    <value>₣áĭļèđ ťσ ѓéłøǻð şèŧŧíпĝŝ !!! !!! !</value>
  </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
  <data name="AboutMenuItem" xml:space="preserve">
    <value>∆вòΰŧ !</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>₣ęęðъâçќ !!</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Śêŧťіňğŝ !!</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Ĉάπςеŀ !</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Ċľθŝє αŀļ !!!</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Qùíт !</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Мµļтíрłĕ φдпėŝ !!! !</value>
  </data>
@@ -271,6 +293,17 @@
    <value>• Тћë ѕрèçїƒĭёď "τћ℮мé" ώαѕ ήøţ ƒόûπđ ΐл ťћê ℓíŝť σƒ ťнεmέѕ. Ŧěмрǿŕдѓΐļγ ƒдℓłίńģ вà¢ĸ τő ŧнě đέƒαùŀŧ νǻľΰê. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Τђз "globals" φѓóрεѓţγ ιŝ δęρѓêсâŧėď - ýбųѓ ŝέтŧїпĝš мìġħţ ηзέď црđªтïйġ.  !!! !!! !!! !!! !!! !!! !!! !</value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>₣οř мòŕе îήƒθ, şéэ ţħìѕ ŵєь рąġé. !!! !!! !!! </value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>₣ăіľέđ ţö ехρåņď ǻ çǿммãηδ ẃìţĥ "iterateOn" şετ. Ťĥīš ćōmмåиď щΐℓĺ ве ĭģňóѓëđ. !!! !!! !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>€ţŕł+Čℓїčķ τõ ορêņ αŝ аðmìñĩѕτŕăţòг !!! !!! !!! !</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Ćℓőŝз !</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Ĉļøşз !</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Ĉļόѕě !</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Μджįmïźэ !!</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Μïиιmіžё !!</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Μîⁿĩmĩż℮ !!</value>
  </data>
@@ -476,6 +518,10 @@
    <value>Véяšîõп: !!</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Ġеťтΐñĝ ѕτдŗτęď !!! !</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Ѕοџŗсė ¢ŏđе !!!</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,14 +715,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>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úŉšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċó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>
@@ -757,9 +797,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Ė×φōŗŧ ţєхŧ !!!</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>₣ăìľεď ťθ эхроґт ţеґmίñдļ ¢ōйт℮лť !!! !!! !!! </value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Ŝūĉčєšśƒυłłγ ĕ×φòŗтэð тēгмïŉãℓ ĉοŉťëⁿţ !!! !!! !!! !!</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>₣ìпđ !</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Ρĺáīň тěхт !!!</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Ťéямїлâŧîόň ь℮ћäνįőř čªή вĕ ċοñƒĩġџřèδ įŋ ăδνåл¢êð ряòƒιļє şėŧтіиĝś. !!! !!! !!! !!! !!! !!! !!</value>
  </data>
@@ -851,11 +900,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>
@@ -865,9 +914,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Α¢ťϊνë рãņє môνέď τō "{0}" ţâъ ĭή "{1}" ẃĩńδθш !!! !!! !!! !!! !</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
@@ -929,4 +982,4 @@
  <data name="InvalidRegex" xml:space="preserve">
    <value>Дŉ ΐňνãľîδ ŗěğµℓдř ë×ρяēѕšιбή ẃăѕ ƒοůŉđ. !!! !!! !!! !!!</value>
  </data>
-</root>
+</root>
--- a/src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Εŋĉőųņŧзяëď зяѓōяś ŵħΐļê ŀθαðĩήġ ùŝéѓ śзťŧĭпģŝ !!! !!! !!! !!! !</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ÓΚ </value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Ŵаґήĩήģ: !!</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>Ŧħє "{0}" ĭşп'ţ řμллĭиġ оŉ ўόùг мàςĥįńë. Ŧħїś ¢áⁿ φřэνєńτ тнэ Тэґмïñăĺ ƒŕöm ŗеς℮íνίиĝ ķēỳвŏαŗδ ĭⁿрΰţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
    <value>₣áĭļèđ ťσ ѓéłøǻð şèŧŧíпĝŝ !!! !!! !</value>
  </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
  <data name="AboutMenuItem" xml:space="preserve">
    <value>∆вòΰŧ !</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>₣ęęðъâçќ !!</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Śêŧťіňğŝ !!</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Ĉάπςеŀ !</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Ċľθŝє αŀļ !!!</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Qùíт !</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Мµļтíрłĕ φдпėŝ !!! !</value>
  </data>
@@ -271,6 +293,17 @@
    <value>• Тћë ѕрèçїƒĭёď "τћ℮мé" ώαѕ ήøţ ƒόûπđ ΐл ťћê ℓíŝť σƒ ťнεmέѕ. Ŧěмрǿŕдѓΐļγ ƒдℓłίńģ вà¢ĸ τő ŧнě đέƒαùŀŧ νǻľΰê. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Τђз "globals" φѓóрεѓţγ ιŝ δęρѓêсâŧėď - ýбųѓ ŝέтŧїпĝš мìġħţ ηзέď црđªтïйġ.  !!! !!! !!! !!! !!! !!! !!! !</value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>₣οř мòŕе îήƒθ, şéэ ţħìѕ ŵєь рąġé. !!! !!! !!! </value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>₣ăіľέđ ţö ехρåņď ǻ çǿммãηδ ẃìţĥ "iterateOn" şετ. Ťĥīš ćōmмåиď щΐℓĺ ве ĭģňóѓëđ. !!! !!! !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>€ţŕł+Čℓїčķ τõ ορêņ αŝ аðmìñĩѕτŕăţòг !!! !!! !!! !</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Ćℓőŝз !</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Ĉļøşз !</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Ĉļόѕě !</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Μджįmïźэ !!</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Μïиιmіžё !!</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Μîⁿĩmĩż℮ !!</value>
  </data>
@@ -476,6 +518,10 @@
    <value>Véяšîõп: !!</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Ġеťтΐñĝ ѕτдŗτęď !!! !</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Ѕοџŗсė ¢ŏđе !!!</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,14 +715,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>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úŉšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċó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>
@@ -757,9 +797,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Ė×φōŗŧ ţєхŧ !!!</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>₣ăìľεď ťθ эхроґт ţеґmίñдļ ¢ōйт℮лť !!! !!! !!! </value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Ŝūĉčєšśƒυłłγ ĕ×φòŗтэð тēгмïŉãℓ ĉοŉťëⁿţ !!! !!! !!! !!</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>₣ìпđ !</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Ρĺáīň тěхт !!!</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Ťéямїлâŧîόň ь℮ћäνįőř čªή вĕ ċοñƒĩġџřèδ įŋ ăδνåл¢êð ряòƒιļє şėŧтіиĝś. !!! !!! !!! !!! !!! !!! !!</value>
  </data>
@@ -851,11 +900,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>
@@ -865,9 +914,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Α¢ťϊνë рãņє môνέď τō "{0}" ţâъ ĭή "{1}" ẃĩńδθш !!! !!! !!! !!! !</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
@@ -929,4 +982,4 @@
  <data name="InvalidRegex" xml:space="preserve">
    <value>Дŉ ΐňνãľîδ ŗěğµℓдř ë×ρяēѕšιбή ẃăѕ ƒοůŉđ. !!! !!! !!! !!!</value>
  </data>
-</root>
+</root>
--- a/src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Εŋĉőųņŧзяëď зяѓōяś ŵħΐļê ŀθαðĩήġ ùŝéѓ śзťŧĭпģŝ !!! !!! !!! !!! !</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ÓΚ </value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Ŵаґήĩήģ: !!</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>Ŧħє "{0}" ĭşп'ţ řμллĭиġ оŉ ўόùг мàςĥįńë. Ŧħїś ¢áⁿ φřэνєńτ тнэ Тэґмïñăĺ ƒŕöm ŗеς℮íνίиĝ ķēỳвŏαŗδ ĭⁿрΰţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
    <value>₣áĭļèđ ťσ ѓéłøǻð şèŧŧíпĝŝ !!! !!! !</value>
  </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
  <data name="AboutMenuItem" xml:space="preserve">
    <value>∆вòΰŧ !</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>₣ęęðъâçќ !!</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Śêŧťіňğŝ !!</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Ĉάπςеŀ !</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Ċľθŝє αŀļ !!!</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Qùíт !</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Мµļтíрłĕ φдпėŝ !!! !</value>
  </data>
@@ -271,6 +293,17 @@
    <value>• Тћë ѕрèçїƒĭёď "τћ℮мé" ώαѕ ήøţ ƒόûπđ ΐл ťћê ℓíŝť σƒ ťнεmέѕ. Ŧěмрǿŕдѓΐļγ ƒдℓłίńģ вà¢ĸ τő ŧнě đέƒαùŀŧ νǻľΰê. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Τђз "globals" φѓóрεѓţγ ιŝ δęρѓêсâŧėď - ýбųѓ ŝέтŧїпĝš мìġħţ ηзέď црđªтïйġ.  !!! !!! !!! !!! !!! !!! !!! !</value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>₣οř мòŕе îήƒθ, şéэ ţħìѕ ŵєь рąġé. !!! !!! !!! </value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>₣ăіľέđ ţö ехρåņď ǻ çǿммãηδ ẃìţĥ "iterateOn" şετ. Ťĥīš ćōmмåиď щΐℓĺ ве ĭģňóѓëđ. !!! !!! !!! !!! !!! !!! !!! !!</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>€ţŕł+Čℓїčķ τõ ορêņ αŝ аðmìñĩѕτŕăţòг !!! !!! !!! !</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Ćℓőŝз !</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Ĉļøşз !</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Ĉļόѕě !</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Μджįmïźэ !!</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Μïиιmіžё !!</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Μîⁿĩmĩż℮ !!</value>
  </data>
@@ -476,6 +518,10 @@
    <value>Véяšîõп: !!</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Ġеťтΐñĝ ѕτдŗτęď !!! !</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Ѕοџŗсė ¢ŏđе !!!</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,14 +715,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>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úŉšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċó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>
@@ -757,9 +797,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Ė×φōŗŧ ţєхŧ !!!</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>₣ăìľεď ťθ эхроґт ţеґmίñдļ ¢ōйт℮лť !!! !!! !!! </value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Ŝūĉčєšśƒυłłγ ĕ×φòŗтэð тēгмïŉãℓ ĉοŉťëⁿţ !!! !!! !!! !!</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>₣ìпđ !</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Ρĺáīň тěхт !!!</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Ťéямїлâŧîόň ь℮ћäνįőř čªή вĕ ċοñƒĩġџřèδ įŋ ăδνåл¢êð ряòƒιļє şėŧтіиĝś. !!! !!! !!! !!! !!! !!! !!</value>
  </data>
@@ -851,11 +900,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>
@@ -865,9 +914,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Α¢ťϊνë рãņє môνέď τō "{0}" ţâъ ĭή "{1}" ẃĩńδθш !!! !!! !!! !!! !</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
@@ -929,4 +982,4 @@
  <data name="InvalidRegex" xml:space="preserve">
    <value>Дŉ ΐňνãľîδ ŗěğµℓдř ë×ρяēѕšιбή ẃăѕ ƒοůŉđ. !!! !!! !!! !!!</value>
  </data>
-</root>
+</root>
--- a/src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>При загрузке параметров пользователя возникли ошибки</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Внимание!</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>"{0}" не работает на вашем компьютере. Это может помешать терминалу получать ввод с клавиатуры.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>О программе</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Отзыв</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Параметры</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Отмена</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Закрыть все</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Выход</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Несколько областей</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• Указанная тема не найдена в списке тем. Временно восстанавливается значение по умолчанию.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Свойство "globals" устарело. Вашим параметрам может требоваться обновление. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>Дополнительные сведения см. на этой веб-странице.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Не удалось расширить команду с помощью набора "iterateOn". Эта команда будет пропущена.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Щелкните мышью с нажатой клавишей CTRL, чтобы открыть от имени администратора</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Закрыть</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Закрыть</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Закрыть</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Развернуть</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Свернуть</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Свернуть</value>
  </data>
@@ -476,6 +510,10 @@
    <value>Версия:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Приступая к работе</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Исходный код</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Экспорт текста</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Не удалось экспортировать содержимое терминала</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Содержимое терминала экспортировано</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Найти</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Обычный текст</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Поведение завершения можно настроить в дополнительных параметрах профиля.</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Активная область перемещена на вкладку "{0}" в "{1}" окна</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@@ -118,7 +118,7 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <data name="InitialJsonParseErrorText" xml:space="preserve">
-    <value>Подешавања нису могла да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
+    <value>Подешавања нису могла да се учитау из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
  </data>
  <data name="MissingDefaultProfileText" xml:space="preserve">
    <value>У листи профила није могао да се пронађе ваш подразумевани профил - користи се први профил. Проверите да ли се "defaultProfile" подудара са GUID неког од ваших профила.</value>
@@ -141,7 +141,7 @@
    <value>Подешавања нису могла поново да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
  </data>
  <data name="UsingDefaultSettingsText" xml:space="preserve">
-    <value>Привремено се користе подразумевана подешавања апликације Windows Терминал.</value>
+    <value>Привремено се користе подразумевана подешавања Windows Терминала.</value>
  </data>
  <data name="InitialJsonParseErrorTitle" xml:space="preserve">
    <value>Није успело учитавање подешавања</value>
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>Наишло се на грешке током учитавања корисничких подешавања</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Упозорење:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>„{0}” се не извршава на вашој машини. Због тога Терминал можда неће моћи да прима улаз са тастатуре.</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
  <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
    <value>Није успело поновно учитавање подешавања</value>
  </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
  <data name="AboutMenuItem" xml:space="preserve">
    <value>О програму</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Повратне информације</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>Подешавања</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Напусти</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>Више панела</value>
  </data>
@@ -271,6 +293,17 @@
    <value>• Наведена "theme" није пронађена у листи тема. Привремено се употребљава подразумевана вредност.</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Особина "globals" је застарела - ваша подешавања би требало да се ажурирају. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>За више информација, погледајте следећу веб страницу.</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>Није успело развијање команде којој је постављено "iterateOn". Ова команда ће се игнорисати.</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+Клик да отворите као администратор</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Затвори</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>Затвори</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Увећај</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>Умањи</value>
  </data>
@@ -476,6 +518,10 @@
    <value>Верзија:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Брзи почетак</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>Изворни кôд</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -554,7 +600,7 @@
    <value>Откуцајте име команде...</value>
  </data>
  <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
-    <value>Ниједна команда се не подудара</value>
+    <value>Нема команди које се подударају</value>
  </data>
  <data name="CommandPaletteModeAnnouncement_ActionMode" xml:space="preserve">
    <value>Акција режим претраге</value>
@@ -751,9 +797,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>Извези текст</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Није успео извоз садржаја терминала</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Успешно је извезен садржај терминала</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>Пронађи</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Чисти текст</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>Понашање при прекиду извршавања може да се подеси у напредним подешавањима профила.</value>
  </data>
@@ -859,6 +914,10 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Активни панел је премештен у картицу "{0}" у прозору "{1}"</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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 the pane was moved to.</comment>
--- a/src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>加载用户设置时遇到错误</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>确定</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>警告: </value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>你的计算机上未运行 "{0}"。这可能会阻止终端接收键盘输入。</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>关于</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>反馈</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>设置</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>全部关闭</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>退出</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>多个窗格</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• 在主题列表中找不到指定的“主题”。暂时回退到默认值。</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>已弃用 "globals" 属性 - 你的设置可能需要更新。</value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>有关详细信息，请参阅此网页。</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>无法展开包含 "iterateOn" 集的命令。此命令将被忽略。</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>按住 Ctrl 并单击以管理员身份打开</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>关闭</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>关闭</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>关闭</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>最大化</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>最小化</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>最小化</value>
  </data>
@@ -476,6 +510,10 @@
    <value>版本:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>入门</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>源代码</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>导出文本</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>无法导出终端内容</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>已成功导出终端内容</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>查找</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>纯文本</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>可以在高级配置文件设置中配置终止行为。</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>活动窗格已移动到“{1}”窗口中的“{0}”选项卡</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw
@@ -149,6 +149,12 @@
  <data name="SettingsValidateErrorTitle" xml:space="preserve">
    <value>載入使用者設定時發生錯誤</value>
  </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>確定</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>警告:</value>
+  </data>
  <data name="KeyboardServiceWarningText" xml:space="preserve">
    <value>"{0}" 未在您的電腦上執行。這可能會讓終端機無法接收鍵盤輸入。</value>
    <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -162,9 +168,21 @@
  <data name="AboutMenuItem" xml:space="preserve">
    <value>關於</value>
  </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>意見反應</value>
+  </data>
  <data name="SettingsMenuItem" xml:space="preserve">
    <value>設定</value>
  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>全部關閉</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>結束</value>
+  </data>
  <data name="MultiplePanes" xml:space="preserve">
    <value>多個窗格</value>
  </data>
@@ -271,6 +289,13 @@
    <value>• 主題清單中找不到指定的「主題」。暫時回到預設值。</value>
    <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
  </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>["globals"] 屬性受到取代 - 您的設定可能需要更新。</value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>如需詳細資訊，請參閱此網頁。</value>
+  </data>
  <data name="FailedToParseCommandJson" xml:space="preserve">
    <value>無法在設定 "iterateOn" 的情況下展開命令。將忽略此命令。</value>
    <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +476,21 @@
  <data name="ElevatedRun.Text" xml:space="preserve">
    <value>Ctrl+按一下以系統管理員身分開啟</value>
  </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>關閉</value>
+  </data>
  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>關閉</value>
  </data>
  <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
    <value>關閉</value>
  </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>最大化</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>最小化</value>
+  </data>
  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
    <value>最小化</value>
  </data>
@@ -476,6 +510,10 @@
    <value>版本:</value>
    <comment>This is the heading for a version number label</comment>
  </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>開始使用</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
  <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
    <value>原始碼</value>
    <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -669,15 +707,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>
@@ -757,9 +789,18 @@
  <data name="ExportTabText" xml:space="preserve">
    <value>匯出文字</value>
  </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>無法匯出終端機內容</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>已成功匯出終端機內容</value>
+  </data>
  <data name="FindText" xml:space="preserve">
    <value>尋找</value>
  </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>純文字</value>
+  </data>
  <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
    <value>您可以在進階設定檔設定中設定終止行為。</value>
  </data>
@@ -851,11 +892,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>
@@ -865,9 +906,13 @@
    <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 new tab index in the tab row.</comment>
  </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>活動窗格已移至 "{1}" 視窗中的 "{0}" 索引標籤</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}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. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </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>
--- a/src/cascadia/TerminalApp/SnippetsPaneContent.cpp
+++ b/src/cascadia/TerminalApp/SnippetsPaneContent.cpp
@@ -48,22 +48,13 @@ namespace winrt::TerminalApp::implementation
    {
        _settings = settings;

-        const auto dispatcher = Dispatcher();
-        const auto weak = get_weak();
-
        // You'd think that `FilterToSendInput(queryString)` would work. It
        // doesn't! That uses the queryString as the current command the user
        // has typed, then relies on the suggestions UI to _also_ filter with that
        // string.

        const auto tasks = co_await _settings.GlobalSettings().ActionMap().FilterToSnippets(winrt::hstring{}, winrt::hstring{}); // IVector<Model::Command>
-        co_await wil::resume_foreground(dispatcher);
-
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());

        _allTasks.Clear();
        for (const auto& t : tasks)
--- a/src/cascadia/TerminalApp/Tab.cpp
+++ b/src/cascadia/TerminalApp/Tab.cpp
@@ -844,14 +844,14 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - direction: The direction to move the separator in.
    // Return Value:
-    // - whether a pane was resized
-    bool Tab::ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void Tab::ResizePane(const ResizeDirection& direction)
    {
        ASSERT_UI_THREAD();

        // NOTE: This _must_ be called on the root pane, so that it can propagate
        // throughout the entire tree.
-        return _rootPane->ResizePane(direction);
+        _rootPane->ResizePane(direction);
    }

    // Method Description:
@@ -1114,7 +1114,7 @@ namespace winrt::TerminalApp::implementation
            [dispatcher, weakThis](auto&&, auto&&) -> safe_void_coroutine {
                const auto weakThisCopy = weakThis;
                co_await wil::resume_foreground(dispatcher);
-                if (auto tab{ weakThisCopy.get() })
+                if (auto tab{ weakThis.get() })
                {
                    tab->_RecalculateAndApplyReadOnly();
                }
@@ -2137,7 +2137,7 @@ namespace winrt::TerminalApp::implementation
            const auto profileName{ profile.Name() };
            if (profileName != Title())
            {
-                return til::hstring_format(FMT_COMPILE(L"{}: {}"), profileName, Title());
+                return winrt::hstring{ fmt::format(FMT_COMPILE(L"{}: {}"), profileName, Title()) };
            }
        }

--- a/src/cascadia/TerminalApp/Tab.h
+++ b/src/cascadia/TerminalApp/Tab.h
@@ -53,7 +53,7 @@ namespace winrt::TerminalApp::implementation
                                                                                                        const float splitSize,
                                                                                                        winrt::Windows::Foundation::Size availableSpace) const;

-        bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
        bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
        bool SwapPane(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
        bool FocusPane(const uint32_t id);
--- a/src/cascadia/TerminalApp/TabManagement.cpp
+++ b/src/cascadia/TerminalApp/TabManagement.cpp
@@ -396,18 +396,12 @@ namespace winrt::TerminalApp::implementation
    // - tab: the tab to remove
    winrt::Windows::Foundation::IAsyncAction TerminalPage::_HandleCloseTabRequested(winrt::TerminalApp::Tab tab)
    {
-        winrt::com_ptr<TerminalPage> strong;
-
        if (tab.ReadOnly())
        {
-            const auto weak = get_weak();
-
            auto warningResult = co_await _ShowCloseReadOnlyDialog();

-            strong = weak.get();
-
            // If the user didn't explicitly click on close tab - leave
-            if (!strong || warningResult != ContentDialogResult::Primary)
+            if (warningResult != ContentDialogResult::Primary)
            {
                co_return;
            }
@@ -716,14 +710,10 @@ namespace winrt::TerminalApp::implementation
    {
        if (pane->ContainsReadOnly())
        {
-            const auto weak = get_weak();
-
            auto warningResult = co_await _ShowCloseReadOnlyDialog();

-            const auto strong = weak.get();
-
            // If the user didn't explicitly click on close tab - leave
-            if (!strong || warningResult != ContentDialogResult::Primary)
+            if (warningResult != ContentDialogResult::Primary)
            {
                co_return false;
            }
@@ -781,13 +771,9 @@ namespace winrt::TerminalApp::implementation

            if (const auto pane{ activeTab->GetActivePane() })
            {
-                const auto weak = get_weak();
                if (co_await _PaneConfirmCloseReadOnly(pane))
                {
-                    if (const auto strong = weak.get())
-                    {
-                        _HandleClosePaneRequested(pane);
-                    }
+                    _HandleClosePaneRequested(pane);
                }
            }
        }
@@ -845,22 +831,9 @@ namespace winrt::TerminalApp::implementation
    // - tabs - tabs to remove
    safe_void_coroutine TerminalPage::_RemoveTabs(const std::vector<winrt::TerminalApp::Tab> tabs)
    {
-        const auto weak = get_weak();
-
        for (auto& tab : tabs)
        {
-            winrt::Windows::Foundation::IAsyncAction action{ nullptr };
-            if (const auto strong = weak.get())
-            {
-                action = _HandleCloseTabRequested(tab);
-            }
-
-            if (!action)
-            {
-                co_return;
-            }
-
-            co_await action;
+            co_await _HandleCloseTabRequested(tab);
        }
    }
    // Method Description:
@@ -944,13 +917,8 @@ namespace winrt::TerminalApp::implementation
        // WinUI asynchronously updates its tab view items, so it may happen that we're given a
        // `TabViewItem` that still contains a `Tab` which has actually already been removed.
        // First we must yield once, to flush out whatever TabView is currently doing.
-        const auto weak = get_weak();
+        const auto strong = get_strong();
        co_await wil::resume_foreground(Dispatcher());
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }

        const auto tab = _GetTabByTabViewItem(sender);
        if (!tab)
--- a/src/cascadia/TerminalApp/TaskbarState.cpp
+++ b/src/cascadia/TerminalApp/TaskbarState.cpp
@@ -9,7 +9,7 @@ namespace winrt::TerminalApp::implementation
 {
    // Default to unset, 0%.
    TaskbarState::TaskbarState() :
-        TaskbarState(0, 0) {};
+        TaskbarState(0, 0){};

    TaskbarState::TaskbarState(const uint64_t dispatchTypesState, const uint64_t progressParam) :
        _State{ dispatchTypesState },
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -134,7 +134,7 @@
    </ClInclude>
    <ClInclude Include="FilteredCommand.h" />
    <ClInclude Include="Pane.h" />
-    <ClInclude Include="../fzf/fzf.h" />
+    <ClInclude Include="fzf/fzf.h" />
    <ClInclude Include="pch.h" />
    <ClInclude Include="ShortcutActionDispatch.h">
      <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
@@ -204,7 +204,7 @@
    <ClCompile Include="Tab.cpp">
      <DependentUpon>Tab.idl</DependentUpon>
    </ClCompile>
-    <ClCompile Include="../fzf/fzf.cpp" />
+    <ClCompile Include="fzf/fzf.cpp" />
    <ClCompile Include="TaskbarState.cpp">
      <DependentUpon>TaskbarState.idl</DependentUpon>
    </ClCompile>
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
@@ -2,6 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
  </ItemGroup>
  <ItemGroup>
    <PRIResource Include="Resources\en-US\Resources.resw" />
@@ -32,7 +33,8 @@
    </ClCompile>
    <ClCompile Include="Toast.cpp" />
    <ClCompile Include="LanguageProfileNotifier.cpp" />
-    <ClCompile Include="TerminalSettingsCache.cpp" />
+    <ClCompile Include="Monarch.cpp" />
+    <ClCompile Include="Peasant.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h" />
@@ -58,10 +60,14 @@
    <ClInclude Include="fzf/fzf.h">
      <Filter>fzf</Filter>
    </ClInclude>
+    <ClInclude Include="fzf/LICENSE">
+      <Filter>fzf</Filter>
+    </ClInclude>
    <ClInclude Include="Toast.h" />
    <ClInclude Include="LanguageProfileNotifier.h" />
    <ClInclude Include="WindowsPackageManagerFactory.h" />
-    <ClInclude Include="TerminalSettingsCache.h" />
+    <ClInclude Include="Monarch.h" />
+    <ClInclude Include="Peasant.h" />
  </ItemGroup>
  <ItemGroup>
    <Midl Include="AppLogic.idl">
@@ -84,8 +90,7 @@
    <Midl Include="TerminalWindow.idl" />
    <Midl Include="TaskbarState.idl" />
    <Midl Include="IPaneContent.idl" />
-    <Midl Include="Remoting.idl" />
-    <Midl Include="HighlightedTextControl.idl" />
+    <Midl Include="Monarch.idl" />
  </ItemGroup>
  <ItemGroup>
    <Page Include="MinMaxCloseControl.xaml">
@@ -118,7 +123,6 @@
    <Page Include="AboutDialog.xaml" />
    <Page Include="SuggestionsControl.xaml" />
    <Page Include="SnippetsPaneContent.xaml" />
-    <Page Include="MarkdownPaneContent.xaml" />
  </ItemGroup>
  <ItemGroup>
    <Filter Include="app">
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -8,7 +8,6 @@
 #include <TerminalCore/ControlKeyStates.hpp>
 #include <TerminalThemeHelpers.h>
 #include <til/hash.h>
-#include <til/unicode.h>
 #include <Utils.h>

 #include "../../types/inc/ColorFix.hpp"
@@ -38,6 +37,7 @@ using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
+using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Text;
@@ -1482,9 +1482,6 @@ namespace winrt::TerminalApp::implementation
                return {};
            }
        }();
-        static const auto ambiguousIsWide = [&]() -> bool {
-            return _settings.GlobalSettings().AmbiguousWidth() == AmbiguousWidth::Wide;
-        }();

        TerminalConnection::ITerminalConnection connection{ nullptr };

@@ -1550,10 +1547,6 @@ namespace winrt::TerminalApp::implementation
        {
            valueSet.Insert(L"textMeasurement", Windows::Foundation::PropertyValue::CreateString(textMeasurement));
        }
-        if (ambiguousIsWide)
-        {
-            valueSet.Insert(L"ambiguousIsWide", Windows::Foundation::PropertyValue::CreateBoolean(true));
-        }

        if (const auto id = settings.SessionId(); id != winrt::guid{})
        {
@@ -2213,15 +2206,7 @@ namespace winrt::TerminalApp::implementation
        if (!_displayingCloseDialog)
        {
            _displayingCloseDialog = true;
-
-            const auto weak = get_weak();
            auto warningResult = co_await _ShowQuitDialog();
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }
-
            _displayingCloseDialog = false;

            if (warningResult != ContentDialogResult::Primary)
@@ -2791,15 +2776,14 @@ namespace winrt::TerminalApp::implementation
    // Arguments:
    // - direction: The direction to move the separator in.
    // Return Value:
-    // - whether a pane was resized
-    bool TerminalPage::_ResizePane(const ResizeDirection& direction)
+    // - <none>
+    void TerminalPage::_ResizePane(const ResizeDirection& direction)
    {
        if (const auto tabImpl{ _GetFocusedTabImpl() })
        {
            _UnZoomIfNeeded();
-            return tabImpl->ResizePane(direction);
+            tabImpl->ResizePane(direction);
        }
-        return false;
    }

    // Method Description:
@@ -2949,7 +2933,7 @@ namespace winrt::TerminalApp::implementation
    // - Does some of this in a background thread, as to not hang/crash the UI thread.
    // Arguments:
    // - eventArgs: the PasteFromClipboard event sent from the TermControl
-    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable sender, const PasteFromClipboardEventArgs eventArgs)
+    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable /*sender*/, const PasteFromClipboardEventArgs eventArgs)
    try
    {
        // The old Win32 clipboard API as used below is somewhere in the order of 300-1000x faster than
@@ -2958,7 +2942,6 @@ namespace winrt::TerminalApp::implementation
        const auto dispatcher = Dispatcher();
        const auto globalSettings = _settings.GlobalSettings();
        const auto bracketedPaste = eventArgs.BracketedPasteEnabled();
-        const auto sourceId = sender.try_as<ControlInteractivity>().Id();

        // GetClipboardData might block for up to 30s for delay-rendered contents.
        co_await winrt::resume_background();
@@ -2974,11 +2957,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;
        }
@@ -3017,19 +2996,7 @@ namespace winrt::TerminalApp::implementation
            {
                // We have to initialize the dialog here to be able to change the text of the text block within it
                std::ignore = FindName(L"MultiLinePasteDialog");
-
-                // WinUI absolutely cannot deal with large amounts of text (at least O(n), possibly O(n^2),
-                // so we limit the string length here and add an ellipsis if necessary.
-                auto clipboardText = text;
-                if (clipboardText.size() > 1024)
-                {
-                    const std::wstring_view view{ text };
-                    // Make sure we don't cut in the middle of a surrogate pair
-                    const auto len = til::utf16_iterate_prev(view, 512);
-                    clipboardText = til::hstring_format(FMT_COMPILE(L"{}\n…"), view.substr(0, len));
-                }
-
-                ClipboardText().Text(std::move(clipboardText));
+                ClipboardText().Text(text);

                // The vertical offset on the scrollbar does not reset automatically, so reset it manually
                ClipboardContentScrollViewer().ScrollToVerticalOffset(0);
@@ -3045,7 +3012,7 @@ namespace winrt::TerminalApp::implementation
                }

                // Clear the clipboard text so it doesn't lie around in memory
-                ClipboardText().Text({});
+                ClipboardText().Text(L"");

                if (warningResult != ContentDialogResult::Primary)
                {
@@ -3060,69 +3027,22 @@ namespace winrt::TerminalApp::implementation
        // This will end up calling ConptyConnection::WriteInput which calls WriteFile which may block for
        // an indefinite amount of time. Avoid freezes and deadlocks by running this on a background thread.
        assert(!dispatcher.HasThreadAccess());
-        eventArgs.HandleClipboardData(text);
-
-        // GH#18821: If broadcast input is active, paste the same text into all other
-        // panes on the tab. We do this here (rather than re-reading the
-        // clipboard per-pane) so that only one paste warning is shown.
-        co_await wil::resume_foreground(dispatcher);
-        if (const auto strongThis = weakThis.get())
-        {
-            if (const auto& tab{ strongThis->_GetFocusedTabImpl() })
-            {
-                if (tab->TabStatus().IsInputBroadcastActive())
-                {
-                    tab->GetRootPane()->WalkTree([&](auto&& pane) {
-                        if (const auto control = pane->GetTerminalControl())
-                        {
-                            if (control.ContentId() != sourceId && !control.ReadOnly())
-                            {
-                                control.RawWriteString(text);
-                            }
-                        }
-                    });
-                }
-            }
-        }
+        eventArgs.HandleClipboardData(std::move(text));
    }
    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 (...)
@@ -3142,10 +3062,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);

@@ -3198,42 +3117,6 @@ namespace winrt::TerminalApp::implementation
        return true;
    }

-    bool TerminalPage::_IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const
-    {
-        const auto& schemeName = parsedUri.SchemeName();
-
-        if (schemeName == L"http" || schemeName == L"https")
-        {
-            return true;
-        }
-        if (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;
-        }
-        if (const auto& safeSchemes = _settings.GlobalSettings().SafeUriSchemes())
-        {
-            for (const auto& scheme : safeSchemes)
-            {
-                if (til::equals_insensitive_ascii(schemeName, scheme))
-                {
-                    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*/,
@@ -3309,12 +3192,8 @@ namespace winrt::TerminalApp::implementation
    // - eventArgs: the arguments specifying how to set the progress indicator
    safe_void_coroutine TerminalPage::_SetTaskbarProgressHandler(const IInspectable /*sender*/, const IInspectable /*eventArgs*/)
    {
-        const auto weak = get_weak();
        co_await wil::resume_foreground(Dispatcher());
-        if (const auto strong = weak.get())
-        {
-            SetTaskbarProgress.raise(*this, nullptr);
-        }
+        SetTaskbarProgress.raise(*this, nullptr);
    }

    // Method Description:
@@ -3371,12 +3250,6 @@ namespace winrt::TerminalApp::implementation
        {
            co_return;
        }
-
-        const auto weak = get_weak();
-        const auto dispatcher = Dispatcher();
-
-        // All of the code until resume_foreground is static and
-        // doesn't touch `this`, so we don't need weak/strong_ref.
        co_await winrt::resume_background();

        // no packages were found, nothing to suggest
@@ -3394,12 +3267,7 @@ namespace winrt::TerminalApp::implementation
            suggestions.emplace_back(fmt::format(FMT_COMPILE(L"winget install --id {} -s winget"), pkg.CatalogPackage().Id()));
        }

-        co_await wil::resume_foreground(dispatcher);
-        const auto strong = weak.get();
-        if (!strong)
-        {
-            co_return;
-        }
+        co_await wil::resume_foreground(Dispatcher());

        auto term = _GetActiveControl();
        if (!term)
@@ -3454,6 +3322,24 @@ namespace winrt::TerminalApp::implementation
    // - Paste text from the Windows Clipboard to the focused terminal
    void TerminalPage::_PasteText()
    {
+        // First, check if we're in broadcast input mode. If so, let's tell all
+        // the controls to paste.
+        if (const auto& tab{ _GetFocusedTabImpl() })
+        {
+            if (tab->TabStatus().IsInputBroadcastActive())
+            {
+                tab->GetRootPane()->WalkTree([](auto&& pane) {
+                    if (auto control = pane->GetTerminalControl())
+                    {
+                        control.PasteTextFromClipboard();
+                    }
+                });
+                return;
+            }
+        }
+
+        // The focused tab wasn't in broadcast mode. No matter. Just ask the
+        // current one to paste.
        if (const auto& control{ _GetActiveControl() })
        {
            control.PasteTextFromClipboard();
@@ -3476,9 +3362,6 @@ namespace winrt::TerminalApp::implementation
            // UI) thread. This is IMPORTANT, because the Windows.Storage API's
            // (used for retrieving the path to the file) will crash on the UI
            // thread, because the main thread is a STA.
-            //
-            // NOTE: All remaining code of this function doesn't touch `this`, so we don't need weak/strong_ref.
-            // NOTE NOTE: Don't touch `this` when you make changes here.
            co_await winrt::resume_background();

            auto openFile = [](const auto& filePath) {
@@ -3808,13 +3691,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();
        }
    }
@@ -4176,12 +4053,12 @@ namespace winrt::TerminalApp::implementation
    {
        constexpr auto lightnessThreshold = 0.6f;
        // TODO GH#3327: Look at what to do with the tab button when we have XAML theming
-        const auto isBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
+        const auto IsBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
        const auto isLightAccentColor = ColorFix::GetLightness(accentColor) >= lightnessThreshold;
        const auto hoverColorAdjustment = isLightAccentColor ? -0.05f : 0.05f;
        const auto pressedColorAdjustment = isLightAccentColor ? -0.1f : 0.1f;

-        const auto foregroundColor = isBrightColor ? Colors::Black() : Colors::White();
+        const auto foregroundColor = IsBrightColor ? Colors::Black() : Colors::White();
        const auto hoverColor = til::color{ ColorFix::AdjustLightness(accentColor, hoverColorAdjustment) };
        const auto pressedColor = til::color{ ColorFix::AdjustLightness(accentColor, pressedColorAdjustment) };

@@ -4846,18 +4723,12 @@ namespace winrt::TerminalApp::implementation
    // - sender: the ICoreState instance containing the connection state
    // Return Value:
    // - <none>
-    safe_void_coroutine TerminalPage::_ConnectionStateChangedHandler(const IInspectable& sender, const IInspectable& /*args*/)
+    safe_void_coroutine TerminalPage::_ConnectionStateChangedHandler(const IInspectable& sender, const IInspectable& /*args*/) const
    {
        if (const auto coreState{ sender.try_as<winrt::Microsoft::Terminal::Control::ICoreState>() })
        {
            const auto newConnectionState = coreState.ConnectionState();
-            const auto weak = get_weak();
            co_await wil::resume_foreground(Dispatcher());
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }

            _adjustProcessPriorityThrottled->Run();

@@ -4995,18 +4866,8 @@ namespace winrt::TerminalApp::implementation
            }
        }

-        // GH#19604: Get the theme's tabRow color to use as the acrylic tint.
-        const auto tabRowBg{ theme.TabRow() ? (_activated ? theme.TabRow().Background() :
-                                                            theme.TabRow().UnfocusedBackground()) :
-                                              ThemeColor{ nullptr } };
-
-        if (_settings.GlobalSettings().UseAcrylicInTabRow() && (_activated || _settings.GlobalSettings().EnableUnfocusedAcrylic()))
+        if (_settings.GlobalSettings().UseAcrylicInTabRow())
        {
-            if (tabRowBg)
-            {
-                bgColor = ThemeColor::ColorFromBrush(tabRowBg.Evaluate(res, terminalBrush, true));
-            }
-
            const auto acrylicBrush = Media::AcrylicBrush();
            acrylicBrush.BackgroundSource(Media::AcrylicBackgroundSource::HostBackdrop);
            acrylicBrush.FallbackColor(bgColor);
@@ -5015,7 +4876,9 @@ namespace winrt::TerminalApp::implementation

            TitlebarBrush(acrylicBrush);
        }
-        else if (tabRowBg)
+        else if (auto tabRowBg{ theme.TabRow() ? (_activated ? theme.TabRow().Background() :
+                                                               theme.TabRow().UnfocusedBackground()) :
+                                                 ThemeColor{ nullptr } })
        {
            const auto themeBrush{ tabRowBg.Evaluate(res, terminalBrush, true) };
            bgColor = ThemeColor::ColorFromBrush(themeBrush);
--- a/src/cascadia/TerminalApp/TerminalPage.h
+++ b/src/cascadia/TerminalApp/TerminalPage.h
@@ -412,7 +412,7 @@ namespace winrt::TerminalApp::implementation
                        const Microsoft::Terminal::Settings::Model::SplitDirection splitType,
                        const float splitSize,
                        std::shared_ptr<Pane> newPane);
-        bool _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+        void _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
        void _ToggleSplitOrientation();

        void _ScrollPage(ScrollDirection scrollDirection);
@@ -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);
-        bool _IsUriConsideredSomewhatSafe(const winrt::Windows::Foundation::Uri& parsedUri) const;
+        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);
@@ -527,7 +526,7 @@ namespace winrt::TerminalApp::implementation
                           const winrt::Microsoft::Terminal::Settings::Model::Profile& profile);
        void _OpenElevatedWT(winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs newTerminalArgs);

-        safe_void_coroutine _ConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args);
+        safe_void_coroutine _ConnectionStateChangedHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
        void _CloseOnExitInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
        void _KeyboardServiceWarningInfoDismissHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& args) const;
        static bool _IsMessageDismissed(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
@@ -543,7 +542,7 @@ namespace winrt::TerminalApp::implementation

        void _ShowWindowChangedHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::ShowWindowArgs args);
        Windows::Foundation::IAsyncAction _SearchMissingCommandHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::SearchMissingCommandEventArgs args);
-        static Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult>> _FindPackageAsync(hstring query);
+        Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult>> _FindPackageAsync(hstring query);

        void _WindowSizeChanged(const IInspectable sender, const winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs args);
        void _windowPropertyChanged(const IInspectable& sender, const winrt::Windows::UI::Xaml::Data::PropertyChangedEventArgs& args);
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/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>
--- a/src/cascadia/TerminalApp/TerminalWindow.cpp
+++ b/src/cascadia/TerminalApp/TerminalWindow.cpp
@@ -323,10 +323,6 @@ namespace winrt::TerminalApp::implementation
    // - an IAsyncOperation with the dialog result
    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalWindow::ShowDialog(winrt::WUX::Controls::ContentDialog dialog)
    {
-        const auto weak = get_weak();
-        const auto dispatcher = _root->Dispatcher();
-        const auto root = _root->XamlRoot();
-
        // As mentioned on s_activeDialog, dismissing the active dialog is necessary.
        // We repeat it a few times in case the resume_foreground failed to work,
        // but I found that one iteration will always be enough in practice.
@@ -340,7 +336,7 @@ namespace winrt::TerminalApp::implementation
            s_activeDialog.Hide();

            // Wait for the current dialog to be hidden.
-            co_await wil::resume_foreground(dispatcher, CoreDispatcherPriority::Low);
+            co_await wil::resume_foreground(_root->Dispatcher(), CoreDispatcherPriority::Low);
        }

        // If two sources call ShowDialog() simultaneously, it may happen that both enter the above loop,
@@ -357,7 +353,7 @@ namespace winrt::TerminalApp::implementation
        // IMPORTANT: This is necessary as documented in the ContentDialog MSDN docs.
        // Since we're hosting the dialog in a Xaml island, we need to connect it to the
        // xaml tree somehow.
-        dialog.XamlRoot(root);
+        dialog.XamlRoot(_root->XamlRoot());

        // IMPORTANT: Set the requested theme of the dialog, because the
        // PopupRoot isn't directly in the Xaml tree of our root. So the dialog
@@ -371,17 +367,14 @@ namespace winrt::TerminalApp::implementation
        // theme on each element up to the root. We're relying a bit on Xaml's implementation
        // details here, but it does have the desired effect.
        // It's not enough to set the theme on the dialog alone.
-        auto themingLambda{ [weak](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
-            if (const auto strong = weak.get())
+        auto themingLambda{ [this](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
+            auto theme{ _settings.GlobalSettings().CurrentTheme() };
+            auto requestedTheme{ theme.RequestedTheme() };
+            auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
+            while (element)
            {
-                auto theme{ strong->_settings.GlobalSettings().CurrentTheme() };
-                auto requestedTheme{ theme.RequestedTheme() };
-                auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
-                while (element)
-                {
-                    element.RequestedTheme(requestedTheme);
-                    element = element.Parent().try_as<winrt::Windows::UI::Xaml::FrameworkElement>();
-                }
+                element.RequestedTheme(requestedTheme);
+                element = element.Parent().try_as<winrt::Windows::UI::Xaml::FrameworkElement>();
            }
        } };

@@ -901,11 +894,6 @@ namespace winrt::TerminalApp::implementation
        {
            // Manually bubble the OnDirectKeyEvent event up through the focus tree.
            auto xamlRoot{ _root->XamlRoot() };
-            if (!xamlRoot)
-            {
-                return false;
-            }
-
            auto focusedObject{ Windows::UI::Xaml::Input::FocusManager::GetFocusedElement(xamlRoot) };
            do
            {
@@ -1405,7 +1393,9 @@ namespace winrt::TerminalApp::implementation
    // - a string for displaying the name of the window.
    winrt::hstring WindowProperties::WindowIdForDisplay() const noexcept
    {
-        return til::hstring_format(FMT_COMPILE(L"{}: {}"), std::wstring_view(RS_(L"WindowIdLabel")), _WindowId);
+        return winrt::hstring{ fmt::format(FMT_COMPILE(L"{}: {}"),
+                                           std::wstring_view(RS_(L"WindowIdLabel")),
+                                           _WindowId) };
    }

    // Method Description:
@@ -1416,7 +1406,9 @@ namespace winrt::TerminalApp::implementation
    // - a string for displaying the name of the window.
    winrt::hstring WindowProperties::WindowNameForDisplay() const noexcept
    {
-        return _WindowName.empty() ? til::hstring_format(FMT_COMPILE(L"<{}>"), RS_(L"UnnamedWindowName")) : _WindowName;
+        return _WindowName.empty() ?
+                   winrt::hstring{ fmt::format(FMT_COMPILE(L"<{}>"), RS_(L"UnnamedWindowName")) } :
+                   _WindowName;
    }

    bool WindowProperties::IsQuakeWindow() const noexcept
--- a/src/cascadia/TerminalApp/TitlebarControl.cpp
+++ b/src/cascadia/TerminalApp/TitlebarControl.cpp
@@ -53,16 +53,6 @@ namespace winrt::TerminalApp::implementation
        return static_cast<float>(minMaxCloseWidth) / 3.0f;
    }

-    bool TitlebarControl::Focused()
-    {
-        return MinMaxCloseControl().Focused();
-    }
-
-    void TitlebarControl::Focused(bool focused)
-    {
-        MinMaxCloseControl().Focused(focused);
-    }
-
    IInspectable TitlebarControl::Content()
    {
        return ContentRoot().Content();
--- a/src/cascadia/TerminalApp/TitlebarControl.h
+++ b/src/cascadia/TerminalApp/TitlebarControl.h
@@ -17,9 +17,6 @@ namespace winrt::TerminalApp::implementation
        void ReleaseButtons();
        float CaptionButtonWidth();

-        bool Focused();
-        void Focused(bool focused);
-
        IInspectable Content();
        void Content(IInspectable content);

--- a/src/cascadia/TerminalApp/TitlebarControl.idl
+++ b/src/cascadia/TerminalApp/TitlebarControl.idl
@@ -29,7 +29,6 @@ namespace TerminalApp
        void ClickButton(CaptionButton button);
        void ReleaseButtons();
        Single CaptionButtonWidth { get; };
-        Boolean Focused { get; set; };

        IInspectable Content;
        Windows.UI.Xaml.Controls.Border DragBar { get; };
--- a/src/cascadia/TerminalApp/fzf/LICENSE
+++ b/src/cascadia/TerminalApp/fzf/LICENSE
--- a/src/cascadia/TerminalApp/fzf/fzf.cpp
+++ b/src/cascadia/TerminalApp/fzf/fzf.cpp
--- a/src/cascadia/TerminalApp/fzf/fzf.h
+++ b/src/cascadia/TerminalApp/fzf/fzf.h
--- a/src/cascadia/TerminalConnection/AzureConnection.cpp
+++ b/src/cascadia/TerminalConnection/AzureConnection.cpp
@@ -94,15 +94,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
    // - helper that will write an unterminated string (generally, from a resource) to the output stream.
    // Arguments:
    // - str: the string to write.
-    void AzureConnection::_WriteStringWithNewline(std::wstring str)
-    {
-        str.append(L"\r\n");
-        TerminalOutput.raise(winrt_wstring_to_array_view(str));
-    }
-
    void AzureConnection::_WriteStringWithNewline(const std::wstring_view str)
    {
-        TerminalOutput.raise(winrt_wstring_to_array_view(str + L"\r\n"));
+        WriteUtf16Output(str + L"\r\n");
    }

    // Method description:
@@ -118,7 +112,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        catch (const std::exception& runtimeException)
        {
            // This also catches the AzureException, which has a .what()
-            TerminalOutput.raise(winrt_wstring_to_array_view(_colorize(91, til::u8u16(std::string{ runtimeException.what() }))));
+            WriteUtf16Output(_colorize(91, til::u8u16(std::string{ runtimeException.what() })));
        }
        catch (...)
        {
@@ -157,7 +151,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        _transitionToState(ConnectionState::Connecting);
    }

-    std::optional<std::wstring> AzureConnection::_ReadUserInput(InputMode mode)
+    std::optional<std::string> AzureConnection::_ReadUserInput(InputMode mode)
    {
        std::unique_lock<std::mutex> inputLock{ _inputMutex };

@@ -168,20 +162,20 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

        _currentInputMode = mode;

-        TerminalOutput.raise(winrt_wstring_to_array_view(L"> \x1b[92m")); // Make prompted user input green
+        WriteUtf8Output("> \x1b[92m"); // Make prompted user input green

        _inputEvent.wait(inputLock, [this, mode]() {
            return _currentInputMode != mode || _isStateAtOrBeyond(ConnectionState::Closing);
        });

-        TerminalOutput.raise(winrt_wstring_to_array_view(L"\x1b[m"));
+        WriteUtf8Output("\x1b[m");

        if (_isStateAtOrBeyond(ConnectionState::Closing))
        {
            return std::nullopt;
        }

-        std::wstring readInput{};
+        std::string readInput{};
        _userInput.swap(readInput);
        return readInput;
    }
@@ -191,12 +185,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
    // - handles the different possible inputs in the different states
    // Arguments:
    // the user's input
-    void AzureConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void AzureConnection::WriteInput(const winrt::array_view<const uint8_t> buffer)
    {
-        _writeInput(winrt_array_to_wstring_view(buffer));
+        _writeInput(winrt_array_to_string_view(buffer));
    }

-    void AzureConnection::_writeInput(const std::wstring_view data)
+    void AzureConnection::_writeInput(const std::string_view data)
    {
        // We read input while connected AND connecting.
        if (!_isStateOneOf(ConnectionState::Connected, ConnectionState::Connecting))
@@ -206,8 +200,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

        if (_state == AzureState::TermConnected)
        {
-            auto buff{ winrt::to_string(data) };
-            WinHttpWebSocketSend(_webSocket.get(), WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, buff.data(), gsl::narrow<DWORD>(buff.size()));
+            WinHttpWebSocketSend(_webSocket.get(), WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, const_cast<char*>(data.data()), gsl::narrow<DWORD>(data.size()));
            return;
        }

@@ -217,19 +210,19 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            if (_userInput.size() > 0)
            {
                _userInput.pop_back();
-                TerminalOutput.raise(winrt_wstring_to_array_view(L"\x08 \x08")); // overstrike the character with a space
+                WriteUtf8Output("\x08 \x08"); // overstrike the character with a space
            }
        }
        else
        {
-            TerminalOutput.raise(winrt_wstring_to_array_view(data)); // echo back
+            WriteUtf8Output(data); // echo back

            switch (_currentInputMode)
            {
            case InputMode::Line:
                if (data.size() > 0 && gsl::at(data, 0) == UNICODE_CARRIAGERETURN)
                {
-                    TerminalOutput.raise(winrt_wstring_to_array_view(L"\r\n")); // we probably got a \r, so we need to advance to the next line.
+                    WriteUtf8Output("\r\n"); // we probably got a \r, so we need to advance to the next line.
                    _currentInputMode = InputMode::None; // toggling the mode indicates completion
                    _inputEvent.notify_one();
                    break;
@@ -421,21 +414,13 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                        case WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE:
                        case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE:
                        {
-                            const auto result{ til::u8u16(std::string_view{ _buffer.data(), read }, _u16Str, _u8State) };
-                            if (FAILED(result))
-                            {
-                                // EXIT POINT
-                                _transitionToState(ConnectionState::Failed);
-                                return gsl::narrow<DWORD>(result);
-                            }
-
-                            if (_u16Str.empty())
+                            if (read == 0)
                            {
                                continue;
                            }

                            // Pass the output to our registered event handlers
-                            TerminalOutput.raise(winrt_wstring_to_array_view(_u16Str));
+                            TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(_buffer.data()), read });
                            break;
                        }
                        case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE:
@@ -532,14 +517,14 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            }

            const auto& tenantSelection = maybeTenantSelection.value();
-            if (tenantSelection == RS_(L"AzureUserEntry_RemoveStored"))
+            if (tenantSelection == RS_A(L"AzureUserEntry_RemoveStored"))
            {
                // User wants to remove the stored settings
                _RemoveCredentials();
                _state = AzureState::DeviceFlow;
                return;
            }
-            else if (tenantSelection == RS_(L"AzureUserEntry_NewLogin"))
+            else if (tenantSelection == RS_A(L"AzureUserEntry_NewLogin"))
            {
                // User wants to login with a different account
                _state = AzureState::DeviceFlow;
@@ -720,13 +705,13 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            }

            const auto& storeCredentials = maybeStoreCredentials.value();
-            if (storeCredentials == RS_(L"AzureUserEntry_Yes"))
+            if (storeCredentials == RS_A(L"AzureUserEntry_Yes"))
            {
                _StoreCredential();
                _WriteStringWithNewline(RS_(L"AzureTokensStored"));
                break;
            }
-            else if (storeCredentials == RS_(L"AzureUserEntry_No"))
+            else if (storeCredentials == RS_A(L"AzureUserEntry_No"))
            {
                break; // we're done, but the user wants nothing.
            }
@@ -778,7 +763,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        const auto shellType = _ParsePreferredShellType(settingsResponse);
        _WriteStringWithNewline(RS_(L"AzureRequestingTerminal"));
        const auto socketUri = _GetTerminal(shellType);
-        TerminalOutput.raise(winrt_wstring_to_array_view(L"\r\n"));
+        WriteUtf16Output(L"\r\n");

        //// Step 8: connecting to said terminal
        {
@@ -810,7 +795,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

        _state = AzureState::TermConnected;

-        std::wstring queuedUserInput{};
+        std::string queuedUserInput{};
        std::swap(_userInput, queuedUserInput);
        if (queuedUserInput.size() > 0)
        {
--- a/src/cascadia/TerminalConnection/AzureConnection.h
+++ b/src/cascadia/TerminalConnection/AzureConnection.h
@@ -22,12 +22,10 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        void Initialize(const Windows::Foundation::Collections::ValueSet& settings);

        void Start();
-        void WriteInput(const winrt::array_view<const char16_t> buffer);
+        void WriteInput(const winrt::array_view<const uint8_t> buffer);
        void Resize(uint32_t rows, uint32_t columns);
        void Close();

-        til::event<TerminalOutputHandler> TerminalOutput;
-
    private:
        til::CoordType _initialRows{};
        til::CoordType _initialCols{};
@@ -66,8 +64,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        std::vector<::Microsoft::Terminal::Azure::Tenant> _tenantList;
        std::optional<::Microsoft::Terminal::Azure::Tenant> _currentTenant;

-        void _writeInput(const std::wstring_view str);
-        void _WriteStringWithNewline(std::wstring str);
+        void _writeInput(const std::string_view str);
        void _WriteStringWithNewline(const std::wstring_view str);
        void _WriteCaughtExceptionRecord();
        winrt::Windows::Data::Json::JsonObject _SendRequestReturningJson(std::wstring_view uri, const winrt::Windows::Web::Http::IHttpContent& content = nullptr, winrt::Windows::Web::Http::HttpMethod method = nullptr, const winrt::Windows::Foundation::Uri referer = nullptr);
@@ -88,19 +85,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            Line
        };
        InputMode _currentInputMode{ InputMode::None };
-        std::wstring _userInput;
+        std::string _userInput;
        std::condition_variable _inputEvent;
        std::mutex _inputMutex;

-        std::optional<std::wstring> _ReadUserInput(InputMode mode);
+        std::optional<std::string> _ReadUserInput(InputMode mode);

        winrt::Windows::Web::Http::HttpClient _httpClient{ nullptr };
        wil::unique_winhttp_hinternet _socketSessionHandle;
        wil::unique_winhttp_hinternet _socketConnectionHandle;
        wil::unique_winhttp_hinternet _webSocket;

-        til::u8state _u8State{};
-        std::wstring _u16Str;
        std::array<char, 4096> _buffer{};

        static winrt::hstring _ParsePreferredShellType(const winrt::Windows::Data::Json::JsonObject& settingsResponse);
--- a/src/cascadia/TerminalConnection/BaseTerminalConnection.h
+++ b/src/cascadia/TerminalConnection/BaseTerminalConnection.h
@@ -18,6 +18,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        }

        til::typed_event<ITerminalConnection, winrt::Windows::Foundation::IInspectable> StateChanged;
+        til::event<TerminalOutputHandler> TerminalOutput;

    protected:
        template<typename U>
@@ -101,6 +102,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            return _isStateOneOf(ConnectionState::Connected);
        }

+        void WriteUtf16Output(std::wstring_view str)
+        {
+            auto converted{ til::u16u8(str) };
+            TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(converted.data()), static_cast<uint32_t>(converted.size()) });
+        }
+
+        void WriteUtf8Output(std::string_view str)
+        {
+            TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(str.data()), static_cast<uint32_t>(str.size()) });
+        }
+
        winrt::guid _sessionId{};

    private:
--- a/src/cascadia/TerminalConnection/CTerminalHandoff.h
+++ b/src/cascadia/TerminalConnection/CTerminalHandoff.h
@@ -31,7 +31,7 @@ Author(s):
 using NewHandoffFunction = HRESULT (*)(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo);

 struct __declspec(uuid(__CLSID_CTerminalHandoff))
-CTerminalHandoff : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, ITerminalHandoff3>
+    CTerminalHandoff : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, ITerminalHandoff3>
 {
 #pragma region ITerminalHandoff
    STDMETHODIMP EstablishPtyHandoff(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo) override;
--- a/src/cascadia/TerminalConnection/ConptyConnection.cpp
+++ b/src/cascadia/TerminalConnection/ConptyConnection.cpp
@@ -289,11 +289,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                }
            }

-            if (unbox_prop_or<bool>(settings, L"ambiguousIsWide", false))
-            {
-                _flags |= PSEUDOCONSOLE_AMBIGUOUS_IS_WIDE;
-            }
-
            const auto& initialEnvironment{ unbox_prop_or<winrt::hstring>(settings, L"initialEnvironment", L"") };
            const bool reloadEnvironmentVariables = unbox_prop_or<bool>(settings, L"reloadEnvironmentVariables", false);

@@ -482,28 +477,31 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        const auto hr = wil::ResultFromCaughtException();

        // GH#11556 - make sure to format the error code to this string as an UNSIGNED int
-        auto failureText = RS_fmt(L"ProcessFailedToLaunch", _formatStatus(hr), _commandline);
+        const auto failureText = RS_fmt(L"ProcessFailedToLaunch", _formatStatus(hr), _commandline);
+        WriteUtf16Output(failureText);

        // If the path was invalid, let's present an informative message to the user
        if (hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY))
        {
-            failureText.append(L"\r\n");
-            failureText.append(RS_fmt(L"BadPathText", _startingDirectory));
+            const auto badPathText = RS_fmt(L"BadPathText", _startingDirectory);
+            WriteUtf16Output(L"\r\n");
+            WriteUtf16Output(badPathText);
        }
        // If the requested action requires elevation, display appropriate message
        else if (hr == HRESULT_FROM_WIN32(ERROR_ELEVATION_REQUIRED))
        {
-            failureText.append(L"\r\n");
-            failureText.append(RS_(L"ElevationRequired"));
+            const auto elevationText = RS_(L"ElevationRequired");
+            WriteUtf16Output(L"\r\n");
+            WriteUtf16Output(elevationText);
        }
        // If the requested executable was not found, display appropriate message
        else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
        {
-            failureText.append(L"\r\n");
-            failureText.append(RS_(L"FileNotFound"));
+            const auto fileNotFoundText = RS_(L"FileNotFound");
+            WriteUtf16Output(L"\r\n");
+            WriteUtf16Output(fileNotFoundText);
        }

-        TerminalOutput.raise(winrt_wstring_to_array_view(failureText));
        _transitionToState(ConnectionState::Failed);

        // Tear down any state we may have accumulated.
@@ -522,7 +520,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            const auto msg1 = RS_fmt(L"ProcessExited", _formatStatus(status));
            const auto msg2 = RS_(L"CtrlDToClose");
            const auto msg = fmt::format(FMT_COMPILE(L"\r\n{}\r\n{}\r\n"), msg1, msg2);
-            TerminalOutput.raise(winrt_wstring_to_array_view(msg));
+            WriteUtf16Output(msg);
        }
        CATCH_LOG();
    }
@@ -550,10 +548,8 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
    }
    CATCH_LOG()

-    void ConptyConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void ConptyConnection::WriteInput(const winrt::array_view<const uint8_t> data)
    {
-        const auto data = winrt_array_to_wstring_view(buffer);
-
        if (!_isConnected())
        {
            return;
@@ -577,10 +573,8 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            }
        }

-        if (FAILED_LOG(til::u16u8(data, _writeBuffer)))
-        {
-            return;
-        }
+        // Since we are using overlapped I/O, we have to store the send buffer until the work is done.
+        _writeBuffer.assign(winrt_array_to_string_view(data));

        if (!WriteFile(_pipe.get(), _writeBuffer.data(), gsl::narrow_cast<DWORD>(_writeBuffer.length()), nullptr, &_writeOverlapped))
        {
@@ -747,11 +741,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        const wil::unique_event overlappedEvent{ CreateEventExW(nullptr, nullptr, CREATE_EVENT_MANUAL_RESET, EVENT_ALL_ACCESS) };
        OVERLAPPED overlapped{ .hEvent = overlappedEvent.get() };
        bool overlappedPending = false;
-        char buffer[128 * 1024];
-        DWORD read = 0;

-        til::u8state u8State;
-        std::wstring wstr;
+        char buffer[128 * 1024], buffer2[128 * 1024];
+        char* thisBuffer = buffer;
+        DWORD read = 0;
+        char* lastBuffer = buffer2;
+        DWORD lastRead = 0;

        // If we use overlapped IO We want to queue ReadFile() calls before processing the
        // string, because TerminalOutput.raise() may take a while (relatively speaking).
@@ -762,7 +757,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            // When we have a `wstr` that's ready for processing we must do so without blocking.
            // Otherwise, whatever the user typed will be delayed until the next IO operation.
            // With overlapped IO that's not a problem because the ReadFile() calls won't block.
-            if (!ReadFile(_pipe.get(), &buffer[0], sizeof(buffer), &read, &overlapped))
+            if (!ReadFile(_pipe.get(), thisBuffer, sizeof(buffer), &read, &overlapped))
            {
                if (GetLastError() != ERROR_IO_PENDING)
                {
@@ -774,7 +769,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
            // wstr can be empty in two situations:
            // * The previous call to til::u8u16 failed.
            // * We're using overlapped IO, and it's the first iteration.
-            if (!wstr.empty())
+            if (lastBuffer && lastRead)
            {
                if (!_receivedFirstByte)
                {
@@ -794,7 +789,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

                try
                {
-                    TerminalOutput.raise(winrt_wstring_to_array_view(wstr));
+                    TerminalOutput.raise(winrt::array_view{ reinterpret_cast<const uint8_t*>(lastBuffer), lastRead });
                }
                CATCH_LOG();
            }
@@ -834,8 +829,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
                TraceLoggingKeyword(TIL_KEYWORD_TRACE));

-            // If we hit a parsing error, eat it. It's bad utf-8, we can't do anything with it.
-            FAILED_LOG(til::u8u16({ &buffer[0], gsl::narrow_cast<size_t>(read) }, wstr, u8State));
+            // Prepare the buffers for the next loop
+            std::swap(thisBuffer, lastBuffer);
+            std::swap(read, lastRead);
        }

        return 0;
--- a/src/cascadia/TerminalConnection/ConptyConnection.h
+++ b/src/cascadia/TerminalConnection/ConptyConnection.h
@@ -21,7 +21,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
        static safe_void_coroutine final_release(std::unique_ptr<ConptyConnection> connection);

        void Start();
-        void WriteInput(const winrt::array_view<const char16_t> buffer);
+        void WriteInput(const winrt::array_view<const uint8_t> buffer);
        void Resize(uint32_t rows, uint32_t columns);
        void ResetSize();
        void Close() noexcept;
@@ -52,8 +52,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                                                                         const winrt::guid& guid,
                                                                         const winrt::guid& profileGuid);

-        til::event<TerminalOutputHandler> TerminalOutput;
-
    private:
        static void closePseudoConsoleAsync(HPCON hPC) noexcept;
        static HRESULT NewHandoff(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo) noexcept;
--- a/src/cascadia/TerminalConnection/EchoConnection.cpp
+++ b/src/cascadia/TerminalConnection/EchoConnection.cpp
@@ -13,28 +13,29 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

    void EchoConnection::Start() noexcept
    {
+        _transitionToState(ConnectionState::Connected);
    }

-    void EchoConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
+    void EchoConnection::WriteInput(const winrt::array_view<const uint8_t> buffer)
    {
-        const auto data = winrt_array_to_wstring_view(buffer);
-        std::wstringstream prettyPrint;
-        for (const auto& wch : data)
+        const auto data = winrt_array_to_string_view(buffer);
+        std::stringstream prettyPrint;
+        for (const auto& ch : data)
        {
-            if (wch < 0x20)
+            if (ch < 0x20)
            {
-                prettyPrint << L"^" << gsl::narrow_cast<wchar_t>(wch + 0x40);
+                prettyPrint << "^" << gsl::narrow_cast<char>(ch + 0x40);
            }
-            else if (wch == 0x7f)
+            else if (ch == 0x7f)
            {
-                prettyPrint << L"0x7f";
+                prettyPrint << "0x7f";
            }
            else
            {
-                prettyPrint << wch;
+                prettyPrint << ch;
            }
        }
-        TerminalOutput.raise(winrt_wstring_to_array_view(prettyPrint.str()));
+        WriteUtf8Output(prettyPrint.str());
    }

    void EchoConnection::Resize(uint32_t /*rows*/, uint32_t /*columns*/) noexcept
--- a/src/cascadia/TerminalConnection/EchoConnection.h
+++ b/src/cascadia/TerminalConnection/EchoConnection.h
@@ -4,25 +4,20 @@
 #pragma once

 #include "EchoConnection.g.h"
+#include "BaseTerminalConnection.h"

 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
-    struct EchoConnection : EchoConnectionT<EchoConnection>
+    struct EchoConnection : EchoConnectionT<EchoConnection>, BaseTerminalConnection<EchoConnection>
    {
        EchoConnection() noexcept;

        void Start() noexcept;
-        void WriteInput(const winrt::array_view<const char16_t> buffer);
+        void WriteInput(const winrt::array_view<const uint8_t> buffer);
        void Resize(uint32_t rows, uint32_t columns) noexcept;
        void Close() noexcept;

        void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) const noexcept {};
-
-        winrt::guid SessionId() const noexcept { return {}; }
-        ConnectionState State() const noexcept { return ConnectionState::Connected; }
-
-        til::event<TerminalOutputHandler> TerminalOutput;
-        til::typed_event<ITerminalConnection, IInspectable> StateChanged;
    };
 }

--- a/src/cascadia/TerminalConnection/ITerminalConnection.idl
+++ b/src/cascadia/TerminalConnection/ITerminalConnection.idl
@@ -13,14 +13,14 @@ namespace Microsoft.Terminal.TerminalConnection
        Failed
    };

-    delegate void TerminalOutputHandler(Char[] output);
+    delegate void TerminalOutputHandler(UInt8[] output);

    interface ITerminalConnection
    {
        void Initialize(Windows.Foundation.Collections.ValueSet settings);

        void Start();
-        void WriteInput(Char[] data);
+        void WriteInput(UInt8[] data);
        void Resize(UInt32 rows, UInt32 columns);
        void Close();

--- a/src/cascadia/TerminalConnection/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalConnection/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@@ -209,7 +209,7 @@
  </data>
  <data name="CtrlDToClose" xml:space="preserve">
    <value>Сада можете да затворите овај терминал са Ctrl+D, или да притиснете Ентер да га поново покренете.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
  </data>
  <data name="ProcessFailedToLaunch" xml:space="preserve">
    <value>[грешка {0} приликом покретања `{1}']</value>
@@ -220,7 +220,7 @@
    <value>Не може да се приступи почетном директоријуму „{0}”</value>
    <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
  </data>
-  <data name="ElevationRequired" xml:space="preserve">
+    <data name="ElevationRequired" xml:space="preserve">
    <value>Тражена операција захтева веће привилегије.</value>
  </data>
  <data name="FileNotFound" xml:space="preserve">
--- a/src/cascadia/TerminalControl/ControlCore.cpp
+++ b/src/cascadia/TerminalControl/ControlCore.cpp
@@ -85,12 +85,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                break;
            }
            CodepointWidthDetector::Singleton().Reset(mode);
-
-            if (settings.AmbiguousWidth() == AmbiguousWidth::Wide)
-            {
-                CodepointWidthDetector::Singleton().SetAmbiguousWidth(2);
-            }
-
            return true;
        }();

@@ -355,12 +349,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)
@@ -488,7 +476,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    {
        if (_connection)
        {
-            _connection.WriteInput(winrt_wstring_to_array_view(wstr));
+            const auto utf8String{ til::u16u8(wstr) };
+            _connection.WriteInput(winrt_u8string_to_array_view(utf8String));
        }
    }

@@ -1748,7 +1737,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
    // - resetOnly: If true, only Reset() will be called, if anything. FindNext() will never be called.
    // Return Value:
    // - <none>
-    SearchResults ControlCore::Search(const SearchRequest& request)
+    SearchResults ControlCore::Search(SearchRequest request)
    {
        const auto lock = _terminal->LockForWriting();

@@ -1757,9 +1746,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        WI_SetFlagIf(flags, SearchFlag::RegularExpression, request.RegularExpression);
        const auto searchInvalidated = _searcher.IsStale(*_terminal.get(), request.Text, flags);

-        if (searchInvalidated || request.ExecuteSearch)
+        if (searchInvalidated || !request.ResetOnly)
        {
            std::vector<til::point_span> oldResults;
+            til::point_span oldFocused;
+
+            if (const auto focused = _terminal->GetSearchHighlightFocused())
+            {
+                oldFocused = *focused;
+            }

            if (searchInvalidated)
            {
@@ -1768,18 +1763,18 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                _terminal->SetSearchHighlights(_searcher.Results());
            }

-            if (request.ExecuteSearch)
+            if (!request.ResetOnly)
            {
                _searcher.FindNext(!request.GoForward);
            }

            _terminal->SetSearchHighlightFocused(gsl::narrow<size_t>(std::max<ptrdiff_t>(0, _searcher.CurrentMatch())));
            _renderer->TriggerSearchHighlight(oldResults);
-        }

-        if (request.ScrollIntoView)
-        {
-            _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+            if (const auto focused = _terminal->GetSearchHighlightFocused(); focused && *focused != oldFocused)
+            {
+                _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+            }
        }

        int32_t totalMatches = 0;
@@ -2081,10 +2076,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();
@@ -2245,13 +2237,16 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        auto noticeArgs = winrt::make<NoticeEventArgs>(NoticeLevel::Info, RS_(L"TermControlReadOnly"));
        RaiseNotice.raise(*this, std::move(noticeArgs));
    }
-    void ControlCore::_connectionOutputHandler(const winrt::array_view<const char16_t> str)
+    void ControlCore::_connectionOutputHandler(const winrt::array_view<const uint8_t>& data)
    {
        try
        {
+            FAILED_LOG(til::u8u16(winrt_array_to_string_view(data), _u16ConversionBuffer, _u8State));
+
+            if (!_u16ConversionBuffer.empty()) [[likely]]
            {
                const auto lock = _terminal->LockForWriting();
-                _terminal->Write(winrt_array_to_wstring_view(str));
+                _terminal->Write(_u16ConversionBuffer);
            }

            if (!_pendingResponses.empty())
--- a/src/cascadia/TerminalControl/ControlCore.h
+++ b/src/cascadia/TerminalControl/ControlCore.h
@@ -225,7 +225,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        void SetSelectionAnchor(const til::point position);
        void SetEndSelectionPoint(const til::point position);

-        SearchResults Search(const SearchRequest& request);
+        SearchResults Search(SearchRequest request);
        const std::vector<til::point_span>& SearchResultRows() const noexcept;
        void ClearSearch();

@@ -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);

@@ -350,7 +349,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation

        void _raiseReadOnlyWarning();
        void _updateAntiAliasingMode();
-        void _connectionOutputHandler(winrt::array_view<const char16_t> str);
+        void _connectionOutputHandler(const winrt::array_view<const uint8_t>& data);
        void _connectionStateChangedHandler(const TerminalConnection::ITerminalConnection&, const Windows::Foundation::IInspectable&);
        void _updateHoveredCell(const std::optional<til::point> terminalPosition);
        void _setOpacity(const float opacity, const bool focused = true);
@@ -460,6 +459,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
        TerminalConnection::ITerminalConnection::StateChanged_revoker _connectionStateChangedRevoker;
        TerminalConnection::ITerminalConnection _connection{ nullptr };

+        std::wstring _u16ConversionBuffer;
+        til::u8state _u8State;
+
        friend class ControlUnitTests::ControlCoreTests;
        friend class ControlUnitTests::ControlInteractivityTests;
        bool _inUnitTests{ false };
--- a/src/cascadia/TerminalControl/ControlCore.idl
+++ b/src/cascadia/TerminalControl/ControlCore.idl
@@ -55,8 +55,7 @@ namespace Microsoft.Terminal.Control
        Boolean GoForward;
        Boolean CaseSensitive;
        Boolean RegularExpression;
-        Boolean ExecuteSearch;
-        Boolean ScrollIntoView;
+        Boolean ResetOnly;
        Int32 ScrollOffset;
    };

@@ -98,7 +97,6 @@ namespace Microsoft.Terminal.Control
        void ApplyAppearance(Boolean focused);

        Microsoft.Terminal.TerminalConnection.ITerminalConnection Connection;
-        void HardResetWithoutErase();

        IControlSettings Settings { get; };
        IControlAppearance FocusedAppearance { get; };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dustin L. Howett	cd2a396b5e	Merge remote-tracking branch 'origin/main' into dev/duhowett/connection-utf8	2025-12-17 12:42:08 -06:00
Dustin L. Howett	9c46e34a3f	Make WriteOutput take utf-8 as well	2025-12-10 13:08:02 -06:00
Dustin L. Howett	b2d54c146a	Az: switch some static strings to u8	2025-12-10 12:25:00 -06:00
Dustin L. Howett	4fdb3fafb2	Debug: use a clever utf8	2025-12-10 10:45:08 -06:00
Dustin L. Howett	5bfbbbd7a2	Echo: use BaseTerminalConnection	2025-12-10 10:45:00 -06:00
Dustin L. Howett	7bb324d047	Transition dhSend16 to a helper	2025-12-09 20:35:15 -06:00
Dustin L. Howett	3d5342d60d	Use Helper	2025-12-09 16:12:06 -06:00
Dustin L. Howett	48603ac834	format+helpers	2025-12-08 12:44:02 -06:00
Dustin L. Howett	faa5f8b08b	leave a note-to-self	2025-12-05 21:28:39 -06:00
Dustin L. Howett	3f48fe6760	ok, it builds and works	2025-12-05 21:28:18 -06:00
Dustin L. Howett	db65c42f2c	What if the connection wrote its output as a utf-8 array?	2025-12-05 21:13:30 -06:00