Skip to content

Commit

Permalink
Swapped localisation keys to be English instead of CN
Browse files Browse the repository at this point in the history
  • Loading branch information
neoKushan committed Aug 5, 2021
1 parent 25c49ff commit 32d4d6f
Show file tree
Hide file tree
Showing 12 changed files with 363 additions and 363 deletions.
24 changes: 12 additions & 12 deletions Magpie/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<Label Style="{StaticResource ContextMenuItemFontIcon}" Content="&#xEDA7;" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="5秒后缩放" Name="cmiScale" Click="CmiScale_Click">
<MenuItem Header="5Zoom_In_After_5S" Name="cmiScale" Click="CmiScale_Click">
<MenuItem.Icon>
<Label Style="{StaticResource ContextMenuItemFontIcon}" Content="&#xE916;" />
</MenuItem.Icon>
Expand All @@ -41,7 +41,7 @@
<Label Style="{StaticResource ContextMenuItemFontIcon}" Content="&#xE737;" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="选项" Click="CmiOptions_Click">
<MenuItem Header="Options" Click="CmiOptions_Click">
<MenuItem.Icon>
<Label Style="{StaticResource ContextMenuItemFontIcon}" Content="&#xE713;" />
</MenuItem.Icon>
Expand Down Expand Up @@ -81,28 +81,28 @@
<RowDefinition/>
</Grid.RowDefinitions>

<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.热键}" VerticalAlignment="Top" Margin="0,5,0,0" Padding="0,5,5,5"/>
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Hotkey}" VerticalAlignment="Top" Margin="0,5,0,0" Padding="0,5,5,5"/>
<TextBox x:Name="txtHotkey" Grid.Column="1" Margin="10,5,10,0" VerticalAlignment="Top" Padding="1,3" TextChanged="TxtHotkey_TextChanged" >
<TextBox.ContextMenu>
<ContextMenu/>
</TextBox.ContextMenu>
</TextBox>
<Button Content="{x:Static p:Resources.秒后缩放}" Name="btnScale" Click="BtnScale_Click" Grid.Column="2" HorizontalAlignment="Right" Margin="0,5,0,0" VerticalAlignment="Top" Padding="10,3"/>
<Button Content="{x:Static p:Resources.Zoom_In_After_5S}" Name="btnScale" Click="BtnScale_Click" Grid.Column="2" HorizontalAlignment="Right" Margin="0,5,0,0" VerticalAlignment="Top" Padding="10,3"/>

<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.缩放模式}" Grid.Row="1" VerticalAlignment="Center" Margin="0,20,0,0" Padding="0,5,5,5" />
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Scaling_Mode}" Grid.Row="1" VerticalAlignment="Center" Margin="0,20,0,0" Padding="0,5,5,5" />
<ComboBox Name="cbbScaleMode" Grid.Row="1" SelectionChanged="CbbScaleMode_SelectionChanged" Margin="10,20,10,0" />

<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.抓取模式}" Grid.Row="2" VerticalAlignment="Top" Margin="0,9.667,0.333,0" Padding="0,5,5,5"/>
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Capture_Mode}" Grid.Row="2" VerticalAlignment="Top" Margin="0,9.667,0.333,0" Padding="0,5,5,5"/>
<ComboBox Name="cbbCaptureMode" Grid.Row="2" SelectionChanged="CbbCaptureMode_SelectionChanged" Margin="10,10,10,0">
<ComboBoxItem Content="WinRT Capture" />
<ComboBoxItem Content="GDI" />
</ComboBox>

<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.进程注入}" Grid.Row="3" VerticalAlignment="Center" Margin="0,10,0,0" Padding="0,5,5,5"/>
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Injection_Mode}" Grid.Row="3" VerticalAlignment="Center" Margin="0,10,0,0" Padding="0,5,5,5"/>
<ComboBox Name="cbbInjectMode" Grid.Row="3" SelectionChanged="CbbInjectMode_SelectionChanged" Margin="10,10,10,0">
<ComboBoxItem Content="{x:Static p:Resources.不注入}" />
<ComboBoxItem Content="{x:Static p:Resources.运行时注入}" />
<ComboBoxItem Content="{x:Static p:Resources.启动时注入}" />
<ComboBoxItem Content="{x:Static p:Resources.No_Injection}" />
<ComboBoxItem Content="{x:Static p:Resources.Runtime_Injection}" />
<ComboBoxItem Content="{x:Static p:Resources.Injection_At_Startup}" />
</ComboBox>
</Grid>

Expand All @@ -116,14 +116,14 @@
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="tbCurWndTitle" Margin="0" Text="当前窗口" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
<TextBlock x:Name="tbCurWndTitle" Margin="0" Text="Current_Window" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
<Button Content="取消" Margin="5,0,0,0" VerticalAlignment="Center" Padding="5,2" Click="BtnCancelRestore_Click" Grid.Column="1"/>
</Grid>

<Button Click="BtnOptions_Click" Margin="10,0,0,0" VerticalAlignment="Center" Padding="10,5" Grid.Column="1" HorizontalAlignment="Right">
<StackPanel Orientation="Horizontal">
<Label FontFamily="Segoe MDL2 Assets" Content="&#xE713;" Padding="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="0" />
<Label Content="{x:Static p:Resources.选项}" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Padding="0" Margin="5,0,0,0" />
<Label Content="{x:Static p:Resources.Options}" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Padding="0" Margin="5,0,0,0" />
</StackPanel>
</Button>
</Grid>
Expand Down
8 changes: 4 additions & 4 deletions Magpie/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public partial class MainWindow : Window {

private IntPtr Handle;

// 不为零时表示全屏窗口不是因为热键关闭的
// 不为零时表示全屏窗口不是因为Hotkey关闭的
private IntPtr prevSrcWindow = IntPtr.Zero;
private readonly DispatcherTimer timerRestore = new DispatcherTimer {
Interval = new TimeSpan(0, 0, 0, 0, 200)
Expand Down Expand Up @@ -83,7 +83,7 @@ private void TimerRestore_Tick(object sender, EventArgs e) {
return;
}

tbCurWndTitle.Text = $"{Properties.Resources.当前窗口}{NativeMethods.GetWindowTitle(prevSrcWindow)}";
tbCurWndTitle.Text = $"{Properties.Resources.Current_Window}{NativeMethods.GetWindowTitle(prevSrcWindow)}";
gridAutoRestore.Visibility = Visibility.Visible;
}

Expand Down Expand Up @@ -144,7 +144,7 @@ private void LoadScaleModels() {
scaleModels = null;

cbbScaleMode.Items.Clear();
_ = cbbScaleMode.Items.Add($"<{Properties.Resources.解析失败}>");
_ = cbbScaleMode.Items.Add($"<{Properties.Resources.Parse_Failure}>");
}
}

Expand Down Expand Up @@ -287,7 +287,7 @@ private void StartScaleTimer() {

private void StopScaleTimer() {
timerScale.Stop();
btnScale.Content = cmiScale.Header = Properties.Resources.秒后缩放;
btnScale.Content = cmiScale.Header = Properties.Resources.Zoom_In_After_5S;
}

private void ToggleScaleTimer() {
Expand Down
16 changes: 8 additions & 8 deletions Magpie/Options/AboutOptionsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<Image Height="28" Source="{StaticResource Logo}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<Label Content="MAGPIE" Margin="5,0,0,-3" VerticalAlignment="Top" FontSize="20" Padding="0" HorizontalAlignment="Left"/>
<Label Name="lblVersion" Content="{x:Static p:Resources.版本}" Padding="0" Margin="10,0,0,0" VerticalAlignment="Bottom" FontSize="11" />
<Label Name="lblVersion" Content="{x:Static p:Resources.Version}" Padding="0" Margin="10,0,0,0" VerticalAlignment="Bottom" FontSize="11" />
</StackPanel>
</StackPanel>
<Button Content="{x:Static p:Resources.开源许可}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center" Click="BtnLicense_Click" />
<Button Content="{x:Static p:Resources.Open_Source_Licenses}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center" Click="BtnLicense_Click" />
</Grid>

<Grid Margin="0,20,0,0">
Expand All @@ -34,7 +34,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>

<Label Content="{x:Static p:Resources.支持}" Padding="0" FontWeight="Bold" />
<Label Content="{x:Static p:Resources.Support}" Padding="0" FontWeight="Bold" />
<Separator Margin="5,0,0,0" VerticalAlignment="Center" Grid.Column="1"/>
</Grid>
<Grid Margin="5,5,0,0">
Expand All @@ -48,13 +48,13 @@
<RowDefinition />
</Grid.RowDefinitions>

<Label Content="{x:Static p:Resources.项目地址}" Padding="5" HorizontalAlignment="Left" VerticalAlignment="Center" />
<Label Content="{x:Static p:Resources.Project_URL}" Padding="5" HorizontalAlignment="Left" VerticalAlignment="Center" />
<TextBlock Grid.Column="1" Padding="5">
<Hyperlink NavigateUri="https://github.com/Blinue/Magpie" RequestNavigate="Hyperlink_RequestNavigate">
https://github.com/Blinue/Magpie
</Hyperlink>
</TextBlock>
<Label Content="{x:Static p:Resources.反馈}" Grid.Row="1" Padding="5" Grid.RowSpan="2" HorizontalAlignment="Left" VerticalAlignment="Center" />
<Label Content="{x:Static p:Resources.Feedback}" Grid.Row="1" Padding="5" Grid.RowSpan="2" HorizontalAlignment="Left" VerticalAlignment="Center" />
<TextBlock Grid.Column="1" Grid.Row="1" Padding="5">
<Hyperlink NavigateUri="https://github.com/Blinue/Magpie/issues" RequestNavigate="Hyperlink_RequestNavigate">
https://github.com/Blinue/Magpie/issues
Expand All @@ -73,7 +73,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>

<Label Content="{x:Static p:Resources.鸣谢}" Padding="0" FontWeight="Bold" />
<Label Content="{x:Static p:Resources.Thanks}" Padding="0" FontWeight="Bold" />
<Separator Margin="5,0,0,0" VerticalAlignment="Center" Grid.Column="1"/>
</Grid>
<Grid Margin="5,5,0,0">
Expand Down Expand Up @@ -106,8 +106,8 @@
https://github.com/microsoft/cppwinrt
</Hyperlink>
</TextBlock>
<TextBlock Text="{x:Static p:Resources.Magpie_移植的所有优秀着色器项目}" Grid.Row="3" Grid.ColumnSpan="2" Padding="5" />
<TextBlock Text="{x:Static p:Resources.所有为Magpie提供反馈与贡献的人}" Grid.Row="4" Grid.ColumnSpan="2" Padding="5" />
<TextBlock Text="{x:Static p:Resources.All_Shaders_Thanks_Text}" Grid.Row="3" Grid.ColumnSpan="2" Padding="5" />
<TextBlock Text="{x:Static p:Resources.All_Contributors_Thanks_Text}" Grid.Row="4" Grid.ColumnSpan="2" Padding="5" />
</Grid>
</StackPanel>
</Page>
2 changes: 1 addition & 1 deletion Magpie/Options/AboutOptionsPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public partial class AboutOptionsPage : Page {
public AboutOptionsPage() {
InitializeComponent();

lblVersion.Content = $"{Properties.Resources.版本} {App.APP_VERSION.ToString(3)}";
lblVersion.Content = $"{Properties.Resources.Version} {App.APP_VERSION.ToString(3)}";
}

private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
Expand Down
4 changes: 2 additions & 2 deletions Magpie/Options/AdvancedOptionsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

<StackPanel>
<StackPanel Orientation="Horizontal">
<Label Content="{x:Static p:Resources.日志级别}" Padding="0" VerticalContentAlignment="Center" />
<Label Content="{x:Static p:Resources.Logging_Level}" Padding="0" VerticalContentAlignment="Center" />
<ComboBox Margin="10,0,0,0" />
</StackPanel>
<CheckBox Content="{x:Static p:Resources.显示帧率}" Margin="0,20,0,0" IsChecked="{Binding Source={x:Static props:Settings.Default},Path=ShowFPS,Mode=TwoWay}"/>
<CheckBox Content="{x:Static p:Resources.Show_Frame_Rate}" Margin="0,20,0,0" IsChecked="{Binding Source={x:Static props:Settings.Default},Path=ShowFPS,Mode=TwoWay}"/>
</StackPanel>
</Page>
6 changes: 3 additions & 3 deletions Magpie/Options/ApplicationOptionsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

<StackPanel HorizontalAlignment="Left" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Left">
<Label Content="{x:Static p:Resources.语言}" Padding="0" VerticalAlignment="Center"/>
<Label Content="{x:Static p:Resources.Language}" Padding="0" VerticalAlignment="Center"/>
<ComboBox Margin="10,0,0,0" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel>
<CheckBox x:Name="ckbRunAtStartUp" Content="{x:Static p:Resources.开机启动}" Margin="0,20,0,0" Unchecked="CkbRunAtStartUp_Unchecked"/>
<CheckBox x:Name="ckbRunAtStartUp" Content="{x:Static p:Resources.Run_At_Startup}" Margin="0,20,0,0" Unchecked="CkbRunAtStartUp_Unchecked"/>
<CheckBox
x:Name="ckbMinimizeAtStartUp"
Content="{x:Static p:Resources.开机启动时最小化到系统托盘}"
Content="{x:Static p:Resources.Minimise_To_System_Tray}"
Margin="20,10,0,0"
Unchecked="CkbMinimizeAtStartUp_Unchecked"
IsChecked="{Binding Source={x:Static props:Settings.Default},Path=MinimizeAtWindowsStartUp,Mode=TwoWay}"
Expand Down
6 changes: 3 additions & 3 deletions Magpie/Options/LicenseWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
xmlns:p="clr-namespace:Magpie.Properties;assembly=Magpie"
xmlns:resx="clr-namespace:Magpie.Properties"
mc:Ignorable="d"
Title="{x:Static p:Resources.Magpie_开源许可}" Height="400" Width="550" ResizeMode="NoResize">
Title="{x:Static p:Resources.Magpie_Open_Source_Licenses}" Height="400" Width="550" ResizeMode="NoResize">
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Text="{x:Static p:Resources.Magpie_和它使用的开源软件的许可}" />
<TextBlock Text="{x:Static p:Resources.Licenses_That_Magpie_Uses}" />
<TextBox VerticalScrollBarVisibility="Auto" Text="{x:Static resx:Resources.Licenses}" UndoLimit="0" Grid.Row="1" AllowDrop="False" IsTabStop="False" Margin="0,10,0,0" TextWrapping="Wrap" IsUndoEnabled="False" IsReadOnly="True" />
<Button Content="{x:Static p:Resources.确定}" Grid.Row="2" HorizontalAlignment="Right" Margin="0,10,0,0" Padding="10,5" IsDefault="True" Click="BtnOK_Click" />
<Button Content="{x:Static p:Resources.Close}" Grid.Row="2" HorizontalAlignment="Right" Margin="0,10,0,0" Padding="10,5" IsDefault="True" Click="BtnOK_Click" />
</Grid>
</Window>
10 changes: 5 additions & 5 deletions Magpie/Options/OptionsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Magpie.Options"
xmlns:p="clr-namespace:Magpie.Properties;assembly=Magpie"
mc:Ignorable="d"
Title="{x:Static p:Resources.Magpie_选项}" Height="400" Width="650">
Title="{x:Static p:Resources.Magpie_Options}" Height="400" Width="650">
<DockPanel>
<ListBox x:Name="lbxOptionsPage" Margin="0" SelectionChanged="LxbOptionsPage_SelectionChanged" Padding="0" BorderThickness="0,0,1,0">
<ListBox.Resources>
Expand All @@ -28,25 +28,25 @@
<ListBoxItem>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource Icon}" Content="&#xECAA;" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.应用程序}" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.Application}" />
</StackPanel>
</ListBoxItem>
<ListBoxItem>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource Icon}" Content="&#xE92D;" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.缩放}" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.Zoom}" />
</StackPanel>
</ListBoxItem>
<ListBoxItem>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource Icon}" Content="&#xEC7A;" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.高级}" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.Advanced}" />
</StackPanel>
</ListBoxItem>
<ListBoxItem>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource Icon}" Content="&#xE946;" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.关于}" />
<Label Style="{StaticResource Name}" Content="{x:Static p:Resources.About}" />
</StackPanel>
</ListBoxItem>
</ListBox>
Expand Down
6 changes: 3 additions & 3 deletions Magpie/Options/ScaleOptionsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</Page.Resources>

<StackPanel>
<CheckBox Content="{x:Static p:Resources.缩放时调整光标速度}"/>
<CheckBox Content="{x:Static p:Resources.如果源窗口失去焦点_则在它重获焦点时恢复全屏}" Margin="0,20,0,0" IsChecked="{Binding Source={x:Static props:Settings.Default},Path=AutoRestore,Mode=TwoWay}" />
<Button Content="{x:Static p:Resources.打开缩放配置}" HorizontalAlignment="Left" Margin="0,20,0,0" Click="BtnScale_Click"/>
<CheckBox Content="{x:Static p:Resources.Adjust_Cursor_Scale}"/>
<CheckBox Content="{x:Static p:Resources.Restore_Full_Screen}" Margin="0,20,0,0" IsChecked="{Binding Source={x:Static props:Settings.Default},Path=AutoRestore,Mode=TwoWay}" />
<Button Content="{x:Static p:Resources.Open_Scale_Config_File}" HorizontalAlignment="Left" Margin="0,20,0,0" Click="BtnScale_Click"/>
</StackPanel>
</Page>
Loading

0 comments on commit 32d4d6f

Please sign in to comment.