Skip to content

Commit 574891b

Browse files
DHowettDHowett
committed
**BODGY** Migrate resw files from main
This works around an issue we encountered in Touchdown where we added keys in main *and* changed keys in main and release-1.18. Because the file hashes don't match, this file is not considered a localization target. I think it is because we changed keys on both branches, but there was no intermediate time point where the entire file was consistent on both branches. Therefore, the files got localized on main and the translations logged against the specific resw version that existed on main. They were never logged against this weird backported verison.
1 parent 0baf372 commit 574891b

File tree

5 files changed

+112
-1
lines changed

5 files changed

+112
-1
lines changed

‎src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@
125125
<value>Terminal Dev</value>
126126
<comment>{Locked}</comment>
127127
</data>
128+
<data name="AppNameCan" xml:space="preserve">
129+
<value>Terminal Canary</value>
130+
<comment>{Locked}</comment>
131+
</data>
128132
<data name="AppNamePre" xml:space="preserve">
129133
<value>Terminal Preview</value>
130134
<comment>{Locked}</comment>
@@ -137,6 +141,10 @@
137141
<value>Windows Terminal Dev</value>
138142
<comment>{Locked}</comment>
139143
</data>
144+
<data name="AppStoreNameCan" xml:space="preserve">
145+
<value>Windows Terminal Canary</value>
146+
<comment>{Locked}</comment>
147+
</data>
140148
<data name="AppStoreNamePre" xml:space="preserve">
141149
<value>Windows Terminal Preview</value>
142150
<comment>{Locked}</comment>
@@ -149,6 +157,10 @@
149157
<value>Terminal Dev</value>
150158
<comment>{Locked}</comment>
151159
</data>
160+
<data name="AppShortNameCan" xml:space="preserve">
161+
<value>Terminal Canary</value>
162+
<comment>{Locked}</comment>
163+
</data>
152164
<data name="AppShortNamePre" xml:space="preserve">
153165
<value>Terminal Preview</value>
154166
<comment>{Locked}</comment>
@@ -161,6 +173,10 @@
161173
<value>The Windows Terminal, but Unofficial</value>
162174
<comment>{Locked}</comment>
163175
</data>
176+
<data name="AppDescriptionCan" xml:space="preserve">
177+
<value>The Windows Terminal (Canary build)</value>
178+
<comment>{Locked}</comment>
179+
</data>
164180
<data name="AppDescriptionPre" xml:space="preserve">
165181
<value>Windows Terminal with a preview of upcoming features</value>
166182
<comment>{Locked}</comment>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@
125125
<value>Terminal Dev</value>
126126
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
127127
</data>
128+
<data name="AppNameCan" xml:space="preserve">
129+
<value>Terminal Canary</value>
130+
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
131+
</data>
128132
<data name="AppNamePre" xml:space="preserve">
129133
<value>Terminal Preview</value>
130134
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
@@ -137,6 +141,10 @@
137141
<value>Windows Terminal Dev</value>
138142
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
139143
</data>
144+
<data name="AppStoreNameCan" xml:space="preserve">
145+
<value>Windows Terminal Canary</value>
146+
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}. "Canary" in this context means an unstable or nightly build of a software product, not the bird.</comment>
147+
</data>
140148
<data name="AppStoreNamePre" xml:space="preserve">
141149
<value>Windows Terminal Preview</value>
142150
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
@@ -149,6 +157,10 @@
149157
<value>Terminal Dev</value>
150158
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
151159
</data>
160+
<data name="AppShortNameCan" xml:space="preserve">
161+
<value>Terminal Canary</value>
162+
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
163+
</data>
152164
<data name="AppShortNamePre" xml:space="preserve">
153165
<value>Terminal Preview</value>
154166
<comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
@@ -160,13 +172,21 @@
160172
<value>The Windows Terminal, but Unofficial</value>
161173
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
162174
</data>
175+
<data name="AppDescriptionCan" xml:space="preserve">
176+
<value>The Windows Terminal (Canary build)</value>
177+
<comment>{Locked}</comment>
178+
</data>
163179
<data name="AppDescriptionPre" xml:space="preserve">
164180
<value>Windows Terminal with a preview of upcoming features</value>
165181
</data>
166182
<data name="ShellExtension_OpenInTerminalMenuItem_Dev" xml:space="preserve">
167183
<value>Open in Terminal (&amp;Dev)</value>
168184
<comment>{Locked} The dev build will never be seen in multiple languages</comment>
169185
</data>
186+
<data name="ShellExtension_OpenInTerminalMenuItem_Canary" xml:space="preserve">
187+
<value>Open in Terminal (&amp;Canary)</value>
188+
<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>
189+
</data>
170190
<data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
171191
<value>Open in Terminal &amp;Preview</value>
172192
<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>

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@
214214
<data name="SplitPaneText" xml:space="preserve">
215215
<value>Split Pane</value>
216216
</data>
217+
<data name="SearchWebText" xml:space="preserve">
218+
<value>Web Search</value>
219+
</data>
217220
<data name="TabColorChoose" xml:space="preserve">
218221
<value>Color...</value>
219222
</data>
@@ -591,6 +594,26 @@
591594
<value>Enter a wt commandline to run</value>
592595
<comment>{Locked="wt"} </comment>
593596
</data>
597+
<data name="SuggestionsControl_NestedCommandAnnouncement" xml:space="preserve">
598+
<value>More options for "{}"</value>
599+
<comment>This text will be read aloud using assistive technologies when the user selects a command that has additional options. The {} will be expanded to the name of the command containing more options.</comment>
600+
</data>
601+
<data name="SuggestionsControl_SearchBox.PlaceholderText" xml:space="preserve">
602+
<value>Type a command name...</value>
603+
</data>
604+
<data name="SuggestionsControl_NoMatchesText.Text" xml:space="preserve">
605+
<value>No matching commands</value>
606+
</data>
607+
<data name="SuggestionsControlName" xml:space="preserve">
608+
<value>Suggestions menu</value>
609+
</data>
610+
<data name="SuggestionsControl_MoreOptions.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
611+
<value>More options</value>
612+
</data>
613+
<data name="SuggestionsControl_MatchesAvailable" xml:space="preserve">
614+
<value>Suggestions found: {0}</value>
615+
<comment>{0} will be replaced with a number.</comment>
616+
</data>
594617
<data name="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
595618
<value>Crimson</value>
596619
</data>
@@ -831,6 +854,12 @@
831854
<value>Reset tab color</value>
832855
<comment>Text used to identify the reset button</comment>
833856
</data>
857+
<data name="MoveTabToNewWindowText" xml:space="preserve">
858+
<value>Move Tab to New Window</value>
859+
</data>
860+
<data name="MoveTabToNewWindowToolTip" xml:space="preserve">
861+
<value>Moves tab to a new window </value>
862+
</data>
834863
<data name="RunAsAdminFlyout.Text" xml:space="preserve">
835864
<value>Run as Administrator</value>
836865
<comment>This text is displayed on context menu for profile entries in add new tab button.</comment>
@@ -863,4 +892,13 @@
863892
<value>Active pane moved to new tab</value>
864893
<comment>This text is read out by screen readers upon a successful pane movement to a new tab within the existing window.</comment>
865894
</data>
895+
<data name="CmdAppendCommandLineDesc" xml:space="preserve">
896+
<value>If set, the command will be appended to the profile's default command instead of replacing it.</value>
897+
</data>
898+
<data name="RestartConnectionText" xml:space="preserve">
899+
<value>Restart Connection</value>
900+
</data>
901+
<data name="RestartConnectionToolTip" xml:space="preserve">
902+
<value>Restart the active pane connection</value>
903+
</data>
866904
</root>

‎src/cascadia/TerminalControl/Resources/en-US/Resources.resw‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,18 @@
178178
<data name="HowToOpenRun.Text" xml:space="preserve">
179179
<value>Ctrl+Click to follow link</value>
180180
</data>
181+
<data name="TermControl_NoMatch" xml:space="preserve">
182+
<value>No results</value>
183+
<comment>Will be presented near the search box when Find operation returned no results.</comment>
184+
</data>
185+
<data name="TermControl_Searching" xml:space="preserve">
186+
<value>Searching...</value>
187+
<comment>Will be presented near the search box when Find operation is running.</comment>
188+
</data>
189+
<data name="TermControl_NumResults" xml:space="preserve">
190+
<value>{0}/{1}</value>
191+
<comment>Will be displayed to indicate what result the user has selected, of how many total results. {0} will be replaced with the index of the current result. {1} will be replaced with the total number of results.</comment>
192+
</data>
181193
<data name="InvalidUri" xml:space="preserve">
182194
<value>Invalid URI</value>
183195
<comment>Whenever we encounter an invalid URI or URL we show this string as a warning.</comment>
@@ -276,4 +288,4 @@ Please either install the missing font or choose another one.</value>
276288
<value>Select output</value>
277289
<comment>The tooltip for a button for selecting all of a command's output</comment>
278290
</data>
279-
</root>
291+
</root>

‎src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,12 @@
449449
<data name="ToggleCommandPaletteCommandKey" xml:space="preserve">
450450
<value>Toggle command palette</value>
451451
</data>
452+
<data name="SuggestionsCommandHistoryCommandKey" xml:space="preserve">
453+
<value>Recent commands...</value>
454+
</data>
455+
<data name="SuggestionsCommandKey" xml:space="preserve">
456+
<value>Open suggestions...</value>
457+
</data>
452458
<data name="ToggleCommandPaletteCommandLineModeCommandKey" xml:space="preserve">
453459
<value>Toggle command palette in command line mode</value>
454460
</data>
@@ -511,6 +517,9 @@
511517
<data name="OpenWindowRenamerCommandKey" xml:space="preserve">
512518
<value>Rename window...</value>
513519
</data>
520+
<data name="DisplayWorkingDirectoryCommandKey" xml:space="preserve">
521+
<value>Display Terminal's current working directory</value>
522+
</data>
514523
<data name="GlobalSummonCommandKey" xml:space="preserve">
515524
<value>Show/Hide the Terminal window</value>
516525
</data>
@@ -684,6 +693,10 @@
684693
<data name="CloseOtherPanesCommandKey" xml:space="preserve">
685694
<value>Close all other panes</value>
686695
</data>
696+
<data name="ToggleBroadcastInputCommandKey" xml:space="preserve">
697+
<value>Toggle broadcast input to all panes</value>
698+
<comment>When enabled, input will go to all panes in this tab simultaneously</comment>
699+
</data>
687700
<data name="RestartConnectionKey" xml:space="preserve">
688701
<value>Restart connection</value>
689702
</data>
@@ -699,4 +712,16 @@
699712
<data name="SelectCommandPreviousCommandKey" xml:space="preserve">
700713
<value>Select previous command</value>
701714
</data>
715+
<data name="SearchForTextCommandKey" xml:space="preserve">
716+
<value>Search {0}</value>
717+
<comment>{0} will be replaced with a user-specified URL to a web page</comment>
718+
</data>
719+
<data name="SearchWebCommandKey" xml:space="preserve">
720+
<value>Search the web for selected text</value>
721+
<comment>This will open a web browser to search for some user-selected text</comment>
722+
</data>
723+
<data name="OpenAboutCommandKey" xml:space="preserve">
724+
<value>Open about dialog</value>
725+
<comment>This will open the "about" dialog, to display version info and other documentation</comment>
726+
</data>
702727
</root>

0 commit comments

Comments
 (0)