Merge branch 'master' into master

2025-01-18 19:57:26 +10:00
parent e8b122b34f 6cd4866d76
commit 7aaaa6cf1b
5 changed files with 186 additions and 133 deletions
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
@@ -7,6 +7,7 @@
    Title="Ryujinx - Waiting"
    SizeToContent="WidthAndHeight"
    WindowStartupLocation="CenterOwner"
+    CanResize="False"
    mc:Ignorable="d"
    Focusable="True">
    <Grid
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -136,6 +136,12 @@
                            <ComboBoxItem>
                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
                    <StackPanel