Skip to content

Commit

Permalink
Add ellipses back in to some command names (#17715)
Browse files Browse the repository at this point in the history
In #16886, the key for the nested action got renamed from `Split
Pane...` to `Split pane`. This accidentally caused a collision because
now there's two actions with the same name! The settings model then
prefers the user's action over the one defined in defaults.json, thus
completely hiding the nested version.

I tried to balance the stylistic recommendations from #16846 (mainly
[this
comment](#16846 (comment))
since it gave some excellent examples) while trying to maintain muscle
memory as much as possible (with similar substring sequences). There was
also one case where we still used "the tab" so I removed the "the" for
consistency.

Side effect of #16886 which closed #16846
Closes #17294
Closes #17684
  • Loading branch information
carlos-zamora authored Aug 21, 2024
1 parent a40a4ea commit 0a7c258
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="SetColorSchemeParentCommandName" xml:space="preserve">
<value>Select color scheme</value>
<value>Select color scheme...</value>
</data>
<data name="NewTabParentCommandName" xml:space="preserve">
<value>New tab</value>
<value>New tab...</value>
</data>
<data name="SplitPaneParentCommandName" xml:space="preserve">
<value>Split pane</value>
<value>Split pane...</value>
</data>
<data name="SnippetsPaneCommandName" xml:space="preserve">
<value>Open snippets pane</value>
Expand Down Expand Up @@ -329,7 +329,7 @@
<comment>{Locked="JSON"}. "JSON" is the extension of the file that will be opened.</comment>
</data>
<data name="OpenTabColorPickerCommandKey" xml:space="preserve">
<value>Set the tab color</value>
<value>Set tab color...</value>
</data>
<data name="PasteTextCommandKey" xml:space="preserve">
<value>Paste</value>
Expand All @@ -351,7 +351,7 @@
<value>Reset tab title</value>
</data>
<data name="OpenTabRenamerCommandKey" xml:space="preserve">
<value>Rename tab title</value>
<value>Rename tab</value>
</data>
<data name="ResizePaneCommandKey" xml:space="preserve">
<value>Resize pane</value>
Expand Down Expand Up @@ -445,17 +445,14 @@
<value>Switch to the last tab</value>
</data>
<data name="TabSearchCommandKey" xml:space="preserve">
<value>Search for tab</value>
<value>Search for tab...</value>
</data>
<data name="ToggleAlwaysOnTopCommandKey" xml:space="preserve">
<value>Toggle always on top mode</value>
</data>
<data name="ToggleCommandPaletteCommandKey" xml:space="preserve">
<value>Toggle command palette</value>
</data>
<data name="SuggestionsCommandHistoryCommandKey" xml:space="preserve">
<value>Recent commands</value>
</data>
<data name="SuggestionsCommandKey" xml:space="preserve">
<value>Open suggestions</value>
</data>
Expand Down Expand Up @@ -519,7 +516,7 @@
<value>Reset window name</value>
</data>
<data name="OpenWindowRenamerCommandKey" xml:space="preserve">
<value>Rename window</value>
<value>Rename window...</value>
</data>
<data name="DisplayWorkingDirectoryCommandKey" xml:space="preserve">
<value>Display Terminal's current working directory</value>
Expand Down Expand Up @@ -570,7 +567,7 @@
<value>Quit the Terminal</value>
</data>
<data name="SetOpacityParentCommandName" xml:space="preserve">
<value>Set background opacity</value>
<value>Set background opacity...</value>
</data>
<data name="IncreaseOpacityCommandKey" xml:space="preserve">
<value>Increase background opacity by {0}%</value>
Expand Down

0 comments on commit 0a7c258

Please sign in to comment.