Merge branch 'master' into master

swiggybobo

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -329,9 +329,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        //private DateTimeOffset _currentDate;
-        //private TimeSpan _currentTime;
-
         public DateTimeOffset CurrentDate { get; set; }
 
         public TimeSpan CurrentTime { get; set; }

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -183,15 +183,15 @@
                             ToolTip.Tip="{ext:Locale TimeTooltip}" />
                     </StackPanel>
                     <StackPanel
-                        Margin="250,0,0,10"
+                        Margin="350,0,0,10"
                         Orientation="Horizontal">
                         <Button
                             VerticalAlignment="Center"
                             Click="MatchSystemTime_OnClick"
                             Background="{DynamicResource SystemAccentColor}"
-                            Width="350"
-                            ToolTip.Tip="{ext:Locale TimeTooltip}">
-                            <TextBlock Text="Match System Time" />
+                            Width="150"
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemTimeMatch}" />
                         </Button>
                     </StackPanel>
                     <Separator />