Fix a dependent template name

see microsoft/gsl#1242

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -8,7 +8,7 @@ body:
     value: |
       Please make sure to [search for existing issues](https://github.com/microsoft/terminal/issues) and [check the FAQ](https://github.com/microsoft/terminal/wiki/Frequently-Asked-Questions-(FAQ)) before filing a new one!
 
-      If this is an application crash, please provide a [Feedback Hub](https://aka.ms/terminal-feedback-hub) submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal" and choose "Share My Feedback" after submission to get the link.
+      If this is an application crash, please also provide a [Feedback Hub](https://aka.ms/terminal-feedback-hub) submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal" and choose "Share My Feedback" after submission to get the link.
 
 - type: input
   attributes:

.github/actions/spelling/README.md

@@ -10,7 +10,6 @@ File | Purpose | Format | Info
 [line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
 [expect/*.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
 [advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
-[config.json](config.json) | Action Configuration | JSON key (action configuration variable) value (action configuration value) | [config](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-config)
 
 Note: you can replace any of these files with a directory by the same name (minus the suffix)
 and then include multiple files inside that directory (with that suffix) to merge multiple files together.

.github/actions/spelling/advice.md

@@ -22,7 +22,6 @@ See the `README.md` in each directory for more information.
 <details><summary>If the flagged items are :exploding_head: false positives</summary>
 
 If items relate to a ...
-
 * binary file (or some other file you wouldn't want to check at all).
 
   Please add a file path to the `excludes.txt` file matching the containing file.

.github/actions/spelling/allow/allow.txt

@@ -23,10 +23,8 @@ FTCS
 gantt
 gfm
 ghe
-github
 godbolt
 hstrings
-https
 hyperlinking
 hyperlinks
 Kbds
@@ -46,7 +44,6 @@ mru
 notwrapped
 NTMTo
 overlined
-passthrough
 perlw
 postmodern
 Powerline
@@ -68,7 +65,6 @@ rubyw
 runtimes
 servicebus
 slnt
-ssh
 stakeholders
 subpage
 subpages
@@ -76,11 +72,10 @@ sustainability
 sxn
 Tencent
 toolset
-ubuntu
-UEFI
-uiatextrange
 Uids
+UEFI
 UIDs
+uiatextrange
 und
 vsdevcmd
 westus

.github/actions/spelling/candidate.patterns

@@ -1,5 +1,5 @@
 # Repeated letters
-\b([A-Za-z])\g{-1}{2,}\b
+\b([a-z])\g{-1}{2,}\b
 
 # marker to ignore all code on line
 ^.*/\* #no-spell-check-line \*/.*$
@@ -11,7 +11,7 @@
 ^.*\b[Cc][Ss][Pp][Ee][Ll]{2}:\s*[Dd][Ii][Ss][Aa][Bb][Ll][Ee]-[Ll][Ii][Nn][Ee]\b
 
 # copyright
-Copyright (?:\([Cc]\)|©|)(?:[-\d, ]|and)+(?: [A-Z][a-z]+ [A-Z][a-z]+,?)+
+Copyright (?:\([Cc]\)|)(?:[-\d, ]|and)+(?: [A-Z][a-z]+ [A-Z][a-z]+,?)+
 
 # patch hunk comments
 ^@@ -\d+(?:,\d+|) \+\d+(?:,\d+|) @@ .*
@@ -19,10 +19,10 @@ Copyright (?:\([Cc]\)|©|)(?:[-\d, ]|and)+(?: [A-Z][a-z]+ [A-Z][a-z]+,?)+
 index (?:[0-9a-z]{7,40},|)[0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
 
 # file permissions
-(?:^|['"`\s])(?!-+\s)[-bcdLlpsw](?:[-r][-w][-Ssx]){2}[-r][-w][-SsTtx]\+?['"`\s]
+['"`\s][-bcdLlpsw](?:[-r][-w][-Ssx]){2}[-r][-w][-SsTtx]\+?['"`\s]
 
 # css fonts
-\bfont(?:-family(?:[-\w+]*)|):[^;}]+
+\bfont(?:-family|):[^;}]+
 
 # css url wrappings
 \burl\([^)]+\)
@@ -36,10 +36,10 @@ index (?:[0-9a-z]{7,40},|)[0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
 # data url in quotes
 ([`'"])data:(?:[^ `'"].*?|)(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
 # data url
-\bdata:[-a-zA-Z=;:/0-9+_]*,\S*
+\bdata:[-a-zA-Z=;:/0-9+]*,\S*
 
 # https/http/file urls
-#(?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/*%?=~_|!:,.;]+[-A-Za-z0-9+&@#/*%=~_|]
+(?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/*%?=~_|!:,.;]+[-A-Za-z0-9+&@#/*%=~_|]
 
 # mailto urls
 mailto:[-a-zA-Z=;:/?%&0-9+@._]{3,}
@@ -88,9 +88,6 @@ arn:aws:[-/:\w]+
 # AWS VPC
 vpc-\w+
 
-# Azure AD
-\baad\.\w{48}\b
-
 # While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
 # YouTube url
 \b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
@@ -172,7 +169,7 @@ themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
 GHSA(?:-[0-9a-z]{4}){3}
 
 # GitHub actions
-\buses:\s+(['"]?)[-\w.]+/[-\w./]+@[-\w.]+\g{-1}
+\buses:\s+[-\w.]+/[-\w./]+@[-\w.]+
 
 # GitLab commit
 \bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
@@ -241,7 +238,7 @@ accounts\.binance\.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
 \bmedium\.com/@?[^/\s"]+/[-\w]+
 
 # microsoft
-\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|docs|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%?#]*
+\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|docs|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%]*
 # powerbi
 \bapp\.powerbi\.com/reportEmbed/[^"' ]*
 # vs devops
@@ -415,7 +412,7 @@ ipfs://[0-9a-zA-Z]{3,}
 \bgetopts\s+(?:"[^"]+"|'[^']+')
 
 # ANSI color codes
-#(?:\\(?:u00|x)1[Bb]|\\03[1-7]|\x1b|\\u\{1[Bb]\})\[(?:\d+(?:;\d+)*|)m
+(?:\\(?:u00|x)1[Bb]|\\03[1-7]|\x1b|\\u\{1[Bb]\})\[\d+(?:;\d+)*m
 
 # URL escaped characters
 %[0-9A-F][A-F](?=[A-Za-z])
@@ -433,7 +430,7 @@ sha\d+:[0-9a-f]*?[a-f]{3,}[0-9a-f]*
 # sha-... -- uses a fancy capture
 (\\?['"]|")[0-9a-f]{40,}\g{-1}
 # hex runs
-\b(?=(?:[a-fA-F]{0,2}\d)*[a-fA-F]{3})[0-9a-fA-F]{16,}\b
+\b[0-9a-fA-F]{16,}\b
 # hex in url queries
 =[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
 # ssh
@@ -457,12 +454,8 @@ LS0tLS1CRUdJT.*
 
 # uuid:
 \b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
-
-# unicode escaped characters (4)
-\\u[0-9a-fA-F]{4}
-
-# hex digits including css/html color classes
-(?:[\\0][xX]|\\u\{?|[uU]\+|#x?|%23|&H)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|[iu]\d+)\b
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|%23|&H)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|[iu]\d+)\b
 
 # integrity
 integrity=(['"])(?:\s*sha\d+-[-a-zA-Z=;:/0-9+]{40,})+\g{-1}
@@ -484,7 +477,7 @@ Name\[[^\]]+\]=.*
 (?:(?:\b|_|(?<=[a-z]))I|(?:\b|_)(?:nsI|isA))(?=(?:[A-Z][a-z]{2,})+(?:[A-Z\d]|\b))
 
 # python
-\b(?i)py(?!gment|gmy|lon|ramid|ro|th)(?=[a-z]{2,})
+\b(?i)py(?!gments|gmy|lon|ramid|ro|th)(?=[a-z]{2,})
 
 # crypt
 (['"])\$2[ayb]\$.{56}\g{-1}
@@ -504,21 +497,12 @@ Name\[[^\]]+\]=.*
 # go.sum
 \bh1:\S+
 
-# golang print-f-style functions
-#(?i)(?<=append|comma|debug|equal|err|error|exit|fatal|format|info|log|name|panic|print|skip|scan|string|trace|true|warn|warning|wrap|write)(?:f|ln)(?:[ (]|$)
-
-# golang regular expression
-#(?<!")\br".+?"
-
 # imports
-^import\s+(?:(?:static|type)\s+|)(?:[\w.]|\{\s*\w*?(?:,\s*(?:\w*|\*))+\s*\})+(?:\s+from (['"]).*?\g{-1}|)
+^import\s+(?:(?:static|type)\s+|)(?:[\w.]|\{\s*\w*?(?:,\s*(?:\w*|\*))+\s*\})+
 
 # scala modules
 ("[^"]+"\s*%%?\s*){2,3}"[^"]+"
 
-# Dataframes / NumPy
-\b(?:df|np)\.\w{3,}
-
 # container images
 image: [-\w./:@]+
 
@@ -529,7 +513,7 @@ image: [-\w./:@]+
 \s*\S+/\S+\s+\S+\s+[0-9a-f]{8,}\s+\d+\s+(?:hour|day|week)s ago\s+[\d.]+[KMGT]B
 
 # Intel intrinsics
-_mm\d*_(?!dd)\w+
+_mm_(?!dd)\w+
 
 # Input to GitHub JSON
 content: (['"])[-a-zA-Z=;:/0-9+]*=\g{-1}
@@ -548,18 +532,12 @@ content: (['"])[-a-zA-Z=;:/0-9+]*=\g{-1}
 # Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
 (?<!['"])\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)['"](?=[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
 
-# Regular expression for word breaks
-#\\b(?=[a-z]{2})
-
 # Regular expressions for (P|p)assword
 \([A-Z]\|[a-z]\)[a-z]+
 
-# Java regular expressions
-Pattern\.(?:compile|matches)\(".*"
-
 # JavaScript regular expressions
-# javascript exec/test regex
-/.{3,}?/[gim]*\.(?:exec|test)\(
+# javascript test regex
+/.{3,}/[gim]*\.test\(
 # javascript match regex
 \.match\(/[^/\s"]{3,}/[gim]*\s*
 # javascript match regex
@@ -586,7 +564,7 @@ perl(?:\s+-[a-zA-Z]\w*)+
 regexp?\.MustCompile\((?:`[^`]*`|".*"|'.*')\)
 
 # regex choice
-#\((?=[^)]*[a-zA-Z]{3})(?:\?:|)[^)|]+(?<! )\|(?!(?:jq|xargs)\b)[^)| ][^)]*\)
+\(\?:[^)]+\|[^)]+\)
 
 # proto
 ^\s*(\w+)\s\g{-1} =
@@ -609,9 +587,6 @@ urn:shemas-jetbrains-com
 # Debian changelog severity
 [-\w]+ \(.*\) (?:\w+|baseline|unstable|experimental); urgency=(?:low|medium|high|emergency|critical)\b
 
-# Red Hat Package management spec file dependencies
-^(?:Build|)Requires: [-.\w]+
-
 # kubernetes pod status lists
 # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
 \w+(?:-\w+)+\s+\d+/\d+\s+(?:Running|Pending|Succeeded|Failed|Unknown)\s+
@@ -666,8 +641,6 @@ PrependWithABINamepsace
 >[-a-zA-Z=;:/0-9+]{3,}=</
 # base64 encoded content, possibly wrapped in mime
 #(?:^|[\s=;:?])[-a-zA-Z=;:/0-9+]{50,}(?:[\s=;:?]|$)
-# jwt
-(?:\be[wy][-a-zA-Z=;:/0-9+]+\.){2}[-_\w]+
 # base64 encoded json
 \beyJ[-a-zA-Z=;:/0-9+]+
 # base64 encoded pkcs
@@ -705,9 +678,9 @@ systemd.*?running in system mode \([-+].*\)$
 
 # Non-English
 # Even repositories expecting pure English content can unintentionally have Non-English content... People will occasionally mistakenly enter [homoglyphs](https://en.wikipedia.org/wiki/Homoglyph) which are essentially typos, and using this pattern will mean check-spelling will not complain about them.
-# .
+#
 # If the content to be checked should be written in English and the only Non-English items will be people's names, then you can consider adding this.
-# .
+#
 # Alternatively, if you're using check-spelling v0.0.25+, and you would like to _check_ the Non-English content for spelling errors, you can. For information on how to do so, see:
 # https://docs.check-spelling.dev/Feature:-Configurable-word-characters.html#unicode
 [a-zA-Z]*[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*|[a-zA-Z]{3,}[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]|[ÀÁÂÃÄÅÆČÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæčçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3,}
@@ -719,7 +692,7 @@ systemd.*?running in system mode \([-+].*\)$
 # This corpus only had capital letters, but you probably want lowercase ones as well.
 \b[LN]'+[a-z]{2,}\b
 
-# LaTeX
+# latex (check-spelling >= 0.0.22)
 \\\w{2,}\{
 
 # American Mathematical Society (AMS) / Doxygen
@@ -746,6 +719,7 @@ nolint:\s*[\w,]+
 # cygwin paths
 /cygdrive/[a-zA-Z]/(?:Program Files(?: \(.*?\)| ?)(?:/[-+.~\\/()\w ]+)*|[-+.~\\/()\w])+
 
+# in check-spelling@v0.0.22+, printf markers aren't automatically consumed
 # printf markers
 #(?<!\\)\\[nrt](?=[a-z]{2,})
 
@@ -776,20 +750,18 @@ W/"[^"]+"
 
 # Compiler flags (Unix, Java/Scala)
 # Use if you have things like `-Pdocker` and want to treat them as `docker`
-#(?:^|[\t ,>"'`=\[(#])-(?:(?:J-|)[DPWXY]|[Llf])(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
+#(?:^|[\t ,>"'`=(#])-(?:(?:J-|)[DPWXY]|[Llf])(?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
 
 # Compiler flags (Windows / PowerShell)
 # This is a subset of the more general compiler flags pattern.
 # It avoids matching `-Path` to prevent it from being treated as `ath`
-#(?:^|[\t ,"'`=\[(#])-(?:[DPL](?=[A-Z]{2,})|[WXYlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,}))
+#(?:^|[\t ,"'`=(#])-(?:[DPL](?=[A-Z]{2,})|[WXYlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,}))
 
 # Compiler flags (linker)
 ,-B
 
-# Library prefix
-# e.g., `lib`+`archive`, `lib`+`raw`, `lib`+`unwind`
-# (ignores some words that happen to start with `lib`)
-#(?:\b|_)[Ll]ib(?!era[lt])(?:re(?=office)|era|)(?!ero|erty|rar(?:i(?:an|es)|y))(?=[a-z])
+# libraries
+#(?:\b|_)[Ll]ib(?:re(?=office)|)(?!era[lt]|ero|erty|rar(?:i(?:an|es)|y))(?=[a-z])
 
 # iSCSI iqn (approximate regex)
 \biqn\.[0-9]{4}-[0-9]{2}(?:[\.-][a-z][a-z0-9]*)*\b
@@ -800,9 +772,9 @@ W/"[^"]+"
 # curl arguments
 \b(?:\\n|)curl(?:\.exe|)(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
 # set arguments
-\b(?:bash|(?<!\.)sh|set)(?:\s+[-+][abefimouxE]{1,2})*\s+[-+][abefimouxE]{3,}(?:\s+[-+][abefimouxE]+)*
+\b(?:bash|sh|set)(?:\s+[-+][abefimouxE]{1,2})*\s+[-+][abefimouxE]{3,}(?:\s+[-+][abefimouxE]+)*
 # tar arguments
-\b(?:\\n|)g?tar(?:\.exe|)(?:\s-C \S+|(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
+\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
 # tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
 \btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
 # macOS temp folders

.github/actions/spelling/config.json

@@ -1,105 +0,0 @@
-{
-  "dictionary_source_prefixes": {
-    "asm": "https://raw.githubusercontent.com/check-spelling/assembly-dictionaries/20231110/",
-    "cspell": "https://raw.githubusercontent.com/check-spelling/cspell-dicts/v20241114/dictionaries/",
-    "census": "https://raw.githubusercontent.com/check-spelling-sandbox/census/dictionaries-d90e686f89dd241ad61d30f26619e54d73e73c6e/dictionaries/"
-  },
-  "extra_dictionaries": [
-    "cspell:software-terms/softwareTerms.txt",
-    "cspell:cpp/stdlib-c.txt",
-    "census:census-5.txt",
-    "cspell:cpp/stdlib-cpp.txt",
-    "cspell:python/python/python-lib.txt",
-    "cspell:php/php.txt",
-    "cspell:dart/dart.txt",
-    "cspell:css/css.txt",
-    "cspell:node/node.txt",
-    "cspell:filetypes/filetypes.txt",
-    "cspell:npm/npm.txt",
-    "cspell:java/java.txt",
-    "cspell:dotnet/dotnet.txt",
-    "cspell:fullstack/fullstack.txt",
-    "cspell:java/java-terms.txt",
-    "cspell:cpp/stdlib-cmath.txt",
-    "cspell:typescript/typescript.txt",
-    "cspell:cpp/compiler-msvc.txt",
-    "cspell:python/common/extra.txt",
-    "cspell:html/html.txt",
-    "cspell:golang/go.txt",
-    "cspell:cpp/ecosystem.txt",
-    "cspell:powershell/powershell.txt",
-    "cspell:mnemonics/mnemonics.txt",
-    ""
-  ],
-  "check_extra_dictionaries": [
-    "asm:amd64-isa.txt",
-    "asm:ia64-isa.txt",
-    "asm:power-isa.txt",
-    "cspell:ada/ada.txt",
-    "cspell:aws/aws.txt",
-    "cspell:clojure/clojure.txt",
-    "cspell:companies/companies.txt",
-    "cspell:cpp/compiler-clang-attributes.txt",
-    "cspell:cpp/compiler-gcc.txt",
-    "cspell:cpp/compiler-msvc.txt",
-    "cspell:cpp/ecosystem.txt",
-    "cspell:cpp/lang-jargon.txt",
-    "cspell:cpp/lang-keywords.txt",
-    "cspell:cpp/people.txt",
-    "cspell:cpp/stdlib-c.txt",
-    "cspell:cpp/stdlib-cerrno.txt",
-    "cspell:cpp/stdlib-cmath.txt",
-    "cspell:cpp/stdlib-cpp.txt",
-    "cspell:cpp/template-strings.txt",
-    "cspell:cryptocurrencies/cryptocurrencies.txt",
-    "cspell:csharp/csharp.txt",
-    "cspell:css/css.txt",
-    "cspell:dart/dart.txt",
-    "cspell:django/django.txt",
-    "cspell:django/requirements.txt",
-    "cspell:docker/docker-words.txt",
-    "cspell:dotnet/dotnet.txt",
-    "cspell:elixir/elixir.txt",
-    "cspell:filetypes/filetypes.txt",
-    "cspell:fonts/fonts.txt",
-    "cspell:fullstack/fullstack.txt",
-    "cspell:gaming-terms/gaming-terms.txt",
-    "cspell:golang/go.txt",
-    "cspell:haskell/haskell.txt",
-    "cspell:html/html.txt",
-    "cspell:java/java-terms.txt",
-    "cspell:java/java.txt",
-    "cspell:k8s/k8s.txt",
-    "cspell:latex/latex.txt",
-    "cspell:latex/samples/sample-words.txt",
-    "cspell:lisp/lisp.txt",
-    "cspell:lorem-ipsum/dictionary.txt",
-    "cspell:lua/lua.txt",
-    "cspell:mnemonics/mnemonics.txt",
-    "cspell:monkeyc/monkeyc_keywords.txt",
-    "cspell:node/node.txt",
-    "cspell:npm/npm.txt",
-    "cspell:php/php.txt",
-    "cspell:powershell/powershell.txt",
-    "cspell:public-licenses/generated/public-licenses.txt",
-    "cspell:python/additional_words.txt",
-    "cspell:python/common/extra.txt",
-    "cspell:python/python/python-lib.txt",
-    "cspell:python/python/python.txt",
-    "cspell:r/r.txt",
-    "cspell:redis/redis.txt",
-    "cspell:ruby/ruby.txt",
-    "cspell:rust/rust.txt",
-    "cspell:scala/scala.txt",
-    "cspell:shell/shell-all-words.txt",
-    "cspell:software-terms/software-terms.txt",
-    "cspell:software-terms/webServices.txt",
-    "cspell:sql/sql.txt",
-    "cspell:sql/tsql.txt",
-    "cspell:svelte/svelte.txt",
-    "cspell:swift/swift.txt",
-    "cspell:typescript/typescript.txt",
-    "census:census-5.txt",
-    ""
-  ]
-}

.github/actions/spelling/excludes.txt

@@ -16,7 +16,6 @@
 ignore$
 Resources/(?!en)
 [^/]\.vsdx$
--lock\.yaml$
 \.a$
 \.ai$
 \.all-contributorsrc$
@@ -121,19 +120,17 @@ Resources/(?!en)
 ^src/types/ut_types/UtilsTests\.cpp$
 ^tools/ReleaseEngineering/ServicingPipeline\.ps1$
 ^XamlStyler\.json$
-^\.clang-format$
 ^\.github/actions/spelling/
 ^\.github/workflows/spelling\d*\.yml$
 ^\.vsconfig$
 ^\Qbuild/config/release.gdnbaselines\E$
 ^\Qdep/WinAppDriver/EULA.rtf\E$
 ^\Qdoc/reference/windows-terminal-logo.ans\E$
-^\Qsrc/cascadia/ut_app/FzfTests.cpp\E$
 ^\Qsrc/host/ft_host/chafa.txt\E$
-^\Qsrc/host/ft_host/Host.Tests.Feature.rc\E$
 ^\Qsrc/host/ft_uia/run.bat\E$
 ^\Qsrc/host/runft.bat\E$
 ^\Qsrc/terminal/parser/ft_fuzzer/run.bat\E$
 ^\Qsrc/terminal/parser/ft_fuzzwrapper/run.bat\E$
 ^\Qsrc/tools/lnkd/lnkd.bat\E$
 ^\Qsrc/tools/pixels/pixels.bat\E$
+^\Qsrc/cascadia/ut_app/FzfTests.cpp\E$

.github/actions/spelling/expect/74d92373e136649071b3c04dc8773f18deaf5e04.txt

@@ -0,0 +1 @@
+ftcs

.github/actions/spelling/expect/alphabet.txt

@@ -5,6 +5,7 @@ BBDM
 BBGGRR
 CBN
 cbt
+Ccc
 cch
 efg
 efgh

.github/actions/spelling/expect/expect.txt

@@ -1,13 +1,13 @@
 aaaaabbb
+aabbcc
+ABANDONFONT
 abbcc
 abcc
 abgr
-ABANDONFONT
 ABORTIFHUNG
 ACCESSTOKEN
 acidev
 ACIOSS
-ACL'd
 acp
 actctx
 ACTCTXW
@@ -51,6 +51,7 @@ appletname
 APPLMODAL
 Applocal
 appmodel
+appshellintegration
 APPWINDOW
 APPXMANIFESTVERSION
 APrep
@@ -59,10 +60,12 @@ ARRAYSIZE
 ARROWKEYS
 ASBSET
 ASetting
+ASingle
 ASYNCDONTCARE
 ASYNCWINDOWPOS
 atch
 ATest
+atg
 aumid
 Authenticode
 AUTOBUDDY
@@ -77,12 +80,14 @@ Autowrap
 AVerify
 awch
 azurecr
+AZZ
 backgrounded
 Backgrounder
 backgrounding
 backstory
 Bazz
 bbccb
+BBDM
 bbwe
 bcount
 bcx
@@ -108,6 +113,7 @@ bitmasks
 BITOPERATION
 BKCOLOR
 BKGND
+BKMK
 Bksp
 Blt
 blu
@@ -116,6 +122,7 @@ bmi
 bodgy
 BOLDFONT
 Borland
+boutput
 boxheader
 BPBF
 bpp
@@ -160,7 +167,7 @@ CFuzz
 cgmanifest
 cgscrn
 chafa
-changelist
+changelists
 CHARSETINFO
 chshdng
 CHT
@@ -193,7 +200,6 @@ colorizing
 COLORONCOLOR
 COLORREFs
 colorschemes
-colorspaces
 colorspec
 colortable
 colortbl
@@ -224,12 +230,14 @@ CONKBD
 conlibk
 conmsgl
 CONNECTINFO
+connyection
 CONOUT
 conprops
 conpropsp
 conpty
 conptylib
 conserv
+consoleaccessibility
 consoleapi
 CONSOLECONTROL
 CONSOLEENDTASK
@@ -239,9 +247,9 @@ CONSOLEIME
 CONSOLESETFOREGROUND
 consoletaeftemplates
 consoleuwp
+Consolewait
 CONSOLEWINDOWOWNER
 consrv
-consteval
 constexprable
 contentfiles
 conterm
@@ -258,6 +266,7 @@ CPG
 cpinfo
 CPINFOEX
 CPLINFO
+cplusplus
 CPPCORECHECK
 cppcorecheckrules
 cpprestsdk
@@ -268,6 +277,7 @@ CREATESTRUCT
 CREATESTRUCTW
 createvpack
 crisman
+crloew
 CRTLIBS
 csbi
 csbiex
@@ -278,6 +288,7 @@ csrutil
 CSTYLE
 CSwitch
 CTerminal
+ctl
 ctlseqs
 CTRLEVENT
 CTRLFREQUENCY
@@ -287,7 +298,6 @@ CTRLVOLUME
 CUAS
 CUF
 cupxy
-curated
 CURRENTFONT
 currentmode
 CURRENTPAGE
@@ -320,6 +330,7 @@ CYVIRTUALSCREEN
 CYVSCROLL
 dai
 DATABLOCK
+DBatch
 dbcs
 DBCSFONT
 DBGALL
@@ -328,12 +339,15 @@ DBGFONTS
 DBGOUTPUT
 dbh
 dblclk
+DBUILD
 Dcd
+DColor
 DCOMMON
 DComposition
 DDESHARE
 DDevice
 DEADCHAR
+Debian
 debugtype
 DECAC
 DECALN
@@ -439,8 +453,10 @@ depersist
 deprioritized
 devicecode
 Dext
+DFactory
 DFF
 dialogbox
+DINLINE
 directio
 DIRECTX
 DISABLEDELAYEDEXPANSION
@@ -455,9 +471,9 @@ dllinit
 dllmain
 DLLVERSIONINFO
 DLOOK
-doc'd
 DONTCARE
 doskey
+dotnet
 DPG
 DPIAPI
 DPICHANGE
@@ -471,6 +487,7 @@ DRAWITEM
 DRAWITEMSTRUCT
 drcs
 DROPFILES
+drv
 DSBCAPS
 DSBLOCK
 DSBPLAY
@@ -480,8 +497,11 @@ dsm
 dsound
 DSRCPR
 DSSCL
+DSwap
 DTo
 DTTERM
+DUNICODE
+DUNIT
 dup'ed
 dvi
 dwl
@@ -510,9 +530,9 @@ ELEMENTNOTAVAILABLE
 EMPTYBOX
 enabledelayedexpansion
 ENDCAP
+endptr
 ENTIREBUFFER
 ENU
-Enum'd
 ENUMLOGFONT
 ENUMLOGFONTEX
 EOB
@@ -521,13 +541,13 @@ EPres
 EQU
 ERASEBKGND
 ERRORONEXIT
-espt
 esrp
 ESV
 ETW
 EUDC
 eventing
 evflags
+evt
 execd
 executionengine
 exemain
@@ -588,14 +608,14 @@ FORCEOFFFEEDBACK
 FORCEONFEEDBACK
 FRAMECHANGED
 fre
-Free'd
 frontends
 fsanitize
+Fscreen
 FSINFOCLASS
-ftcs
 fte
 Ftm
 Fullscreens
+Fullwidth
 FUNCTIONCALL
 fuzzmain
 fuzzmap
@@ -656,13 +676,16 @@ GETWAITTOKILLTIMEOUT
 GETWHEELSCROLLCHARACTERS
 GETWHEELSCROLLCHARS
 GETWHEELSCROLLLINES
+Gfun
 gfx
+gfycat
 GGI
 GHgh
 GHIJK
 GHIJKL
 gitcheckin
 gitfilters
+gitlab
 gle
 GLOBALFOCUS
 GLYPHENTRY
@@ -670,13 +693,13 @@ GMEM
 Goldmine
 gonce
 goutput
-GPUs
 GREENSCROLL
 Grehan
 Greyscale
 gridline
 gset
 gsl
+Guake
 guc
 GUIDATOM
 GValue
@@ -698,6 +721,7 @@ hbr
 hbrush
 HCmd
 hdc
+hdr
 HDROP
 hdrstop
 HEIGHTSCROLL
@@ -762,6 +786,7 @@ ICONWARNING
 IDCANCEL
 IDD
 IDISHWND
+idl
 idllib
 IDOK
 IDR
@@ -775,8 +800,9 @@ IIo
 ILC
 ILCo
 ILD
-IMEs
+ime
 IMPEXP
+inbox
 inclusivity
 INCONTEXT
 INDEXID
@@ -789,7 +815,6 @@ INITGUID
 INITMENU
 inkscape
 INLINEPREFIX
-inlines
 inproc
 Inputkeyinfo
 Inputreadhandledata
@@ -802,6 +827,7 @@ INTERNALNAME
 intsafe
 INVALIDARG
 INVALIDATERECT
+Ioctl
 ipch
 ipsp
 iterm
@@ -844,12 +870,14 @@ KLF
 KLMNO
 KOK
 KPRIORITY
+KVM
 kyouhaishaheiku
 langid
 LANGUAGELIST
 lasterror
 LASTEXITCODE
 LAYOUTRTL
+lbl
 LBN
 LBUTTON
 LBUTTONDBLCLK
@@ -870,8 +898,10 @@ LINESELECTION
 LINEWRAP
 LINKERRCAP
 LINKERROR
+linputfile
 listptr
 listptrsize
+lld
 llx
 LMENU
 lnkd
@@ -928,11 +958,12 @@ LPWINDOWPOS
 lpwpos
 lpwstr
 LRESULT
-LSBs
+lsb
 lsconfig
 lstatus
 lstrcmp
 LTEXT
+lto
 ltsc
 LUID
 luma
@@ -954,7 +985,6 @@ MAKELRESULT
 MAPBITMAP
 MAPVIRTUALKEY
 MAPVK
-matrix'd
 MAXDIMENSTRING
 MAXSHORT
 maxval
@@ -967,6 +997,7 @@ MBUTTONDOWN
 MBUTTONUP
 mdmerge
 MDs
+mdtauk
 MEASUREITEM
 megamix
 memallocator
@@ -1020,9 +1051,9 @@ MSGMARKMODE
 MSGSCROLLMODE
 MSGSELECTMODE
 msiexec
+MSIL
 msix
 MSRC
-msvcrt
 MSVCRTD
 MTSM
 murmurhash
@@ -1033,7 +1064,6 @@ mydir
 Mypair
 Myval
 NAMELENGTH
-nameof
 namestream
 NCACTIVATE
 NCCALCSIZE
@@ -1073,9 +1103,7 @@ NOCLIP
 NOCOMM
 NOCONTEXTHELP
 NOCOPYBITS
-nodiscard
 NODUP
-NODEFAULT
 noexcepts
 NOFONT
 NOHIDDENTEXT
@@ -1089,6 +1117,7 @@ NOMOVE
 NONALERT
 nonbreaking
 nonclient
+NONINFRINGEMENT
 NONPREROTATED
 nonspace
 NOOWNERZORDER
@@ -1106,7 +1135,6 @@ NOSIZE
 NOSNAPSHOT
 NOTHOUSANDS
 NOTICKS
-notif
 NOTIMEOUTIFNOTHUNG
 NOTIMPL
 NOTOPMOST
@@ -1132,7 +1160,6 @@ ntuser
 NTVDM
 nugetversions
 NUKTA
-nullability
 nullness
 nullonfailure
 nullopts
@@ -1172,6 +1199,8 @@ osc
 OSDEPENDSROOT
 OSG
 OSGENG
+oss
+outdir
 OUTOFCONTEXT
 Outptr
 outstr
@@ -1211,7 +1240,6 @@ PCONSOLEENDTASK
 PCONSOLESETFOREGROUND
 PCONSOLEWINDOWOWNER
 pcoord
-pcs
 pcshell
 PCSHORT
 PCSR
@@ -1305,7 +1333,8 @@ PREVIEWLABEL
 PREVIEWWINDOW
 PREVLINE
 prg
-PRIs
+pri
+prioritization
 processhost
 PROCESSINFOCLASS
 PRODEXT
@@ -1343,14 +1372,18 @@ PUCHAR
 pvar
 pwch
 PWDDMCONSOLECONTEXT
+Pwease
+pweview
 pws
 pwstr
 pwsz
 pythonw
+Qaabbcc
 QUERYOPEN
 quickedit
 QUZ
 QWER
+Qxxxxxxxxxxxxxxx
 qzmp
 RAII
 RALT
@@ -1373,17 +1406,18 @@ RCOCA
 RCOCW
 RCONTROL
 RCOW
+rcv
 readback
 READCONSOLE
 READCONSOLEOUTPUT
 READCONSOLEOUTPUTSTRING
 READMODE
+rectread
 redef
 redefinable
 redist
 REDSCROLL
 REFCLSID
-Reference'd
 REFGUID
 REFIID
 REFPROPERTYKEY
@@ -1468,7 +1502,7 @@ SCRBUFSIZE
 screenbuffer
 SCREENBUFFERINFO
 screeninfo
-screenshot
+screenshots
 scriptload
 scrollback
 SCROLLFORWARD
@@ -1479,6 +1513,7 @@ SCROLLSCALE
 SCROLLSCREENBUFFER
 sddl
 SDKDDK
+segfault
 SELCHANGE
 SELECTEDFONT
 SELECTSTRING
@@ -1562,11 +1597,10 @@ SMARTQUOTE
 SMTO
 snapcx
 snapcy
-SND
 snk
 SOLIDBOX
 Solutiondir
-spec'd
+sourced
 SRCAND
 SRCCODEPAGE
 SRCCOPY
@@ -1597,7 +1631,6 @@ STDEXT
 STDMETHODCALLTYPE
 STDMETHODIMP
 STGM
-stl
 STRINGTABLE
 STRSAFE
 STUBHEAD
@@ -1610,8 +1643,9 @@ SUBLANG
 swapchain
 swapchainpanel
 SWMR
+SWP
+swrapped
 SYMED
-sync'd
 SYNCPAINT
 syscalls
 SYSCHAR
@@ -1636,12 +1670,14 @@ TARGETNAME
 targetver
 tbc
 tbi
+Tbl
 TBM
 TCHAR
 TCHFORMAT
 TCI
 tcommands
 tdbuild
+Tdd
 TDP
 Teb
 Techo
@@ -1658,6 +1694,7 @@ testenvs
 testlab
 testlist
 testmd
+testname
 TESTNULL
 testpass
 testpasses
@@ -1673,7 +1710,6 @@ TEXTMETRICW
 textmode
 texttests
 TFCAT
-threadpool
 THUMBPOSITION
 THUMBTRACK
 tilunittests
@@ -1682,6 +1718,7 @@ titlebars
 TITLEISLINKNAME
 TLDP
 TLEN
+Tlgg
 TMAE
 TMPF
 tmultiple
@@ -1695,6 +1732,7 @@ tracelogging
 traceviewpp
 trackbar
 trackpad
+transitioning
 Trd
 triaged
 triaging
@@ -1711,7 +1749,6 @@ TTM
 TTo
 tvpp
 tvtseq
-typeparam
 TYUI
 uap
 uapadmin
@@ -1746,10 +1783,12 @@ unhosted
 UNICODETEXT
 UNICRT
 Unintense
-Unittesting
+unittesting
 unittests
+unk
 unknwn
 UNORM
+unparseable
 untextured
 UPDATEDISPLAY
 UPDOWN
@@ -1794,9 +1833,12 @@ vga
 vgaoem
 viewkind
 VIRAMA
+Virt
 VIRTTERM
+visualstudiosdk
 vkey
 VKKEYSCAN
+VMs
 VPA
 vpack
 vpackdirectory
@@ -1846,15 +1888,21 @@ wddm
 wddmcon
 WDDMCONSOLECONTEXT
 wdm
+webpage
+websites
 wekyb
+wewoad
 wex
 wextest
+WFill
 wfopen
+WHelper
 wic
 WIDTHSCROLL
 Widthx
 Wiggum
 wil
+WImpl
 WINAPI
 winbasep
 wincon
@@ -1894,9 +1942,11 @@ winmm
 WINMSAPP
 winnt
 Winperf
+WInplace
 winres
 winrt
 winternl
+winui
 winuser
 WINVER
 wistd
@@ -1909,16 +1959,24 @@ WNDCLASSEX
 WNDCLASSEXW
 WNDCLASSW
 Wndproc
+WNegative
+WNull
+wordi
 wordiswrapped
 workarea
+WOutside
 WOWARM
 WOWx
 wparam
+WPartial
 wpf
 wpfdotnet
 WPR
+WPrep
+WPresent
 wprp
 wprpi
+wrappe
 wregex
 writeback
 WRITECONSOLE
@@ -1927,12 +1985,15 @@ WRITECONSOLEOUTPUT
 WRITECONSOLEOUTPUTSTRING
 wrkstr
 wrl
+WRL
 wrp
+WRunoff
 WSLENV
 wstr
 wstrings
 wsz
 wtd
+WTest
 WTEXT
 WTo
 wtof
@@ -1941,6 +2002,8 @@ WTSOFTFONT
 wtw
 Wtypes
 WUX
+WVerify
+WWith
 wxh
 wyhash
 wymix
@@ -1954,22 +2017,34 @@ xbutton
 XBUTTONDBLCLK
 XBUTTONDOWN
 XBUTTONUP
+XCast
 XCENTER
 xcopy
+XCount
 xdy
+XEncoding
 xes
 XFG
+XFile
 XFORM
 XIn
+xkcd
+XManifest
+XMath
+XNamespace
 xorg
+XPan
+XResource
+xsi
 xstyler
+XSubstantial
+XTest
 XTPOPSGR
 XTPUSHSGR
 xtr
 XTWINOPS
 xunit
 xutr
-xvalue
 XVIRTUALSCREEN
 yact
 YCast
@@ -1985,6 +2060,6 @@ Zabcdefghijklmn
 Zabcdefghijklmnopqrstuvwxyz
 ZCmd
 ZCtrl
-zero'd
 ZWJs
+ZYXWVU
 ZYXWVUTd

.github/actions/spelling/patterns/patterns.txt

@@ -1,51 +1,5 @@
 # See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
 
-# src/host/ut_host/AliasTests.cpp
-\$\d\$[A-ZA-z]
-
-# src/cascadia/TerminalSettingsEditor/Appearances.cpp
-// Pwease call.*
-
-# src/host/ft_host/CJK_DbcsTests.cpp
-// \|Q.*|^\s+// \|\s*aa\w+
-
-# App Package trailer
-__[a-z\d]{13}\b
-
-# src/host/ut_host/TextBufferTests.cpp
-// \d\|.{10}\|
-
-# contributors
-\[@[-_\w]+\]
-
-# src/types/CodepointWidthDetector.cpp
-  fallback to
-
-Include=".*?"
-
-^author = \w+
-
-D2D
-
-# Compiler flags
-\s-D(?=[A-Z])
-
-# Automatically suggested patterns
-
-# hit-count: 26 file-count: 12
-# unicode escaped characters (4)
-\\u[0-9a-fA-F]{4}
-
-# hit-count: 6 file-count: 5
-# ANSI color codes
-(?:\\(?:u00|x)1[Bb]|\\03[1-7]|\x1b|\\u\{1[Bb]\})\[(?:\d+(?:;\d+)*|)m(?=[a-z])
-
-# profiles.schema.json
-"pattern": ".*?"
-
-# Intentionally reversed binomials
-\b(?:bottom to top|down and up)\b
-
 # Windows accelerators
 \b[A-Z][a-z]*&[a-z]+(?!;)\b
 
@@ -89,7 +43,7 @@ L"[0-9A-F]{4}"
 
 # hit-count: 3904 file-count: 577
 # IServiceProvider / isAThing
-(?:(?:\b|_|(?<=[a-z]))[ITWX]|(?:\b|_)(?:nsI|isA))(?=(?:[A-Z][a-z]{2,})+(?:[A-Z\d]|\b))
+(?:(?:\b|_|(?<=[a-z]))[IT]|(?:\b|_)(?:nsI|isA))(?=(?:[A-Z][a-z]{2,})+(?:[A-Z\d]|\b))
 
 # hit-count: 2437 file-count: 826
 # #includes
@@ -176,7 +130,7 @@ mailto:[-a-zA-Z=;:/?%&0-9+@._]{3,}
 
 # hit-count: 1 file-count: 1
 # microsoft
-\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|docs|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%?#]*
+\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|docs|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%]*
 
 # hit-count: 1 file-count: 1
 # Punycode
@@ -217,7 +171,7 @@ Scro\&ll
  :\\windows\\syste\b
 TestUtils::VerifyExpectedString\(tb, L"[^"]+"
 (?:hostSm|mach)\.ProcessString\(L"[^"]+"
-
+\b([A-Za-z])\g{-1}{3,}\b
 Base64::s_(?:En|De)code\(L"[^"]+"
 VERIFY_ARE_EQUAL\(L"[^"]+"
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
@@ -266,15 +220,13 @@ equals_insensitive_ascii\("\w+", "\w+"
 # mount
 \bmount\s+-t\s+(\w+)\s+\g{-1}\b
 # C/idl types, repeated CSS values, + English ...
-\s(auto|await|buffalo|center|div|Guid|GUID|inherit|long|LONG|none|normal|solid|that|thin|transparent|very)(?:\s\g{-1})+\s
+\s(auto|buffalo|center|div|Guid|GUID|inherit|long|LONG|none|normal|solid|that|thin|transparent|very)(?: \g{-1})+\s
 # C enum and struct
 \b(?:enum|struct)\s+(\w+)\s+\g{-1}\b
 # go templates
 \s(\w+)\s+\g{-1}\s+\`(?:graphql|inject|json|yaml):
 # doxygen / javadoc / .net
 (?:[\\@](?:brief|defgroup|groupname|link|t?param|return|retval)|(?:public|private|\[Parameter(?:\(.+\)|)\])(?:\s+(?:static|override|readonly|required|virtual))*)(?:\s+\{\w+\}|)\s+(\w+)\s+\g{-1}\s
-# C# getter/setter
-\s(\w+)\s+\g{-1}\s*\{\s*[gs]et;
 
 # macOS file path
 (?:Contents\W+|(?!iOS)/)MacOS\b

.github/actions/spelling/reject.txt

@@ -1,30 +1,25 @@
-attache
-aroynt.*
-bellows?
+^attache$
+^attacher$
+^attachers$
+^bellow?$
 benefitting
 occurences?
-.+dnt
-dependan.*
-developement
-developp?e
-Devers?
-devex.*
-devide
-Devinn?[ae]
-devisals?
-devisors?
-diables?
-hasta?
-hastat.*
-immediatly
-inisle
-inital
-linge
-oer
+^dependan.*
+^develope$
+^developement$
+^developpe
+^Devers?$
+^devex
+^devide
+^Devinn?[ae]
+^devisal
+^devisor
+^diables?$
+^oer$
 Sorce
-[Ss]pae.*
-Teh
-untill
-untilling
-venders?
-wether.*
+^[Ss]pae.*
+^Teh$
+^untill$
+^untilling$
+^venders?$
+^wether.*

.github/workflows/spelling2.yml

@@ -55,7 +55,7 @@ name: Spell checking
 #   spelling:
 #     # remove `security-events: write` and `use_sarif: 1`
 #     # remove `experimental_apply_changes_via_bot: 1`
-#     ... otherwise, adjust the `with:` as you wish
+#     ... otherwise adjust the `with:` as you wish
 
 on:
   push:
@@ -74,8 +74,6 @@ on:
     types:
       - "created"
 
-permissions: {}
-
 jobs:
   spelling:
     name: Check Spelling
@@ -87,7 +85,7 @@ jobs:
     outputs:
       followup: ${{ steps.spelling.outputs.followup }}
     runs-on: ubuntu-latest
-    if: ${{ (contains(github.event_name, 'pull_request') && github.event.pull_request.state == 'open') || github.event_name == 'push' }}
+    if: ${{ contains(github.event_name, 'pull_request') || github.event_name == 'push' }}
     concurrency:
       group: spelling-${{ github.event.pull_request.number || github.ref }}
       # note: If you use only_check_changed_files, you do not want cancel-in-progress
@@ -95,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
         with:
           suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
           checkout: true
@@ -107,25 +105,47 @@ jobs:
           warnings: bad-regex,binary-file,deprecated-feature,ignored-expect-variant,large-file,limited-references,no-newline-at-eof,noisy-file,non-alpha-in-dictionary,token-is-substring,unexpected-line-ending,whitespace-in-dictionary,minified-file,unsupported-configuration,no-files-to-check,unclosed-block-ignore-begin,unclosed-block-ignore-end
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           use_sarif: 1
-          allow-hunspell: false
-          load-config-from: |
+          check_extra_dictionaries: ""
+          dictionary_source_prefixes: >
             {
-              "pr-base-keys": [
-                ""
-              ],
-              "pr-trusted-keys": [
-                "check_extra_dictionaries",
-                "dictionary_source_prefixes",
-                "extra_dictionaries",
-                ""
-              ],
-              "": []
+            "cspell": "https://raw.githubusercontent.com/check-spelling/cspell-dicts/v20241114/dictionaries/"
             }
+          extra_dictionaries: |
+            cspell:software-terms/softwareTerms.txt
+            cspell:cpp/stdlib-cpp.txt
+            cspell:cpp/stdlib-c.txt
+            cspell:python/python/python-lib.txt
+            cspell:php/php.txt
+            cspell:node/node.txt
+            cspell:dart/dart.txt
+            cspell:filetypes/filetypes.txt
+            cspell:java/java.txt
+            cspell:css/css.txt
+            cspell:dotnet/dotnet.txt
+            cspell:npm/npm.txt
+            cspell:fullstack/fullstack.txt
+            cspell:java/java-terms.txt
+            cspell:r/r.txt
+            cspell:golang/go.txt
+            cspell:cpp/stdlib-cmath.txt
+            cspell:typescript/typescript.txt
+            cspell:html/html.txt
+            cspell:cpp/compiler-msvc.txt
+            cspell:django/django.txt
+            cspell:aws/aws.txt
+            cspell:python/common/extra.txt
+            cspell:cpp/ecosystem.txt
+            cspell:cpp/lang-keywords.txt
+            cspell:csharp/csharp.txt
+            cspell:cpp/compiler-clang-attributes.txt
+            cspell:python/python/python.txt
+            cspell:mnemonics/mnemonics.txt
+            cspell:powershell/powershell.txt
 
   comment-push:
     name: Report (Push)
     # If your workflow isn't running on push, you can remove this job
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     needs: spelling
     permissions:
       actions: read
@@ -133,24 +153,27 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
         with:
+          checkout: true
           spell_check_this: microsoft/terminal@main
           task: ${{ needs.spelling.outputs.followup }}
 
   comment-pr:
     name: Report (PR)
     # If you workflow isn't running on pull_request*, you can remove this job
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     needs: spelling
     permissions:
       actions: read
+      contents: read
       pull-requests: write
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
         with:
+          checkout: true
           spell_check_this: microsoft/terminal@main
           task: ${{ needs.spelling.outputs.followup }}
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
@@ -161,13 +184,12 @@ jobs:
       contents: write
       pull-requests: write
       actions: read
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     if: ${{
       github.repository_owner != 'microsoft' &&
       github.event_name == 'issue_comment' &&
       github.event.issue.pull_request &&
-      contains(github.event.comment.body, '@check-spelling-bot') &&
-      contains(github.event.comment.body, 'apply') &&
+      contains(github.event.comment.body, '@check-spelling-bot apply') &&
       contains(github.event.comment.body, 'https://')
       }}
     concurrency:
@@ -175,7 +197,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: apply spelling updates
-        uses: check-spelling/check-spelling@cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c # v0.0.26
+        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
         with:
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           checkout: true

.vscode/settings.json

@@ -127,5 +127,4 @@
         "**/obj/**": true,
         "**/packages/**": true,
     },
-    "sarif-viewer.connectToGithubCodeScanning": "on",
-}
+}

build/config/tsa.json

@@ -1,5 +1,4 @@
 {
-    "codebaseName": "VSTS_Microsoft_OSGS_OpenConsole",
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
     "areaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SHINE\\Terminal",

build/pipelines/1espt-nightly.yml

@@ -1,64 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Terminal Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-parameters:
-  - name: publishToAzure
-    displayName: "Deploy to **PUBLIC** Azure Storage"
-    type: boolean
-    default: true
-  - name: official
-    displayName: "Run on Official 1ES Pipeline Templates"
-    type: boolean
-    default: true
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: Canary
-
-extends:
-  template: templates-v2/pipeline-1espt-full-release-build.yml
-  parameters:
-    official: ${{ parameters.official }}
-    branding: Canary
-    buildTerminal: true
-    pgoBuildMode: Optimize
-    codeSign: true
-    signingIdentity:
-      serviceName: $(SigningServiceName)
-      appId: $(SigningAppId)
-      tenantId: $(SigningTenantId)
-      akvName: $(SigningAKVName)
-      authCertName: $(SigningAuthCertName)
-      signCertName: $(SigningSignCertName)
-      useManagedIdentity: $(SigningUseManagedIdentity)
-      clientId: $(SigningOriginalClientId)
-    publishSymbolsToPublic: true
-    symbolExpiryTime: 15
-    symbolPublishingSubscription: $(SymbolPublishingServiceConnection)
-    symbolPublishingProject: $(SymbolPublishingProject)
-    ${{ if eq(true, parameters.publishToAzure) }}:
-      extraPublishJobs:
-        - template: build/pipelines/templates-v2/job-deploy-to-azure-storage.yml@self
-          parameters:
-            pool:
-              name: SHINE-INT-S
-              os: windows
-            dependsOn: [PublishSymbols]
-            storagePublicRootURL: $(AppInstallerRootURL)
-            subscription: $(AzureSubscriptionName)
-            storageAccount: $(AzureStorageAccount)
-            storageContainer: $(AzureStorageContainer)
-            buildConfiguration: Release
-            buildPlatforms: [x64, x86, arm64]
-            environment: production-canary
-

build/pipelines/ci.yml

@@ -59,6 +59,7 @@ stages:
                 name: SHINE-INT-L
               ${{ else }}:
                 name: SHINE-OSS-L
+              demands: ImageOverride -equals SHINE-VS18-Latest
             buildPlatforms: [x64]
             buildConfigurations: [AuditMode]
             buildEverything: true
@@ -82,6 +83,7 @@ stages:
                 name: SHINE-INT-L
               ${{ else }}:
                 name: SHINE-OSS-L
+              demands: ImageOverride -equals SHINE-VS18-Latest
             buildPlatforms:
               - ${{ platform }}
             buildConfigurations: [Release]

build/pipelines/templates-v2/job-build-package-wpf.yml

@@ -30,13 +30,9 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
-  - name: outerTemplateContext
-    type: object
-    default: {}
 
 jobs:
 - job: ${{ parameters.jobName }}
-  templateContext: ${{ parameters.outerTemplateContext }}
   ${{ if ne(length(parameters.pool), 0) }}:
     pool: ${{ parameters.pool }}
   ${{ if eq(parameters.codeSign, true) }}:

build/pipelines/templates-v2/job-build-project.yml

@@ -74,13 +74,9 @@ parameters:
   - name: afterBuildSteps
     type: stepList
     default: []
-  - name: outerTemplateContext
-    type: object
-    default: {}
 
 jobs:
 - job: ${{ parameters.jobName }}
-  templateContext: ${{ parameters.outerTemplateContext }}
   ${{ if ne(length(parameters.pool), 0) }}:
     pool: ${{ parameters.pool }}
   strategy:

build/pipelines/templates-v2/job-merge-msix-into-bundle.yml

@@ -35,13 +35,9 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
-  - name: outerTemplateContext
-    type: object
-    default: {}
 
 jobs:
 - job: ${{ parameters.jobName }}
-  templateContext: ${{ parameters.outerTemplateContext }}
   ${{ if ne(length(parameters.pool), 0) }}:
     pool: ${{ parameters.pool }}
   ${{ if eq(parameters.codeSign, true) }}:

build/pipelines/templates-v2/job-package-conpty.yml

@@ -30,13 +30,9 @@ parameters:
   - name: signingIdentity
     type: object
     default: {}
-  - name: outerTemplateContext
-    type: object
-    default: {}
 
 jobs:
 - job: ${{ parameters.jobName }}
-  templateContext: ${{ parameters.outerTemplateContext }}
   ${{ if ne(length(parameters.pool), 0) }}:
     pool: ${{ parameters.pool }}
   ${{ if eq(parameters.codeSign, true) }}:

build/pipelines/templates-v2/pipeline-1espt-full-release-build.yml

@@ -1,233 +0,0 @@
-parameters:
-  - name: official
-    type: boolean
-    default: false
-  - name: branding
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Canary
-      - Dev
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    type: boolean
-    default: true
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
-  - name: symbolPublishingSubscription
-    type: string
-  - name: symbolPublishingProject
-    type: string
-
-  - name: extraPublishJobs
-    type: object
-    default: []
-  - name: signingIdentity
-    type: object
-    default: {}
-
-resources:
-  repositories:
-  - repository: 1esPipelines
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-
-extends:
-  ${{ if eq(parameters.official, true) }}:
-    template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
-  ${{ else }}:
-    template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
-  parameters:
-    customBuildTags:
-    - 1ES.PT.ViaStartRight
-    pool:
-      name: SHINE-INT-L
-      os: windows
-    sdl:
-      tsa:
-        enabled: true
-        configFile: '$(Build.SourcesDirectory)\build\config\tsa.json'
-      binskim:
-        enabled: true
-      policheck:
-        enabled: false
-        severity: Note
-      baseline:
-        baselineFile: '$(Build.SourcesDirectory)\build\config\release.gdnbaselines'
-        suppressionSet: default
-
-    stages:
-      - stage: Build
-        displayName: Build
-        dependsOn: []
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-            parameters:
-              outerTemplateContext:
-                outputs:
-                  - output: pipelineArtifact
-                    targetPath: $(JobOutputDirectory)
-                    artifactName: $(JobOutputArtifactName)
-              publishArtifacts: false # Handled by 1ESPT
-              branding: ${{ parameters.branding }}
-              buildTerminal: ${{ parameters.buildTerminal }}
-              buildConPTY: ${{ parameters.buildConPTY }}
-              buildWPF: ${{ parameters.buildWPF }}
-              pgoBuildMode: ${{ parameters.pgoBuildMode }}
-              buildConfigurations: ${{ parameters.buildConfigurations }}
-              buildPlatforms: ${{ parameters.buildPlatforms }}
-              generateSbom: false # this is handled by 1ESPT
-              removeAllNonSignedFiles: true # appease the overlords
-              codeSign: ${{ parameters.codeSign }}
-              signingIdentity: ${{ parameters.signingIdentity }}
-              beforeBuildSteps:
-                - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
-
-                - template: ./build/pipelines/templates-v2/steps-install-terrapin.yml@self
-
-                - task: UniversalPackages@0
-                  displayName: Download terminal-internal Universal Package
-                  inputs:
-                    feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-                    packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-                    versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            # Add an Any CPU build flavor for the WPF control bits
-            - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-              parameters:
-                outerTemplateContext:
-                  outputs:
-                    - output: pipelineArtifact
-                      targetPath: $(JobOutputDirectory)
-                      artifactName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by 1ESPT
-                jobName: BuildWPF
-                branding: ${{ parameters.branding }}
-                buildTerminal: false
-                buildWPFDotNetComponents: true
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms:
-                  - Any CPU
-                generateSbom: false # this is handled by 1ESPT
-                removeAllNonSignedFiles: true # appease the overlords
-                codeSign: ${{ parameters.codeSign }}
-                signingIdentity: ${{ parameters.signingIdentity }}
-                beforeBuildSteps:
-                  - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
-                  # WPF doesn't need the localizations or the universal package, but if it does... put them here.
-
-      - stage: Package
-        displayName: Package
-        dependsOn: [Build]
-        jobs:
-          - ${{ if eq(parameters.buildTerminal, true) }}:
-            - template: ./build/pipelines/templates-v2/job-merge-msix-into-bundle.yml@self
-              parameters:
-                pool:
-                  name: SHINE-INT-S
-                  os: windows
-                outerTemplateContext:
-                  outputs:
-                    - output: pipelineArtifact
-                      targetPath: $(JobOutputDirectory)
-                      artifactName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by 1ESPT
-                jobName: Bundle
-                branding: ${{ parameters.branding }}
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # Handled by 1ESPT
-                codeSign: ${{ parameters.codeSign }}
-                signingIdentity: ${{ parameters.signingIdentity }}
-
-          - ${{ if eq(parameters.buildConPTY, true) }}:
-            - template: ./build/pipelines/templates-v2/job-package-conpty.yml@self
-              parameters:
-                pool:
-                  name: SHINE-INT-S
-                  os: windows
-                outerTemplateContext:
-                  outputs:
-                    - output: pipelineArtifact
-                      targetPath: $(JobOutputDirectory)
-                      artifactName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by 1ESPT
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by 1ESPT
-                codeSign: ${{ parameters.codeSign }}
-                signingIdentity: ${{ parameters.signingIdentity }}
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            - template: ./build/pipelines/templates-v2/job-build-package-wpf.yml@self
-              parameters:
-                pool:
-                  name: SHINE-INT-S
-                  os: windows
-                outerTemplateContext:
-                  outputs:
-                    - output: pipelineArtifact
-                      targetPath: $(JobOutputDirectory)
-                      artifactName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by 1ESPT
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by 1ESPT
-                codeSign: ${{ parameters.codeSign }}
-                signingIdentity: ${{ parameters.signingIdentity }}
-
-      - stage: Publish
-        displayName: Publish
-        dependsOn:
-          - Build
-          - ${{ if or(parameters.buildTerminal, parameters.buildConPTY, parameters.buildWPF) }}:
-              - Package
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml@self
-            parameters:
-              pool:
-                name: SHINE-INT-S
-                os: windows
-              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
-              subscription: ${{ parameters.symbolPublishingSubscription }}
-              symbolProject: ${{ parameters.symbolPublishingProject }}
-
-          - ${{ parameters.extraPublishJobs }}

build/pipelines/templates-v2/pipeline-full-release-build.yml

@@ -58,7 +58,7 @@ parameters:
     type: object
     default:
       name: SHINE-INT-S # By default, send jobs to the small agent pool.
-      demands: ImageOverride -equals SHINE-VS17-Latest
+      demands: ImageOverride -equals SHINE-VS18-Latest
 
 variables:
   - template: variables-nuget-package-version.yml
@@ -81,7 +81,7 @@ stages:
         parameters:
           pool:
             name: SHINE-INT-L # Run the compilation on the large agent pool, rather than the default small one.
-            demands: ImageOverride -equals SHINE-VS17-Latest
+            demands: ImageOverride -equals SHINE-VS18-Latest
           branding: ${{ parameters.branding }}
           buildTerminal: ${{ parameters.buildTerminal }}
           buildConPTY: ${{ parameters.buildConPTY }}
@@ -153,10 +153,7 @@ stages:
   - stage: Publish
     displayName: Publish
     pool: ${{ parameters.pool }}
-    dependsOn:
-      - Build
-      - ${{ if or(parameters.buildTerminal, parameters.buildConPTY, parameters.buildWPF) }}:
-          - Package
+    dependsOn: [Build, Package]
     jobs:
       # We only support the vpack for Release builds that include Terminal
       - ${{ if and(containsValue(parameters.buildConfigurations, 'Release'), parameters.buildTerminal, parameters.publishVpackToWindows) }}:

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -279,10 +279,7 @@ extends:
 
       - stage: Publish
         displayName: Publish
-        dependsOn:
-          - Build
-          - ${{ if or(parameters.buildTerminal, parameters.buildConPTY, parameters.buildWPF) }}:
-              - Package
+        dependsOn: [Build]
         jobs:
           - template: ./build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml@self
             parameters:

build/pipelines/templates-v2/steps-install-terrapin.yml

@@ -1,6 +0,0 @@
-steps:
-- pwsh: |-
-    nuget install -source "https://pkgs.dev.azure.com/microsoft/_packaging/WindowsTerminal/nuget/v3/index.json" TerrapinRetrievalTool -Prerelease -OutputDirectory _trt
-    $TerrapinRetrievalToolPath = (Get-Item _trt\TerrapinRetrievalTool.*\win-x64\TerrapinRetrievalTool.exe).FullName
-    Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES]x-script,${TerrapinRetrievalToolPath} -b https://vcpkg.storage.devpackages.microsoft.io/artifacts/ -a true -u None -p {url} -s {sha512} -d {dst};x-block-origin"
-  displayName: Set up the Terrapin Retrieval Tool (vcpkg cache)

build/pipelines/templates-v2/steps-install-vcpkg.yml

@@ -1,6 +1,6 @@
 steps:
   - pwsh: |-
-      $VsInstallRoot = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -requires Microsoft.VisualStudio.Component.Vcpkg -property installationPath
+      $VsInstallRoot = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -requires Microsoft.VisualStudio.Component.Vcpkg -property installationPath -latest
       If ([String]::IsNullOrEmpty($VsInstallRoot)) {
         Remove-Item -Recurse -Force dep/vcpkg -ErrorAction:Ignore
         git clone https://github.com/microsoft/vcpkg dep/vcpkg

dep/vcpkg-overlay-triplets/arm64-windows-static.cmake

@@ -5,4 +5,4 @@ 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_PLATFORM_TOOLSET v145)

dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake

@@ -5,7 +5,7 @@ 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_PLATFORM_TOOLSET v145)
 
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake

@@ -5,7 +5,7 @@ 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_PLATFORM_TOOLSET v145)
 
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake

@@ -5,7 +5,7 @@ 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_PLATFORM_TOOLSET v145)
 
 set(VCPKG_CXX_FLAGS /fsanitize=address)
 set(VCPKG_C_FLAGS /fsanitize=address)

dep/vcpkg-overlay-triplets/x64-windows-static.cmake

@@ -5,4 +5,4 @@ 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_PLATFORM_TOOLSET v145)

dep/vcpkg-overlay-triplets/x86-windows-static.cmake

@@ -5,4 +5,4 @@ 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_PLATFORM_TOOLSET v145)

doc/ConsoleHostSettings.md

@@ -63,7 +63,7 @@ When console applications are launched, the Windows Console Host determines whic
 2. Overlay settings specified by the user's configured defaults
 3. Overlay application-specific settings from either the registry or the shortcut file, depending on how the application was launched
 
-Note that the registry settings are "sparse" settings repositories, meaning that if a setting isn't present, then whatever value that is already in use remains unchanged. This allows users to have some settings shared amongst all console applications and other settings be specific. Shortcut files, however, store each setting regardless of whether or not it was a default setting.
+Note that the registry settings are "sparse" settings repositories, meaning that if a setting isn't present, then whatever value that is already in use remains unchanged. This allows users to have some settings shared amongst all console applications and other settings be specific. Shortcut files, however, store each setting regardless of whether it was a default setting or not.
 
 ## Known Issues
 

doc/cascadia/profiles.schema.json

@@ -60,8 +60,7 @@
             "enum": [
               "audible",
               "window",
-              "taskbar",
-              "notification"
+              "taskbar"
             ]
           }
         },
@@ -71,7 +70,6 @@
             "audible",
             "taskbar",
             "window",
-            "notification",
             "all",
             "none"
           ]
@@ -1767,7 +1765,7 @@
       ]
     },
     "ExportBufferAction": {
-      "description": "Arguments corresponding to an exportBuffer Action",
+      "description": "Arguments corresponding to a exportBuffer Action",
       "allOf": [
         {
           "$ref": "#/$defs/ShortcutAction"
@@ -2244,7 +2242,7 @@
           "$ref": "#/$defs/Icon"
         },
         "name": {
-          "description": "The name that will appear in the command palette. If one isn't provided, the terminal will attempt to automatically generate a name.\nIf name is a string, it will be the name of the command.\nIf name is an object, the key property of the object will be used to lookup a localized string resource for the command",
+          "description": "The name that will appear in the command palette. If one isn't provided, the terminal will attempt to automatically generate a name.\nIf name is a string, it will be the name of the command.\nIf name is a object, the key property of the object will be used to lookup a localized string resource for the command",
           "type": [
             "string",
             "object",
@@ -2472,13 +2470,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",
@@ -2663,21 +2654,10 @@
           "type": "string"
         },
         "warning.confirmCloseAllTabs": {
-          "deprecated": true,
-          "description": "[Deprecated] Use \"warning.confirmOnClose\" instead.",
           "default": true,
+          "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"
         },
-        "warning.confirmOnClose": {
-          "default": "automatic",
-          "description": "Controls when a confirmation dialog appears before closing tabs or windows.",
-          "enum": [
-            "never",
-            "automatic",
-            "always"
-          ],
-          "type": "string"
-        },
         "useTabSwitcher": {
           "description": "[Deprecated] Replaced with the \"tabSwitcherMode\" setting.",
           "default": true,

doc/specs/#1043 - Set the initial position of the Terminal/spec.md

@@ -55,7 +55,7 @@ Edge cases:
 
 1. Multiple monitors. The user should be able to set the initial position to any monitors attached. For the monitors on the left side of the major monitor, the initial position values are negative.
 2. If the initial position is larger than the screen resolution and the window top left corner is off-screen, we should let user be able to see and drag the window back on screen. One solution is to set the initial position to the top left corner of the nearest monitor if the top left is off-screen.
-3. If the user wants to launch maximized and provides an initial position, we should launch the maximized window at the top left corner of the monitor where the position is located.
+3. If the user wants to launch maximized and provides an initial position, we should launch the maximized window on the top left corner of the monitor where the position is located.
 4. Launch the Terminal on a monitor with custom dpi. Changing the dpi of the monitor will not affect the initial position of the top left corner. So we do not need to handle this case.
 5. Launch the Terminal on a monitor with custom resolution. Changing the resolution will change the available point for the initial position. (2) already covers this case.
 
@@ -73,7 +73,7 @@ The rest of the UI will be the same of the current Terminal experience, except t
 Users can only set the initial position and launch mode in the Json file with keyboard. Thus, this will not affect accessibility.
 
 ### Reliability
-We need to make sure that whatever the initial position is set, the user can access the Terminal window. This is guaranteed because if the top left corner position of the Terminal Window is out of screen, we put it at the top left corner of the screen.
+We need to make sure that whatever the initial position is set, the user can access the Terminal window. This is guaranteed because if the top left corner position of the Terminal Window is out of screen, we put it on the top left corner of the screen.
 
 ### Performance, Power, and Efficiency
 

doc/specs/#11000 - Marks/Shell-Integration-Marks.md

@@ -68,7 +68,7 @@ allows the terminal to expose quick actions for:
 
 ### User Stories
 
-This is a bit of an unusual section, as this feature was already partially
+This is a bit of a unusual section, as this feature was already partially
 implemented when this spec was written.
 
 Story |  Size | Description

doc/specs/#1142 - Keybinding Arguments.md

@@ -189,7 +189,7 @@ However, for actions that _do_ require args, we'll set up a global function that
 can be used to parse a json blob into an `IActionArgs`.
 
 Once the `IActionArgs` is built for the keybinding, we'll set it in
-`AppKeyBindings` with an updated `AppKeyBindings::SetKeyBinding` call.
+`AppKeyBindings` with a updated `AppKeyBindings::SetKeyBinding` call.
 `SetKeyBinding`'s signature will be updated to take a `ActionAndArgs` instead.
 Should an action not need arguments, the `Args` member can be left `null` in the
 `ActionAndArgs`.

doc/specs/#1337 - Per-Profile Tab Colors/#1337 - Per-Profile Tab Colors.md

@@ -100,7 +100,7 @@ No expected change
 <tr>
 <td><strong>Compatibility</strong></td>
 <td>
-This entire spec outlines how this feature is designed with an emphasis on future
+This entire spec outlines how this feature is designed with a emphasis on future
 compatibility. As such, there are no expected regressions in the future when we
 do add support for themes.
 </td>

doc/specs/#1502 - Advanced Tab Switcher/spec.md

@@ -141,7 +141,7 @@ Pressing the `openTabSwitcher` keychord again will not close the switcher, it'll
 
 We'll provide a setting that will allow the list of tabs to be presented in either _in-order_ (how the tabs are ordered on the tab bar), or _Most Recently Used Order_ (MRU). MRU means that the tab that the terminal most recently visited will be on the top of the list, and the tab that the terminal has not visited for the longest time will be on the bottom.
 
-There will be an argument for the `openTabSwitcher` action called `displayOrder`. This can be either `inOrder` or `mruOrder`. Using an argument passed into `openTabSwitcher` would allow the user to have one keybinding to open an MRU Tab Switcher, and different one for the In-Order Tab Switcher. For example:
+There will be an argument for the `openTabSwitcher` action called `displayOrder`. This can be either `inOrder` or `mruOrder`. Making the setting an argument passed into `openTabSwitcher` would allow the user to have one keybinding to open an MRU Tab Switcher, and different one for the In-Order Tab Switcher. For example:
 ```
   {"keys": ["ctrl+tab"], "command": {"action": "openTabSwitcher", "anchor":"ctrl", "displayOrder":"mruOrder"}}
   {"keys": ["ctrl+shift+p"], "command": {"action": "openTabSwitcher", "anchor":"ctrl", "displayOrder":"inOrder"}}

doc/specs/#1564 - Settings UI/cascading-settings.md

@@ -103,7 +103,7 @@ This option was not chosen because it added too much overhead for changing a set
 
 ### 2: Lock Button
 
-Every setting will have a lock button next to it. If the lock is locked, that means the setting is being inherited from Global, and the control is disabled. If the user wants to edit the setting, they can click the lock, which will change it to the unlocked lock icon, and the control will become enabled.
+Every setting will have a lock button next to it. If the lock is locked, that means the setting is being inherited from Global, and the control is disabled. If the user wants to edit the setting, they can click the lock, which will changed it to the unlocked lock icon, and the control will become enabled.
 
 ![Locks inheritance](./inheritance-locks.png)
 

doc/specs/#1564 - Settings UI/spec.md

@@ -9,7 +9,7 @@ issue id: #1564
 
 ## Abstract
 
-This spec describes the basic functionality of the settings UI, including disabling it, the navigation items, launch methods, and editing of settings. The specific layout of each page will be defined in later design reviews.
+This spec describes the basic functionality of the settings UI, including disabling it, the navigation items, launch methods, and editing of settings. The specific layout of each page will defined in later design reviews.
 
 ## Inspiration
 

doc/specs/#1571 - New Tab Menu Customization/#1571 - New Tab Menu Customization.md

@@ -71,7 +71,7 @@ There are five `type`s of objects in this menu:
   the user to visually space out entries.
 * `"type":"folder"`: This represents a nested menu of entries.
   - The `"name"` property provides a string of text to display for the group.
-  - The `"icon"` property provides a path to an image to use as the icon. This
+  - The `"icon"` property provides a path to a image to use as the icon. This
     property is optional.
   - The `"entries"` property specifies a list of menu entries that will appear
     nested under this entry. This can contain other `"type":"folder"` groups as

doc/specs/#1595 - Suggestions UI/Suggestions-UI.md

@@ -377,7 +377,7 @@ spec's review.
 * [ ] Enable previewing `sendInput` actions in the Command Palette and `SuggestionsControl`
 * [ ] Enable the `SuggestionsControl` to open top-down (aligned to the bottom of the cursor row) or bottom-up (aligned to the top of the cursor row).
 * [ ] Disable sorting on the `SuggestionsControl` - elements should presumably be pre-sorted by the source.
-* [ ] Expose the recent commands as an accessor on `TermControl`
+* [ ] Expose the recent commands as a accessor on `TermControl`
 * [ ] Add a `suggestions` action which accepts a single option `recentCommands`. These should be fed in MRU order to the `SuggestionsControl`.
 * [ ] Expose the recent directories as an accessor on `TermControl`, and add a `recentDirectories` source.
 
@@ -505,7 +505,7 @@ Here's a sample json schema for the settings discussed here.
 > committing any plans here._
 
 It would be beneficial for the Suggestions UI to display additional context to
-the user. Consider an extension that provides some commands for the user, like a
+the user. Consider a extension that provides some commands for the user, like a
 hypothetical "Docker" extension. The extension author might be able to give the
 commands simplified names, but also want to expose a more detailed description
 of the commands to the user.

doc/specs/#1790 - Font features and axes-spec.md

@@ -36,7 +36,7 @@ We will do this by allowing users to define a dictionary in their settings.json
 
 ### Axes of variation
 
-Specifying axes of variation is done in an extremely similar manner to the way font features are specified - a 4-character tag is used to specify which font axis is being modified and a numerical value is provided to specify the value for the axis. For example, {'slnt', 20} specifies that the 'slant' axis should be set to 20.
+Specifying axes of variation is done in an extremely similar manner to the way font features are specified - a 4-character tag is used to specify which font axis is being modified and a numerical value is provided to specify the value the axis should be set to. For example, {'slnt', 20} specifies that the 'slant' axis should be set to 20.
 
 There is also a standard list of axes of variation, and each axis has its own default. We will approach this the same way we approached font features, by allowing users to specify additional features or omit features without needing to redefine the defaults.
 

doc/specs/#2046 - Command Palette.md

@@ -229,7 +229,7 @@ with the default profile running `wsl` in it.
 
 We'll add another action that can be used to toggle the visibility of the
 command palette. Pressing that keybinding will bring up the command palette. We
-should make sure to add an argument to this action that specifies whether the
+should make sure to add a argument to this action that specifies whether the
 palette should be opened directly in Action Mode or Commandline Mode.
 
 When the command palette appears, we'll want it to appear as a single overlay
@@ -525,7 +525,7 @@ default. These are largely the actions that are bound by default.
 ## Addenda
 
 This spec also has a follow-up spec which introduces further changes upon this
-original draft. Please refer to:
+original draft. Please also refer to:
 
 * June 2020: Unified keybindings and commands, and synthesized action names.
 
@@ -578,7 +578,7 @@ original draft. Please refer to:
   in commandline mode before we try to auto-parse their commandline, to check
   for errors. Might be useful to help sanity check users. We can always parse
   their `wt` commandlines safely without having to execute them.
-* It would be cool if commands the user typed in Commandline Mode could be
+* It would be cool if the commands the user typed in Commandline Mode could be
   saved to a history of some sort, so they could easily be re-entered.
   - It would be especially cool if it could do this across launches.
     - We don't really have any way of storing transient data like that in the

doc/specs/#492 - Default Terminal/spec.md

@@ -68,7 +68,7 @@ This workflow affords us several benefits:
     - This also makes it potentially possible to backport this portion of the code change to popular in-market versions of Windows 10. For instance, WSL2 has just backported to 1903 and 1909. The less churn and risk, the easier it is to sell a backport.
 
 *Potential future:*
-- ~~If no updated console exists, potentially check for registration of a terminal UX that is willing to use the inbox ConPTY bits, start it, and transition to being a PTY instead.~~
+- ~~If no updated console exists, potentially check for registration of a terminal UX that is willing to use the inbox ConPTY bits, start it, and transition to being a PTY instead.~~ 
 - **CUT FROM v1**: To simplify the story for end-users, we're offering this as a package deal in the first revision. Explaining the difference between consoles and terminals to end users is very difficult.
 
 The registration would operate as follows:
@@ -80,7 +80,7 @@ The registration would operate as follows:
     - **V1 NOTE:** The subkey `%%Startup` was chosen to separate these keys (this one and the `DelegationTerminal` one below) in case we needed to ACL them or protect them in some way. We want a per-user choice of which Terminal/Console are used, but we might need to take action to prevent these keys from being slammed at some point in the future. Why `%%`? The subkeys are traditionally used to resolve paths to client binaries that have their own console preferences set. The `%%` should never be resolvable as it won't lead to a valid path or expanded path variable.
 
 The delegation process would operate as follows:
-- A method contract is established between the existing inbox console and any updated console (an interface).
+- A method contract is established between the existing inbox console and any updated console (an interface). 
     - `HRESULT ConsoleEstablishHandoff(HANDLE server, HANDLE driverInputEvent, const PortableConnectMessage* const msg, HANDLE signalPipe, HANDLE inboxProcess, HANDLE* process)`
         - `HANDLE server`: This is the server side handle to the console driver, used with `DeviceIoControl` to receive/send messages with the client command-line application
         - `HANDLE driverInputEvent`: The input event is created and assigned to the driver immediately on first connection, before any messages are read from the driver, to ensure that it can track a blocking state should first message be an input request that we do not yet have data to fill. As such, the inbox console will have created this and assigned it to the driver before pulling off the connection packet and determining that it wants to delegate. Therefore, we will transfer ownership of this event to the updated console.
@@ -88,7 +88,7 @@ The delegation process would operate as follows:
             - ~~The `ConsoleArguments` structure could technically change between versions, so we will make a version agnostic portable structure that just carries the communication from the old one to the new one.~~
             - **CUT FROM V1**: The only arguments coming in from a default light-up are the server handle. Pretty much all the other arguments are related to the operation of the PTY. Since this feature is about "default application" launches where no arguments are specified, this was cut from the initial revision.
         - `const PortableConnectMessage* const msg`:
-            - The `CONSOLE_API_MSG` structure contains both the actual packet data from the driver as well as some overhead/administration data related to the packet state, ordering, completion, errors, and buffers. It's a broad scope structure for every type of message we process and it can change over time as we improve the way that `conserver.lib` handles packets.
+            - The `CONSOLE_API_MSG` structure contains both the actual packet data from the driver as well as some overhead/administration data related to the packet state, ordering, completion, errors, and buffers. It's a broad scope structure for every type of message we process and it can change over time as we improve the way the `conserver.lib` handles packets.
             - This represents a version agnostic variant for ONLY the connect message that can pass along the initial connect information structure, the packet sequencing information, and other relevant payload only to that one message type. It will purposefully discard references to things like a specific set of API servicing routines because the point of handing off is to get updated routines, if necessary.
             - **V1 NOTE:** This was named `CONSOLE_PORTABLE_ATTACH_MSG`
         - `HANDLE signalPipe`: During authoring, it was identified that <kbd>Ctrl+C</kbd> and other similar signals need to make it back to the original `conhost.exe` application as the Operating System grants it special privilege over the originally attached client application. This privilege cannot be transferred to the delegated console. So this channel remains for the delegated one to send its signals back through the original one for commanding the underlying client. (This also implies the original `conhost.exe` inbox cannot close and must remain a part of the process tree for the life of the session to maintain this control.)
@@ -100,7 +100,7 @@ The delegation process would operate as follows:
         1. ~~The issue of passing the server, event, and other handles into another process space. We're not entirely sure if the console driver will happily accept these things moving to a different process. It probably should, but unconfirmed.~~
         1. ~~Some command-line client applications rely on spelunking the process tree to figure out who is their servicing application. Maintaining the delegated/updated console inside the same process space maintains some level of continuity for these sorts of applications.~~
     - **Alternative:** We may make this just be a COM server/client contract. ~~An in-proc COM server should operate in much the same fashion here (loading the DLL into the process and running particular method) while being significantly more formal and customizable (version revisions, moving to out-of-proc, not really needing to know the binary path because the catalog knows).~~
-        - **V1 NOTE:** We landed on an out-of-proc COM server/client here. This maintains the isolation of the newly running code from the old code. Since we're maintaining the original `conhost.exe` for signaling purposes, we're no longer worried about spelunking the process tree and not having the relationship for clients to find.
+        - **V1 NOTE:** We landed on an out-of-proc COM server/client here. This maintains the isolation of the newly running code from the old code. Since we're maintaining the original `conhost.exe` for signaling purposes, we're no longer worried about the spelunking the process tree and not having the relationship for clients to find.
     - **Not considering:** ~~WinRT. `conhost.exe` has no WinRT. Adding WinRT to it would significantly increase the complexity of compilation in the inbox and out of box code base. It would also significantly increase the compilation time, binary size, library link list, etc... unless we use just the ABI to access it. But I don't see an advantage to that over just using classic COM at that point. This is only one handoff method and a rather simplistic one at that. Every benefit WinRT provides is outweighed by the extra effort that would be required over just a classic COM server in this case.~~
 - After delegation is complete, the inbox console will have to clean up any threads, handles, and state related to the session. We do a fairly good job with this normally, but some portions of the `conhost.exe` codebase are reliant on the process exiting for final cleanup. There may be a bit of extra effort to do some explicit cleanup here.
     - **V1 NOTE:** The inbox one cleans up everything it can and sits in a state waiting for the child/delegated process handle to exit. It also maintains a thread listening for the signals to come through in case it needs to send a command to the client application using the privilege granted to it by the driver.
@@ -177,7 +177,7 @@ The settings experience includes:
         - Inside Windows Terminal
             - Inside the new Settings UI, we will likely need a page that configures the delegation keys in `HKCU\Console\%%Startup` ~~or a link out to the Windows Settings panel, should we manage to get the settings configurable there~~.
         - Inside the console property sheet
-            - Same as Terminal, but with `comctl` controls over XAML +/- a link to the Windows Settings panel
+            - Same as for Terminal but with `comctl` controls over XAML +/- a link to the Windows Settings panel
         - Inside the Settings panel for Windows (probably on the developer settings page)
             - The ultimate location for this is likely a panel directly inside Windows. This is the hardest one to accomplish because of the timelines of the Windows product. We may not get this in an initial revision, but it should likely be our ultimate goal. **V1 NOTE:** We did it!
     - Operation:
@@ -185,7 +185,7 @@ The settings experience includes:
         - Offer a list of registered servers or discovered manifests from the app catalog - This is the ideal scenario where we search the installed app catalog +/- the COM catalog and offer a list of apps that conform to the contract in a drop-down.
             - The final process was to use [App Extensions](https://docs.microsoft.com/windows/uwp/launch-resume/how-to-create-an-extension) inside the Terminal APPX package to declare the COM GUIDs that were available for the `DelegationConsole` and `DelegationTerminal` fields respectively. A configuration class `DelegationConfig` was added to `propslib.lib` that enables the lookup of these from the application state catalog and presents a list of them to choose from. It also manages reading and writing the registry keys.
             - **V1 NOTE:** Our configuration options currently allow pairings of replacement consoles and terminals to be adjusted in lock-step from the UI. That's not to say further combinations are not possible or even necessarily inhibited by the code. We just went for minimal confusion in our first round.
-
+    
 - Configuration of the legacy console state:
     - ~~Since we could end up in an experience where the default launch experience gets you directly into Windows Terminal, we believe that the Terminal will likely need an additional setting or settings in the new Settings UI that will allow the toggling of some of the `HKCU\Console` values to do things like set/remove the legacy console state.~~ **V1 NOTE:** Cut as low priority. Switch back to console and configure it that way or use the existing property sheet or tamper with registry keys.
     - We have left the per-launch debugging and advanced access hole of calling something like `conhost.exe cmd.exe` which will use the inbox conhost to launch `cmd.exe` even if there is a default specified.
@@ -209,9 +209,9 @@ The major players here that I am considering are NVDA, JAWS, and Narrator. As fa
 
 Let's hit the elephant in the room. "You plan on pulling a completely different binary inside the `conhost.exe` process and just... delegating all activity to it?" Yes.
 
-(**V1 NOTE:** Well, it's out of proc now. But it is at the same privilege level as the original one thanks to the mechanics of COM.)
+(**V1 NOTE:** Well, it's out of proc now. But it is at the same privilege level as the original one thanks to the mechanics of COM.) 
 
-As far as I'm concerned, the `conhost.exe` that is started to host the command-line client application is running at the same integrity level as the client binary that is partially started and waiting for its server to be ready. This is the long-standing existing protection that we have from the Windows operating system. Anything running in the same integrity level is already expected to be able to tamper with anything else at the same integrity level. The delegated binary that we would be loading into our process space will also be at the same integrity level. Nothing really stops a malicious actor from launching that binary in any other way in the same integrity level as a part of the command-line client application's startup.
+As far as I'm concerned, the `conhost.exe` that is started to host the command-line client application is running at the same integrity level as the client binary that is partially started and waiting for its server to be ready. This is the long-standing existing protection that we have from the Windows operating system. Anything running in the same integrity level is already expected to be able to tamper with anything else at the same integrity level. The delegated binary that we would be loading into our process space will also be at the same integrity level. Nothing really stops a malicious actor from launching that binary in any other way in the same integrity level as a part of the command-line client application's startup. 
 
 The mitigation here, if necessary, would be to use `WinVerifyTrust` to validate the certification path of the `OpenConsole.exe` binary to ensure that only one that is signed by Microsoft can be the substitute server host for the application. This doesn't stop third parties from redistributing our `OpenConsole.exe` off of GitHub if necessary with their products, but it would stop someone from introducing any random binary that met the signature interface of the delegation methods into `conhost.exe`. The only value I see this providing is stopping someone from being "tricked" into delegating their `conhost.exe` to another binary through the configuration methods we provide. It doesn't really stop someone (or an attacker) from taking ownership of the `conhost.exe` in System32 and replacing it directly. So this point might be moot. (It is expected that replacement of the System32 one is already protected, to some degree, by being owned by the SYSTEM account and requiring some measure of authority to replace.)
 
@@ -242,8 +242,8 @@ I expect to take some degree of performance, power, and efficiency hit by implem
 
 The mitigations to these losses are as follows:
 
-1. We will delay load any of the interface load and packaging data lookup libraries to only be pulled into process space should we determine that the application is non-interactive.
-    1. That should save us some of the commit and power costs for the sorts of non-interactive scripts and applications that typically run early in OS startup (and leverage `conhost.exe` as their host environment).
+1. We will delay load any of the interface load and packaging data lookup libraries to only be pulled into process space should we determine that the application is non-interactive. 
+    1. That should save us some of the commit and power costs for the sorts of non-interactive scripts and applications that typically run early in OS startup (and leverage `conhost.exe` as their host environment). 
     1. We will still likely get hit with the on-disk commit cost for the additional export libraries linked as well as additional code. That would be a by-design change.
 
 1. We plan to begin Profile Guided Optimization across our `OpenConsole.exe` and `WindowsTerminal.exe` binaries. This should allow us to optimize the startup paths for this scenario and bias the `OpenConsole.exe` binary that we redistribute to focus its efforts and efficiency on the ConPTY role specifically, ignoring all of the interactive Win32/GDI portions that aren't typically used.

doc/specs/#5000 - Process Model 2.0/#1032 - Elevation Quality of Life Improvements.md

@@ -109,7 +109,7 @@ each thing in the elevated window that they'd want to create it elevated. Or the
 Terminal would need to provide some setting like
 `"autoElevateEverythingInAnElevatedWindow"`.
 
-We cannot support mixed elevation when starting in an unelevated window.
+We cannot support mixed elevation when starting in a unelevated window.
 Therefore, it doesn't make a lot of UX sense to support it in the other
 direction. It's a cleaner UX story to just have everything in a single window at
 the same elevation level.
@@ -141,7 +141,7 @@ We could also simplify this to only allow a boolean true/false for displaying
 the shield. As we do often with other enums, we could define `true` to be the
 same as the default appearance, and `false` to be the hidden option. As always,
 the development of the Terminal is an iterative process, where we can
-incrementally improve from no setting, to a boolean setting, to an enum-backed
+incrementally improve from no setting, to a boolean setting, to a enum-backed
 one.
 
 ### Configuring a profile to always run elevated

doc/specs/#5000 - Process Model 2.0/#4472 - Windows Terminal Session Management.md

@@ -469,7 +469,7 @@ This is a list of actionable tasks generated as described by this spec:
   commandline
 * [ ] Add a `NameWindow` action, subcommand that allows the user to set the name
   for the window.
-* [ ] Add an action that will cause all windows to briefly display an overlay
+* [ ] Add an action that will cause all windows to briefly display a overlay
   with the current window ID and name. This would be something like the
   "identify" feature of the Windows "Display" settings.
 

doc/specs/#5000 - Process Model 2.0/#5000 - Process Model 2.0.md

@@ -886,7 +886,7 @@ Here, we've got two tabs that have been serialized.
   - The second pane is also a `TermControl`, takes up 70% of the parent, and is
     attached to the content process `{2-2-2-2}`
 * The second tab has a single pane, with a SettingsPage. The settings page has
-  also specified in its `payload` that its current page is the "globals" page.
+  also specified in it's `payload` that its current page is the "globals" page.
 
 When we send this serialized state to another window, it can use the content
 GUIDs to initialize new `TermControl`s connected to the appropriate content
@@ -983,7 +983,7 @@ of each other.
    all the logic concerning input. The core will expose these methods that the
    UI layer calls as projected methods
 
-8. (Dependent on 7): Expose the methods that the UI layer calls on the core as
+8. (Dependent on 7): Expose the methods the UI layer calls on the core as
    projected methods. The control is still fundamentally in-proc, and the UI
    layer calls directly into the implementation of the control core, but the
    methods _could_ be used x-proc.
@@ -1132,7 +1132,7 @@ prompt the user for permission, but that's an acceptable user experience.
 
 ## TODOs
 
-* [x] Experimentally prove that an elevated window can host an unelevated content
+* [x] Experimentally prove that a elevated window can host an unelevated content
   - Research proved the opposite actually.
 * [ ] Experimentally prove that I can toss content process IDs from one window
   to another
@@ -1155,7 +1155,7 @@ prompt the user for permission, but that's an acceptable user experience.
 ## Addenda
 
 This spec also has a follow-up spec which introduces further changes upon this
-original draft. Please refer to:
+original draft. Please also refer to:
 
 * November 2020: Windows Terminal Window Management
 

doc/specs/#532 - Panes and Split Windows.md

@@ -156,7 +156,7 @@ then this is the pane with the currently focused terminal control. When the user
 brings the tab into focus, the last focused pane is the pane that should become
 focused again.
 
-The tab's state will be updated to reflect the state of its focused pane. The
+The tab's state will be updated to reflect the state of it's focused pane. The
 title text and icon of the tab will reflect that of the focused pane. Should the
 focus switch from one pane to another, the tab's text and icon should update to
 reflect the newly focused control. Any additional state that the tab would
@@ -172,7 +172,7 @@ match.
 A pane can either be closed by the user manually, or when the terminal it's
 attached to raises its ConnectionClosed event. When this happens, we should
 remove this pane from the tree. The parent of the closing pane will have to
-remove the pane as one of its children. If the sibling of the closing pane is a
+remove the pane as one of it's children. If the sibling of the closing pane is a
 leaf, then the parent should just take all of the state from the remaining pane.
 This will cause the remaining pane's content to expand to take the entire
 boundaries of the parent's pane. If the remaining child was a parent itself,
@@ -182,7 +182,7 @@ replaced by the remaining child.
 
 ## Future considerations
 
-The Pane implementation isn't complete in its current form. There are many
+The Pane implementation isn't complete in it's current form. There are many
 additional things that could be done to improve the user experience. This is by
 no means a comprehensive list.
 

doc/specs/#605 - Search/spec.md

@@ -30,7 +30,7 @@ Conhost already has a module for search. It implements case-sensitive or insensi
 
 We will create a `SearchBoxControl` Xaml `UserControl` element. When a search process begins, a `SearchBoxControl` object will be created and attached to `TermControl` root grid. In other words, one SearchBox is added for each `TermControl`. The reasons for this design is:
 
-1. Each `TermControl` object is a Terminal Window and has an individual text buffer. In phase 1 we are going to search within the current terminal text buffer.
+1. Each `TermControl` object is a Terminal Window and has a individual text buffer. In phase 1 we are going to search within the current terminal text buffer.
 2. If we put the search box under TerminalApp, then the search can only happen on the current focused Terminal.
 3. If the community does not like the current design, we can lift SearchBox to a higher level.
 
@@ -55,7 +55,7 @@ Above is the `SearchBoxControl` in dark theme and light theme.
 
 ![SearchBox mockup, arrow button clicked](images/SearchBoxUpSelected.png)
 
-The search box defaults to the top right corner of the Terminal window. If the current tab is split into panes, each pane will have an individual searchbox.
+The search box defaults to be on the top right corner of the Terminal window. If the current tab is split into panes, each pane will have a individual searchbox.
 
 #### Search process
 1. The user presses <kbd>ctrl+shift+f</kbd> (or user's custom key binding) to open the search box. Focus will move to the TextBox.

doc/specs/#607 - Commandline Arguments for the Windows Terminal.md

@@ -169,7 +169,7 @@ wt my-commandline.exe with some args
 #  tab, and in another tab, run "another.exe running in a second tab"
 wt my-commandline.exe with some args and a \; literal semicolon ; new-tab another.exe running in a second tab
 
-# Start cmd.exe, then split it vertically (with the first taking 70% of its
+# Start cmd.exe, then split it vertically (with the first taking 70% of it's
 #  space, and the new pane taking 30%), and run wsl.exe in that pane (user story 13)
 wt cmd.exe ; split-pane --target 0 -V -% 30 wsl.exe
 wt cmd.exe ; split-pane -% 30 wsl.exe
@@ -551,7 +551,7 @@ this works as expected.
 
 Painfully, powershell uses `;` as a separator between commands as well. So, if
 someone wanted to call a `wt` commandline in powershell with multiple commands,
-the user would also need to escape those semicolons for powershell first. That
+the user would need to also escape those semicolons for powershell first. That
 means a command like ```wt new-tab ; split-pane``` would need to be ```wt new-tab
 `; split-pane``` in powershell, and ```wt new-tab ; split-pane commandline \; with
 \; semicolons``` would need to become ```wt new-tab `; split-pane commandline \`;

doc/specs/#653 - Quake Mode/#653 - Quake Mode.md

@@ -69,7 +69,7 @@ To implement this feature, we'll add the following settings:
 
 ### `globalSummon` Action
 
-The `globalSummon` action will be a keybinding that the user can use to summon a
+The `globalSummon` action will be a keybinding the user can use to summon a
 Terminal window from anywhere in the OS. Various arguments to the action will
 specify which window is summoned, to where, and how the window should behave on
 summon.
@@ -182,7 +182,7 @@ for pure markdown, sorry. -->
 <tr>
 <td><code>"any"</code><br> Summon the MRU window</td>
 
-<td>Go to the desktop with the window (leave position alone)</td>
+<td>Go to the desktop the window is on  (leave position alone)</td>
 <td>Move the window to this desktop (leave position alone)</td>
 <td>
 
@@ -196,7 +196,7 @@ Else:
 <!-- ----------------------------------------------------------------------- -->
 <tr>
 <td><code>"toCurrent"</code><br> Summon the MRU window TO the monitor with the foreground window</td>
-<td>Go to the desktop with the window, move to the monitor with the foreground window</td>
+<td>Go to the desktop the window is on, move to the monitor with the foreground window</td>
 <td>Move the window to this desktop, move to the monitor with the foreground window</td>
 <td>
 
@@ -213,7 +213,7 @@ Else:
   <code>"toMouse"</code>
   <sup><a href="#footnote-2">[2]</a></sup> <br>
   Summon the MRU window TO the monitor with the mouse</td>
-<td>Go to the desktop with the window, move to the monitor with the mouse</td>
+<td>Go to the desktop the window is on, move to the monitor with the mouse</td>
 <td>Move the window to this desktop, move to the monitor with the mouse</td>
 <td>
 
@@ -230,7 +230,7 @@ Else:
 <td>
 
 If there is a window on this monitor on any desktop,
-* Go to the desktop with the window (leave position alone)
+* Go to the desktop the window is on (leave position alone)
 
 else
 * Create a new window on this monitor  & desktop
@@ -262,7 +262,7 @@ Else (one on this desktop & monitor)
 <td>
 
 If there is a window on monitor N on any desktop,
-* Go to the desktop with the window (leave position alone)
+* Go to the desktop the window is on (leave position alone)
 
 else
 * Create a new window on this monitor  & desktop

doc/specs/#754 - Cascading Default Settings.md

@@ -273,7 +273,7 @@ with GUIDs set.
 After a dynamic profile generator runs, we will determine what new profiles need
 to be added to the user settings, so we can append those to the list of
 profiles. The deserializer will look at the list of generated profiles and check
-if each and every one already has an entry in the user settings. The generator
+if each and every one already has a entry in the user settings. The generator
 will just blind hand back a list of profiles, and the deserializer will figure
 out if any of them need to be added to the user settings. We'll store some sort
 of result indicating that we want a save operation to occur. After the rest of
@@ -505,8 +505,8 @@ like so:
 // To view the default settings, open the defaults.json file in this directory
 ```
 
-The "Settings" button would then only open the file that the user needs to edit,
-and provide them instructions on how to open the defaults file.
+The "Settings" button would then only open the file the user needs to edit, and
+provide them instructions on how to open the defaults file.
 
 There could alternatively be a hidden option for the "Open Settings" button,
 where holding <kbd>Alt</kbd> while clicking on the button would open the

doc/specs/#8324 - Application State (TSM).md

@@ -56,7 +56,7 @@ short duration after they're made.
 ## UI/UX Design
 
 This has no direct impact on the UI/UX; however, we may want to add a button to general settings page titled "reset all
-dialogs" or "ask me *again* about those things that, some time ago, I told you to not ask me about".
+dialogs" or "don't not ask me again about those things that, some time ago, I told you to not ask me about".
 
 We do not intend this file to be edited by hand, so it does not have to be user-friendly or serialized with indentation.
 

doc/specs/Proto extensions-spec.md

@@ -66,7 +66,7 @@ default profiles (cmd/powershell) or the dynamically generated profiles.
 
 For modifications to existing profiles, the json stub would need to indicate which profile it wishes to modify. It will
 do this by providing the corresponding guid in the `"updates"` field of the json stub. The reason we use an `"updates"`
-field rather than a `"guid"` field (like the way that user settings are eventually layered onto profiles) is because we
+field rather than a `"guid"` field (like the way the user settings are eventually layered onto profiles) is because we
 do not want to mistakenly create a new profile when the stub was meant to update a profile that did not exist.
 
 Note that currently, we generate a GUID for dynamic profiles using the "initial" name of the profile (i.e. before
@@ -96,7 +96,7 @@ Here is an example of a json file that modifies an existing profile (specificall
 }
 ```
 
-**NOTE**: This will *not* change the way that profile looks in the user's settings file. The Azure cloud shell profile
+**NOTE**: This will *not* change the way the profile looks in the user's settings file. The Azure cloud shell profile
 in their settings file (assuming they have made no changes) will still be as below.
 
 ```js

doc/specs/drafts/#1256 - Tab tearoff.md

@@ -31,7 +31,7 @@ There are several common pieces needed for both the tab tear-off scenario and th
 
 We need some sort of server/manager code that sits there waiting for connections from `wt.exe` processes and potentially `conhost.exe` processes such that it can broker a connection between the processes. It either needs to run in its own process or it needs to run in one of the existing `wt.exe`s that is chosen as the primary manager at the time. It should create communication channels and a global mutex at the time of creation.
 
-All other `wt.exe` processes starting after the primary should detect the existence of the server manager process and wait on the mutex handle. When the primary disappears, the OS scheduler should choose one of the others to wake up first on the mutex. It can take the lock and then set up the primary management channel.
+All other `wt.exe` processes starting after the primary should detect the existence of the server manager process and wait on the mutex handle. When the primary disappears, the OS scheduler should choose one of the others to wake up first on the mutex. It can take the lock and then set up the primary management channel. 
 
 Alternatively, if the manager process is completely isolated and we expect all `wt.exe`s to have to remain connected at all times, we can make it such that when the connections are broken between the individual processes and the manager that they all shut down. I would prefer that it is resilient (the previous option) over this one, but browsers must have a good reason for preferring this way.
 
@@ -85,7 +85,7 @@ If the registered handler fails to start the connection, there is no registered
 
 ##### Interactive vs. Not
 
-We would have to be able to detect the difference between an interactive and non-interactive mode here.
+We would have to be able to detect the difference between an interactive and non-interactive mode here. 
 - Interactive is defined as the end-user is attempting to launch a command-line application with a visible window to see the output and enter input.
 - Non-interactive is defined as tools, utilities, and services attempting to launch a command-line application with no visible window (and possibly some redirected handles).
 
@@ -120,7 +120,7 @@ There's a few areas to study here.
 
 3. Updating conhost.exe to look up the launch preference and/or to launch another console host via a protocol handler
 - This would allow the `C:\windows\system32\conhost.exe` to effectively delegate the session to another `conhost.exe` that is hopefully newer than the inbox one. Given that the driver protocol in the box doesn't change and hasn't changed and we don't intend to change it, the forward/backward compatibility story is great here. Additionally, if for whatever reason the delegated `conhost.exe` fails to launch, we can just fall back and launch the old one like we would have prior to the change. It is significantly more likely, but still challenging, to argue for servicing `conhost.exe` back several versions in Windows to make this light up better for all folks. It might be especially more possible if it is a very targeted code snippet that can drop in to all the old versions of the `conhost.exe` code. We would still have the argument about spending resources developing for OS versions that are supposed to be dropped in favor of latest, but it's still a lesser argument than upending all of `kernelbase.dll`.
-- A protocol handler is also well understood and relatively well handled/tested in Windows. Old apps can handle protocols. New apps can handle protocols. Protocol handlers can take arguments. We don't have to lean on any other team to get them to help change the way that the rest of the OS works.
+- A protocol handler is also well understood and relatively well handled/tested in Windows. Old apps can handle protocols. New apps can handle protocols. Protocol handlers can take arguments. We don't have to lean on any other team to get them to help change the way the rest of the OS  works. 
 
 #### Communicating the launch
 For the parameters passing, I see a few options:
@@ -149,7 +149,7 @@ To simplify this for a first iteration, we could just make it so the transfer do
 - If released onto anything that isn't a `wt.exe` instance, we create a new `wt.exe` instance and send in the connection as the default startup parameter.
 
 #### Component UI
-It is also theoretically possible that if we could find a Component UI style solution (where the tab/panes live in their own process and just remote the UI/input into the shell) that it would be easy and even trivial to change out which shell/frame host is holding that element at any given time.
+It is also theoretically possible that if we could find a Component UI style solution (where the tab/panes live in their own process and just remote the UI/input into the shell) that it would be easy and even trivial to change out which shell/frame host is holding that element at any given time. 
 
 ### For Default Application
 The UX would make it look exactly like the user had started `wt.exe` from a shortcut or launch tile, but would launch the first tab differently than the defaults.
@@ -173,7 +173,7 @@ I don't believe it changes anything for accessibility. The only concern I'd have
 
 This particular feature will have to go through a security review/audit. It is unclear what level of control we will need over the IPC communication channels. A few things come to mind:
 1. We need to ensure that the mutexes/pipes/communications are restricted inside of one particular session to one particular user. If another user is also running WT in their session, it should involve a completely different manager process and system objects.
-1. We MAY have to enforce a scenario where we inhibit cross-integrity-level connections from being passed around. Generally speaking, processes at a higher integrity level have the authority to perform actions on those with a lower integrity level. This means that an elevated `wt.exe` could theoretically send a tab to a standard level `wt.exe`. We may be required to inhibit/prohibit this. We may also need to have one manager per integrity level.
+1. We MAY have to enforce a scenario where we inhibit cross-integrity-level connections from being passed around. Generally speaking, processes at a higher integrity level have the authority to perform actions on those with a lower integrity level. This means that an elevated `wt.exe` could theoretically send a tab to a standard level `wt.exe`. We may be required to inhibit/prohibit this. We may also need to have one manager per integrity level. 
 1. I'm not sure what sorts of ACL/DACL/SACLs we would need to apply to all the kernel objects involved.
 1. My initial prototype here used message-passing type pipes with a custom rolled protocol. If I make my own protocol, it needs to be fuzzed. And I'm probably missing something. Many/most of these concerns for security are probably eliminated if we use a well-known mechanism for this sort of IPC. My thoughts go to a COM server. More complicated to implement than message pipes, but probably brings a lot of security benefits and eliminates the need to fuzz the protocol (probably).
 
@@ -184,18 +184,18 @@ In the simple implementation, it will decrease reliability. We'll be shuffling c
 We might be able to mitigate some of the reliability concerns here or even improve reliability by going a step further with the process/containerization model like browsers do and standing up each individual tab as its own process host.
 
 ```
-wt.exe - Manager Mode
-|- wt.exe - Frame Host Mode
+wt.exe - Manager Mode 
+|- wt.exe - Frame Host Mode 
 |   |- wt.exe - Tab Host Mode
 |   |  |- conhost.exe - ConPTY mode
-|   |     |- pwsh.exe - Client application
+|   |     |- pwsh.exe - Client application 
 |   |- wt.exe - Tab Host Mode
 |      |- conhost.exe - ConPTY mode
-|         |- cmd.exe - Client application
-|- wt.exe - Frame Host Mode
+|         |- cmd.exe - Client application 
+|- wt.exe - Frame Host Mode 
     |- wt.exe - Tab Host Mode
        |- conhost.exe - ConPTY mode
-          |- pwsh.exe - Client application
+          |- pwsh.exe - Client application 
 ```
 
 The current structure of `wt.exe` has everything hosted within the one process. To improve reliability, we would likely have to make `wt.exe` run in three modes.
@@ -219,29 +219,29 @@ It is possible (but would need to be explored) that the APIs available to us to
 In the one instance, we have this process hierarchy. Two instances of Windows Terminal exist. In Terminal A, the user has started a `cmd.exe` and a `pwsh.exe` tab. In the second instance, the user has started just one `cmd.exe` tab.
 
 ```
-- wt.exe (Terminal Instance A)
+- wt.exe (Terminal Instance A) 
   |- conhost.exe (in PTY mode) - Hosted to A
   |  |- cmd.exe
   |- conhost.exe (in PTY mode) - Hosted to A
      |- pwsh.exe <-- I will be dragged out
 
 - wt.exe (Terminal Instance B)
-  |- conhost.exe (in PTY mode) - Hosted to B
-     |- cmd.exe
+  |- conhost.exe (in PTY mode) - Hosted to B 
+     |- cmd.exe 
 ```
 
 When the `pwsh.exe` tab is torn off from Instance A and is dropped onto Instance B, the process hierarchy doesn't actually change. The connection details, preferences, and session metadata are passed via the IPC management channels, but to an outside observer, nothing has actually changed.
 
 ```
-- wt.exe (Terminal Instance A)
+- wt.exe (Terminal Instance A) 
   |- conhost.exe (in PTY mode) - Hosted to A
   |  |- cmd.exe
   |- conhost.exe (in PTY mode) - Hosted to B
      |- pwsh.exe <-- I am hosted in B but I'm parented to A
 
 - wt.exe (Terminal Instance B)
-  |- conhost.exe (in PTY mode) - Hosted to B
-     |- cmd.exe
+  |- conhost.exe (in PTY mode) - Hosted to B 
+     |- cmd.exe 
 ```
 
 I don't believe there are provisions in the Windows OS to reparent applications to a different process.
@@ -253,8 +253,8 @@ Additionally, this becomes more interesting when Terminal Instance A dies and B
   |- pwsh.exe <-- I am hosted in B but I'm parented to A
 
 - wt.exe (Terminal Instance B)
-  |- conhost.exe (in PTY mode) - Hosted to B
-     |- cmd.exe
+  |- conhost.exe (in PTY mode) - Hosted to B 
+     |- cmd.exe 
 ```
 
 When instance A dies, the `conhost.exe` that was reparented keeps running and now just appears orphaned within the process hierarchy, reporting to the top level under utilities like Process Explorer.
@@ -280,7 +280,7 @@ The `conhost.exe` was started in response to a `pwsh.exe` being started with no
 
 ```
 - conhost.exe - idling
-
+  
 - wt.exe (Terminal Instance A)
   |- conhost.exe (in PTY mode)
      |- pwsh.exe
@@ -294,7 +294,7 @@ This is obviously less efficient than not doing it as we have to stand up server
 
 But as long as we're creating threads and services that sleep most of the time and are only awakened on some kernel/system event, we shouldn't be wasting too much in terms of power and background resources.
 
-Additionally, `wt.exe` is worse than `conhost.exe` alone in all efficiency categories simply because it not only requires more resources to display in a "pretty" manner, but it also requires a `conhost.exe` under it in PTY mode to adapt the API calls. This is generally acceptable for end users who care more about the experience than the total performance.
+Additionally, `wt.exe` is worse than `conhost.exe` alone in all efficiency categories simply because it not only requires more resources to display in a "pretty" manner, but it also requires a `conhost.exe` under it in PTY mode to adapt the API calls. This is generally acceptable for end users who care more about the experience than the total performance. 
 
 It is, however, not likely to be much if any worse than just choosing to use `wt.exe` anyway over `conhost.exe`.
 
@@ -304,7 +304,7 @@ I've listed most of the issues above in their individual sections. The primary h
 1. Process tree layout - The processes in hierarchy may not make sense to someone inspecting them either visually with a tool or programmatically
 1. Process and kernel object lifetime - Applications may be counting on a specific process or object lifetime in regards to their hosting window and we might be tampering with that in how we apply job objects or shuffle around ownership to make tabs happen
 1. Default launch expectations - It is possible that test utilities or automation are counting on `conhost.exe` being the host application or that they're not ready to tolerate the potential for other applications to start. I think the interactive/non-interactive check mitigates this, but we'd have to remain concerned here.
-1. `AttachConsole` and `DetachConsole` and `AllocConsole` - I don't have the slightest idea what happens for these APIs. We would have to explore. `AttachConsole` has restrictions based on the process hierarchy. It would likely behave in interesting ways with the strange parenting order and might be a driver to why we would have to adjust the parenting of the processes (or change the API under the hood). `DetachConsole` might create an issue where a tab disappears out of the terminal and the job object causes everything to die. `AttachConsole` wouldn't necessarily be guaranteed to go back into the same `wt.exe` or a `wt.exe` at all.
+1. `AttachConsole` and `DetachConsole` and `AllocConsole` - I don't have the slightest idea what happens for these APIs. We would have to explore. `AttachConsole` has restrictions based on the process hierarchy. It would likely behave in interesting ways with the strange parenting order and might be a driver to why we would have to adjust the parenting of the processes (or change the API under the hood). `DetachConsole` might create an issue where a tab disappears out of the terminal and the job object causes everything to die. `AttachConsole` wouldn't necessarily be guaranteed to go back into the same `wt.exe` or a `wt.exe` at all. 
 
 ## Future considerations
 

doc/specs/drafts/#3327 - Application Theming/#3327 - Application Theming.md

@@ -647,7 +647,7 @@ style admin vs regular windows?
 ## Addenda
 
 This spec also has a follow-up spec which elaborates on the complexities of Mica
-in the Terminal. Please refer to:
+in the Terminal. Please also refer to:
 
 * [Mica in the Terminal]
 

doc/specs/drafts/#997 Non-Terminal-Panes.md

@@ -94,7 +94,7 @@ should the control provide some sort of accessibility pattern.
   if the hosted control wants to use Ctrl+T for its own shortcut? The current
   keybindings model has the `TermControl` call into the App layer to see if a
   keystroke should be handled by the app first. We may want to make sure that
-  for non-terminal controls, we add an event handler to try and have the
+  for non-terminal controls, we add a event handler to try and have the
   `AppKeyBindings` handle the keypress if the control doesn't. This won't solve
   the case where the control wants to use a keybinding that is mapped by the
   Terminal App. In that case, non-terminal controls will actually behave

src/buffer/out/Row.cpp

@@ -350,7 +350,7 @@ void ROW::_init() noexcept
     std::iota(_charOffsets.begin(), _charOffsets.end(), uint16_t{ 0 });
 #endif
 
-#pragma warning(pop)
+#pragma warning(push)
 }
 
 void ROW::CopyFrom(const ROW& source)
@@ -1143,13 +1143,6 @@ til::CoordType ROW::GetTrailingColumnAtCharOffset(const ptrdiff_t offset) const
     return _createCharToColumnMapper(offset).GetTrailingColumnAt(offset);
 }
 
-uint16_t ROW::GetCharOffset(til::CoordType col) const noexcept
-{
-    const auto columns = GetReadableColumnCount();
-    const auto colBeg = clamp(col, 0, columns);
-    return _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
-}
-
 DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
 {
     const auto col = _clampedColumn(column);

src/buffer/out/Row.hpp

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

src/buffer/out/textBuffer.cpp

@@ -100,7 +100,7 @@ void TextBuffer::_reserve(til::size screenBufferSize, const TextAttribute& defau
     const auto rowStride = rowSize + charsBufferSize + charOffsetsBufferSize;
     assert(rowStride % alignof(ROW) == 0);
 
-    // 65535*65535 cells would result in an allocSize of 8GiB.
+    // 65535*65535 cells would result in a allocSize of 8GiB.
     // --> Use uint64_t so that we can safely do our calculations even on x86.
     // We allocate 1 additional row, which will be used for GetScratchpadRow().
     const auto rowCount = ::base::strict_cast<uint64_t>(h) + 1;
@@ -2724,7 +2724,7 @@ void TextBuffer::Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer, const View
     til::point newCursorPos;
 
     // BODGY: We use oldCursorPos in two critical places below:
-    // * To compute an oldHeight that includes, at a minimum, the cursor row
+    // * To compute an oldHeight that includes at a minimum the cursor row
     // * For REFLOW_JANK_CURSOR_WRAP (see comment below)
     // Both of these would break the reflow algorithm, but the latter of the two in particular
     // would cause the main copy loop below to deadlock. In other words, these two lines
@@ -2844,7 +2844,7 @@ void TextBuffer::Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer, const View
             // We don't need to be smart about this. Reset() is fast and shrinking doesn't occur often.
             if (newY >= newHeight && newX == 0)
             {
-                // We need to ensure not to overwrite the row containing the cursor.
+                // We need to ensure not to overwrite the row the cursor is on.
                 if (newY >= newYLimit)
                 {
                     break;

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -103,7 +103,7 @@
         <!-- Blank the SourceProject here to vend all files into the root of the package. -->
         <SourceProject>
         </SourceProject>
-        <!-- Replace the filename for wt/wtd.exe with the one that the manifest wants. -->
+        <!-- Replace the filename for wt/wtd.exe with the one the manifest wants. -->
         <TargetPath Condition="'%(Filename)' == 'wt' and '%(Extension)' == '.exe'">$(OCExecutionAliasName).exe</TargetPath>
       </_FilteredNonWapProjProjectOutput>
     </ItemGroup>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

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

src/cascadia/CascadiaPackage/Package.appxmanifest

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

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -741,7 +741,7 @@ namespace TerminalAppLocalTests
 
     void SettingsTests::TestNestedInIterableCommand()
     {
-        // This test checks an iterable command that includes a nested command.
+        // This test checks a iterable command that includes a nested command.
         // The commands should look like:
         //
         // <Command Palette>

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -308,11 +308,6 @@ namespace TerminalAppLocalTests
         // TerminalPage and not only create them successfully, but also create a
         // tab using those settings successfully.
 
-        // - - - IMPORTANT - - -
-        // GH#14623: "closeOnExit": "never" is important for all test profiles. Without
-        // it, the spawned process exits immediately in the UAP test environment,
-        // and the default "automatic" close-on-exit behavior removes the
-        // tab/pane asynchronously, racing against test assertions.
         static constexpr std::wstring_view settingsJson0{ LR"(
         {
             "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
@@ -320,14 +315,12 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -354,6 +347,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TryDuplicateBadTab()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
         // * Try calling _DuplicateFocusedTab on tab 1
@@ -368,14 +365,12 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -387,8 +382,7 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -444,6 +438,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TryDuplicateBadPane()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
         // * Try calling _SplitPane(Duplicate) on tab 1
@@ -458,14 +456,12 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -477,8 +473,7 @@ namespace TerminalAppLocalTests
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 }
             ]
         })" };
@@ -577,29 +572,25 @@ namespace TerminalAppLocalTests
                     "name" : "profile0",
                     "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 0",
-                    "historySize": 1,
-                    "closeOnExit": "never"
+                    "historySize": 1
                 },
                 {
                     "name" : "profile1",
                     "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 1",
-                    "historySize": 2,
-                    "closeOnExit": "never"
+                    "historySize": 2
                 },
                 {
                     "name" : "profile2",
                     "guid": "{6239a42c-3333-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 2",
-                    "historySize": 3,
-                    "closeOnExit": "never"
+                    "historySize": 3
                 },
                 {
                     "name" : "profile3",
                     "guid": "{6239a42c-4444-49a3-80bd-e8fdd045185c}",
                     "tabTitle" : "Profile 3",
-                    "historySize": 4,
-                    "closeOnExit": "never"
+                    "historySize": 4
                 }
             ],
             "schemes":
@@ -702,6 +693,7 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -741,6 +733,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::MoveFocusFromZoomedPane()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         auto page = _commonSetup();
 
         Log::Comment(L"Create a second pane");
@@ -786,6 +782,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::CloseZoomedPane()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         auto page = _commonSetup();
 
         Log::Comment(L"Create a second pane");
@@ -841,6 +841,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::SwapPanes()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         auto page = _commonSetup();
 
         Log::Comment(L"Setup 4 panes.");
@@ -1047,31 +1051,31 @@ namespace TerminalAppLocalTests
 
     void TabTests::NextMRUTab()
     {
-        // This is a test for GH#8025 - we want to make sure that MRU tab
-        // ordering works correctly and that in-order/disabled switching works.
-        //
-        // Note: We test MRU ordering directly rather than going through the
-        // command palette tab switcher, because the palette's anchor key
-        // handling auto-dismisses when no modifier keys are held (which we
-        // can't simulate in the test environment).
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
+        // This is a test for GH#8025 - we want to make sure that we can do both
+        // in-order and MRU tab traversal, using the tab switcher and with the
+        // tab switcher disabled.
 
         auto page = _commonSetup();
 
-        Log::Comment(L"Create Tab[1]");
+        Log::Comment(L"Create a second tab");
         TestOnUIThread([&page]() {
             NewTerminalArgs newTerminalArgs{ 1 };
             page->_OpenNewTab(newTerminalArgs);
         });
         VERIFY_ARE_EQUAL(2u, page->_tabs.Size());
 
-        Log::Comment(L"Create Tab[2]");
+        Log::Comment(L"Create a third tab");
         TestOnUIThread([&page]() {
             NewTerminalArgs newTerminalArgs{ 2 };
             page->_OpenNewTab(newTerminalArgs);
         });
         VERIFY_ARE_EQUAL(3u, page->_tabs.Size());
 
-        Log::Comment(L"Create Tab[3]");
+        Log::Comment(L"Create a fourth tab");
         TestOnUIThread([&page]() {
             NewTerminalArgs newTerminalArgs{ 3 };
             page->_OpenNewTab(newTerminalArgs);
@@ -1080,89 +1084,99 @@ namespace TerminalAppLocalTests
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify Tab[3] is focused");
+            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
         });
 
-        Log::Comment(L"Select Tab[1]");
+        Log::Comment(L"Select the second tab");
         TestOnUIThread([&page]() {
             page->_SelectTab(1);
         });
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify Tab[1] is focused");
+            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify the second tab is the focused one");
         });
 
-        // MRU order should now be: Tab[1], Tab[3], Tab[2], Tab[0]
-        // Verify the MRU list directly.
-        Log::Comment(L"Verify MRU order: MRU[0]=Tab[1], MRU[1]=Tab[3]");
+        Log::Comment(L"Change the tab switch order to MRU switching");
         TestOnUIThread([&page]() {
-            VERIFY_ARE_EQUAL(4u, page->_mruTabs.Size());
-            uint32_t mruIdx;
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(0), mruIdx);
-            VERIFY_ARE_EQUAL(1u, mruIdx, L"MRU[0] should be Tab[1] (most recent)");
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(1), mruIdx);
-            VERIFY_ARE_EQUAL(3u, mruIdx, L"MRU[1] should be Tab[3] (last tab added)");
+            page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::MostRecentlyUsed);
         });
 
-        Log::Comment(L"Select MRU[1]=Tab[3] directly");
+        Log::Comment(L"Switch to the next MRU tab, which is the fourth tab");
         TestOnUIThread([&page]() {
-            // The next MRU tab after Tab[1] is Tab[3]
-            uint32_t nextMruIdx;
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(1), nextMruIdx);
-            page->_SelectTab(nextMruIdx);
+            page->_SelectNextTab(true, nullptr);
+        });
+
+        Log::Comment(L"Sleep to let events propagate");
+        Sleep(250);
+
+        TestOnUIThread([&page]() {
+            Log::Comment(L"Hide the command palette, to confirm the selection");
+            // If you don't do this, the palette will just stay open, and the
+            // next time we call _HandleNextTab, we'll continue traversing the
+            // MRU list, instead of just hoping one entry.
+            page->LoadCommandPalette().Visibility(Visibility::Collapsed);
         });
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify Tab[3] is focused");
+            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
         });
 
-        Log::Comment(L"Select MRU[1]=Tab[1] directly");
+        Log::Comment(L"Switch to the next MRU tab, which is the second tab");
         TestOnUIThread([&page]() {
-            uint32_t nextMruIdx;
-            page->_tabs.IndexOf(page->_mruTabs.GetAt(1), nextMruIdx);
-            page->_SelectTab(nextMruIdx);
+            page->_SelectNextTab(true, nullptr);
+        });
+
+        Log::Comment(L"Sleep to let events propagate");
+        Sleep(250);
+
+        TestOnUIThread([&page]() {
+            Log::Comment(L"Hide the command palette, to confirm the selection");
+            // If you don't do this, the palette will just stay open, and the
+            // next time we call _HandleNextTab, we'll continue traversing the
+            // MRU list, instead of just hoping one entry.
+            page->LoadCommandPalette().Visibility(Visibility::Collapsed);
         });
 
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify Tab[1] is focused");
+            VERIFY_ARE_EQUAL(1u, focusedIndex, L"Verify the second tab is the focused one");
+        });
+
+        Log::Comment(L"Change the tab switch order to in-order switching");
+        page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::InOrder);
+
+        Log::Comment(L"Switch to the next in-order tab, which is the third tab");
+        TestOnUIThread([&page]() {
+            page->_SelectNextTab(true, nullptr);
+        });
+        TestOnUIThread([&page]() {
+            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
+            VERIFY_ARE_EQUAL(2u, focusedIndex, L"Verify the third tab is the focused one");
         });
 
-        // The Disabled tab switcher mode uses direct index-based switching
-        // without the command palette, so it works in the test environment.
         Log::Comment(L"Change the tab switch order to not use the tab switcher (which is in-order always)");
         page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::Disabled);
 
-        Log::Comment(L"Switch to the next in-order tab: Tab[2]");
+        Log::Comment(L"Switch to the next in-order tab, which is the fourth tab");
         TestOnUIThread([&page]() {
             page->_SelectNextTab(true, nullptr);
         });
         TestOnUIThread([&page]() {
             auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(2u, focusedIndex, L"Verify Tab[2] is focused");
-        });
-
-        Log::Comment(L"Switch to the next in-order tab: Tab[3]");
-        TestOnUIThread([&page]() {
-            page->_SelectNextTab(true, nullptr);
-        });
-        TestOnUIThread([&page]() {
-            auto focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
-            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify Tab[3] is focused");
+            VERIFY_ARE_EQUAL(3u, focusedIndex, L"Verify the fourth tab is the focused one");
         });
     }
 
     void TabTests::VerifyCommandPaletteTabSwitcherOrder()
     {
-        // This is a test for GH#8188 - we want to make sure that the MRU
-        // ordering is correctly maintained as tabs are selected.
-        //
-        // Note: We verify MRU ordering directly rather than going through
-        // the command palette tab switcher, because the palette's anchor key
-        // handling auto-dismisses when no modifier keys are held (which we
-        // can't simulate in the test environment).
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
+        // This is a test for GH#8188 - we want to make sure that the order of tabs
+        // is preserved in the CommandPalette's TabSwitcher
 
         auto page = _commonSetup();
 
@@ -1175,7 +1189,7 @@ namespace TerminalAppLocalTests
         });
         VERIFY_ARE_EQUAL(4u, page->_mruTabs.Size());
 
-        Log::Comment(L"give alphabetical names to all tabs");
+        Log::Comment(L"give alphabetical names to all switch tab actions");
         TestOnUIThread([&page]() {
             page->_GetTabImpl(page->_tabs.GetAt(0))->Title(L"a");
         });
@@ -1197,14 +1211,18 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"c", page->_tabs.GetAt(2).Title());
             VERIFY_ARE_EQUAL(L"d", page->_tabs.GetAt(3).Title());
 
-            // MRU order after creating Tab[0]-Tab[3]: MRU[0]=Tab[3], MRU[3]=Tab[0]
             VERIFY_ARE_EQUAL(L"d", page->_mruTabs.GetAt(0).Title());
             VERIFY_ARE_EQUAL(L"c", page->_mruTabs.GetAt(1).Title());
             VERIFY_ARE_EQUAL(L"b", page->_mruTabs.GetAt(2).Title());
             VERIFY_ARE_EQUAL(L"a", page->_mruTabs.GetAt(3).Title());
         });
 
-        Log::Comment(L"Select Tab[0] through Tab[3] to establish MRU order");
+        Log::Comment(L"Change the tab switch order to MRU switching");
+        TestOnUIThread([&page]() {
+            page->_settings.GlobalSettings().TabSwitcherMode(TabSwitcherMode::MostRecentlyUsed);
+        });
+
+        Log::Comment(L"Select the tabs from 0 to 3");
         RunOnUIThread([&page]() {
             page->_UpdatedSelectedTab(page->_tabs.GetAt(0));
             page->_UpdatedSelectedTab(page->_tabs.GetAt(1));
@@ -1212,31 +1230,47 @@ namespace TerminalAppLocalTests
             page->_UpdatedSelectedTab(page->_tabs.GetAt(3));
         });
 
-        Log::Comment(L"Verify MRU order: MRU[0]='d', MRU[1]='c', MRU[2]='b', MRU[3]='a'");
         VERIFY_ARE_EQUAL(4u, page->_mruTabs.Size());
         VERIFY_ARE_EQUAL(L"d", page->_mruTabs.GetAt(0).Title());
         VERIFY_ARE_EQUAL(L"c", page->_mruTabs.GetAt(1).Title());
         VERIFY_ARE_EQUAL(L"b", page->_mruTabs.GetAt(2).Title());
         VERIFY_ARE_EQUAL(L"a", page->_mruTabs.GetAt(3).Title());
 
-        Log::Comment(L"Select Tab[2]='c' (MRU[1] after 'd')");
-        TestOnUIThread([&page]() {
-            page->_SelectTab(2);
+        Log::Comment(L"Switch to the next MRU tab, which is the third tab");
+        RunOnUIThread([&page]() {
+            page->_SelectNextTab(true, nullptr);
+            // In the course of a single tick, the Command Palette will:
+            // * open
+            // * select the proper tab from the mru's list
+            // * raise an event for _filteredActionsView().SelectionChanged to
+            //   immediately preview the new tab
+            // * raise a _SwitchToTabRequestedHandlers event
+            // * then dismiss itself, because we can't fake holing down an
+            //   anchor key in the tests
         });
 
-        Log::Comment(L"Verify MRU order updated: MRU[0]='c', MRU[1]='d', MRU[2]='b', MRU[3]='a'");
         TestOnUIThread([&page]() {
             VERIFY_ARE_EQUAL(L"c", page->_mruTabs.GetAt(0).Title());
             VERIFY_ARE_EQUAL(L"d", page->_mruTabs.GetAt(1).Title());
             VERIFY_ARE_EQUAL(L"b", page->_mruTabs.GetAt(2).Title());
             VERIFY_ARE_EQUAL(L"a", page->_mruTabs.GetAt(3).Title());
         });
+
+        const auto palette = winrt::get_self<winrt::TerminalApp::implementation::CommandPalette>(page->LoadCommandPalette());
+
+        VERIFY_ARE_EQUAL(winrt::TerminalApp::implementation::CommandPaletteMode::TabSwitchMode, palette->_currentMode, L"Verify we are in the tab switcher mode");
+        // At this point, the contents of the command palette's _mruTabs list is
+        // still the _old_ ordering (d, c, b, a). The ordering is only updated
+        // in TerminalPage::_SelectNextTab, but as we saw before, the palette
+        // will also dismiss itself immediately when that's called. So we can't
+        // really inspect the contents of the list in this test, unfortunately.
     }
 
     void TabTests::TestWindowRenameSuccessful()
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -1269,6 +1303,7 @@ namespace TerminalAppLocalTests
     {
         BEGIN_TEST_METHOD_PROPERTIES()
             TEST_METHOD_PROPERTY(L"IsolationLevel", L"Method")
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
@@ -1301,6 +1336,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewCommitScheme()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
 
         auto page = _commonSetup();
@@ -1363,6 +1402,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewDismissScheme()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then dismissed accordingly");
 
         auto page = _commonSetup();
@@ -1411,6 +1454,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestPreviewSchemeWhilePreviewing()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Preview a color scheme, then preview another scheme. ");
 
         Log::Comment(L"Preview a color scheme. Make sure it's applied, then committed accordingly");
@@ -1478,6 +1525,10 @@ namespace TerminalAppLocalTests
 
     void TabTests::TestClampSwitchToTab()
     {
+        BEGIN_TEST_METHOD_PROPERTIES()
+            TEST_METHOD_PROPERTY(L"Ignore", L"True") // GH#19610 tracks re-enabling this test
+        END_TEST_METHOD_PROPERTIES()
+
         Log::Comment(L"Test that switching to a tab index higher than the number of tabs just clamps to the last tab.");
 
         auto page = _commonSetup();

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);
             }
         }
     }
@@ -801,7 +801,7 @@ namespace winrt::TerminalApp::implementation
 
             _RemoveTabs(tabsToRemove);
 
-            actionArgs.Handled(!tabsToRemove.empty());
+            actionArgs.Handled(true);
         }
     }
 
@@ -837,7 +837,7 @@ namespace winrt::TerminalApp::implementation
             // tab row, until you mouse over them. Probably has something to do
             // with tabs not resizing down until there's a mouse exit event.
 
-            actionArgs.Handled(!tabsToRemove.empty());
+            actionArgs.Handled(true);
         }
     }
 

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -1068,15 +1068,6 @@ int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring> args)
         return 0;
     }
 
-    // When a toast notification is clicked, Windows may launch a new instance
-    // with "--from-toast" as the argument. This is a no-op sentinel — the
-    // in-process Activated handler on the toast already handled activation.
-    // See DesktopNotification.cpp for more details.
-    if (args.size() == 2 && args[1] == L"--from-toast")
-    {
-        return 0;
-    }
-
     auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
 
     for (auto& cmdBlob : commands)

src/cascadia/TerminalApp/AppLogic.cpp

@@ -294,7 +294,7 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Registers for changes to the settings folder and upon an updated settings
+    // - Registers for changes to the settings folder and upon a updated settings
     //      profile calls ReloadSettings().
     // Arguments:
     // - <none>
@@ -307,7 +307,7 @@ namespace winrt::TerminalApp::implementation
             settingsPath.parent_path().c_str(),
             false,
             // We want file modifications, AND when files are renamed to be
-            // settings.json. This second case will often happen with text
+            // settings.json. This second case will oftentimes happen with text
             // editors, who will write a temp file, then rename it to be the
             // actual file you wrote. So listen for that too.
             wil::FolderChangeEvents::FileName | wil::FolderChangeEvents::LastWriteTime,

src/cascadia/TerminalApp/BasicPaneEvents.h

@@ -15,7 +15,6 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<IPaneContent> TaskbarProgressChanged;
         til::typed_event<IPaneContent> ReadOnlyChanged;
         til::typed_event<IPaneContent> FocusRequested;
-        til::typed_event<IPaneContent, winrt::TerminalApp::NotificationEventArgs> NotificationRequested;
 
         til::typed_event<winrt::Windows::Foundation::IInspectable, Microsoft::Terminal::Settings::Model::Command> DispatchCommandRequested;
     };

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -741,10 +741,10 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Helper method to run a command, switch to a tab, or retrieve the
-    //   action from a user selected command and dispatch that command.
-    //   Also fires a tracelogging event indicating that the user successfully
-    //   found the action they were looking for.
+    // - Helper method for retrieving the action from a command the user
+    //   selected, and dispatching that command. Also fires a tracelogging event
+    //   indicating that the user successfully found the action they were
+    //   looking for.
     // Arguments:
     // - command: the Command to dispatch. This might be null.
     // Return Value:
@@ -791,7 +791,7 @@ namespace winrt::TerminalApp::implementation
                     _close();
 
                     // But make an exception for the Toggle Command Palette action: we don't want the dispatch
-                    // to make the command palette - that was just closed - visible again.
+                    // make the command palette - that was just closed - visible again.
                     // All other actions can just be dispatched.
                     if (command.ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
                     {

src/cascadia/TerminalApp/DesktopNotification.cpp

@@ -1,129 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "DesktopNotification.h"
-
-#include <WtExeUtils.h>
-
-using namespace winrt::Windows::UI::Notifications;
-using namespace winrt::Windows::Data::Xml::Dom;
-
-namespace winrt::TerminalApp::implementation
-{
-    std::atomic<uint64_t> DesktopNotification::_lastNotificationTime{ 0 };
-
-    // Method Description:
-    // - Rate-limits toast notifications so we don't spam the user.
-    // Return Value:
-    // - Returns true if a notification is allowed, false if too recent.
-    bool DesktopNotification::ShouldSendNotification()
-    {
-        const auto now = GetTickCount64();
-        auto last = _lastNotificationTime.load(std::memory_order_relaxed);
-
-        // Subtraction wraps cleanly modulo 2^64, so the delta is correct even
-        // across the (~584 million year) GetTickCount64 rollover.
-        if (now - last < MinNotificationIntervalMs)
-        {
-            return false;
-        }
-
-        // Attempt to update; if another thread beat us, that's fine — we'll skip this one.
-        return _lastNotificationTime.compare_exchange_strong(last, now, std::memory_order_relaxed);
-    }
-
-    // Method Description:
-    // - Sends a toast notification with the given title and message.
-    // - When the user clicks the toast, the `Activated` callback fires
-    //   with the tabIndex that was passed in, so the caller can switch
-    //   to the correct tab and summon the window.
-    // Arguments:
-    // - args: The title, message, and tab index to include in the notification.
-    // - activated: A callback invoked on the background thread when the
-    //              toast is clicked. The uint32_t parameter is the tab index.
-    void DesktopNotification::SendNotification(const DesktopNotificationArgs& args, std::function<void()> activatedFunc)
-    {
-        try
-        {
-            if (!ShouldSendNotification())
-            {
-                return;
-            }
-
-            // Build the toast XML. We use a simple template with a title and body text.
-            //
-            // <toast launch="--from-toast">
-            //   <visual>
-            //     <binding template="ToastGeneric">
-            //       <text>Title</text>
-            //       <text>Message</text>
-            //     </binding>
-            //   </visual>
-            // </toast>
-            auto toastXml = ToastNotificationManager::GetTemplateContent(ToastTemplateType::ToastText02);
-            auto textNodes = toastXml.GetElementsByTagName(L"text");
-
-            // First <text> is the title
-            textNodes.Item(0).InnerText(args.Title);
-            // Second <text> is the body
-            textNodes.Item(1).InnerText(args.Message);
-
-            auto toastElement = toastXml.DocumentElement();
-
-            // When a toast is clicked, Windows launches a new instance of the app
-            // with the "launch" attribute as command-line arguments. We handle
-            // toast activation in-process via the Activated event below, so the
-            // new instance should do nothing. "--from-toast" is recognized by
-            // AppCommandlineArgs::ParseArgs as a no-op sentinel.
-            toastElement.SetAttribute(L"launch", L"--from-toast");
-
-            toastElement.SetAttribute(L"scenario", L"default");
-
-            auto toast = ToastNotification{ toastXml };
-
-            // Set the tag and group to enable notification replacement.
-            // Repeated notifications with the same tag replace the previous one
-            // rather than stacking in the notification center.
-            toast.Tag(args.Tag);
-            toast.Group(L"WindowsTerminal");
-
-            // When the user activates (clicks) the toast, fire the callback.
-            if (activatedFunc)
-            {
-                toast.Activated([activatedFunc](const auto& /*sender*/, const auto& /*eventArgs*/) {
-                    activatedFunc();
-                });
-            }
-
-            // For packaged apps, CreateToastNotifier() uses the package identity automatically.
-            // For unpackaged apps, we must pass the explicit AUMID that was registered
-            // at startup via SetCurrentProcessExplicitAppUserModelID.
-            winrt::Windows::UI::Notifications::ToastNotifier notifier{ nullptr };
-            if (IsPackaged())
-            {
-                notifier = ToastNotificationManager::CreateToastNotifier();
-            }
-            else
-            {
-                // Retrieve the AUMID that was set by WindowEmperor at startup.
-                wil::unique_cotaskmem_string aumid;
-                if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&aumid)))
-                {
-                    notifier = ToastNotificationManager::CreateToastNotifier(aumid.get());
-                }
-            }
-            if (notifier)
-            {
-                notifier.Show(toast);
-            }
-        }
-        catch (...)
-        {
-            // Toast notification is a best-effort feature. If it fails (e.g., notifications
-            // are disabled, or the app is unpackaged without proper AUMID setup), we silently
-            // ignore the error.
-            LOG_CAUGHT_EXCEPTION();
-        }
-    }
-}

src/cascadia/TerminalApp/DesktopNotification.h

@@ -1,37 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- DesktopNotification.h
-
-Module Description:
-- Helper for sending Windows desktop toast notifications. Used to surface
-  terminal activity events to the user via the Windows notification center.
---*/
-
-#pragma once
-#include "pch.h"
-
-namespace winrt::TerminalApp::implementation
-{
-    struct DesktopNotificationArgs
-    {
-        winrt::hstring Title;
-        winrt::hstring Message;
-        winrt::hstring Tag;
-    };
-
-    class DesktopNotification
-    {
-    public:
-        static bool ShouldSendNotification();
-        static void SendNotification(const DesktopNotificationArgs& args, std::function<void()> activatedFunc);
-
-    private:
-        static std::atomic<uint64_t> _lastNotificationTime;
-
-        // Minimum interval between notifications, in milliseconds (GetTickCount64 units).
-        static constexpr uint64_t MinNotificationIntervalMs = 5'000;
-    };
-}

src/cascadia/TerminalApp/IPaneContent.idl

@@ -14,13 +14,6 @@ namespace TerminalApp
     runtimeclass BellEventArgs
     {
         Boolean FlashTaskbar { get; };
-        Boolean SendNotification { get; };
-    };
-
-    runtimeclass NotificationEventArgs
-    {
-        String Title { get; };
-        String Body { get; };
     };
 
     interface IPaneContent
@@ -53,7 +46,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TaskbarProgressChanged;
         event Windows.Foundation.TypedEventHandler<IPaneContent, Object> ReadOnlyChanged;
         event Windows.Foundation.TypedEventHandler<IPaneContent, Object> FocusRequested;
-        event Windows.Foundation.TypedEventHandler<IPaneContent, NotificationEventArgs> NotificationRequested;
     };
 
 

src/cascadia/TerminalApp/Pane.cpp

@@ -136,7 +136,7 @@ Pane::BuildStartupState Pane::BuildStartupActions(uint32_t currentId, uint32_t n
         ActionAndArgs actionAndArgs;
         actionAndArgs.Action(ShortcutAction::SplitPane);
         const auto terminalArgs{ newPane->GetTerminalArgsForPane(kind) };
-        // When creating a pane, the split size is the size of the new pane
+        // When creating a pane the split size is the size of the new pane
         // and not position.
         const auto splitDirection = _splitState == SplitState::Horizontal ? SplitDirection::Down : SplitDirection::Right;
         const auto splitSize = (kind != BuildStartupKind::None && _IsLeaf() ? 0.5f : 1.0f - _desiredSplitPosition);
@@ -2264,7 +2264,7 @@ SplitState Pane::_convertAutomaticOrDirectionalSplitState(const SplitDirection&
 //   creates a new Pane to host the control, registers event handlers.
 // Arguments:
 // - splitType: what type of split we should create.
-// - splitSize: the fraction of the pane that the new pane should get
+// - splitSize: what fraction of the pane the new pane should get
 // - newPane: the pane to add as a child
 // Return Value:
 // - The two newly created Panes, with the original pane as the first pane.

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

@@ -499,48 +499,24 @@
     <value>Hinweise von Drittanbietern</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Alle schließen</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Möchten Sie alle Fenster schließen?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Abbrechen</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Alle schließen</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Möchten Sie alle Registerkarten schließen?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Alle schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Möchten Sie diese Registerkarte schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Registerkarte schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Möchten Sie diesen Bereich schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Bereich schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Möchten Sie diese Registerkarten schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Registerkarten schließen</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Möchten Sie diese Bereiche schließen?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Bereiche schließen</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Nicht mehr fragen</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
@@ -696,15 +672,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Dieser Linktyp wird derzeit nicht unterstützt:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Dieser Link kann zu einem unsicheren Speicherort führen. Links können ihren Computer und Ihre Daten beschädigen. Klicken Sie zum Schutz Des Computers nur auf Links aus vertrauenswürdigen Quellen.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Trotzdem öffnen</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
@@ -772,14 +742,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Aktivität auf der Registerkarte „{0}“</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Aktivität auf der Registerkarte „{0}“ (Fenster „{1}“)</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Eine neue Registerkarte im angegebenen Startverzeichnis öffnen</value>
   </data>
@@ -886,11 +848,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Der aktive Bereich wurde auf die Registerkarte „{0}“ verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Registerkarte „{0}“ wurde in das Fenster „{1}“ verschoben</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Registerkarte „{0}“ in neues Fenster verschoben</value>
@@ -902,7 +864,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Der aktive Bereich wurde in das Fenster "{0}" verschoben</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Aktiver Bereich in neues Fenster verschoben</value>
@@ -916,10 +878,10 @@
     <value>Wenn diese Option festgelegt ist, wird der Befehl an den Standardbefehl des Profils angefügt, anstatt ihn zu ersetzen.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Sitzung neu starten</value>
+    <value>Verbindung neu starten</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Sitzung im aktiven Bereich neu starten</value>
+    <value>Verbindung mit aktivem Bereich neu starten</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Schnipsel</value>

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

@@ -496,48 +496,24 @@
     <value>Third-Party notices</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Close all</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Do you want to close all windows?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Close all</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Do you want to close all tabs?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Close all</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Do you want to close this tab?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Close tab</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Do you want to close this pane?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Close pane</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Do you want to close these tabs?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Close tabs</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Do you want to close these panes?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Close panes</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Don't ask me again</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>This link type is currently not supported:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>This link may lead to an unsafe location. Hyperlinks can be harmful to your computer and data. To protect your computer, only click links from trusted sources.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Open anyway</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Settings</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Activity in tab "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Activity in tab "{0}" (window "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Open a new tab in given starting directory</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Active pane moved to "{0}" tab</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}" tab moved to "{1}" window</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}" tab moved to new window</value>
@@ -899,7 +861,7 @@
   </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 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>Active pane moved to new window</value>
@@ -913,10 +875,10 @@
     <value>If set, the command will be appended to the profile's default command instead of replacing it.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Restart session</value>
+    <value>Restart connection</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Restart the session in the active pane</value>
+    <value>Restart the active pane connection</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Snippets</value>

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

@@ -496,48 +496,24 @@
     <value>Avisos de terceros</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Cerrar todo</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>¿Quiere cerrar todas las ventanas?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Cancelar</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cerrar todo</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>¿Quieres cerrar todas las pestañas?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Cerrar todo</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>¿Desea cerrar esta pestaña?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Cerrar pestaña</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>¿Desea cerrar este panel?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Cerrar panel</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>¿Desea cerrar estas pestañas?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Cerrar pestañas</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>¿Desea cerrar estos paneles?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Cerrar paneles</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>No volver a preguntarme</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Este tipo de vínculo no se admite actualmente:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este vínculo puede dar lugar a una ubicación no segura. Los hipervínculos pueden ser perjudiciales para el equipo y los datos. Para proteger el equipo, haga clic solo en vínculos de orígenes de confianza.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir de todas formas</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Configuración</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Actividad en la pestaña "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Actividad en la pestaña "{0}" (ventana "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Abrir una nueva pestaña en un directorio de inicio determinado</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Panel activo movido a la pestaña "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>La pestaña "{0}" se ha movido a la ventana "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>La pestaña "{0}" se ha movido a la nueva ventana</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Panel activo movido a la ventana "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Panel activo movido a nueva ventana</value>
@@ -913,10 +875,10 @@
     <value>Si se establece, el comando se anexará al comando predeterminado del perfil en lugar de reemplazarlo.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Reiniciar sesión</value>
+    <value>Reiniciar conexión</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Reiniciar la sesión en el panel activo</value>
+    <value>Reiniciar la conexión del panel activo</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Fragmentos</value>

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

@@ -496,48 +496,24 @@
     <value>Mentions tierces</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Fermer tout</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Voulez-vous fermer toutes les fenêtres ?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Fermer tout</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Voulez-vous fermer tous les onglets ?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Fermer tout</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Voulez-vous fermer cet onglet ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Fermer l'onglet</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Voulez-vous fermer ce volet ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Fermer le volet</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Voulez-vous fermer ces onglets ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Fermer les onglets</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Voulez-vous fermer ces volets ?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Fermer les panneaux</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Ne plus me le demander</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ce type de lien n’est actuellement pas pris en charge :</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ce lien peut entraîner un emplacement non sécurisé. Les liens hypertexte peuvent endommager votre ordinateur et vos données. Pour protéger votre ordinateur, cliquez uniquement sur des liens provenant de sources fiables.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Ouvrir quand même</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Paramètres</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Activité sous l’onglet « {0} »</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Activité sous l’onglet « {0} » (fenêtre « {1} »)</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Ouvrez un nouvel onglet dans le répertoire correspondant</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Onglet « {0} » déplacé vers la fenêtre « {1} »</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Onglet « {0} » déplacé vers une nouvelle fenêtre</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Volet actif déplacé vers l’onglet « {0} »</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Volet actif déplacé vers une nouvelle fenêtre</value>
@@ -913,10 +875,10 @@
     <value>Si elle est définie, la commande sera ajoutée à la commande par défaut du profil au lieu de la remplacer.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Redémarrer la session</value>
+    <value>Redémarrer la connexion</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Redémarrez la session dans le volet actif</value>
+    <value>Redémarrer la connexion du volet actif</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Extraits</value>

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

@@ -496,48 +496,24 @@
     <value>Comunicazioni di terze parti</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Chiudi tutto</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Vuoi chiudere tutte le finestre?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Annulla</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Chiudi tutto</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Vuoi chiudere tutte le schede?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Chiudi tutto</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Vuoi chiudere questa scheda?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Chiudi scheda</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Vuoi chiudere questo riquadro?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Chiudi riquadro</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Vuoi chiudere queste schede?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Chiudi schede</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Vuoi chiudere questi riquadri?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Chiudi riquadri</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Non chiedermelo più</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Questo tipo di collegamento non è al momento supportato:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Annulla</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Questo collegamento potrebbe causare un percorso non sicuro. I collegamenti ipertestuali possono essere dannosi per il computer e i dati. Per proteggere il computer, fare clic solo su collegamenti da origini attendibili.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Apri comunque</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Impostazioni</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Attività nella scheda "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Attività nella scheda "{0}" (finestra "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Apri una nuova scheda nella directory di avvio specificata</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Riquadro attivo spostato nella scheda "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Scheda "{0}" spostata nella finestra "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Scheda "{0}" spostata in una nuova finestra</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Riquadro attivo spostato nella finestra "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Riquadro attivo spostato in una nuova finestra</value>
@@ -913,10 +875,10 @@
     <value>Se impostato, il comando verrà aggiunto al comando predefinito del profilo invece di sostituirlo.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Riavvia la sessione</value>
+    <value>Riavvia connessione</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Riavvia la sessione nel riquadro attivo</value>
+    <value>Riavvia la connessione al riquadro attivo</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Frammenti</value>

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

@@ -497,48 +497,24 @@
     <value>サード パーティ通知</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>すべて閉じる</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>すべてのウィンドウを閉じますか?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>キャンセル</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>すべて閉じる</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>すべてのタブを閉じますか?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>すべて閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>このタブを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>タブを閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>このウィンドウを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>これらのタブを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>タブを閉じる</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>これらのウィンドウを閉じますか?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>ウィンドウを閉じる</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>今後、このメッセージを表示しない</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
@@ -694,15 +670,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>このリンクの種類は現在サポートされていません:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>キャンセル</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>このリンクは安全でない可能性があります。ハイパーリンクは、コンピューターやデータに問題を起こす可能性があります。コンピューターを保護するには、信頼できるソースからのリンクのみをクリックしてください。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>開く</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>設定</value>
   </data>
@@ -770,14 +740,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>タブ "{0}" のアクティビティ</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>タブ "{0}" のアクティビティ (ウィンドウ "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>指定された開始ディレクトリで新しいタブを開きます</value>
   </data>
@@ -884,11 +846,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>アクティブなペインを [{0}] タブに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>[{0}] タブを "{1}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>[{0}] タブを新しいウィンドウに移動しました</value>
@@ -900,7 +862,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>アクティブなペインを "{0}" ウィンドウに移動しました</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>アクティブなペインを新しいウィンドウに移動しました</value>
@@ -914,10 +876,10 @@
     <value>設定されている場合、コマンドはプロファイルの既定のコマンドを置き換えるのではなく、追加されます。</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>セッションの再開</value>
+    <value>接続の再起動</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>アクティブなウィンドウでセッションを再起動します</value>
+    <value>アクティブ ペイン接続を再起動します</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>抜粋</value>

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

@@ -496,48 +496,24 @@
     <value>타사 통지</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>모두 닫기</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>모든 창을 닫으시겠습니까?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>취소</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>모두 닫기</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>모든 탭을 닫으시겠습니까?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>모두 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>이 탭을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>탭 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>이 창을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>창 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>이러한 탭을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>탭 닫기</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>이 창을 닫으시겠습니까?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>창 닫기</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>다시 묻지 않기</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>이 링크 형식은 현재 지원되지 않습니다.</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>취소</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>이 링크로 인해 안전하지 않은 위치가 발생할 수 있습니다. 하이퍼링크는 컴퓨터와 데이터를 손상시킬 수 있습니다. 컴퓨터를 보호하려면 신뢰할 수 있는 원본의 링크만 클릭하세요.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>열기</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>설정</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>"{0}" 탭의 활동</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>"{0}" 탭의 활동(창 "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>지정된 시작 디렉터리에서 새 탭 열기</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>활성 창이 "{0}" 탭으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" 탭이 "{1}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" 탭이 새 창으로 이동됨</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>활성 창이 "{0}" 창으로 이동됨</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>활성 창이 새 창으로 이동됨</value>
@@ -913,10 +875,10 @@
     <value>설정하면 이 명령은 프로필의 기본 명령 대신 프로필의 기본 명령에 추가됩니다.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>세션 다시 시작</value>
+    <value>연결 다시 시작</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>활성 창에서 세션을 다시 시작하세요.</value>
+    <value>활성 창 연결 다시 시작</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>짧은 요약</value>

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

@@ -496,48 +496,24 @@
     <value>Avisos de Terceiros</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Fechar tudo</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Deseja fechar todas as janelas?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Cancelar</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Fechar tudo</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Deseja fechar todas as guias?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Fechar tudo</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Deseja fechar esta guia?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Fechar guia</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Deseja fechar este painel?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Fechar painel</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Deseja fechar estas guias?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Fechar guias</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Deseja fechar estes painéis?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Fechar painéis</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Não me pergunte novamente</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Não há suporte para este tipo de link no momento:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancelar</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Este link pode levar a um local não seguro. Hiperlinks podem ser prejudiciais ao computador e aos dados. Para proteger o computador, clique somente em links de fontes confiáveis.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Abrir mesmo assim</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Configurações</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Atividade na aba "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Atividade na aba "{0}" (janela "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Abrir uma nova guia no diretório inicial fornecido</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Painel ativo movido para a guia "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Guia "{0}" movida para janela "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Guia "{0}" movida para nova janela</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Painel ativo movido para a janela "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Painel ativo movido para nova janela</value>
@@ -913,10 +875,10 @@
     <value>Se definido, o comando será acrescentado ao comando padrão do perfil em vez de substituí-lo.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Reiniciar sessão</value>
+    <value>Reiniciar conexão</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Reinicie a sessão no painel ativo</value>
+    <value>Reiniciar a conexão do painel ativo</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Trechos</value>

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

@@ -496,47 +496,23 @@
     <value>Ţћĩřð-Ρářŧγ ñοŧīĉęŝ !!! !!!</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>Ĉάйçэļ !</value>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Ċдйĉέł !</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
-    <value>Ďő убυ ẅåήт ţø ¢ľöѕē äľľ ẃιⁿðŏŵş? !!! !!! !!! </value>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>€ļőşε áļľ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>Ċľóѕε ªĺĺ !!!</value>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ďõ γбű ẁāŋţ ťó ςℓσśĕ äℓℓ шîйđбẁś? !!! !!! !!! </value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
-    <value>Ďō γőű шдπŧ ŧò ςłοѕз āĺℓ ţäьš? !!! !!! !!!</value>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Ćăʼnċęℓ !</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Ĉŀõśê āłĺ !!!</value>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ćļõѕέ аłℓ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Đó уøυ ẅāńť тο çŀǿśę ŧĥíš τάъ? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Ċℓοѕē ţαъ !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Đò γθũ ώăńт ťǿ ¢ℓσŝę ŧħîŝ ρаńе? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Ĉŀбśз φдŋё !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Đó ўоú ŵąňτ ŧò çŀσѕė ŧћěśé ţдьş? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Ćŀöśé ŧãвś !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Ðǿ ỳбū ŵáήť ŧо ćļόśě τнέšê φăñєš? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>€łǿśē рāⁿęѕ !!!</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Đòñ'ť ªѕķ мë àĝáîⁿ !!! !!</value>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Đσ ŷőū шдиŧ тò čļòŝз αŀľ ţâвŝ? !!! !!! !!!</value>
   </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Čǻñčėŀ !</value>
@@ -693,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>
@@ -769,14 +739,6 @@
     <value>Ẃϊйδοŵš !!</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Δćţíνïŧý īй τаь "{0}" !!! !!!</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Δсŧìνιŧý įņ ţªь "{0}" (ŵϊņδόώ "{1}") !!! !!! !!! !</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Фφĕń ª пёẅ ţâь ίи ğīνęņ ѕŧāятĩлğ δįŗęćтŏяγ !!! !!! !!! !!! </value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>
@@ -913,10 +875,10 @@
     <value>Ĩƒ šęţ, ŧнĕ ¢ömmдлδ ŵîĺł ьέ åφрєйδĕđ τσ ŧђė рřŏƒїłє'ş đзƒªūľţ ¢οmмăńδ іñѕţέáđ øƒ ѓēρļąċĭлĝ їţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Γēѕŧâяŧ ŝєѕѕïσⁿ !!! !</value>
+    <value>Γēѕŧâяŧ ćǿńńēčťїöл !!! !!</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Γėşťáгţ ŧħ℮ ŝёšŝīőń įй τђ℮ ăċţΐνе φǻñē !!! !!! !!! !!</value>
+    <value>Γėşťáгţ ŧħ℮ ãčтĩνέ ρăйё сǿηńëςтιóņ !!! !!! !!! !</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Šņíрρēťş !!</value>

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

@@ -496,47 +496,23 @@
     <value>Ţћĩřð-Ρářŧγ ñοŧīĉęŝ !!! !!!</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>Ĉάйçэļ !</value>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Ċдйĉέł !</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
-    <value>Ďő убυ ẅåήт ţø ¢ľöѕē äľľ ẃιⁿðŏŵş? !!! !!! !!! </value>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>€ļőşε áļľ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>Ċľóѕε ªĺĺ !!!</value>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ďõ γбű ẁāŋţ ťó ςℓσśĕ äℓℓ шîйđбẁś? !!! !!! !!! </value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
-    <value>Ďō γőű шдπŧ ŧò ςłοѕз āĺℓ ţäьš? !!! !!! !!!</value>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Ćăʼnċęℓ !</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Ĉŀõśê āłĺ !!!</value>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ćļõѕέ аłℓ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Đó уøυ ẅāńť тο çŀǿśę ŧĥíš τάъ? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Ċℓοѕē ţαъ !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Đò γθũ ώăńт ťǿ ¢ℓσŝę ŧħîŝ ρаńе? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Ĉŀбśз φдŋё !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Đó ўоú ŵąňτ ŧò çŀσѕė ŧћěśé ţдьş? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Ćŀöśé ŧãвś !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Ðǿ ỳбū ŵáήť ŧо ćļόśě τнέšê φăñєš? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>€łǿśē рāⁿęѕ !!!</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Đòñ'ť ªѕķ мë àĝáîⁿ !!! !!</value>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Đσ ŷőū шдиŧ тò čļòŝз αŀľ ţâвŝ? !!! !!! !!!</value>
   </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Čǻñčėŀ !</value>
@@ -693,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>
@@ -769,14 +739,6 @@
     <value>Ẃϊйδοŵš !!</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Δćţíνïŧý īй τаь "{0}" !!! !!!</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Δсŧìνιŧý įņ ţªь "{0}" (ŵϊņδόώ "{1}") !!! !!! !!! !</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Фφĕń ª пёẅ ţâь ίи ğīνęņ ѕŧāятĩлğ δįŗęćтŏяγ !!! !!! !!! !!! </value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>
@@ -913,10 +875,10 @@
     <value>Ĩƒ šęţ, ŧнĕ ¢ömmдлδ ŵîĺł ьέ åφрєйδĕđ τσ ŧђė рřŏƒїłє'ş đзƒªūľţ ¢οmмăńδ іñѕţέáđ øƒ ѓēρļąċĭлĝ їţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Γēѕŧâяŧ ŝєѕѕïσⁿ !!! !</value>
+    <value>Γēѕŧâяŧ ćǿńńēčťїöл !!! !!</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Γėşťáгţ ŧħ℮ ŝёšŝīőń įй τђ℮ ăċţΐνе φǻñē !!! !!! !!! !!</value>
+    <value>Γėşťáгţ ŧħ℮ ãčтĩνέ ρăйё сǿηńëςтιóņ !!! !!! !!! !</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Šņíрρēťş !!</value>

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

@@ -496,47 +496,23 @@
     <value>Ţћĩřð-Ρářŧγ ñοŧīĉęŝ !!! !!!</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
-    <value>Ĉάйçэļ !</value>
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
+    <value>Ċдйĉέł !</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
-    <value>Ďő убυ ẅåήт ţø ¢ľöѕē äľľ ẃιⁿðŏŵş? !!! !!! !!! </value>
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>€ļőşε áļľ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
-    <value>Ċľóѕε ªĺĺ !!!</value>
+  <data name="QuitDialog.Title" xml:space="preserve">
+    <value>Ďõ γбű ẁāŋţ ťó ςℓσśĕ äℓℓ шîйđбẁś? !!! !!! !!! </value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
-    <value>Ďō γőű шдπŧ ŧò ςłοѕз āĺℓ ţäьš? !!! !!! !!!</value>
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Ćăʼnċęℓ !</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Ĉŀõśê āłĺ !!!</value>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Ćļõѕέ аłℓ !!!</value>
   </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Đó уøυ ẅāńť тο çŀǿśę ŧĥíš τάъ? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Ċℓοѕē ţαъ !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Đò γθũ ώăńт ťǿ ¢ℓσŝę ŧħîŝ ρаńе? !!! !!! !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Ĉŀбśз φдŋё !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Đó ўоú ŵąňτ ŧò çŀσѕė ŧћěśé ţдьş? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Ćŀöśé ŧãвś !!!</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Ðǿ ỳбū ŵáήť ŧо ćļόśě τнέšê φăñєš? !!! !!! !!! </value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>€łǿśē рāⁿęѕ !!!</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Đòñ'ť ªѕķ мë àĝáîⁿ !!! !!</value>
+  <data name="CloseAllDialog.Title" xml:space="preserve">
+    <value>Đσ ŷőū шдиŧ тò čļòŝз αŀľ ţâвŝ? !!! !!! !!!</value>
   </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Čǻñčėŀ !</value>
@@ -693,14 +669,8 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Ťђïś łϊηќ ŧурē ιş çũґѓзⁿτľÿ ñστ şΰρρоŕŧĕđ: !!! !!! !!! !!! </value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
-    <value>Çдπсёľ !</value>
-  </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Ŧђīś ℓîŋќ мαў ľêãδ τб áń úʼnšàƒé ℓоćάŧίоñ. Ĥўрзŗℓĭŋķѕ çâⁿ ъέ ђąřмƒúļ τό ўôця ċómφύŧèґ аňδ ðáťǻ. Ţб ρгøťėçŧ ўòύг ςömφùţĕŕ, ŏŋľỳ čℓΐςķ łίŋκѕ ƒřöм ťŗμѕŧєđ śόυяčêś. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Őρέй ǻпŷŵãγ !!!</value>
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Сąñс℮ł !</value>
   </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Śëţťĩпğś !!</value>
@@ -769,14 +739,6 @@
     <value>Ẃϊйδοŵš !!</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Δćţíνïŧý īй τаь "{0}" !!! !!!</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Δсŧìνιŧý įņ ţªь "{0}" (ŵϊņδόώ "{1}") !!! !!! !!! !</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Фφĕń ª пёẅ ţâь ίи ğīνęņ ѕŧāятĩлğ δįŗęćтŏяγ !!! !!! !!! !!! </value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>∆çťíνĕ рåⁿэ мôνеð ťб "{0}" ţав !!! !!! !!!</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>"{0}" ťāъ мōνęđ τŏ "{1}" шΐπδŏẅ !!! !!! !!!</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>"{0}" тąь mǿνєđ ŧσ ήèώ ẅĩŋďøẃ !!! !!! !!!</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Λςťìνє рáиė mόνéð ťб "{0}" ŵîńđθω !!! !!! !!! </value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Αĉťįνέ ρªņз mσνёđ τǿ ήёẃ ẃîпďǿω !!! !!! !!!</value>
@@ -913,10 +875,10 @@
     <value>Ĩƒ šęţ, ŧнĕ ¢ömmдлδ ŵîĺł ьέ åφрєйδĕđ τσ ŧђė рřŏƒїłє'ş đзƒªūľţ ¢οmмăńδ іñѕţέáđ øƒ ѓēρļąċĭлĝ їţ. !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Γēѕŧâяŧ ŝєѕѕïσⁿ !!! !</value>
+    <value>Γēѕŧâяŧ ćǿńńēčťїöл !!! !!</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Γėşťáгţ ŧħ℮ ŝёšŝīőń įй τђ℮ ăċţΐνе φǻñē !!! !!! !!! !!</value>
+    <value>Γėşťáгţ ŧħ℮ ãčтĩνέ ρăйё сǿηńëςтιóņ !!! !!! !!! !</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Šņíрρēťş !!</value>

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

@@ -496,48 +496,24 @@
     <value>Уведомления третьих лиц</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Закрыть все</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>Закрыть все окна?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>Отмена</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>Закрыть все</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>Закрыть все вкладки?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>Закрыть все</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>Закрыть эту вкладку?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>Закрыть вкладку</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>Закрыть эту панель?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>Закрыть область</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>Закрыть эти вкладки?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>Закрыть вкладки</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>Закрыть эти панели?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>Закрыть панели</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>Больше не спрашивать</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>Этот тип связи в настоящее время не поддерживается:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>Эта ссылка может привести к небезопасному расположению. Гиперссылки могут нанести вред компьютеру и данным. Чтобы защитить компьютер, щелкните ссылки только из надежных источников.</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>Все равно открыть</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>Параметры</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>Активность на вкладке "{0}"</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>Активность на вкладке "{0}" (окно "{1}")</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>Открыть новую вкладку в указанном начальном каталоге</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>Активная область перемещена на вкладку "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>Вкладка "{0}" перемещена в окно "{1}"</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Вкладка "{0}" перемещена в новое окно</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Активная область перемещена в окно "{0}"</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Активная область перемещена в новое окно</value>
@@ -913,10 +875,10 @@
     <value>Если этот параметр настроен, команда будет добавлена к стандартной команде профиля, а не заменит ее.</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>Перезапустить сеанс</value>
+    <value>Перезапустить подключение</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Перезапустите сеанс в активной панели</value>
+    <value>Перезапустить соединение с активной панелью.</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>Фрагменты</value>

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

@@ -496,48 +496,24 @@
     <value>第三方通知</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>全部关闭</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>是否要关闭所有窗口?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>全部关闭</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>是否要关闭所有标签页?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>全部关闭</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>是否要关闭此选项卡?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>关闭选项卡</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>是否要关闭此窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>关闭窗格</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>是否要关闭这些选项卡?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>关闭选项卡</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>是否要关闭这些窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>关闭窗格</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>不再询问</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>当前不支持此链接类型：</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此链接可能会导致不安全的位置。超链接可能对你的计算机和数据有害。若要保护你的计算机，请仅单击来自受信任源的链接。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>仍然打开</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>设置</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>选项卡“{0}”中的活动</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>选项卡“{0}”(窗口“{1}”)中的活动</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>在给定的起始目录中打开新选项卡</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>“{0}”选项卡已移动到“{1}”窗口</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>“{0}”选项卡已移动到新窗口</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>活动窗格已移动到“{0}”选项卡</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>活动窗格已移动到新窗口</value>
@@ -913,10 +875,10 @@
     <value>如果设置，该命令将追加到配置文件的默认命令，而不是替换它。</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>重启会话</value>
+    <value>重新启动连接</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>重启活动窗格中的会话</value>
+    <value>重新启动活动窗格连接</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>片段</value>

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

@@ -496,48 +496,24 @@
     <value>第三方注意事項</value>
     <comment>A hyperlink name for the Terminal's third-party notices</comment>
   </data>
-  <data name="ConfirmCloseDialog_Cancel" xml:space="preserve">
+  <data name="QuitDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllTitle" xml:space="preserve">
+  <data name="QuitDialog.PrimaryButtonText" xml:space="preserve">
+    <value>全部關閉</value>
+  </data>
+  <data name="QuitDialog.Title" xml:space="preserve">
     <value>您要關閉所有視窗嗎?</value>
   </data>
-  <data name="ConfirmCloseDialog_CloseAllPrimary" xml:space="preserve">
+  <data name="CloseAllDialog.CloseButtonText" xml:space="preserve">
+    <value>取消</value>
+  </data>
+  <data name="CloseAllDialog.PrimaryButtonText" xml:space="preserve">
     <value>全部關閉</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowTitle" xml:space="preserve">
+  <data name="CloseAllDialog.Title" xml:space="preserve">
     <value>您要關閉所有索引標籤嗎?</value>
   </data>
-  <data name="ConfirmCloseDialog_WindowPrimary" xml:space="preserve">
-    <value>全部關閉</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabTitle" xml:space="preserve">
-    <value>是否要關閉此索引標籤?</value>
-  </data>
-  <data name="ConfirmCloseDialog_TabPrimary" xml:space="preserve">
-    <value>關閉索引標籤</value>
-  </data>
-  <data name="ConfirmCloseDialog_PaneTitle" xml:space="preserve">
-    <value>是否要關閉此窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_PanePrimary" xml:space="preserve">
-    <value>關閉窗格</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsTitle" xml:space="preserve">
-    <value>是否要關閉這些索引標籤?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultipleTabsPrimary" xml:space="preserve">
-    <value>關閉索引標籤</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesTitle" xml:space="preserve">
-    <value>是否要關閉這些窗格?</value>
-  </data>
-  <data name="ConfirmCloseDialog_MultiplePanesPrimary" xml:space="preserve">
-    <value>關閉窗格</value>
-  </data>
-  <data name="DontAskAgainCheckBox.Content" xml:space="preserve">
-    <value>不要再問我</value>
-  </data>
   <data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
@@ -693,15 +669,9 @@
   <data name="UnsupportedSchemeText" xml:space="preserve">
     <value>目前不支援此連結類型:</value>
   </data>
-  <data name="UriErrorDialog.CloseButtonText" xml:space="preserve">
+  <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>取消</value>
   </data>
-  <data name="UnsafeUrlConfirmText" xml:space="preserve">
-    <value>此連結可能通往不安全地點。超連結可能對你的電腦和資料造成傷害。為了保護你的電腦，只點擊來自可信來源的連結。</value>
-  </data>
-  <data name="UnsafeUrlConfirmAllowAction" xml:space="preserve">
-    <value>一律開啟</value>
-  </data>
   <data name="SettingsTab" xml:space="preserve">
     <value>設定</value>
   </data>
@@ -769,14 +739,6 @@
     <value>Windows</value>
     <comment>This is displayed as a label for the context menu item that holds the submenu of available windows.</comment>
   </data>
-  <data name="NotificationMessage_TabActivity" xml:space="preserve">
-    <value>索引標籤「{0}」中的活動</value>
-    <comment>{0} is the tab title. Shown as the body of a desktop notification when tab activity is detected.</comment>
-  </data>
-  <data name="NotificationMessage_TabActivityInWindow" xml:space="preserve">
-    <value>索引標籤「{0}」(視窗「{1}」) 中的活動</value>
-    <comment>{0} is the tab title, {1} is the window name. Shown as the body of a desktop notification when tab activity is detected and the window has a name.</comment>
-  </data>
   <data name="DropPathTabRun.Text" xml:space="preserve">
     <value>開啟指定起始目錄中的新索引標籤</value>
   </data>
@@ -883,11 +845,11 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
     <value>活動窗格已移動至「{0}」索引標籤</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_Default" xml:space="preserve">
     <value>「{0}」索引標籤已移至「{1}」視窗</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window to which the tab was moved.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the name of the window the tab was moved to.</comment>
   </data>
   <data name="TerminalPage_TabMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>「{0}」索引標籤已移至新視窗</value>
@@ -899,7 +861,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>活動窗格已移動至「{0}」視窗</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window to which the pane was moved.</comment>
+    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>活動窗格已移至新視窗</value>
@@ -913,10 +875,10 @@
     <value>如果設定，命令會附加到設定檔的預設命令，而不是取代命令。</value>
   </data>
   <data name="RestartConnectionText" xml:space="preserve">
-    <value>重新啟動工作模式</value>
+    <value>重新啟動連線</value>
   </data>
   <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>在使用中窗格重新啟動工作階段</value>
+    <value>重新啟動使用中的窗格連線</value>
   </data>
   <data name="SnippetPaneTitle.Text" xml:space="preserve">
     <value>片斷</value>

src/cascadia/TerminalApp/SuggestionsControl.cpp

@@ -686,8 +686,8 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Helper method to retrieve the action from the user selected command,
-    //   and dispatch that command. Also fires a tracelogging event
+    // - Helper method for retrieving the action from a command the user
+    //   selected, and dispatching that command. Also fires a tracelogging event
     //   indicating that the user successfully found the action they were
     //   looking for.
     // Arguments:

src/cascadia/TerminalApp/Tab.cpp

@@ -35,6 +35,7 @@ namespace winrt::TerminalApp::implementation
         _activePane = nullptr;
 
         _closePaneMenuItem.Visibility(WUX::Visibility::Collapsed);
+        _restartConnectionMenuItem.Visibility(WUX::Visibility::Collapsed);
 
         auto firstId = _nextPaneId;
 
@@ -85,7 +86,6 @@ namespace winrt::TerminalApp::implementation
 
         _MakeTabViewItem();
         _CreateContextMenu();
-        _UpdateMenuItemStates();
 
         _headerControl.TabStatus(_tabStatus);
 
@@ -654,7 +654,7 @@ namespace winrt::TerminalApp::implementation
 
         _activePane = original;
 
-        // Add event handlers to the new panes' GotFocus event. When the pane
+        // Add a event handlers to the new panes' GotFocus event. When the pane
         // gains focus, we'll mark it as the new active pane.
         _AttachEventHandlersToPane(original);
 
@@ -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:
@@ -1148,14 +1148,6 @@ namespace winrt::TerminalApp::implementation
                         tab->TabRaiseVisualBell.raise();
                     }
 
-                    // Send a desktop toast notification if requested, but only if
-                    // the pane isn't already in the belled state. This prevents
-                    // sending repeated toasts for repeated BEL characters.
-                    if (bellArgs.SendNotification() && !tab->_tabStatus.BellIndicator())
-                    {
-                        tab->TabToastNotificationRequested.raise(tab->Title(), L"", sender);
-                    }
-
                     // Show the bell indicator in the tab header
                     tab->ShowBellIndicator(true);
 
@@ -1174,18 +1166,6 @@ namespace winrt::TerminalApp::implementation
             events.RestartTerminalRequested = terminal.RestartTerminalRequested(winrt::auto_revoke, { get_weak(), &Tab::_bubbleRestartTerminalRequested });
         }
 
-        events.NotificationRequested = content.NotificationRequested(
-            winrt::auto_revoke,
-            [dispatcher, weakThis](TerminalApp::IPaneContent sender, auto notifArgs) -> safe_void_coroutine {
-                const auto weakThisCopy = weakThis;
-                co_await wil::resume_foreground(dispatcher);
-                if (const auto tab{ weakThisCopy.get() })
-                {
-                    const auto title = notifArgs.Title().empty() ? tab->Title() : notifArgs.Title();
-                    tab->TabToastNotificationRequested.raise(title, notifArgs.Body(), sender);
-                }
-            });
-
         if (_tabStatus.IsInputBroadcastActive())
         {
             if (const auto& termContent{ content.try_as<TerminalApp::TerminalPaneContent>() })
@@ -1274,7 +1254,7 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Set an indicator on the tab if any pane is in a closed connection state.
-    // - Show/hide the Restart Session context menu entry depending on active pane's state.
+    // - Show/hide the Restart Connection context menu entry depending on active pane's state.
     // Arguments:
     // - <none>
     // Return Value:
@@ -1291,6 +1271,13 @@ namespace winrt::TerminalApp::implementation
 
             _tabStatus.IsConnectionClosed(isClosed);
         }
+
+        if (_activePane)
+        {
+            _restartConnectionMenuItem.Visibility(_activePane->IsConnectionClosed() ?
+                                                      WUX::Visibility::Visible :
+                                                      WUX::Visibility::Collapsed);
+        }
     }
 
     void Tab::_RestartActivePaneConnection()
@@ -1361,22 +1348,6 @@ namespace winrt::TerminalApp::implementation
                 }
             });
         }
-
-        _UpdateMenuItemStates();
-    }
-
-    void Tab::_UpdateMenuItemStates()
-    {
-        // Terminal-specific menu items
-        const auto content = _activePane ? _activePane->GetContent() : nullptr;
-        const auto isTerm = content && content.try_as<winrt::TerminalApp::TerminalPaneContent>() != nullptr;
-        _duplicateTabMenuItem.IsEnabled(isTerm);
-        _exportTabMenuItem.IsEnabled(isTerm);
-        _findMenuItem.IsEnabled(isTerm);
-        _restartConnectionMenuItem.IsEnabled(isTerm);
-
-        // Snippets Pane can technically be split
-        _splitTabMenuItem.IsEnabled(isTerm || (content && content.try_as<winrt::TerminalApp::SnippetsPaneContent>() != nullptr));
     }
 
     // Method Description:
@@ -1681,100 +1652,106 @@ namespace winrt::TerminalApp::implementation
             Automation::AutomationProperties::SetHelpText(renameTabMenuItem, renameTabToolTip);
         }
 
+        Controls::MenuFlyoutItem duplicateTabMenuItem;
         {
             // "Duplicate tab"
             Controls::FontIcon duplicateTabSymbol;
             duplicateTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             duplicateTabSymbol.Glyph(L"\xF5ED");
 
-            _duplicateTabMenuItem.Click({ get_weak(), &Tab::_duplicateTabClicked });
-            _duplicateTabMenuItem.Text(RS_(L"DuplicateTabText"));
-            _duplicateTabMenuItem.Icon(duplicateTabSymbol);
+            duplicateTabMenuItem.Click({ get_weak(), &Tab::_duplicateTabClicked });
+            duplicateTabMenuItem.Text(RS_(L"DuplicateTabText"));
+            duplicateTabMenuItem.Icon(duplicateTabSymbol);
 
             const auto duplicateTabToolTip = RS_(L"DuplicateTabToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_duplicateTabMenuItem, box_value(duplicateTabToolTip));
-            Automation::AutomationProperties::SetHelpText(_duplicateTabMenuItem, duplicateTabToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(duplicateTabMenuItem, box_value(duplicateTabToolTip));
+            Automation::AutomationProperties::SetHelpText(duplicateTabMenuItem, duplicateTabToolTip);
         }
 
+        Controls::MenuFlyoutItem splitTabMenuItem;
         {
             // "Split tab"
             Controls::FontIcon splitTabSymbol;
             splitTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             splitTabSymbol.Glyph(L"\xF246"); // ViewDashboard
 
-            _splitTabMenuItem.Click({ get_weak(), &Tab::_splitTabClicked });
-            _splitTabMenuItem.Text(RS_(L"SplitTabText"));
-            _splitTabMenuItem.Icon(splitTabSymbol);
+            splitTabMenuItem.Click({ get_weak(), &Tab::_splitTabClicked });
+            splitTabMenuItem.Text(RS_(L"SplitTabText"));
+            splitTabMenuItem.Icon(splitTabSymbol);
 
             const auto splitTabToolTip = RS_(L"SplitTabToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_splitTabMenuItem, box_value(splitTabToolTip));
-            Automation::AutomationProperties::SetHelpText(_splitTabMenuItem, splitTabToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(splitTabMenuItem, box_value(splitTabToolTip));
+            Automation::AutomationProperties::SetHelpText(splitTabMenuItem, splitTabToolTip);
         }
 
+        Controls::MenuFlyoutItem closePaneMenuItem = _closePaneMenuItem;
         {
             // "Close pane"
-            _closePaneMenuItem.Click({ get_weak(), &Tab::_closePaneClicked });
-            _closePaneMenuItem.Text(RS_(L"ClosePaneText"));
+            closePaneMenuItem.Click({ get_weak(), &Tab::_closePaneClicked });
+            closePaneMenuItem.Text(RS_(L"ClosePaneText"));
 
             const auto closePaneToolTip = RS_(L"ClosePaneToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_closePaneMenuItem, box_value(closePaneToolTip));
-            Automation::AutomationProperties::SetHelpText(_closePaneMenuItem, closePaneToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(closePaneMenuItem, box_value(closePaneToolTip));
+            Automation::AutomationProperties::SetHelpText(closePaneMenuItem, closePaneToolTip);
         }
 
+        Controls::MenuFlyoutItem exportTabMenuItem;
         {
             // "Export tab"
             Controls::FontIcon exportTabSymbol;
             exportTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             exportTabSymbol.Glyph(L"\xE74E"); // Save
 
-            _exportTabMenuItem.Click({ get_weak(), &Tab::_exportTextClicked });
-            _exportTabMenuItem.Text(RS_(L"ExportTabText"));
-            _exportTabMenuItem.Icon(exportTabSymbol);
+            exportTabMenuItem.Click({ get_weak(), &Tab::_exportTextClicked });
+            exportTabMenuItem.Text(RS_(L"ExportTabText"));
+            exportTabMenuItem.Icon(exportTabSymbol);
 
             const auto exportTabToolTip = RS_(L"ExportTabToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_exportTabMenuItem, box_value(exportTabToolTip));
-            Automation::AutomationProperties::SetHelpText(_exportTabMenuItem, exportTabToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(exportTabMenuItem, box_value(exportTabToolTip));
+            Automation::AutomationProperties::SetHelpText(exportTabMenuItem, exportTabToolTip);
         }
 
+        Controls::MenuFlyoutItem findMenuItem;
         {
             // "Find"
             Controls::FontIcon findSymbol;
             findSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             findSymbol.Glyph(L"\xF78B"); // SearchMedium
 
-            _findMenuItem.Click({ get_weak(), &Tab::_findClicked });
-            _findMenuItem.Text(RS_(L"FindText"));
-            _findMenuItem.Icon(findSymbol);
+            findMenuItem.Click({ get_weak(), &Tab::_findClicked });
+            findMenuItem.Text(RS_(L"FindText"));
+            findMenuItem.Icon(findSymbol);
 
             const auto findToolTip = RS_(L"FindToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_findMenuItem, box_value(findToolTip));
-            Automation::AutomationProperties::SetHelpText(_findMenuItem, findToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(findMenuItem, box_value(findToolTip));
+            Automation::AutomationProperties::SetHelpText(findMenuItem, findToolTip);
         }
 
+        Controls::MenuFlyoutItem restartConnectionMenuItem = _restartConnectionMenuItem;
         {
-            // "Restart session"
+            // "Restart connection"
             Controls::FontIcon restartConnectionSymbol;
             restartConnectionSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
             restartConnectionSymbol.Glyph(L"\xE72C");
 
-            _restartConnectionMenuItem.Click([weakThis](auto&&, auto&&) {
+            restartConnectionMenuItem.Click([weakThis](auto&&, auto&&) {
                 if (auto tab{ weakThis.get() })
                 {
                     tab->_RestartActivePaneConnection();
                 }
             });
-            _restartConnectionMenuItem.Text(RS_(L"RestartConnectionText"));
-            _restartConnectionMenuItem.Icon(restartConnectionSymbol);
+            restartConnectionMenuItem.Text(RS_(L"RestartConnectionText"));
+            restartConnectionMenuItem.Icon(restartConnectionSymbol);
 
             const auto restartConnectionToolTip = RS_(L"RestartConnectionToolTip");
 
-            WUX::Controls::ToolTipService::SetToolTip(_restartConnectionMenuItem, box_value(restartConnectionToolTip));
-            Automation::AutomationProperties::SetHelpText(_restartConnectionMenuItem, restartConnectionToolTip);
+            WUX::Controls::ToolTipService::SetToolTip(restartConnectionMenuItem, box_value(restartConnectionToolTip));
+            Automation::AutomationProperties::SetHelpText(restartConnectionMenuItem, restartConnectionToolTip);
         }
 
         // Build the menu
@@ -1782,16 +1759,16 @@ namespace winrt::TerminalApp::implementation
         Controls::MenuFlyoutSeparator menuSeparator;
         contextMenuFlyout.Items().Append(chooseColorMenuItem);
         contextMenuFlyout.Items().Append(renameTabMenuItem);
-        contextMenuFlyout.Items().Append(_duplicateTabMenuItem);
-        contextMenuFlyout.Items().Append(_splitTabMenuItem);
+        contextMenuFlyout.Items().Append(duplicateTabMenuItem);
+        contextMenuFlyout.Items().Append(splitTabMenuItem);
         _AppendMoveMenuItems(contextMenuFlyout);
-        contextMenuFlyout.Items().Append(_exportTabMenuItem);
-        contextMenuFlyout.Items().Append(_findMenuItem);
-        contextMenuFlyout.Items().Append(_restartConnectionMenuItem);
+        contextMenuFlyout.Items().Append(exportTabMenuItem);
+        contextMenuFlyout.Items().Append(findMenuItem);
+        contextMenuFlyout.Items().Append(restartConnectionMenuItem);
         contextMenuFlyout.Items().Append(menuSeparator);
 
         auto closeSubMenu = _AppendCloseMenuItems(contextMenuFlyout);
-        closeSubMenu.Items().Append(_closePaneMenuItem);
+        closeSubMenu.Items().Append(closePaneMenuItem);
 
         // GH#5750 - When the context menu is dismissed with ESC, toss the focus
         // back to our control.
@@ -2121,7 +2098,7 @@ namespace winrt::TerminalApp::implementation
     // Method Description:
     // - Calculates if the tab is read-only.
     // The tab is considered read-only if one of the panes is read-only.
-    // If, after the calculation, the tab is read-only we hide the close button on the tab view item
+    // If after the calculation the tab is read-only we hide the close button on the tab view item
     void Tab::_RecalculateAndApplyReadOnly()
     {
         const auto control = GetActiveTerminalControl();
@@ -2148,7 +2125,7 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Creates a text for the title run in the tool tip by returning tab title
-    // or <profile name>: <tab title> if the profile name differs from the title
+    // or <profile name>: <tab title> in the case the profile name differs from the title
     // Arguments:
     // - <none>
     // Return Value:
@@ -2376,7 +2353,7 @@ namespace winrt::TerminalApp::implementation
         auto deselectedTabColor = color.with_alpha(77); // 255 * .3 = 77
 
         // If we DON'T have a color set from the color picker, or the profile's
-        // tabColor, but if we have an unfocused color in the theme, use the
+        // tabColor, but we do have a unfocused color in the theme, use the
         // unfocused theme color here instead.
         if (!GetTabColor().has_value() &&
             _unfocusedThemeColor != nullptr)

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);
@@ -121,7 +121,6 @@ namespace winrt::TerminalApp::implementation
 
         til::typed_event<TerminalApp::Tab, IInspectable> ActivePaneChanged;
         til::event<winrt::delegate<>> TabRaiseVisualBell;
-        til::event<winrt::delegate<winrt::hstring /*title*/, winrt::hstring /*body*/, winrt::TerminalApp::IPaneContent /*content*/>> TabToastNotificationRequested;
         til::typed_event<IInspectable, IInspectable> TaskbarProgressChanged;
 
         // The TabViewIndex is the index this Tab object resides in TerminalPage's _tabs vector.
@@ -141,17 +140,11 @@ namespace winrt::TerminalApp::implementation
         static constexpr double HeaderRenameBoxWidthTitleLength{ std::numeric_limits<double>::infinity() };
 
         winrt::Windows::UI::Xaml::FocusState _focusState{ winrt::Windows::UI::Xaml::FocusState::Unfocused };
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _duplicateTabMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _splitTabMenuItem{};
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
+        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveToNewWindowMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveRightMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveLeftMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _exportTabMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _findMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _restartConnectionMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closePaneMenuItem{};
         winrt::TerminalApp::ShortcutActionDispatch _dispatch;
         Microsoft::Terminal::Settings::Model::IActionMapView _actionMap{ nullptr };
         winrt::hstring _keyChord{};
@@ -166,6 +159,9 @@ namespace winrt::TerminalApp::implementation
         std::shared_ptr<Pane> _activePane{ nullptr };
         std::shared_ptr<Pane> _zoomedPane{ nullptr };
 
+        Windows::UI::Xaml::Controls::MenuFlyoutItem _closePaneMenuItem;
+        Windows::UI::Xaml::Controls::MenuFlyoutItem _restartConnectionMenuItem;
+
         winrt::Microsoft::Terminal::Settings::Model::IconStyle _lastIconStyle;
         winrt::hstring _lastIconPath{};
         std::optional<winrt::Windows::UI::Color> _runtimeTabColor{};
@@ -186,7 +182,6 @@ namespace winrt::TerminalApp::implementation
             winrt::TerminalApp::IPaneContent::ConnectionStateChanged_revoker ConnectionStateChanged;
             winrt::TerminalApp::IPaneContent::ReadOnlyChanged_revoker ReadOnlyChanged;
             winrt::TerminalApp::IPaneContent::FocusRequested_revoker FocusRequested;
-            winrt::TerminalApp::IPaneContent::NotificationRequested_revoker NotificationRequested;
 
             // These events literally only apply if the content is a TermControl.
             winrt::Microsoft::Terminal::Control::TermControl::KeySent_revoker KeySent;
@@ -225,7 +220,6 @@ namespace winrt::TerminalApp::implementation
         void _AttachEventHandlersToPane(std::shared_ptr<Pane> pane);
 
         void _UpdateActivePane(std::shared_ptr<Pane> pane);
-        void _UpdateMenuItemStates();
 
         winrt::hstring _GetActiveTitle() const;
 
@@ -236,6 +230,8 @@ namespace winrt::TerminalApp::implementation
         void _UpdateConnectionClosedState();
         void _RestartActivePaneConnection();
 
+        void _DuplicateTab();
+
         winrt::Windows::UI::Xaml::Media::Brush _BackgroundBrush();
 
         void _MakeTabViewItem();

src/cascadia/TerminalApp/TabManagement.cpp

@@ -17,7 +17,6 @@
 
 #include "TabRowControl.h"
 #include "DebugTapConnection.h"
-#include "DesktopNotification.h"
 #include "..\TerminalSettingsModel\FileUtils.h"
 #include "../TerminalSettingsAppAdapterLib/TerminalSettings.h"
 
@@ -151,18 +150,6 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        // When a tab requests a desktop toast notification, send the toast
-        // and handle activation by summoning this window and switching to the tab.
-        newTabImpl->TabToastNotificationRequested([weakThis{ get_weak() }, weakTab{ newTabImpl->get_weak() }](const winrt::hstring& title, const winrt::hstring& body, const winrt::TerminalApp::IPaneContent& content) {
-            if (const auto page{ weakThis.get() })
-            {
-                if (const auto tab{ weakTab.get() })
-                {
-                    page->_SendDesktopNotification(title, body, tab, content);
-                }
-            }
-        });
-
         auto tabViewItem = newTabImpl->TabViewItem();
         _tabView.TabItems().InsertAt(insertPosition, tabViewItem);
 
@@ -407,9 +394,7 @@ namespace winrt::TerminalApp::implementation
     // - Removes the tab (both TerminalControl and XAML) after prompting for approval
     // Arguments:
     // - tab: the tab to remove
-    // - skipConfirmClose: if true, skip the confirmOnClose check. Used when
-    //   an aggregate confirmation has already been shown (i.e. close other tabs)
-    winrt::Windows::Foundation::IAsyncAction TerminalPage::_HandleCloseTabRequested(winrt::TerminalApp::Tab tab, bool skipConfirmClose)
+    winrt::Windows::Foundation::IAsyncAction TerminalPage::_HandleCloseTabRequested(winrt::TerminalApp::Tab tab)
     {
         winrt::com_ptr<TerminalPage> strong;
 
@@ -428,24 +413,6 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        // Skip the per-tab confirmOnClose check when the caller has already
-        // shown an aggregate confirmation dialog (e.g. _RemoveTabs).
-        if (!skipConfirmClose)
-        {
-            const auto tabImpl = _GetTabImpl(tab);
-            if (tabImpl && _ShouldWarnOnCloseTab(tabImpl))
-            {
-                const auto weak = get_weak();
-
-                auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::Tab);
-                strong = weak.get();
-                if (!strong || warningResult != ContentDialogResult::Primary)
-                {
-                    co_return;
-                }
-            }
-        }
-
         auto t = winrt::get_self<implementation::Tab>(tab);
         auto actions = t->BuildStartupActions(BuildStartupKind::None);
         _AddPreviouslyClosedPaneOrTab(std::move(actions));
@@ -815,26 +782,6 @@ namespace winrt::TerminalApp::implementation
             if (const auto pane{ activeTab->GetActivePane() })
             {
                 const auto weak = get_weak();
-
-                // Check if we should warn before closing a single pane
-                // (only triggers on Always — Automatic doesn't warn for single pane)
-                const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-                if (setting == ConfirmOnClose::Always)
-                {
-                    // If this is the last pane, closing it closes the tab,
-                    // so use the tab dialog text instead.
-                    const auto kind = activeTab->GetLeafPaneCount() == 1 ? ConfirmCloseDialogKind::Tab : ConfirmCloseDialogKind::Pane;
-                    auto warningResult = co_await _ShowConfirmCloseDialog(kind);
-
-                    // Hold a strong reference to `this` for the rest of the
-                    // method; we may be the last holder after `co_await`.
-                    auto strong = weak.get();
-                    if (!strong || warningResult != ContentDialogResult::Primary)
-                    {
-                        co_return;
-                    }
-                }
-
                 if (co_await _PaneConfirmCloseReadOnly(pane))
                 {
                     if (const auto strong = weak.get())
@@ -848,37 +795,10 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Close all panes with the given IDs sequentially.
-    // - Shows a single aggregate confirmation dialog upfront if the confirmOnClose setting warrants it.
     // Arguments:
-    // - weakTab: weak reference to the tab that the panes belong to.
+    // - weakTab: weak reference to the tab that the pane belongs to.
     // - paneIds: collection of the IDs of the panes that are marked for removal.
-    safe_void_coroutine TerminalPage::_ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds)
-    {
-        // Show a single aggregate confirmation for closing multiple panes.
-        if (_settings.GlobalSettings().ConfirmOnClose() != ConfirmOnClose::Never)
-        {
-            const auto weak = get_weak();
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::MultiplePanes);
-
-            // Hold a strong reference to `this` after the co_await; we may
-            // be the last holder if the page was being torn down.
-            auto strong = weak.get();
-            if (!strong || warningResult != ContentDialogResult::Primary)
-            {
-                co_return;
-            }
-        }
-        _CloseRemainingPanes(weakTab, std::move(paneIds));
-    }
-
-    // Method Description:
-    // - Recursively closes panes by ID, chaining each close via the
-    //   ClosedByParent callback. Called after confirmation has already
-    //   been handled by _ClosePanes.
-    // Arguments:
-    // - weakTab: weak reference to the tab that the panes belong to
-    // - paneIds: remaining pane IDs to close
-    void TerminalPage::_CloseRemainingPanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds)
+    void TerminalPage::_ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds)
     {
         if (auto strongTab{ weakTab.get() })
         {
@@ -893,9 +813,10 @@ namespace winrt::TerminalApp::implementation
                     pane->ClosedByParent([ids{ std::move(paneIds) }, weakThis{ get_weak() }, weakTab]() {
                         if (auto strongThis{ weakThis.get() })
                         {
-                            strongThis->_CloseRemainingPanes(weakTab, std::move(ids));
+                            strongThis->_ClosePanes(weakTab, std::move(ids));
                         }
                     });
+
                     // Close the pane which will eventually trigger the closed by parent event
                     _HandleClosePaneRequested(pane);
                     break;
@@ -920,37 +841,18 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Closes provided tabs one by one
-    // - Shows a single aggregate confirmation dialog upfront if the confirmOnClose setting warrants it.
     // Arguments:
     // - tabs - tabs to remove
     safe_void_coroutine TerminalPage::_RemoveTabs(const std::vector<winrt::TerminalApp::Tab> tabs)
     {
-        if (tabs.empty())
-        {
-            co_return;
-        }
-
-        // Show a single aggregate confirmation instead of per-tab dialogs.
         const auto weak = get_weak();
-        if (_settings.GlobalSettings().ConfirmOnClose() != ConfirmOnClose::Never)
-        {
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::MultipleTabs);
-
-            // Hold a strong reference to `this` after the co_await so that
-            // the for-loop below can safely dispatch on us.
-            auto strong = weak.get();
-            if (!strong || warningResult != ContentDialogResult::Primary)
-            {
-                co_return;
-            }
-        }
 
         for (auto& tab : tabs)
         {
             winrt::Windows::Foundation::IAsyncAction action{ nullptr };
             if (const auto strong = weak.get())
             {
-                action = _HandleCloseTabRequested(tab, /*skipConfirmClose*/ true);
+                action = _HandleCloseTabRequested(tab);
             }
 
             if (!action)
@@ -1283,128 +1185,4 @@ namespace winrt::TerminalApp::implementation
     {
         return _tabs.Size() > 1;
     }
-
-    // Method Description:
-    // - Attempts to find and focus the given tab in this window.
-    // Arguments:
-    // - tab: The tab to focus.
-    // Return Value:
-    // - true if the tab was found and focused, false otherwise.
-    bool TerminalPage::FocusTab(const winrt::TerminalApp::Tab& tab)
-    {
-        if (const auto tabIndex{ _GetTabIndex(tab) })
-        {
-            _SelectTab(tabIndex.value());
-            return true;
-        }
-        return false;
-    }
-
-    // Method Description:
-    // - Sends a desktop toast notification with the given title and body.
-    //   When the toast is activated (clicked), the window is summoned and
-    //   the originating tab is focused.
-    // Arguments:
-    // - tabTitle: The title to display in the notification.
-    // - body: The body text. If empty, a standard tab-activity message is built.
-    // - tab: The tab to switch to when the toast is activated.
-    void TerminalPage::_SendDesktopNotification(const winrt::hstring& tabTitle, const winrt::hstring& body, const winrt::com_ptr<Tab>& tab, const winrt::TerminalApp::IPaneContent& content)
-    {
-        // Don't send a notification if the window is focused and the requesting
-        // pane is the active pane. The user is already looking at it.
-        if (_activated && tab == _GetFocusedTabImpl())
-        {
-            if (const auto activePane{ tab->GetActivePane() })
-            {
-                if (activePane->GetContent() == content)
-                {
-                    return;
-                }
-            }
-        }
-
-        // Build the notification message.
-        // If a custom body is provided (e.g. from OSC 777), use the title/body directly.
-        // Otherwise, build the standard tab-activity notification message.
-        winrt::hstring notificationTitle;
-        winrt::hstring message;
-        if (!body.empty())
-        {
-            notificationTitle = tabTitle;
-            message = body;
-        }
-        else
-        {
-            // Use the window name if available for context; otherwise just use the tab title.
-            // Use the raw WindowName (not WindowNameForDisplay) so we don't include
-            // the "<unnamed window>" placeholder in the notification body.
-            const auto windowName = _WindowProperties ? _WindowProperties.WindowName() : winrt::hstring{};
-            if (!windowName.empty())
-            {
-                message = RS_fmt(L"NotificationMessage_TabActivityInWindow", std::wstring_view{ tabTitle }, std::wstring_view{ windowName });
-            }
-            else
-            {
-                message = RS_fmt(L"NotificationMessage_TabActivity", std::wstring_view{ tabTitle });
-            }
-            notificationTitle = CascadiaSettings::ApplicationDisplayName();
-        }
-
-        // Use the Tab object's identity hash as a stable toast tag.
-        // This survives tab reordering and cross-window moves.
-        const auto tabHash = std::hash<winrt::Windows::Foundation::IUnknown>{}(*tab);
-        const hstring tabTag{ fmt::format(FMT_COMPILE(L"wt-tab-{:016x}"), tabHash) };
-
-        const implementation::DesktopNotificationArgs args{
-            .Title = notificationTitle,
-            .Message = message,
-            .Tag = tabTag
-        };
-
-        implementation::DesktopNotification::SendNotification(args, [weakThis{ get_weak() }, weakTab{ tab->get_weak() }, weakContent{ winrt::make_weak(content) }]() {
-            if (const auto page{ weakThis.get() })
-            {
-                // The toast Activated callback runs on a background thread.
-                // Marshal to the UI thread for tab focus and window summon.
-                page->Dispatcher().RunAsync(winrt::Windows::UI::Core::CoreDispatcherPriority::Normal, [weakPage{ page->get_weak() }, weakTab, weakContent]() {
-                    if (const auto p{ weakPage.get() })
-                    {
-                        if (const auto t{ weakTab.get() })
-                        {
-                            // Try to find and focus the tab in this window first.
-                            if (const auto tabIndex{ p->_GetTabIndex(*t) })
-                            {
-                                p->SummonWindowRequested.raise(nullptr, nullptr);
-                                p->_SelectTab(tabIndex.value());
-
-                                // Focus the specific pane that raised the notification.
-                                if (const auto paneContent{ weakContent.get() })
-                                {
-                                    const auto rootPane = t->GetRootPane();
-                                    rootPane->WalkTree([&](const auto& pane) {
-                                        if (pane->GetContent() == paneContent)
-                                        {
-                                            rootPane->FocusPane(pane);
-                                        }
-                                    });
-                                }
-                            }
-                            else
-                            {
-                                // The tab may have moved to another window.
-                                // Raise FocusTabRequested so the emperor can
-                                // search all windows for it.
-                                p->FocusTabRequested.raise(nullptr, *t);
-                            }
-                        }
-                        else
-                        {
-                            // Tab was closed. Just summon this window.
-                            p->SummonWindowRequested.raise(nullptr, nullptr);
-                        }
-                    }
-                });
-            }
-        });
-    }
 }

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -174,7 +174,6 @@
       <DependentUpon>TerminalPaneContent.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="Toast.h" />
-    <ClInclude Include="DesktopNotification.h" />
     <ClInclude Include="TerminalSettingsCache.h" />
     <ClInclude Include="SuggestionsControl.h">
       <DependentUpon>SuggestionsControl.xaml</DependentUpon>
@@ -288,7 +287,6 @@
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="Toast.cpp" />
-    <ClCompile Include="DesktopNotification.cpp" />
     <ClCompile Include="TerminalSettingsCache.cpp" />
     <ClCompile Include="SuggestionsControl.cpp">
       <DependentUpon>SuggestionsControl.xaml</DependentUpon>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -884,78 +884,26 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Displays the unified close confirmation dialog configured for the
-    //   given scenario. Resets the "don't ask me again" checkbox before showing.
-    //   If the user confirms and checked "don't ask me again", sets
-    //   confirmOnClose to Never and writes settings to disk.
+    // - Displays a dialog to warn the user that they are about to close all open windows.
+    //   Once the user clicks the OK button, shut down the application.
+    //   If cancel is clicked, the dialog will close.
     // - Only one dialog can be visible at a time. If another dialog is visible
     //   when this is called, nothing happens. See _ShowDialog for details
-    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalPage::_ShowConfirmCloseDialog(ConfirmCloseDialogKind kind)
+    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalPage::_ShowQuitDialog()
     {
-        // Load the dialog (triggers x:Load) and configure its strings.
-        const auto dialog = FindName(L"ConfirmCloseDialog").as<ContentDialog>();
+        return _ShowDialogHelper(L"QuitDialog");
+    }
 
-        winrt::hstring title;
-        winrt::hstring primary;
-        switch (kind)
-        {
-        case ConfirmCloseDialogKind::CloseAll:
-            title = RS_(L"ConfirmCloseDialog_CloseAllTitle");
-            primary = RS_(L"ConfirmCloseDialog_CloseAllPrimary");
-            break;
-        case ConfirmCloseDialogKind::Window:
-            title = RS_(L"ConfirmCloseDialog_WindowTitle");
-            primary = RS_(L"ConfirmCloseDialog_WindowPrimary");
-            break;
-        case ConfirmCloseDialogKind::Tab:
-            title = RS_(L"ConfirmCloseDialog_TabTitle");
-            primary = RS_(L"ConfirmCloseDialog_TabPrimary");
-            break;
-        case ConfirmCloseDialogKind::MultiplePanes:
-            title = RS_(L"ConfirmCloseDialog_MultiplePanesTitle");
-            primary = RS_(L"ConfirmCloseDialog_MultiplePanesPrimary");
-            break;
-        case ConfirmCloseDialogKind::MultipleTabs:
-            title = RS_(L"ConfirmCloseDialog_MultipleTabsTitle");
-            primary = RS_(L"ConfirmCloseDialog_MultipleTabsPrimary");
-            break;
-        case ConfirmCloseDialogKind::Pane:
-            title = RS_(L"ConfirmCloseDialog_PaneTitle");
-            primary = RS_(L"ConfirmCloseDialog_PanePrimary");
-            break;
-        }
-        dialog.Title(winrt::box_value(title));
-        dialog.PrimaryButtonText(primary);
-        dialog.CloseButtonText(RS_(L"ConfirmCloseDialog_Cancel"));
-
-        // BODGY: After a ContentDialog is dismissed, FindName() can no longer
-        // resolve children inside it. Use Content() to get the checkbox directly.
-        const auto checkbox = dialog.Content().as<CheckBox>();
-        checkbox.IsChecked(false);
-
-        auto result = ContentDialogResult::None;
-        if (auto presenter{ _dialogPresenter.get() })
-        {
-            const auto weak = get_weak();
-            result = co_await presenter.ShowDialog(dialog);
-
-            // ShowDialog blocks until the dialog is dismissed, so it is
-            // possible for `this` to be torn down while we wait. Re-acquire
-            // a strong reference before touching any of our state.
-            const auto strong = weak.get();
-            if (!strong)
-            {
-                co_return ContentDialogResult::None;
-            }
-
-            if (result == ContentDialogResult::Primary && checkbox.IsChecked().Value())
-            {
-                _settings.GlobalSettings().ConfirmOnClose(ConfirmOnClose::Never);
-                _settings.WriteSettingsToDisk();
-            }
-        }
-
-        co_return result;
+    // Method Description:
+    // - Displays a dialog for warnings found while closing the terminal app using
+    //   key binding with multiple tabs opened. Display messages to warn user
+    //   that more than 1 tab is opened, and once the user clicks the OK button, remove
+    //   all the tabs and shut down and app. If cancel is clicked, the dialog will close
+    // - Only one dialog can be visible at a time. If another dialog is visible
+    //   when this is called, nothing happens. See _ShowDialog for details
+    winrt::Windows::Foundation::IAsyncOperation<ContentDialogResult> TerminalPage::_ShowCloseWarningDialog()
+    {
+        return _ShowDialogHelper(L"CloseAllDialog");
     }
 
     // Method Description:
@@ -2261,13 +2209,12 @@ namespace winrt::TerminalApp::implementation
     //   signal that we want to close everything.
     safe_void_coroutine TerminalPage::RequestQuit()
     {
-        const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-        if (setting != ConfirmOnClose::Never && !_displayingCloseDialog)
+        if (!_displayingCloseDialog)
         {
             _displayingCloseDialog = true;
 
             const auto weak = get_weak();
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::CloseAll);
+            auto warningResult = co_await _ShowQuitDialog();
             const auto strong = weak.get();
             if (!strong)
             {
@@ -2280,9 +2227,9 @@ namespace winrt::TerminalApp::implementation
             {
                 co_return;
             }
-        }
 
-        QuitRequested.raise(nullptr, nullptr);
+            QuitRequested.raise(nullptr, nullptr);
+        }
     }
 
     void TerminalPage::PersistState()
@@ -2360,59 +2307,12 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Determines whether a close-window action should show a confirmation
-    //   dialog, based on the confirmOnClose setting and the current window state.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - true, if a warning dialog should be shown before closing the window
-    bool TerminalPage::_ShouldWarnOnClose() const
-    {
-        const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-        switch (setting)
-        {
-        case ConfirmOnClose::Always:
-            return true;
-        case ConfirmOnClose::Automatic:
-        {
-            // Warn if there's more than one tab, or the one tab has more than one pane.
-            return _HasMultipleTabs() || _GetTabImpl(_tabs.GetAt(0))->GetLeafPaneCount() > 1;
-        }
-        case ConfirmOnClose::Never:
-        default:
-            return false;
-        }
-    }
-
-    // Method Description:
-    // - Determines whether closing a specific tab should show a confirmation
-    //   dialog, based on the confirmOnClose setting and the tab's state.
-    // Arguments:
-    // - tab: The tab being closed
-    // Return Value:
-    // - true, if a warning dialog should be shown before closing the tab
-    bool TerminalPage::_ShouldWarnOnCloseTab(const winrt::com_ptr<Tab>& tab) const
-    {
-        const auto setting = _settings.GlobalSettings().ConfirmOnClose();
-        switch (setting)
-        {
-        case ConfirmOnClose::Always:
-            return true;
-        case ConfirmOnClose::Automatic:
-            // Warn if this tab has more than one pane.
-            return tab->GetLeafPaneCount() > 1;
-        case ConfirmOnClose::Never:
-        default:
-            return false;
-        }
-    }
-
-    // Method Description:
-    // - Close the terminal app. If the confirmOnClose setting indicates we should
-    //   warn for the current window state, show a warning dialog.
+    // - Close the terminal app. If there is more
+    //   than one tab opened, show a warning dialog.
     safe_void_coroutine TerminalPage::CloseWindow()
     {
-        if (_ShouldWarnOnClose() &&
+        if (_HasMultipleTabs() &&
+            _settings.GlobalSettings().ConfirmCloseAllTabs() &&
             !_displayingCloseDialog)
         {
             if (_newTabButton && _newTabButton.Flyout())
@@ -2421,17 +2321,7 @@ namespace winrt::TerminalApp::implementation
             }
             _DismissTabContextMenus();
             _displayingCloseDialog = true;
-
-            const auto weak = get_weak();
-            auto warningResult = co_await _ShowConfirmCloseDialog(ConfirmCloseDialogKind::Window);
-            // Hold a strong reference to `this` after the co_await; we may
-            // be the last holder if the window was already being torn down.
-            auto strong = weak.get();
-            if (!strong)
-            {
-                co_return;
-            }
-
+            auto warningResult = co_await _ShowCloseWarningDialog();
             _displayingCloseDialog = false;
 
             if (warningResult != ContentDialogResult::Primary)
@@ -2900,15 +2790,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:
@@ -3196,42 +3085,18 @@ namespace winrt::TerminalApp::implementation
     }
     CATCH_LOG();
 
-    safe_void_coroutine TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
+    void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
     {
         try
         {
-            auto uriString{ eventArgs.Uri() };
-            auto parsed = winrt::Windows::Foundation::Uri(uriString);
+            auto parsed = winrt::Windows::Foundation::Uri(eventArgs.Uri());
             if (_IsUriSupported(parsed))
             {
-                bool shouldLaunch{ _IsUriConsideredSomewhatSafe(parsed) };
-
-                if (!shouldLaunch)
-                {
-                    if (auto presenter{ _dialogPresenter.get() })
-                    {
-                        // FindName needs to be called first to actually load the xaml object
-                        auto unopenedUriDialog = FindName(L"UriErrorDialog").try_as<WUX::Controls::ContentDialog>();
-
-                        // Insert the reason and the URI
-                        unopenedUriDialog.SecondaryButtonText(RS_(L"UnsafeUrlConfirmAllowAction"));
-                        CouldNotOpenUriReason().Text(RS_(L"UnsafeUrlConfirmText"));
-                        UnopenedUri().Text(uriString);
-
-                        // Show the dialog
-                        auto result = co_await presenter.ShowDialog(unopenedUriDialog);
-                        shouldLaunch = result == ContentDialogResult::Secondary;
-                    }
-                }
-
-                if (shouldLaunch)
-                {
-                    ShellExecuteW(nullptr, L"open", uriString.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
-                }
+                ShellExecute(nullptr, L"open", eventArgs.Uri().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
             }
             else
             {
-                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), uriString);
+                _ShowCouldNotOpenDialog(RS_(L"UnsupportedSchemeText"), eventArgs.Uri());
             }
         }
         catch (...)
@@ -3251,10 +3116,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);
 
@@ -3307,42 +3171,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*/,
@@ -4850,7 +4678,7 @@ namespace winrt::TerminalApp::implementation
 
     // Function Description:
     // - Helper to launch a new WT instance elevated. It'll do this by spawning
-    //   a helper process, that will ask the shell to elevate the process for
+    //   a helper process, who will asking the shell to elevate the process for
     //   us. This might cause a UAC prompt. The elevation is performed on a
     //   background thread, as to not block the UI thread.
     // Arguments:

src/cascadia/TerminalApp/TerminalPage.h

@@ -54,16 +54,6 @@ namespace winrt::TerminalApp::implementation
         ScrollDown = 1
     };
 
-    enum class ConfirmCloseDialogKind
-    {
-        Pane,
-        Tab,
-        MultiplePanes,
-        MultipleTabs,
-        Window,
-        CloseAll
-    };
-
     struct RenameWindowRequestedArgs : RenameWindowRequestedArgsT<RenameWindowRequestedArgs>
     {
         WINRT_PROPERTY(winrt::hstring, ProposedName);
@@ -178,7 +168,6 @@ namespace winrt::TerminalApp::implementation
 
         void OpenSettingsUI();
         void WindowActivated(const bool activated);
-        bool FocusTab(const winrt::TerminalApp::Tab& tab);
 
         bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
 
@@ -203,7 +192,6 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<IInspectable, IInspectable> IdentifyWindowsRequested;
         til::typed_event<IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs> RenameWindowRequested;
         til::typed_event<IInspectable, IInspectable> SummonWindowRequested;
-        til::typed_event<IInspectable, winrt::TerminalApp::Tab> FocusTabRequested;
         til::typed_event<IInspectable, winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs> WindowSizeChanged;
 
         til::typed_event<IInspectable, IInspectable> OpenSystemMenu;
@@ -313,7 +301,8 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowDialogHelper(const std::wstring_view& name);
 
         void _ShowAboutDialog();
-        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowConfirmCloseDialog(ConfirmCloseDialogKind kind);
+        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowQuitDialog();
+        winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowCloseWarningDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowCloseReadOnlyDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowMultiLinePasteWarningDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowLargePasteWarningDialog();
@@ -360,7 +349,7 @@ namespace winrt::TerminalApp::implementation
 
         safe_void_coroutine _ExportTab(const Tab& tab, winrt::hstring filepath);
 
-        winrt::Windows::Foundation::IAsyncAction _HandleCloseTabRequested(winrt::TerminalApp::Tab tab, bool skipConfirmClose = false);
+        winrt::Windows::Foundation::IAsyncAction _HandleCloseTabRequested(winrt::TerminalApp::Tab tab);
         void _CloseTabAtIndex(uint32_t index);
         void _RemoveTab(const winrt::TerminalApp::Tab& tab);
         safe_void_coroutine _RemoveTabs(const std::vector<winrt::TerminalApp::Tab> tabs);
@@ -411,12 +400,9 @@ namespace winrt::TerminalApp::implementation
         TerminalApp::Tab _GetTabByTabViewItem(const IInspectable& tabViewItem) const noexcept;
 
         void _HandleClosePaneRequested(std::shared_ptr<Pane> pane);
-        bool _ShouldWarnOnClose() const;
-        bool _ShouldWarnOnCloseTab(const winrt::com_ptr<Tab>& tab) const;
         safe_void_coroutine _SetFocusedTab(const winrt::TerminalApp::Tab tab);
         safe_void_coroutine _CloseFocusedPane();
-        safe_void_coroutine _ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds);
-        void _CloseRemainingPanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds);
+        void _ClosePanes(weak_ref<Tab> weakTab, std::vector<uint32_t> paneIds);
         winrt::Windows::Foundation::IAsyncOperation<bool> _PaneConfirmCloseReadOnly(std::shared_ptr<Pane> pane);
         void _AddPreviouslyClosedPaneOrTab(std::vector<Microsoft::Terminal::Settings::Model::ActionAndArgs>&& args);
 
@@ -426,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);
@@ -436,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);
@@ -585,8 +570,6 @@ namespace winrt::TerminalApp::implementation
         void _activePaneChanged(winrt::TerminalApp::Tab tab, Windows::Foundation::IInspectable args);
         safe_void_coroutine _doHandleSuggestions(Microsoft::Terminal::Settings::Model::SuggestionsArgs realArgs);
 
-        void _SendDesktopNotification(const winrt::hstring& tabTitle, const winrt::hstring& body, const winrt::com_ptr<Tab>& tab, const winrt::TerminalApp::IPaneContent& content);
-
 #pragma region ActionHandlers
         // These are all defined in AppActionHandlers.cpp
 #define ON_ALL_ACTIONS(action) DECLARE_ACTION_HANDLER(action);

src/cascadia/TerminalApp/TerminalPage.xaml

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

src/cascadia/TerminalApp/TerminalPaneContent.cpp

@@ -71,6 +71,18 @@ namespace winrt::TerminalApp::implementation
         _removeControlEvents();
 
         _control.Close();
+
+        // Clear out our media player callbacks, and stop any playing media. This
+        // will prevent the callback from being triggered after we've closed, and
+        // also make sure that our sound stops when we're closed.
+        if (_bellPlayer)
+        {
+            _bellPlayer.Pause();
+            _bellPlayer.Source(nullptr);
+            _bellPlayer.Close();
+            _bellPlayer = nullptr;
+            _bellPlayerCreated = false;
+        }
     }
 
     winrt::hstring TerminalPaneContent::Icon() const
@@ -263,15 +275,14 @@ namespace winrt::TerminalApp::implementation
                     auto sounds{ _profile.BellSound() };
                     if (sounds && sounds.Size() > 0)
                     {
-                        // Sound paths are resolved and validated by CascadiaSettings
-                        // before we reach this point.
-                        auto soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
-                        PlaySoundW(soundPath.c_str(), nullptr, SND_FILENAME | SND_ASYNC | SND_SENTRY | SND_NODEFAULT);
+                        winrt::hstring soundPath{ sounds.GetAt(rand() % sounds.Size()).Resolved() };
+                        winrt::Windows::Foundation::Uri uri{ soundPath };
+                        _playBellSound(uri);
                     }
                     else
                     {
-                        const auto soundAlias = reinterpret_cast<LPCWSTR>(SND_ALIAS_SYSTEMHAND);
-                        PlaySoundW(soundAlias, nullptr, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
+                        const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+                        PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
                     }
                 }
 
@@ -280,15 +291,40 @@ namespace winrt::TerminalApp::implementation
                     _control.BellLightOn();
                 }
 
-                // raise the event with the bool values corresponding to the taskbar and notification flags
+                // raise the event with the bool value corresponding to the taskbar flag
                 BellRequested.raise(*this,
-                                    *winrt::make_self<TerminalApp::implementation::BellEventArgs>(
-                                        WI_IsFlagSet(_profile.BellStyle(), BellStyle::Taskbar),
-                                        WI_IsFlagSet(_profile.BellStyle(), BellStyle::Notification)));
+                                    *winrt::make_self<TerminalApp::implementation::BellEventArgs>(WI_IsFlagSet(_profile.BellStyle(), BellStyle::Taskbar)));
             }
         }
     }
 
+    safe_void_coroutine TerminalPaneContent::_playBellSound(winrt::Windows::Foundation::Uri uri)
+    {
+        auto weakThis{ get_weak() };
+        co_await wil::resume_foreground(_control.Dispatcher());
+        if (auto pane{ weakThis.get() })
+        {
+            if (!_bellPlayerCreated)
+            {
+                // The MediaPlayer might not exist on Windows N SKU.
+                try
+                {
+                    _bellPlayerCreated = true;
+                    _bellPlayer = winrt::Windows::Media::Playback::MediaPlayer();
+                    // GH#12258: The media keys (like play/pause) should have no effect on our bell sound.
+                    _bellPlayer.CommandManager().IsEnabled(false);
+                }
+                CATCH_LOG();
+            }
+            if (_bellPlayer)
+            {
+                const auto source{ winrt::Windows::Media::Core::MediaSource::CreateFromUri(uri) };
+                const auto item{ winrt::Windows::Media::Playback::MediaPlaybackItem(source) };
+                _bellPlayer.Source(item);
+                _bellPlayer.Play();
+            }
+        }
+    }
     void TerminalPaneContent::_closeTerminalRequestedHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
                                                              const winrt::Windows::Foundation::IInspectable& /*args*/)
     {