From 290a1ddd9ee732397b14be280c6b46848877e520 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Wed, 27 Jul 2022 11:06:39 +0800
Subject: [PATCH 1/3] style: add some space

---
 .../Resources/Localizations/en-us.xaml        | 30 +++++++++----------
 .../Resources/Localizations/zh-cn.xaml        | 28 ++++++++---------
 .../UserControl/TimerSettingsUserControl.xaml | 16 +++++-----
 .../ViewModels/SettingsViewModel.cs           |  2 +-
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index b783aaae0c..345331a851 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -231,11 +231,11 @@
 
     <!--Logs-->
     <system:String x:Key="CopilotTip">Tips：</system:String>
-    <system:String x:Key="CopilotTip1">1.Please set the emulator and game frame rate to 60 frames or higher.</system:String>
-    <system:String x:Key="CopilotTip2">2.Please use this function only in the interface with "Start" button.</system:String>
-    <system:String x:Key="CopilotTip3">3.You can turn off the "Auto squad" when using friends to help you, and manually select an agent to start.</system:String>
-    <system:String x:Key="CopilotTip4">4.To Paradox Simulation, you need to turn off "Auto squad" and select a skill before starting on the interface of "Start" button.</system:String>
-    <system:String x:Key="CopilotTip5">5."Auto squad" can not identify the "special focus" crew members temporarily, please cancel the special attention or manual formation if necessary.</system:String>
+    <system:String x:Key="CopilotTip1">1. Please set the emulator and game frame rate to 60 frames or higher.</system:String>
+    <system:String x:Key="CopilotTip2">2. Please use this function only in the interface with "Start" button.</system:String>
+    <system:String x:Key="CopilotTip3">3. You can turn off the "Auto squad" when using friends to help you, and manually select an agent to start.</system:String>
+    <system:String x:Key="CopilotTip4">4. To Paradox Simulation, you need to turn off "Auto squad" and select a skill before starting on the interface of "Start" button.</system:String>
+    <system:String x:Key="CopilotTip5">5. "Auto squad" can not identify the "special focus" crew members temporarily, please cancel the special attention or manual formation if necessary.</system:String>
 
     <system:String x:Key="CopilotFileReadError">Failed to read file!</system:String>
     <system:String x:Key="CopilotNoFound">No corresponding file found!</system:String>
@@ -320,10 +320,10 @@
     <!--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="QQgroup">Copilot Json sharing QQ group</system:String>
+    <system:String x:Key="QQgroup1">QQ group1(Full)</system:String>
+    <system:String x:Key="QQgroup2">QQ group2</system:String>
+    <system:String x:Key="QQgroup3">QQ group3</system:String>
     <system:String x:Key="Help">Q&amp;A</system:String>
     <system:String x:Key="Issue">Issue</system:String>
     <!--AboutUser-->
@@ -332,11 +332,11 @@
     <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>
+    <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>
\ No newline at end of file
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 5f85437174..7b2a8c72e3 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -220,7 +220,7 @@
     <system:String x:Key="Copilot">自动战斗 Beta</system:String>
     <system:String x:Key="CopilotLocation">作业路径/神秘代码</system:String>
     <system:String x:Key="SelectTheFile">选择作业</system:String>
-    <system:String x:Key="SelectTheFileTip">作业文件可以直接用鼠标拖进来哦(oﾟvﾟ)ノ</system:String>
+    <system:String x:Key="SelectTheFileTip">作业文件可以直接用鼠标拖进来哦 (oﾟvﾟ)ノ</system:String>
     <system:String x:Key="AutoSquad">自动编队</system:String>
     <system:String x:Key="AutoSquadTip">自动编队暂时无法识别“特别关注”的干员</system:String>
 
@@ -231,11 +231,11 @@
 
     <!--日志-->
     <system:String x:Key="CopilotTip">小提示：</system:String>
-    <system:String x:Key="CopilotTip1">1.请将模拟器及游戏帧率设置到 60 帧或更高；</system:String>
-    <system:String x:Key="CopilotTip2">2.请在有“开始行动”按钮的界面再使用本功能；</system:String>
-    <system:String x:Key="CopilotTip3">3.使用好友助战可以关闭“自动编队”，手动选择干员后开始；</system:String>
-    <system:String x:Key="CopilotTip4">4.模拟悖论需要关闭“自动编队”，并选好技能后处于“开始模拟”按钮的界面再开始；</system:String>
-    <system:String x:Key="CopilotTip5">5.“自动编队”暂时无法识别“特别关注”的干员，如有需求请取消特别关注或手动编队；</system:String>
+    <system:String x:Key="CopilotTip1">1. 请将模拟器及游戏帧率设置到 60 帧或更高；</system:String>
+    <system:String x:Key="CopilotTip2">2. 请在有“开始行动”按钮的界面再使用本功能；</system:String>
+    <system:String x:Key="CopilotTip3">3. 使用好友助战可以关闭“自动编队”，手动选择干员后开始；</system:String>
+    <system:String x:Key="CopilotTip4">4. 模拟悖论需要关闭“自动编队”，并选好技能后处于“开始模拟”按钮的界面再开始；</system:String>
+    <system:String x:Key="CopilotTip5">5. “自动编队”暂时无法识别“特别关注”的干员，如有需求请取消特别关注或手动编队；</system:String>
 
     <system:String x:Key="CopilotFileReadError">读取文件失败！</system:String>
     <system:String x:Key="CopilotNoFound">未找到对应作业！</system:String>
@@ -297,7 +297,7 @@
     <system:String x:Key="ThisFacility">当前设施：</system:String>
     <system:String x:Key="RecruitingResults">公招识别结果：</system:String>
     <system:String x:Key="RecruitingTips">公招提示</system:String>
-    <system:String x:Key="RecruitmentOfStar">公招出{0}星了哦！</system:String>
+    <system:String x:Key="RecruitmentOfStar">公招出 {0} 星了哦！</system:String>
     <system:String x:Key="RecruitmentOfBot">公招出小车了哦！</system:String>
     <system:String x:Key="Choose">选择</system:String>
     <system:String x:Key="Refreshed">当前槽位已刷新</system:String>
@@ -329,14 +329,14 @@
     <!--About-->
 
     <!--AutoRecruitSettings-->
-    <system:String x:Key="AutoRefresh">自动刷新3星Tags</system:String>
+    <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>
+    <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>
\ No newline at end of file
diff --git a/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml
index 6009b9c0b9..2e652c6783 100644
--- a/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml
@@ -29,7 +29,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}1">
+                            <MultiBinding StringFormat="{}{0} 1">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -44,7 +44,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}2">
+                            <MultiBinding StringFormat="{}{0} 2">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -59,7 +59,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}3">
+                            <MultiBinding StringFormat="{}{0} 3">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -74,7 +74,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}4">
+                            <MultiBinding StringFormat="{}{0} 4">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -89,7 +89,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}5">
+                            <MultiBinding StringFormat="{}{0} 5">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -104,7 +104,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}6">
+                            <MultiBinding StringFormat="{}{0} 6">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -119,7 +119,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}7">
+                            <MultiBinding StringFormat="{}{0} 7">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
@@ -134,7 +134,7 @@
                 <CheckBox.Content>
                     <TextBlock>
                         <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}8">
+                            <MultiBinding StringFormat="{}{0} 8">
                                 <Binding Source="{StaticResource Timer}" />
                             </MultiBinding>
                         </TextBlock.Text>
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 6f70aafa31..b175eb4804 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -1146,7 +1146,7 @@ namespace MeoAsstGui
                 {
                     Execute.OnUIThread(() =>
                     {
-                        using (var toast = new ToastNotification("通知演示"))
+                        using (var toast = new ToastNotification("Test test"))
                         {
                             toast.Show();
                         }

From f13c7b3f41bde9160e7712d83d51c0c845e9aff8 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Wed, 27 Jul 2022 11:11:56 +0800
Subject: [PATCH 2/3] style: add space

---
 src/MeoAsstGui/Resources/Localizations/en-us.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index e88bfc7198..a080f25afb 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -220,7 +220,7 @@
     <system:String x:Key="Copilot">Copilot Beta</system:String>
     <system:String x:Key="CopilotLocation">Task file / url</system:String>
     <system:String x:Key="SelectTheFile">Select the file</system:String>
-    <system:String x:Key="SelectTheFileTip">Task files can be directly dragged in with the mouse(oﾟvﾟ)ノ</system:String>
+    <system:String x:Key="SelectTheFileTip">Task files can be directly dragged in with the mouse (oﾟvﾟ)ノ</system:String>
     <system:String x:Key="AutoSquad">Auto squad</system:String>
     <system:String x:Key="AutoSquadTip">The agent of "special focus" cannot be identified at this time</system:String>
 

From 47a2288c1273d4f4a1246d8f5420ca27480b3ac7 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Wed, 27 Jul 2022 11:14:16 +0800
Subject: [PATCH 3/3] style: fix a translation

---
 src/MeoAsstGui/Resources/Localizations/en-us.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index a080f25afb..1ff6ed95d1 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -231,7 +231,7 @@
 
     <!--Logs-->
     <system:String x:Key="CopilotTip">Tips：</system:String>
-    <system:String x:Key="CopilotTip1">1. Please set the emulator and game frame rate to 60 frames or higher.</system:String>
+    <system:String x:Key="CopilotTip1">1. Please set the emulator and game to 60 FPS or higher.</system:String>
     <system:String x:Key="CopilotTip2">2. Please use this function only in the interface with "Start" button.</system:String>
     <system:String x:Key="CopilotTip3">3. You can turn off the "Auto squad" when using friends to help you, and manually select an agent to start.</system:String>
     <system:String x:Key="CopilotTip4">4. To Paradox Simulation, you need to turn off "Auto squad" and select a skill before starting on the interface of "Start" button.</system:String>