From a3fa2f0a6ccba8adf8a335c90a9abedf2fef0c96 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Fri, 12 Apr 2024 23:49:42 +0800
Subject: [PATCH] Solve Missing language translation #347

---
 .../MutiPlayer/winMutiPlayer.xaml.cs              |  2 +-
 .../WinDesign/winBetterBuy.xaml                   |  2 +-
 VPet-Simulator.Windows/WinDesign/winConsole.xaml  | 10 +++++-----
 .../WinDesign/winConsole.xaml.cs                  |  8 ++++----
 .../WinDesign/winGameSetting.xaml                 | 11 +++++------
 .../WinDesign/winGameSetting.xaml.cs              |  2 +-
 VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml |  2 +-
 .../mod/0000_core/lang/en/Prog2312.lps            | 15 ++++++++++++++-
 .../mod/0000_core/lang/zh-Hans/Prog2312.lps       | 15 ++++++++++++++-
 .../mod/0000_core/lang/zh-Hant/Prog2312.lps       | 13 +++++++++++++
 10 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml.cs b/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml.cs
index 81ef6e2..4ee3ce7 100644
--- a/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml.cs
+++ b/VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml.cs
@@ -453,7 +453,7 @@ public partial class winMutiPlayer : WindowX, IMPWindows
     private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
     {
         if (!lb.Equals(default(Lobby)))
-            if (MessageBoxX.Show("确定要关闭访客表吗?".Translate(), "离开游戏", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+            if (MessageBoxX.Show("确定要关闭访客表吗?".Translate(), "离开访客表".Translate(), MessageBoxButton.YesNo) != MessageBoxResult.Yes)
             {
                 e.Cancel = true;
                 return;
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
index 033ea96..a9dd004 100644
--- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
@@ -330,7 +330,7 @@
                 <StackPanel Grid.Column="1" Margin="5,0,0,0" Orientation="Horizontal">
                     <TextBox x:Name="TbPage" MinWidth="50" Style="{DynamicResource StandardTextBoxStyle}" 
                          PreviewKeyDown="TbPage_PreviewKeyDown" />
-                    <TextBlock Margin="3,0,0,0" Text="页" VerticalAlignment="Center"/> 
+                    <TextBlock Margin="3,0,0,0" Text="{ll:Str 页}" VerticalAlignment="Center"/> 
                 </StackPanel>
             </Grid>
         </Grid>
diff --git a/VPet-Simulator.Windows/WinDesign/winConsole.xaml b/VPet-Simulator.Windows/WinDesign/winConsole.xaml
index 57783d9..bceae68 100644
--- a/VPet-Simulator.Windows/WinDesign/winConsole.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winConsole.xaml
@@ -48,7 +48,7 @@
                         MouseDoubleClick="GraphListPlayerBox_MouseDoubleClick" />
                 <ListBox x:Name="GraphListWillPlayBox" Grid.Row="1" Grid.Column="1" Margin="5"
                         MouseDoubleClick="GraphListWillPlayBox_MouseDoubleClick" />
-                <Button Grid.Row="2" Grid.ColumnSpan="2" Margin="5" Click="Play_Click" Content="开始播放" />
+                <Button Grid.Row="2" Grid.ColumnSpan="2" Margin="5" Click="Play_Click" Content="{ll:Str 开始播放}" />
                 <Button Grid.Column="1" Margin="5" HorizontalAlignment="Right" VerticalAlignment="Top"
                         Click="PlayADD_Click" Content="ADD" />
             </Grid>
@@ -104,10 +104,10 @@
                 </Grid>
                 <Grid Grid.Row="1">
                     <StackPanel>
-                        <Button x:Name="Button_MoveToLeft" Click="Button_MoveToLeft_Click" Content="向左移动" />
-                        <Button x:Name="Button_MoveToUp" Click="Button_MoveToUp_Click" Content="向上移动" />
-                        <Button x:Name="Button_MoveToRight" Click="Button_MoveToRight_Click" Content="向右移动" />
-                        <Button x:Name="Button_MoveToButton" Click="Button_MoveToButton_Click" Content="向下移动" />
+                        <Button x:Name="Button_MoveToLeft" Click="Button_MoveToLeft_Click" Content="{ll:Str 向左移动}" />
+                        <Button x:Name="Button_MoveToUp" Click="Button_MoveToUp_Click" Content="{ll:Str 向上移动}" />
+                        <Button x:Name="Button_MoveToRight" Click="Button_MoveToRight_Click" Content="{ll:Str 向右移动}" />
+                        <Button x:Name="Button_MoveToButton" Click="Button_MoveToButton_Click" Content="{ll:Str 向下移动}" />
                     </StackPanel>
                 </Grid>
             </Grid>
diff --git a/VPet-Simulator.Windows/WinDesign/winConsole.xaml.cs b/VPet-Simulator.Windows/WinDesign/winConsole.xaml.cs
index 47b16b7..5b6eabf 100644
--- a/VPet-Simulator.Windows/WinDesign/winConsole.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winConsole.xaml.cs
@@ -155,22 +155,22 @@ namespace VPet_Simulator.Windows
 
         private void Button_MoveToLeft_Click(object sender, RoutedEventArgs e)
         {
-            mw.Core.Graph.GraphConfig.Moves[8].Display(mw.Main);
+            mw.Core.Graph.GraphConfig.Moves.Find(x => x.SpeedX < 0 && x.Checked(mw.MWController))?.Display(mw.Main);
         }
 
         private void Button_MoveToUp_Click(object sender, RoutedEventArgs e)
         {
-            //mf.Core.Graph.GraphConfig.Moves[8].Display(mf.Main);
+            mw.Core.Graph.GraphConfig.Moves.Find(x => x.SpeedY < 0 && x.Checked(mw.MWController))?.Display(mw.Main);
         }
 
         private void Button_MoveToButton_Click(object sender, RoutedEventArgs e)
         {
-            //mf.Core.Graph.GraphConfig.Moves[8].Display(mf.Main);
+            mw.Core.Graph.GraphConfig.Moves.Find(x => x.SpeedY > 0 && x.Checked(mw.MWController))?.Display(mw.Main);
         }
 
         private void Button_MoveToRight_Click(object sender, RoutedEventArgs e)
         {
-            mw.Core.Graph.GraphConfig.Moves[9].Display(mw.Main);
+            mw.Core.Graph.GraphConfig.Moves.Find(x => x.SpeedX > 0 && x.Checked(mw.MWController))?.Display(mw.Main);
         }
 
         private void Window_Closed(object sender, EventArgs e)
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
index 950ed4f..aa9a484 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
@@ -480,8 +480,7 @@
                                     ToggleShadowColor="{x:Null}" ToggleSize="14"
                                     ToolTip="{ll:Str '启用数据计算,桌宠会有状态变化,需要按时投喂等.\&#13;如果嫌麻烦可以关掉'}"
                                     Unchecked="CalFunctionBox_Checked" />
-                            <Grid Grid.Row="1" Grid.Column="2"
-                                    ToolTip="{ll:Str '当玩家在指定时间未对桌宠进行交互的时候,智能禁用移动功能\&#13;将在下次交互时解除'}">
+                            <Grid Grid.Row="1" Grid.Column="2">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
@@ -491,10 +490,10 @@
                                         SelectionChanged="combCalFunState_SelectionChanged"
                                         Style="{DynamicResource StandardComboBoxStyle}"
                                         ToolTip="{ll:Str '当关闭数据计算时\&#13;桌宠显示的状态'}">
-                                    <ComboBoxItem Content="Happy" />
-                                    <ComboBoxItem Content="Nomal" />
-                                    <ComboBoxItem Content="PoorCondition" />
-                                    <ComboBoxItem Content="Ill" />
+                                    <ComboBoxItem Content="{ll:Str Happy}" />
+                                    <ComboBoxItem Content="{ll:Str Nomal}" />
+                                    <ComboBoxItem Content="{ll:Str PoorCondition}" />
+                                    <ComboBoxItem Content="{ll:Str Ill}" />
                                 </ComboBox>
                             </Grid>
                             <Grid Grid.Row="5" Grid.RowSpan="4" Grid.Column="2">
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
index 104d27e..7c2ad9e 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
@@ -632,7 +632,7 @@ namespace VPet_Simulator.Windows
             MessageBoxX.Show("经测试,除正式版均无创意工坊权限,此功能仅作为展示", "特殊版无法上传创意工坊");
 #endif
             ButtonPublish.IsEnabled = false;
-            ButtonPublish.Text = "正在上传";
+            ButtonPublish.Text = "正在上传".Translate();
             ProgressBarUpload.Visibility = Visibility.Visible;
             ProgressBarUpload.Value = 0;
             if (mods.ItemID == 0)
diff --git a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
index 313d2d1..b7cac2e 100644
--- a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
@@ -40,7 +40,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Text="工作内容"
+                    <TextBlock Text="{ll:Str 工作内容}"
                             FontSize="{Binding FontSize, Converter={x:Static pu:Converters.DoubleMinusConverter}, ConverterParameter=2, Source={x:Static pu:GlobalSettings.Setting}}" />
                     <Grid Grid.Row="1" Margin="0,3,0,0">
                         <Grid.ColumnDefinitions>
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2312.lps b/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2312.lps
index 76961ce..3864ee0 100644
--- a/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2312.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2312.lps
@@ -11,6 +11,10 @@
 We are 伐木累~#We are Family.:|
 女鹅#Daughter:|
 爸妈~ 这么叫好像不太好#Mom and Dad!, I don't think it's a good idea to call them that.:|
+相当于桌宠的小学学历哦\n"肃清! {0}的安魂曲☆"#It's the equivalent of VPet's elementary school education.\n"Clear! {0}'s Requiem☆":|
+相当于桌宠的大学学历哦\n"大学生上课吃饭睡觉, {0}学习吃饭睡觉, {0}＝大学生"#It's the equivalent of VPet's college education.\n"College students eat, sleep, and sleep in class, {0} study, eat, and sleep, {0} = college students":|
+相当于桌宠的博士学历哦\n"大学生上课吃饭睡觉, 人家和那个带兜帽的没关系啦"#It's the equivalent of VPet's doctorate.\n"College students eat, sleep, and sleep in class, they have nothing to do with the one with the hood":|
+<虚拟桌宠模拟器砖家>\n"一定是{0}干的!"#<VPet Simulator Expert>\n"It must be {0}!":|
 相当于桌宠的中学学历哦\n<高考桌宠100天>#It's the equivalent of VPet's high school education.\n<College Entrance Exam for VPet>:|
 在你这个年纪,你怎么睡得着觉的?#How do you sleep at your age?:|
 学而不思则罔，思而不学则die#Learning without thought means labour lost; thought without learning is perilous.:|
@@ -104,4 +108,13 @@ Gift#Gift:|
 孩子学习老不好，多半是废了，快来试试思维驰学习机#The child's learning is not good, mostly waste, come and try the Nintendo switch learning machine:|
 主人还可以再去创意工坊体验更多MOD喵#Master can also go to the workshop to experience more MOD:|
 点击前往查看#Click to view:|
-哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#Humph~Master, my exam results are out, come and see my report card with me:|
\ No newline at end of file
+哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#Humph~Master, my exam results are out, come and see my report card with me:|
+正在上传#Uploading:|
+离开访客表#Leave Guest List:|
+页#Page:|
+开始播放#Start playing:|
+向左移动#Move left:|
+向上移动#Move up:|
+向右移动#Move right:|
+向下移动#Move down:|
+工作内容#Work content:|
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2312.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2312.lps
index 32211ee..e3ef6a1 100644
--- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2312.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2312.lps
@@ -11,6 +11,10 @@
 We are 伐木累~#We are 伐木累~:|
 女鹅#女鹅:|
 爸妈~ 这么叫好像不太好#爸妈~ 这么叫好像不太好:|
+相当于桌宠的小学学历哦\n"肃清! {0}的安魂曲☆"#相当于桌宠的小学学历哦\n"肃清! {0}的安魂曲☆":|
+相当于桌宠的大学学历哦\n"大学生上课吃饭睡觉, {0}学习吃饭睡觉, {0}＝大学生"#相当于桌宠的大学学历哦\n"大学生上课吃饭睡觉, {0}学习吃饭睡觉, {0}＝大学生":|
+相当于桌宠的博士学历哦\n"大学生上课吃饭睡觉, 人家和那个带兜帽的没关系啦"#相当于桌宠的博士学历哦\n"大学生上课吃饭睡觉, 人家和那个带兜帽的没关系啦":|
+<虚拟桌宠模拟器砖家>\n"一定是{0}干的!"#<虚拟桌宠模拟器砖家>\n"一定是{0}干的!":|
 相当于桌宠的中学学历哦\n<高考桌宠100天>#相当于桌宠的中学学历哦\n<高考桌宠100天>:|
 在你这个年纪,你怎么睡得着觉的?#在你这个年纪,你怎么睡得着觉的?:|
 学而不思则罔，思而不学则die#学而不思则罔，思而不学则die:|
@@ -104,4 +108,13 @@ Gift#礼品:|
 孩子学习老不好，多半是废了，快来试试思维驰学习机#孩子学习老不好，多半是废了，快来试试思维驰学习机:|
 主人还可以再去创意工坊体验更多MOD喵#主人还可以再去创意工坊体验更多MOD喵:|
 点击前往查看#点击前往查看:|
-哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵:|
\ No newline at end of file
+哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵:|
+正在上传#正在上传:|
+离开访客表#离开访客表:|
+页#页:|
+开始播放#开始播放:|
+向左移动#向左移动:|
+向上移动#向上移动:|
+向右移动#向右移动:|
+向下移动#向下移动:|
+工作内容#工作内容:|
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2312.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2312.lps
index 420c276..0886ac4 100644
--- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2312.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2312.lps
@@ -12,6 +12,10 @@ We are 伐木累~#We are 伐木累～:|
 女鹅#女鵝。:|
 爸妈~ 这么叫好像不太好#爸媽～嗯…這麼叫好像不太洽當…:|
 相当于桌宠的中学学历哦\n<高考桌宠100天>#相當於桌寵的國中學歷哦\n<學測桌寵100天>:|
+相当于桌宠的小学学历哦\n"肃清! {0}的安魂曲☆"#相當於桌寵的小學學歷哦\n"肅清！{0}的安魂曲☆":|
+相当于桌宠的大学学历哦\n"大学生上课吃饭睡觉, {0}学习吃饭睡觉, {0}＝大学生"#相當於桌寵的大學學歷哦\n"大學生上課吃飯睡覺，{0}學習吃飯睡覺，{0}＝大學生":|
+相当于桌宠的博士学历哦\n"大学生上课吃饭睡觉, 人家和那个带兜帽的没关系啦"#相當於桌寵的博士學歷哦\n"大學生上課吃飯睡覺，人家和那個帶兜帽的沒關係啦":|
+<虚拟桌宠模拟器砖家>\n"一定是{0}干的!"#<虛擬桌寵模擬器磚家>\n"一定是{0}幹的!":|
 在你这个年纪,你怎么睡得着觉的?#在你這個年紀，你怎麼睡得著覺的？:|
 学而不思则罔，思而不学则die#學而不思則罔，思而不學則die。:|
 学习?#學習？:|
@@ -105,3 +109,12 @@ Gift#禮品:|
 主人还可以再去创意工坊体验更多MOD喵#主人還可以再去工作坊體驗更多模組喵！:|
 点击前往查看#點擊前往查看:|
 哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#哼哼～主人，我的考試成績出爐了哦，快來和我一起看我的成績單喵！:|
+正在上传#正在上傳:|
+离开访客表#離開訪客表:|
+页#頁:|
+开始播放#開始播放:|
+向左移动#向左移動:|
+向上移动#向上移動:|
+向右移动#向右移動:|
+向下移动#向下移動:|
+工作内容#工作內容:|
\ No newline at end of file