Merge branch 'master' into master

Specify it's date & time
UI: localize the button & make it smaller
2024-12-22 03:01:37 +01:00 · 2024-12-21 20:00:16 -06:00 · 2024-12-21 19:59:16 -06:00 · 2024-12-21 07:21:42 +01:00
3 changed files with 202 additions and 157 deletions
@@ -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; }
@@ -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"
+                            Width="150"
-                            ToolTip.Tip="{ext:Locale TimeTooltip}">
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
-                            <TextBlock Text="Match System Time" />
+                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemTimeMatch}" />
                        </Button>
                    </StackPanel>
                    <Separator />
Author	SHA1	Message	Date
Daenorth	9b6f409a86	Merge branch 'master' into master	2024-12-22 03:01:37 +01:00
Evan Husted	2fac0f4db1	Specify it's date & time	2024-12-21 20:00:16 -06:00
Evan Husted	0f18df982f	UI: localize the button & make it smaller	2024-12-21 19:59:16 -06:00
Daenorth	30728e3053	Update Norwegian Translation swiggybobo	2024-12-21 07:21:42 +01:00