Skip to content

Commit

Permalink
Fix: UI style errors: Menu items capitalization and … (ellipses) mark…
Browse files Browse the repository at this point in the history
… misuse (#16886)

I changed the improper capitalization and misuse of ellipses mark (...)
in the context menu and various other places.

Fixes issues #16819 and #16846

## PR Checklist
- [ ] Closes #16846
- [x] Tests added/passed - NA
- [x] Documentation updated - NA
- If checked, please file a pull request on [our docs
repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
- [x] Schema updated (if necessary) - NA
  • Loading branch information
HarshNarayanJha authored Apr 10, 2024
1 parent 7adc374 commit 8bd9578
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 49 deletions.
60 changes: 30 additions & 30 deletions src/cascadia/TerminalApp/Resources/en-US/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -191,43 +191,43 @@
<value>Multiple panes</value>
</data>
<data name="TabCloseSubMenu" xml:space="preserve">
<value>Close...</value>
<value>Close</value>
</data>
<data name="TabCloseAfter" xml:space="preserve">
<value>Close Tabs to the Right</value>
<value>Close tabs to the right</value>
</data>
<data name="TabCloseOther" xml:space="preserve">
<value>Close Other Tabs</value>
<value>Close other tabs</value>
</data>
<data name="TabClose" xml:space="preserve">
<value>Close Tab</value>
<value>Close tab</value>
</data>
<data name="PaneClose" xml:space="preserve">
<value>Close Pane</value>
<value>Close pane</value>
</data>
<data name="SplitTabText" xml:space="preserve">
<value>Split Tab</value>
<value>Split tab</value>
</data>
<data name="SplitPaneText" xml:space="preserve">
<value>Split Pane</value>
<value>Split pane</value>
</data>
<data name="SearchWebText" xml:space="preserve">
<value>Web Search</value>
<value>Web search</value>
</data>
<data name="TabColorChoose" xml:space="preserve">
<value>Color...</value>
<value>Change tab color</value>
</data>
<data name="TabColorCustomButton.Content" xml:space="preserve">
<value>Custom...</value>
<value>Custom</value>
</data>
<data name="TabColorClearButton.Content" xml:space="preserve">
<value>Reset</value>
</data>
<data name="RenameTabText" xml:space="preserve">
<value>Rename Tab</value>
<value>Rename tab</value>
</data>
<data name="DuplicateTabText" xml:space="preserve">
<value>Duplicate Tab</value>
<value>Duplicate tab</value>
</data>
<data name="InvalidBackgroundImage" xml:space="preserve">
<value>Found a profile with an invalid "backgroundImage". Defaulting that profile to have no background image. Make sure that when setting a "backgroundImage", the value is a valid file path to an image.</value>
Expand Down Expand Up @@ -462,7 +462,7 @@
<value>About</value>
</data>
<data name="AboutDialog.PrimaryButtonText" xml:space="preserve">
<value>Send Feedback</value>
<value>Send feedback</value>
</data>
<data name="AboutDialog.CloseButtonText" xml:space="preserve">
<value>OK</value>
Expand All @@ -472,27 +472,27 @@
<comment>This is the heading for a version number label</comment>
</data>
<data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
<value>Getting Started</value>
<value>Getting started</value>
<comment>A hyperlink name for a guide on how to get started using Terminal</comment>
</data>
<data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
<value>Source Code</value>
<value>Source code</value>
<comment>A hyperlink name for the Terminal's documentation</comment>
</data>
<data name="AboutDialog_DocumentationLink.Content" xml:space="preserve">
<value>Documentation</value>
<comment>A hyperlink name for user documentation</comment>
</data>
<data name="AboutDialog_ReleaseNotesLink.Content" xml:space="preserve">
<value>Release Notes</value>
<value>Release notes</value>
<comment>A hyperlink name for the Terminal's release notes</comment>
</data>
<data name="AboutDialog_PrivacyPolicyLink.Content" xml:space="preserve">
<value>Privacy Policy</value>
<value>Privacy policy</value>
<comment>A hyperlink name for the Terminal's privacy policy</comment>
</data>
<data name="AboutDialog_ThirdPartyNoticesLink.Content" xml:space="preserve">
<value>Third-Party Notices</value>
<value>Third-Party notices</value>
<comment>A hyperlink name for the Terminal's third-party notices</comment>
</data>
<data name="QuitDialog.CloseButtonText" xml:space="preserve">
Expand Down Expand Up @@ -579,10 +579,10 @@
<value>Failed parsing command line:</value>
</data>
<data name="CommandPaletteControlName" xml:space="preserve">
<value>Command Palette</value>
<value>Command palette</value>
</data>
<data name="TabSwitcherControlName" xml:space="preserve">
<value>Tab Switcher</value>
<value>Tab switcher</value>
</data>
<data name="TabSwitcher_SearchBoxText" xml:space="preserve">
<value>Type a tab name...</value>
Expand Down Expand Up @@ -731,10 +731,10 @@
<value>Maximize</value>
</data>
<data name="WindowRestoreDownButtonToolTip" xml:space="preserve">
<value>Restore Down</value>
<value>Restore down</value>
</data>
<data name="CommandPaletteMenuItem" xml:space="preserve">
<value>Command Palette</value>
<value>Command palette</value>
</data>
<data name="NotificationIconFocusTerminal" xml:space="preserve">
<value>Focus Terminal</value>
Expand All @@ -754,7 +754,7 @@
<value>Split the window and start in given directory</value>
</data>
<data name="ExportTabText" xml:space="preserve">
<value>Export Text</value>
<value>Export text</value>
</data>
<data name="ExportFailure" xml:space="preserve">
<value>Failed to export terminal content</value>
Expand All @@ -766,7 +766,7 @@
<value>Find</value>
</data>
<data name="PlainText" xml:space="preserve">
<value>Plain Text</value>
<value>Plain text</value>
</data>
<data name="CloseOnExitInfoBar.Message" xml:space="preserve">
<value>Termination behavior can be configured in advanced profile settings.</value>
Expand All @@ -775,7 +775,7 @@
<value>Don't show again</value>
</data>
<data name="ElevationShield.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>This Terminal window is running as Admin</value>
<value>This Terminal window is running as administrator</value>
</data>
<data name="CommandPalette_MatchesAvailable" xml:space="preserve">
<value>Suggestions found: {0}</value>
Expand Down Expand Up @@ -835,10 +835,10 @@
<value>Close this tab</value>
</data>
<data name="NewTabMenuFolderEmpty" xml:space="preserve">
<value>Empty...</value>
<value>Empty</value>
</data>
<data name="ClosePaneText" xml:space="preserve">
<value>Close Pane</value>
<value>Close pane</value>
</data>
<data name="ClosePaneToolTip" xml:space="preserve">
<value>Close the active pane if multiple panes are present</value>
Expand All @@ -848,13 +848,13 @@
<comment>Text used to identify the reset button</comment>
</data>
<data name="MoveTabToNewWindowText" xml:space="preserve">
<value>Move Tab to New Window</value>
<value>Move tab to new window</value>
</data>
<data name="MoveTabToNewWindowToolTip" xml:space="preserve">
<value>Moves tab to a new window </value>
</data>
<data name="RunAsAdminFlyout.Text" xml:space="preserve">
<value>Run as Administrator</value>
<value>Run as administrator</value>
<comment>This text is displayed on context menu for profile entries in add new tab button.</comment>
</data>
<data name="TerminalPage_PaneMovedAnnouncement_ExistingTab" xml:space="preserve">
Expand Down Expand Up @@ -893,7 +893,7 @@
<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 Connection</value>
<value>Restart connection</value>
</data>
<data name="RestartConnectionToolTip" xml:space="preserve">
<value>Restart the active pane connection</value>
Expand Down
16 changes: 8 additions & 8 deletions src/cascadia/TerminalApp/TerminalTab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@ namespace winrt::TerminalApp::implementation
{
auto weakThis{ get_weak() };

// "Color..."
// "Change tab color..."
Controls::MenuFlyoutItem chooseColorMenuItem;
{
Controls::FontIcon colorPickSymbol;
Expand All @@ -1391,7 +1391,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem renameTabMenuItem;
{
// "Rename Tab"
// "Rename tab"
Controls::FontIcon renameTabSymbol;
renameTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
renameTabSymbol.Glyph(L"\xE8AC"); // Rename
Expand All @@ -1408,7 +1408,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem duplicateTabMenuItem;
{
// "Duplicate Tab"
// "Duplicate tab"
Controls::FontIcon duplicateTabSymbol;
duplicateTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
duplicateTabSymbol.Glyph(L"\xF5ED");
Expand All @@ -1425,7 +1425,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem splitTabMenuItem;
{
// "Split Tab"
// "Split tab"
Controls::FontIcon splitTabSymbol;
splitTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
splitTabSymbol.Glyph(L"\xF246"); // ViewDashboard
Expand All @@ -1442,7 +1442,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem moveTabToNewWindowMenuItem;
{
// "Move Tab to New Window"
// "Move tab to new window"
Controls::FontIcon moveTabToNewWindowTabSymbol;
moveTabToNewWindowTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
moveTabToNewWindowTabSymbol.Glyph(L"\xE8A7");
Expand All @@ -1459,7 +1459,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem closePaneMenuItem = _closePaneMenuItem;
{
// "Close Pane"
// "Close pane"
closePaneMenuItem.Click({ get_weak(), &TerminalTab::_closePaneClicked });
closePaneMenuItem.Text(RS_(L"ClosePaneText"));

Expand All @@ -1471,7 +1471,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem exportTabMenuItem;
{
// "Export Tab"
// "Export tab"
Controls::FontIcon exportTabSymbol;
exportTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
exportTabSymbol.Glyph(L"\xE74E"); // Save
Expand Down Expand Up @@ -1505,7 +1505,7 @@ namespace winrt::TerminalApp::implementation

Controls::MenuFlyoutItem restartConnectionMenuItem = _restartConnectionMenuItem;
{
// "Restart Connection"
// "Restart connection"
Controls::FontIcon restartConnectionSymbol;
restartConnectionSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
restartConnectionSymbol.Glyph(L"\xE72C");
Expand Down
22 changes: 11 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="ApplicationDisplayNamePortable" xml:space="preserve">
<value>Terminal (Portable)</value>
Expand Down Expand Up @@ -325,7 +325,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 the tab color</value>
</data>
<data name="PasteTextCommandKey" xml:space="preserve">
<value>Paste</value>
Expand All @@ -347,7 +347,7 @@
<value>Reset tab title</value>
</data>
<data name="OpenTabRenamerCommandKey" xml:space="preserve">
<value>Rename tab title...</value>
<value>Rename tab title</value>
</data>
<data name="ResizePaneCommandKey" xml:space="preserve">
<value>Resize pane</value>
Expand Down Expand Up @@ -441,7 +441,7 @@
<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>
Expand All @@ -450,10 +450,10 @@
<value>Toggle command palette</value>
</data>
<data name="SuggestionsCommandHistoryCommandKey" xml:space="preserve">
<value>Recent commands...</value>
<value>Recent commands</value>
</data>
<data name="SuggestionsCommandKey" xml:space="preserve">
<value>Open suggestions...</value>
<value>Open suggestions</value>
</data>
<data name="ToggleCommandPaletteCommandLineModeCommandKey" xml:space="preserve">
<value>Toggle command palette in command line mode</value>
Expand Down Expand Up @@ -505,7 +505,7 @@
<value>Break into the debugger</value>
</data>
<data name="OpenSettingsUICommandKey" xml:space="preserve">
<value>Open settings...</value>
<value>Open settings</value>
</data>
<data name="RenameWindowCommandKey" xml:space="preserve">
<value>Rename window to "{0}"</value>
Expand All @@ -515,7 +515,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 @@ -566,7 +566,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 8bd9578

Please sign in to comment.