Merge commit 'cb91ad4f7e1685b90401a847cff2258007de4fb9' into dev

src/MeoAsstGui/Resources/Localizations/en-us.xaml

@@ -316,4 +316,27 @@
     <!--TrayIcon-->
     <system:String x:Key="Exit">Exit</system:String>
     <!--TrayIcon-->
+
+    <!--AboutUser-->
+    <system:String x:Key="Website">MAA Website</system:String>
+    <system:String x:Key="Github">Source: GitHub</system:String>
+    <system:String x:Key="QQgroup">Copilot Json sharing QQgroup</system:String>
+    <system:String x:Key="QQgroup1">QQgroup1(Full)</system:String>
+    <system:String x:Key="QQgroup2">QQgroup2</system:String>
+    <system:String x:Key="QQgroup3">QQgroup3</system:String>
+    <system:String x:Key="Help">Q&amp;A</system:String>
+    <system:String x:Key="Issue">Issue</system:String>
+    <!--AboutUser-->
+
+    <!--AutoRecruitSettings-->
+    <system:String x:Key="AutoRefresh">Auto refresh Lv3 Tags</system:String>
+    <system:String x:Key="AutoUseExpedited">Auto use Expedited*</system:String>
+    <system:String x:Key="RecruitMaxTimes">Recruit max times</system:String>
+    <system:String x:Key="ManuallySelectLevel1">Manually select 1★</system:String>
+    <system:String x:Key="AutoSelectLevel3">Auto select 3★</system:String>
+    <system:String x:Key="AutoSelectLevel4">Auto select 4★</system:String>
+    <system:String x:Key="AutoSelectLevel5">Auto select 5★</system:String>
+    <system:String x:Key="AutoSelectLevel6">Auto select 6★</system:String>
+    <system:String x:Key="Level1Tip">If checked, the recruitment will be skipped when the entry with 1★ is identified. If not checked, the entry with 1★ will be ignored</system:String>
+    <!--AutoRecruitSettings-->
 </ResourceDictionary>

src/MeoAsstGui/Resources/Localizations/zh-cn.xaml

@@ -316,4 +316,27 @@
     <!--TrayIcon-->
     <system:String x:Key="Exit">退出</system:String>
     <!--TrayIcon-->
+
+    <!--About-->
+    <system:String x:Key="Website">MAA 官网</system:String>
+    <system:String x:Key="Github">源码：GitHub</system:String>
+    <system:String x:Key="QQgroup">自动战斗作业分享 Q 群</system:String>
+    <system:String x:Key="QQgroup1">一群（已满）</system:String>
+    <system:String x:Key="QQgroup2">二群</system:String>
+    <system:String x:Key="QQgroup3">三群</system:String>
+    <system:String x:Key="Help">常见问题</system:String>
+    <system:String x:Key="Issue">问题反馈</system:String>
+    <!--About-->
+
+    <!--AutoRecruitSettings-->
+    <system:String x:Key="AutoRefresh">自动刷新3星Tags</system:String>
+    <system:String x:Key="AutoUseExpedited">自动使用加急许可*</system:String>
+    <system:String x:Key="RecruitMaxTimes">每次执行时最大招募次数</system:String>
+    <system:String x:Key="ManuallySelectLevel1">手动确认1星</system:String>
+    <system:String x:Key="AutoSelectLevel3">自动确认3星</system:String>
+    <system:String x:Key="AutoSelectLevel4">自动确认4星</system:String>
+    <system:String x:Key="AutoSelectLevel5">自动确认5星</system:String>
+    <system:String x:Key="AutoSelectLevel6">自动确认6星</system:String>
+    <system:String x:Key="Level1Tip">勾选时识别到1星词条时跳过该次招募，未勾选时将忽略1星词条</system:String>
+    <!--AutoRecruitSettings-->
 </ResourceDictionary>

src/MeoAsstGui/UserControl/AboutUserControl.xaml

@@ -11,24 +11,34 @@
              d:DesignHeight="300" d:DesignWidth="550">
     <StackPanel VerticalAlignment="Center" Margin="10">
         <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-            <Hyperlink NavigateUri="https://www.maa.plus" Click="Hyperlink_Click" TextDecorations="None">MAA 官网</Hyperlink>
+            <Hyperlink NavigateUri="https://www.maa.plus" Click="Hyperlink_Click" TextDecorations="None" Cursor="Hand" >
+                <TextBlock Text="{DynamicResource Website}"></TextBlock>
+            </Hyperlink>
         </TextBlock>
         <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-            <Hyperlink NavigateUri="https://github.com/MaaAssistantArknights/MaaAssistantArknights" Click="Hyperlink_Click" TextDecorations="None">源码: GitHub</Hyperlink>
+            <Hyperlink NavigateUri="https://github.com/MaaAssistantArknights/MaaAssistantArknights" Click="Hyperlink_Click" TextDecorations="None">
+                <TextBlock Text="{DynamicResource Github}"></TextBlock>
+            </Hyperlink>
+        </TextBlock>
+        <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Text="{DynamicResource QQgroup}"></TextBlock>
+        <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
+            <TextBlock Text="{DynamicResource QQgroup1}"></TextBlock>
+            <Hyperlink NavigateUri="https://jq.qq.com/?_wv=1027&amp;k=u9i2n7Sb" Click="Hyperlink_Click" TextDecorations="None">
+                <TextBlock Text="{DynamicResource QQgroup2}"></TextBlock>
+            </Hyperlink>
+            <Hyperlink NavigateUri="https://jq.qq.com/?_wv=1027&amp;k=mKdOnhWV" Click="Hyperlink_Click" TextDecorations="None" Cursor="Hand">
+                <TextBlock Text="{DynamicResource QQgroup3}"></TextBlock>
+            </Hyperlink>
         </TextBlock>
         <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-            自动战斗作业分享 Q 群
+            <Hyperlink NavigateUri="https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98.md" Click="Hyperlink_Click" TextDecorations="None">
+                <TextBlock Text="{DynamicResource Help}"></TextBlock>
+            </Hyperlink>
         </TextBlock>
         <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-            一群（已满）
-            <Hyperlink NavigateUri="https://jq.qq.com/?_wv=1027&amp;k=u9i2n7Sb" Click="Hyperlink_Click" TextDecorations="None">二群</Hyperlink>
-            <Hyperlink NavigateUri="https://jq.qq.com/?_wv=1027&amp;k=mKdOnhWV" Click="Hyperlink_Click" TextDecorations="None">三群</Hyperlink>
-        </TextBlock>
-        <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-            <Hyperlink NavigateUri="https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98.md" Click="Hyperlink_Click" TextDecorations="None">常见问题</Hyperlink>
-        </TextBlock>
-        <TextBlock Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
-            <Hyperlink NavigateUri="https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues" Click="Hyperlink_Click" TextDecorations="None">问题反馈</Hyperlink>
+            <Hyperlink NavigateUri="https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues" Click="Hyperlink_Click" TextDecorations="None">
+                <TextBlock Text="{DynamicResource Issue}"></TextBlock>
+            </Hyperlink>
         </TextBlock>
     </StackPanel>
 </UserControl>

src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml

@@ -15,22 +15,22 @@
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0" VerticalAlignment="Center" Margin="10">
-            <CheckBox IsChecked="{Binding RefreshLevel3}" Content="自动刷新3星Tags" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
-            <CheckBox IsChecked="{Binding UseExpedited}" Content="自动使用加急许可*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" 
+            <CheckBox IsChecked="{Binding RefreshLevel3}" Content="{DynamicResource AutoRefresh}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
+            <CheckBox IsChecked="{Binding UseExpedited}" Content="{DynamicResource AutoUseExpedited}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" 
                       ToolTip="{DynamicResource CheckBoxesNotSaved}"/>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0, 10">
                 <TextBlock Style="{StaticResource TextBlockDefault}" Block.TextAlignment="Center"
-                   Text="每次执行时&#xA;最大招募次数" Margin="5" VerticalAlignment="Center" />
+                   Text="{DynamicResource RecruitMaxTimes}" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" Width="72"/>
                 <TextBox Text="{Binding RecruitMaxTimes}" Margin="5"
                      Width="50" InputMethod.IsInputMethodEnabled="False" />
             </StackPanel>
         </StackPanel>
         <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="10">
-            <CheckBox IsChecked="{Binding NotChooseLevel1}" Content="手动确认1星" Margin="5" ToolTip="勾选时识别到1星词条时跳过该次招募，未勾选时将忽略1星词条"/>
-            <CheckBox IsChecked="{Binding ChooseLevel3}" Content="自动确认3星" Margin="5" />
-            <CheckBox IsChecked="{Binding ChooseLevel4}" Content="自动确认4星" Margin="5" />
-            <CheckBox IsChecked="{Binding ChooseLevel5}" Content="自动确认5星" Margin="5" />
-            <CheckBox IsEnabled="False" IsChecked="False" Content="自动确认6星" Margin="5" />
+            <CheckBox IsChecked="{Binding NotChooseLevel1}" Content="{DynamicResource ManuallySelectLevel1}" Margin="5" ToolTip="{DynamicResource Level1Tip}"/>
+            <CheckBox IsChecked="{Binding ChooseLevel3}" Content="{DynamicResource AutoSelectLevel3}" Margin="5" />
+            <CheckBox IsChecked="{Binding ChooseLevel4}" Content="{DynamicResource AutoSelectLevel4}" Margin="5" />
+            <CheckBox IsChecked="{Binding ChooseLevel5}" Content="{DynamicResource AutoSelectLevel5}" Margin="5" />
+            <CheckBox IsEnabled="False" IsChecked="False" Content="{DynamicResource AutoSelectLevel6}" Margin="5" />
         </StackPanel>
     </Grid>
 </UserControl>