Merge branch 'Ryubing:master' into master

Update locales.json with Swedish and Norwegian
2025-01-17 19:04:14 +01:00 · 2025-01-13 15:30:57 +01:00 · 2025-01-11 13:32:56 +01:00 · 2025-01-11 13:29:12 +01:00 · 2025-01-11 13:25:07 +01:00 · 2025-01-11 12:22:20 +01:00
3 changed files with 182 additions and 129 deletions
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
@@ -7,7 +7,6 @@
    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
Author	SHA1	Message	Date
Daniel Nylander	2c34117957	Merge branch 'Ryubing:master' into master	2025-01-17 19:04:14 +01:00
Daniel Nylander	ebeac1f4aa	Merge branch 'Ryubing:master' into master	2025-01-13 15:30:57 +01:00
Daniel Nylander	92b6756d24	Update locales.json with Swedish and Norwegian Adding SettingsTabSystemSystemLanguageSwedish SettingsTabSystemSystemLanguageNorwegian	2025-01-11 13:32:56 +01:00
Daniel Nylander	a93adad50b	Update SettingsSystemView.axaml adding Swedish and Norwegian This list should be in alphabetical order?	2025-01-11 13:29:12 +01:00
Daniel Nylander	8ff24506fb	Merge branch 'Ryubing:master' into master	2025-01-11 13:25:07 +01:00
Daniel Nylander	f05b3cdd53	Updated sv_SE in locales.json	2025-01-11 12:22:20 +01:00