Skip to content

Fix typo #3479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 20, 2025
Merged

Fix typo #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
908d1b7
Fix typo
onesounds Apr 19, 2025
d5f48da
Fix typo
onesounds Apr 19, 2025
3637649
Merge remote-tracking branch 'origin/250420-MissTypo' into 250420-Mis…
onesounds Apr 19, 2025
5765baa
Fix Typo
onesounds Apr 19, 2025
f9a201a
"disable from displaying" to "Hide"
onesounds Apr 19, 2025
09f04bc
Merge remote-tracking branch 'origin/250420-MissTypo' into 250420-Mis…
onesounds Apr 20, 2025
31f2866
Adjust Badge Text and remove subtitle
onesounds Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Flow.Launcher/Languages/en.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@
<system:String x:Key="currentActionKeywords">Current action keyword</system:String>
<system:String x:Key="newActionKeyword">New action keyword</system:String>
<system:String x:Key="actionKeywordsTooltip">Change Action Keywords</system:String>
<system:String x:Key="pluginSearchDelayTime">Plugin seach delay time</system:String>
<system:String x:Key="pluginSearchDelayTimeTooltip">Change Plugin Seach Delay Time</system:String>
<system:String x:Key="pluginSearchDelayTime">Plugin search delay time</system:String>
<system:String x:Key="pluginSearchDelayTimeTooltip">Change Plugin Search Delay Time</system:String>
<system:String x:Key="FilterComboboxLabel">Advanced Settings:</system:String>
<system:String x:Key="DisplayModeOnOff">Enabled</system:String>
<system:String x:Key="DisplayModePriority">Priority</system:String>
Expand Down Expand Up @@ -235,7 +235,7 @@
<system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
<system:String x:Key="BackdropTypesMica">Mica</system:String>
<system:String x:Key="BackdropTypesMicaAlt">Mica Alt</system:String>
<system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
<system:String x:Key="TypeIsDarkToolTip">This theme supports two (light/dark) modes.</system:String>
<system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
<system:String x:Key="ShowPlaceholder">Show placeholder</system:String>
<system:String x:Key="ShowPlaceholderTip">Display placeholder when query is empty</system:String>
Expand Down Expand Up @@ -303,9 +303,8 @@
<system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
<system:String x:Key="flowlauncherPressHotkey">Press Key</system:String>
<system:String x:Key="showBadges">Show Result Badges</system:String>
<system:String x:Key="showBadgesToolTip">Show badges for query results where supported</system:String>
<system:String x:Key="showBadgesToolTip">For supported plugins, badges are displayed to help distinguish them more easily.</system:String>
<system:String x:Key="showBadgesGlobalOnly">Show Result Badges for Global Query Only</system:String>
<system:String x:Key="showBadgesGlobalOnlyToolTip">Show badges for global query results only</system:String>

<!-- Setting Proxy -->
<system:String x:Key="proxy">HTTP Proxy</system:String>
Expand Down
5 changes: 1 addition & 4 deletions Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
Visibility="Visible" />
</ContentControl>
<Border x:Name="ContextMenu" Visibility="Collapsed" />
<Border x:Name="History" Visibility="Collapsed" />

Check warning on line 376 in Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

View workflow job for this annotation

GitHub Actions / build 

'SettingsPaneTheme.ContextMenu' hides inherited member 'FrameworkElement.ContextMenu'. Use the new keyword if hiding was intended.
</Grid>
</Border>
</Border>
Expand Down Expand Up @@ -740,10 +740,7 @@
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
</cc:ExCard.SideContent>
<cc:Card
Title="{DynamicResource showBadgesGlobalOnly}"
Sub="{DynamicResource showBadgesGlobalOnlyToolTip}"
Type="InsideFit">
<cc:Card Title="{DynamicResource showBadgesGlobalOnly}" Type="InsideFit">
<ui:ToggleSwitch
IsOn="{Binding Settings.ShowBadgesGlobalOnly}"
OffContent="{DynamicResource disable}"
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<system:String x:Key="flowlauncher_plugin_program_run_as_different_user">Run As Different User</system:String>
<system:String x:Key="flowlauncher_plugin_program_run_as_administrator">Run As Administrator</system:String>
<system:String x:Key="flowlauncher_plugin_program_open_containing_folder">Open containing folder</system:String>
<system:String x:Key="flowlauncher_plugin_program_disable_program">Disable this program from displaying</system:String>
<system:String x:Key="flowlauncher_plugin_program_disable_program">Hide</system:String>
<system:String x:Key="flowlauncher_plugin_program_open_target_folder">Open target folder</system:String>

<system:String x:Key="flowlauncher_plugin_program_plugin_name">Program</system:String>
Expand Down
Loading