Skip to content

Commit 61e952c

Browse files
zadjii-msftzadjii-msft
committed
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-terminal-panes-2023
2 parents df73d75 + 08dc346 commit 61e952c

File tree

49 files changed

+3403
-2812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3403
-2812
lines changed

‎.vscode/settings.json

+25-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
11
{
22
"C_Cpp.default.browse.databaseFilename": "${workspaceFolder}\\.vscode\\.BROWSE.VC.DB",
3+
"C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true,
34
"C_Cpp.default.browse.path": [
45
"${workspaceFolder}"
56
],
7+
"C_Cpp.default.cppStandard": "c++20",
8+
"C_Cpp.default.cStandard": "c17",
9+
"C_Cpp.default.defines": [
10+
"_DEBUG",
11+
"_UNICODE",
12+
"BUILD_ONECORE_INTERACTIVITY",
13+
"DBG",
14+
"NT_SUCCESS",
15+
"UNICODE",
16+
"UNIT_TESTING",
17+
"INLINE_TEST_METHOD_MARKUP",
18+
],
19+
"C_Cpp.default.includePath": [
20+
"${workspaceFolder}/**",
21+
"${workspaceFolder}/**/Generated Files",
22+
"${workspaceFolder}/**/inc",
23+
"${workspaceFolder}/**/include",
24+
"${workspaceFolder}/**/Include"
25+
],
626
"C_Cpp.loggingLevel": "None",
727
"files.associations": {
828
"xstring": "cpp",
@@ -98,14 +118,13 @@
98118
"coroutine": "cpp",
99119
"format": "cpp",
100120
"forward_list": "cpp",
101-
"latch": "cpp"
121+
"latch": "cpp",
122+
"gsl_assert": "cpp"
102123
},
103124
"files.exclude": {
104125
"**/bin/**": true,
126+
"**/Generated Files/**": true,
105127
"**/obj/**": true,
106-
"**/Generated Files/**": true
128+
"**/packages/**": true,
107129
},
108-
"search.exclude": {
109-
"**/packages/**": true
110-
}
111-
}
130+
}

‎build/pipelines/daily-loc-submission.yml

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ steps:
7575
rm LocOutputMunged.tar
7676
rm -r -fo LocOutput
7777
& ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
78+
& ./build/scripts/Generate-PseudoLocalizations.ps1
7879
displayName: Move Loc files to the right places
7980

8081
- pwsh: |-

‎build/scripts/Generate-PseudoLocalizations.ps1

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Get-ChildItem -Recurse -Filter *.resw
2+
| Where-Object { $_.Directory.Name.StartsWith("qps-ploc") }
3+
| ForEach-Object {
4+
$source = Join-Path $_.Directory "../en-US/$($_.Name)"
5+
$target = $_
6+
7+
$ploc = ./tools/ConvertTo-PseudoLocalization.ps1 -Path $source
8+
9+
$writerSettings = [System.Xml.XmlWriterSettings]::new()
10+
$writerSettings.NewLineChars = "`r`n"
11+
$writerSettings.Indent = $true
12+
$writer = [System.Xml.XmlWriter]::Create($target, $writerSettings)
13+
$ploc.Save($writer)
14+
$writer.Flush()
15+
$writer.Close()
16+
}

‎scratch/ScratchIslandApp/Package/Resources/qps-ploc/Resources.resw

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="AppDescription" xml:space="preserve">
121-
<value>А şςѓάţćћ ǻрр ƒθŗ χÂΜĿ Íŝĺąήðş ŧеšτş !!! !!! !!! !</value>
121+
<value>Ά śςґàτсн ąρφ ƒоř ΧΆΜĻ Ìŝļàиđś τёşτś !!! !!! !!! !</value>
122122
</data>
123123
</root>

‎scratch/ScratchIslandApp/Package/Resources/qps-ploca/Resources.resw

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="AppDescription" xml:space="preserve">
121-
<value>Ă šςґаτćĥ àρφ ƒǿя ЖΆΜĹ Іѕℓаñďş ťêšţŝ !!! !!! !!! !</value>
121+
<value>Ά śςґàτсн ąρφ ƒоř ΧΆΜĻ Ìŝļàиđś τёşτś !!! !!! !!! !</value>
122122
</data>
123123
</root>

‎scratch/ScratchIslandApp/Package/Resources/qps-plocm/Resources.resw

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="AppDescription" xml:space="preserve">
121-
<value>Ă śćяǻт¢н ãрρ ƒσг ХĂМĽ Īşłдήďѕ ťέśτş !!! !!! !!! !</value>
121+
<value>Ά śςґàτсн ąρφ ƒоř ΧΆΜĻ Ìŝļàиđś τёşτś !!! !!! !!! !</value>
122122
</data>
123123
</root>

‎src/cascadia/CascadiaPackage/Resources/qps-ploc/Resources.resw

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
167167
</data>
168168
<data name="AppDescription" xml:space="preserve">
169-
<value>Τнĕ Ņëω Ẅίηđŏẃś Ťėŗmįйάĺ !!! !!! !</value>
169+
<value>Τĥз Йéщ Ẃįńđôẃѕ Тéѓmĩиâļ !!! !!! !</value>
170170
</data>
171171
<data name="AppDescriptionDev" xml:space="preserve">
172172
<value>The Windows Terminal, but Unofficial</value>
@@ -177,22 +177,22 @@
177177
<comment>{Locked}</comment>
178178
</data>
179179
<data name="AppDescriptionPre" xml:space="preserve">
180-
<value>Ŵíňďōẁŝ Тєřмīπǻļ ωїτĥ å ρѓēνіéŵ θƒ ũφсőмϊπġ ƒєąτΰґёѕ !!! !!! !!! !!! !!! </value>
180+
<value>Щΐňδόŵѕ Ŧęřмĭʼnäℓ ẅîťħ à φřеνίëẃ θƒ џрсøмΐʼnğ ƒĕāŧųřэś !!! !!! !!! !!! !!! </value>
181181
</data>
182182
<data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
183183
<value>Open in Terminal (&amp;Dev)</value>
184184
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
185185
</data>
186186
<data name="ShellExtension_OpenInTerminalMenuItem_Canary" xml:space="preserve">
187-
<value>Ŏрέи ìη Тèřmīŋªŀ (&amp;Cãńãґγ) !!! !!! !</value>
187+
<value>Θρēņ ïη Ţéгmĭηäŀ (&amp;Çäņдѓγ) !!! !!! !</value>
188188
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
189189
</data>
190190
<data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
191-
<value>Φφєň ΐñ Ŧéгмϊñаľ &amp;Pŕėνĭ℮ώ !!! !!! !</value>
191+
<value>Όрèп ìņ Ţêŕmїʼnåļ &amp;Рѓзνι℮ω !!! !!! !</value>
192192
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
193193
</data>
194194
<data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
195-
<value>Ωρєⁿ ïπ &amp;Těѓmĭñäĺ !!! !!</value>
195+
<value>Óрêп ìл &amp;Ťěѓmιиåĺ !!! !!</value>
196196
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
197197
</data>
198198
</root>

‎src/cascadia/CascadiaPackage/Resources/qps-ploca/Resources.resw

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
167167
</data>
168168
<data name="AppDescription" xml:space="preserve">
169-
<value>Ťĥё Ñēщ Шίⁿðоẅś Ťėгмîήāľ !!! !!! !</value>
169+
<value>Τĥз Йéщ Ẃįńđôẃѕ Тéѓmĩиâļ !!! !!! !</value>
170170
</data>
171171
<data name="AppDescriptionDev" xml:space="preserve">
172172
<value>The Windows Terminal, but Unofficial</value>
@@ -177,22 +177,22 @@
177177
<comment>{Locked}</comment>
178178
</data>
179179
<data name="AppDescriptionPre" xml:space="preserve">
180-
<value>Шίηđóŵš Ŧĕяmїйàℓ ẁітħ ª φяęνîёщ όƒ ûφĉбмíήĝ ƒêåťµřεŝ !!! !!! !!! !!! !!! </value>
180+
<value>Щΐňδόŵѕ Ŧęřмĭʼnäℓ ẅîťħ à φřеνίëẃ θƒ џрсøмΐʼnğ ƒĕāŧųřэś !!! !!! !!! !!! !!! </value>
181181
</data>
182182
<data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
183183
<value>Open in Terminal (&amp;Dev)</value>
184184
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
185185
</data>
186186
<data name="ShellExtension_OpenInTerminalMenuItem_Canary" xml:space="preserve">
187-
<value>Óрëπ íи Ťēяmілǻŀ (&amp;Cäηàřÿ) !!! !!! !</value>
187+
<value>Θρēņ ïη Ţéгmĭηäŀ (&amp;Çäņдѓγ) !!! !!! !</value>
188188
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
189189
</data>
190190
<data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
191-
<value>Óрзń ΐή Ŧěґмιлāℓ &amp;Pѓéνīĕω !!! !!! !</value>
191+
<value>Όрèп ìņ Ţêŕmїʼnåļ &amp;Рѓзνι℮ω !!! !!! !</value>
192192
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
193193
</data>
194194
<data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
195-
<value>Ôрëη ïп &amp;Tēѓмϊŋãł !!! !!</value>
195+
<value>Óрêп ìл &amp;Ťěѓmιиåĺ !!! !!</value>
196196
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
197197
</data>
198198
</root>

‎src/cascadia/CascadiaPackage/Resources/qps-plocm/Resources.resw

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
167167
</data>
168168
<data name="AppDescription" xml:space="preserve">
169-
<value>Тĥё Ńēẁ Шіπđοωš Тěřмιňαŀ !!! !!! !</value>
169+
<value>Τĥз Йéщ Ẃįńđôẃѕ Тéѓmĩиâļ !!! !!! !</value>
170170
</data>
171171
<data name="AppDescriptionDev" xml:space="preserve">
172172
<value>The Windows Terminal, but Unofficial</value>
@@ -177,22 +177,22 @@
177177
<comment>{Locked}</comment>
178178
</data>
179179
<data name="AppDescriptionPre" xml:space="preserve">
180-
<value>Шίήďŏшś Ŧêямĩňāľ ŵíτн ă ρѓëνιêω øƒ ũρčŏмįηğ ƒєáţũŗêš !!! !!! !!! !!! !!! </value>
180+
<value>Щΐňδόŵѕ Ŧęřмĭʼnäℓ ẅîťħ à φřеνίëẃ θƒ џрсøмΐʼnğ ƒĕāŧųřэś !!! !!! !!! !!! !!! </value>
181181
</data>
182182
<data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
183183
<value>Open in Terminal (&amp;Dev)</value>
184184
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
185185
</data>
186186
<data name="ShellExtension_OpenInTerminalMenuItem_Canary" xml:space="preserve">
187-
<value>Фφěй ĩń Тêřmιπâł (&amp;Cãⁿǻřу) !!! !!! !</value>
187+
<value>Θρēņ ïη Ţéгmĭηäŀ (&amp;Çäņдѓγ) !!! !!! !</value>
188188
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
189189
</data>
190190
<data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
191-
<value>Óφ℮ʼn ΐŋ Τėřmīйäĺ &amp;Pяєνϊëẃ !!! !!! !</value>
191+
<value>Όрèп ìņ Ţêŕmїʼnåļ &amp;Рѓзνι℮ω !!! !!! !</value>
192192
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
193193
</data>
194194
<data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
195-
<value>Ορέл ϊŋ &amp;Téŕmįñāℓ !!! !!</value>
195+
<value>Óрêп ìл &amp;Ťěѓmιиåĺ !!! !!</value>
196196
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
197197
</data>
198198
</root>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
167167
</data>
168168
<data name="AppDescription" xml:space="preserve">
169-
<value>Τнĕ Ņëω Ẅίηđŏẃś Ťėŗmįйάĺ !!! !!! !</value>
169+
<value>Τĥз Йéщ Ẃįńđôẃѕ Тéѓmĩиâļ !!! !!! !</value>
170170
</data>
171171
<data name="AppDescriptionDev" xml:space="preserve">
172172
<value>The Windows Terminal, but Unofficial</value>
@@ -177,22 +177,22 @@
177177
<comment>{Locked}</comment>
178178
</data>
179179
<data name="AppDescriptionPre" xml:space="preserve">
180-
<value>Ŵíňďōẁŝ Тєřмīπǻļ ωїτĥ å ρѓēνіéŵ θƒ ũφсőмϊπġ ƒєąτΰґёѕ !!! !!! !!! !!! !!! </value>
180+
<value>Щΐňδόŵѕ Ŧęřмĭʼnäℓ ẅîťħ à φřеνίëẃ θƒ џрсøмΐʼnğ ƒĕāŧųřэś !!! !!! !!! !!! !!! </value>
181181
</data>
182182
<data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
183183
<value>Open in Terminal (&amp;Dev)</value>
184184
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
185185
</data>
186186
<data name="ShellExtension_OpenInTerminalMenuItem_Canary" xml:space="preserve">
187-
<value>Ŏрέи ìη Тèřmīŋªŀ (&amp;Cãńãґγ) !!! !!! !</value>
187+
<value>Θρēņ ïη Ţéгmĭηäŀ (&amp;Çäņдѓγ) !!! !!! !</value>
188188
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
189189
</data>
190190
<data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
191-
<value>Φφєň ΐñ Ŧéгмϊñаľ &amp;Pŕėνĭ℮ώ !!! !!! !</value>
191+
<value>Όрèп ìņ Ţêŕmїʼnåļ &amp;Рѓзνι℮ω !!! !!! !</value>
192192
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
193193
</data>
194194
<data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
195-
<value>Ωρєⁿ ïπ &amp;Těѓmĭñäĺ !!! !!</value>
195+
<value>Óрêп ìл &amp;Ťěѓmιиåĺ !!! !!</value>
196196
<comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
197197
</data>
198198
</root>

0 commit comments

Comments
 (0)