starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-09-23 23:45:08 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Carlos Zamora
2026-08-26 11:29:28 -07:00
parent f69e009bc3
commit c7c8fef8eb
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
View File

@@ -1097,10 +1097,6 @@
<value>Hide profile from dropdown</value>
<comment>Header for a control to toggle whether the profile is shown in a dropdown menu, or not.</comment>
</data>
<data name="Profile_Hidden.Description" xml:space="preserve">
<value>If enabled, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file.</value>
<comment>A description for what the "hidden" setting does. Presented near "Profile_Hidden".</comment>
</data>
<data name="Profile_HiddenBadge.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Hidden from the dropdown menu</value>
<comment>Tooltip shown when hovering the InfoBadge next to a profile name on the Profiles landing page when that profile is hidden from the dropdown menu.</comment>

4
src/cascadia/TerminalSettingsEditor/SearchIndex.cpp
View File

@@ -254,10 +254,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
LocalizedIndexEntry localizedEntry;
localizedEntry.Entry = &entry;
localizedEntry.DisplayTextLocalized = GetLibraryResourceString(entry.ResourceName);
if (!entry.SecondaryResourceName.empty())
{
localizedEntry.SecondaryLabelLocalized = GetLibraryResourceString(entry.SecondaryResourceName);
}
if (shouldIncludeLanguageNeutralResources)
{
localizedEntry.DisplayTextNeutral = EnglishOnlyResourceLoader().GetLocalizedString(entry.ResourceName);