Skip to content

Commit a6ef43f

Browse files
committed
Adjust strings
1 parent b68ab2c commit a6ef43f

File tree

2 files changed

+25
-15
lines changed

2 files changed

+25
-15
lines changed

Flow.Launcher/Languages/en.xaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<system:String x:Key="GameMode">Game Mode</system:String>
4545
<system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>
4646
<system:String x:Key="PositionReset">Position Reset</system:String>
47-
<system:String x:Key="PositionResetToolTip">Reset search window position</system:String>
47+
<system:String x:Key="PositionResetToolTip">Reset search window location</system:String>
4848
<system:String x:Key="queryTextBoxPlaceholder">Type here to search</system:String>
4949

5050
<!-- Setting General -->
@@ -58,7 +58,7 @@
5858
<system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
5959
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
6060
<system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
61-
<system:String x:Key="SearchWindowPosition">Search Window Position</system:String>
61+
<system:String x:Key="SearchWindowPosition">Search Window Location</system:String>
6262
<system:String x:Key="SearchWindowScreenRememberLastLaunchLocation">Remember Last Position</system:String>
6363
<system:String x:Key="SearchWindowScreenCursor">Monitor with Mouse Cursor</system:String>
6464
<system:String x:Key="SearchWindowScreenFocus">Monitor with Focused Window</system:String>
@@ -490,6 +490,18 @@
490490
<system:String x:Key="Welcome_Page5_Title">Let's Start Flow Launcher</system:String>
491491
<system:String x:Key="Welcome_Page5_Text01">Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)</system:String>
492492

493+
<system:String x:Key="Welcome_Page_UserType_Title">Pick your style</system:String>
494+
<system:String x:Key="Welcome_Page_UserType_Desc">Based on your selected style, Flow will customize the initial settings for you. This setting can be changed later.</system:String>
495+
<system:String x:Key="Welcome_Page_UserType_CLI_Title">CLI Friendly</system:String>
496+
<system:String x:Key="Welcome_Page_UserType_CLI_Desc">Recommended for users familiar with the CLI or Terminal environment.</system:String>
497+
<system:String x:Key="Welcome_Page_UserType_CLI_Sub1">TAB is used as the key to Auto Complete.</system:String>
498+
<system:String x:Key="Welcome_Page_UserType_CLI_Sub2">Pressing Enter will open the path in Flow.</system:String>
499+
<system:String x:Key="Welcome_Page_UserType_GUI_Title">Windows Friendly</system:String>
500+
<system:String x:Key="Welcome_Page_UserType_GUI_Desc">Recommended for users familiar with the Windows operating style.</system:String>
501+
<system:String x:Key="Welcome_Page_UserType_GUI_Sub1">TAB is used as the key to switch between selectable options.</system:String>
502+
<system:String x:Key="Welcome_Page_UserType_GUI_Sub2">Auto Complete will be ALT+RIGHT.</system:String>
503+
<system:String x:Key="Welcome_Page_UserType_GUI_Sub3">Pressing Enter will open the folder.</system:String>
504+
493505
<!-- General Guide & Hotkey -->
494506

495507
<system:String x:Key="HotkeyUpDownDesc">Back / Context Menu</system:String>

Flow.Launcher/Resources/Pages/WelcomePageUserType.xaml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,13 @@
3737
CornerRadius="5">
3838
<StackPanel HorizontalAlignment="Left" VerticalAlignment="Center">
3939
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
40-
<!-- 아이콘 -->
4140
<TextBlock
4241
x:Name="IconText"
4342
Margin="0 0 8 0"
4443
VerticalAlignment="Center"
4544
FontFamily="/Resources/#Segoe Fluent Icons"
4645
FontSize="24"
4746
Text="{Binding Tag.Icon, RelativeSource={RelativeSource TemplatedParent}}" />
48-
<!-- 제목 -->
4947
<TextBlock
5048
x:Name="TitleText"
5149
Margin="0 0 0 2"
@@ -153,43 +151,43 @@
153151
<TextBlock
154152
FontSize="20"
155153
FontWeight="SemiBold"
156-
Text="Pick your style" />
154+
Text="{DynamicResource Welcome_Page_UserType_Title}" />
157155
<TextBlock
158156
Margin="0 10 0 15"
159157
FontSize="14"
160-
Text="Based on your selected style, Flow will customize the initial settings for you. This setting can be changed later."
158+
Text="{DynamicResource Welcome_Page_UserType_Desc}"
161159
TextWrapping="Wrap" />
162160
</StackPanel>
163161

164162
<ScrollViewer Grid.Row="1" VerticalAlignment="Top">
165163
<StackPanel>
166164
<!-- CLI 카드 -->
167165
<RadioButton
168-
Content="CLI Friendly"
166+
Content="{DynamicResource Welcome_Page_UserType_CLI_Title}"
169167
GroupName="UserTypeGroup"
170168
IsChecked="True"
171169
Style="{StaticResource RadioCardStyle}">
172170
<RadioButton.Tag>
173171
<local:RadioCardData
174-
Bullet1="TAB is used as the key to Auto Complete."
175-
Bullet2="Pressing Enter will open the path in Flow."
176-
Description1="Recommended for users familiar with the CLI or Terminal environment."
172+
Bullet1="{StaticResource Welcome_Page_UserType_CLI_Sub1}"
173+
Bullet2="{StaticResource Welcome_Page_UserType_CLI_Sub2}"
174+
Description1="{StaticResource Welcome_Page_UserType_CLI_Desc}"
177175
Icon="&#xE756;" />
178176
</RadioButton.Tag>
179177
</RadioButton>
180178

181179
<!-- Windows 카드 (Bullet 3개) -->
182180
<RadioButton
183181
Margin="0 12 0 0"
184-
Content="Windows Friendly"
182+
Content="{DynamicResource Welcome_Page_UserType_GUI_Title}"
185183
GroupName="UserTypeGroup"
186184
Style="{StaticResource RadioCardStyle}">
187185
<RadioButton.Tag>
188186
<local:RadioCardData
189-
Bullet1="TAB is used as the key to switch between selectable options."
190-
Bullet2="Autocomplete will be ALT+RIGHT."
191-
Bullet3="Pressing Enter will open the folder."
192-
Description1="Recommended for users familiar with the Windows operating style."
187+
Bullet1="{StaticResource Welcome_Page_UserType_GUI_Sub1}"
188+
Bullet2="{StaticResource Welcome_Page_UserType_GUI_Sub2}"
189+
Bullet3="{StaticResource Welcome_Page_UserType_GUI_Sub3}"
190+
Description1="{StaticResource Welcome_Page_UserType_GUI_Desc}"
193191
Icon="&#xE961;" />
194192
</RadioButton.Tag>
195193
</RadioButton>

0 commit comments

Comments
 (0)