Skip to content

Commit e74a0c9

Browse files
committed
fix most untranslated string in Setting window
1 parent 79962fb commit e74a0c9

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Icon="Images\app.png"
66
ResizeMode="NoResize"
77
WindowStartupLocation="CenterScreen"
8-
Title="Custom Plugin Hotkey" Height="200" Width="674.766">
8+
Title="{DynamicResource customeQueryHotkeyTitle}" Height="200" Width="674.766">
99
<Window.InputBindings>
1010
<KeyBinding Key="Escape" Command="Close"/>
1111
</Window.InputBindings>
@@ -19,22 +19,23 @@
1919
<RowDefinition />
2020
</Grid.RowDefinitions>
2121
<Grid.ColumnDefinitions>
22-
<ColumnDefinition Width="150" />
22+
<ColumnDefinition Width="102.124" />
23+
<ColumnDefinition Width="47.876"/>
2324
<ColumnDefinition />
2425
</Grid.ColumnDefinitions>
25-
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
26-
HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
27-
<flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
26+
<TextBlock Margin="92,0,0,0" FontSize="14" Grid.Column="0" VerticalAlignment="Center"
27+
HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Grid.ColumnSpan="2" />
28+
<flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="2" VerticalAlignment="Center" Height="32" />
2829

29-
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
30-
HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
31-
<StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
30+
<TextBlock Margin="38,0,0,0" FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
31+
HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
32+
<StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="2">
3233
<TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
3334
<Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
3435
Content="{DynamicResource preview}" />
3536
</StackPanel>
3637

37-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
38+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="2" Margin="325,61,0,0" Grid.RowSpan="2">
3839
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
3940
Content="{DynamicResource cancel}" />
4041
<Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">

Flow.Launcher/Languages/en.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<!--Setting General-->
1818
<system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
1919
<system:String x:Key="general">General</system:String>
20+
<system:String x:Key="portableMode">Portable Mode</system:String>
2021
<system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
2122
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
2223
<system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
@@ -39,6 +40,7 @@
3940
<!--Setting Plugin-->
4041
<system:String x:Key="plugin">Plugin</system:String>
4142
<system:String x:Key="browserMorePlugins">Find more plugins</system:String>
43+
<system:String x:Key="enable">Enable</system:String>
4244
<system:String x:Key="disable">Disable</system:String>
4345
<system:String x:Key="actionKeywords">Action keyword:</system:String>
4446
<system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
@@ -122,6 +124,7 @@
122124
<system:String x:Key="actionkeyword_tips">Use * if you don't want to specify an action keyword</system:String>
123125

124126
<!--Custom Query Hotkey Dialog-->
127+
<system:String x:Key="customeQueryHotkeyTitle">Custom Plugin Hotkey</system:String>
125128
<system:String x:Key="preview">Preview</system:String>
126129
<system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
127130
<system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>

Flow.Launcher/SettingWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ScrollViewer ui:ScrollViewerHelper.AutoHideScrollBars="True" Margin="60,30,0,30">
3838
<StackPanel Orientation="Vertical">
3939
<ui:ToggleSwitch Margin="10" IsOn="{Binding PortableMode}">
40-
<TextBlock Text="Portable Mode" />
40+
<TextBlock Text="{DynamicResource portableMode}" />
4141
</ui:ToggleSwitch>
4242
<CheckBox Margin="10" IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
4343
Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck">
@@ -166,7 +166,7 @@
166166
</TextBlock>
167167
</ToolTipService.ToolTip>
168168
</TextBlock>
169-
<ui:ToggleSwitch Grid.Column="1" OffContent="Disabled" OnContent="Enabled"
169+
<ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}"
170170
MaxWidth="110" HorizontalAlignment="Right"
171171
IsOn="{Binding PluginState}"/>
172172
</Grid>

0 commit comments

Comments
 (0)