Update Norwegian Translation (#418)

swiggybobo

.github/labeler.yml

@@ -32,7 +32,7 @@ kernel:
 
 infra:
 - changed-files:
-  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props']
+  - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props', 'src/Ryujinx.BuildValidationTasks/**']
 
 documentation:
 - changed-files:

src/Ryujinx.BuildValidationTasks/LocaleValidationTask.cs

@@ -14,20 +14,20 @@ namespace Ryujinx.BuildValidationTasks
         {
             string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
 
-            if (path.Split(new string[] { "src" }, StringSplitOptions.None).Length == 1 )
+            if (path.Split(["src"], StringSplitOptions.None).Length == 1)
             {
                 //i assume that we are in a build directory in the solution dir
-                path = new FileInfo(path).Directory.Parent.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+                path = new FileInfo(path).Directory!.Parent!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
             }
             else
             {
-                path = path.Split(new string[] { "src" }, StringSplitOptions.None)[0];
-                path = new FileInfo(path).Directory.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
+                path = path.Split(["src"], StringSplitOptions.None)[0];
+                path = new FileInfo(path).Directory!.GetDirectories("src")[0].GetDirectories("Ryujinx")[0].GetDirectories("Assets")[0].GetFiles("locales.json")[0].FullName;
             }
 
             string data;
 
-            using (StreamReader sr = new StreamReader(path))
+            using (StreamReader sr = new(path))
             {
                 data = sr.ReadToEnd();
             }
@@ -38,13 +38,10 @@ namespace Ryujinx.BuildValidationTasks
             {
                 LocalesEntry locale = json.Locales[i];
 
-                foreach (string language in json.Languages)
+                foreach (string langCode in json.Languages.Where(it => !locale.Translations.ContainsKey(it)))
                 {
-                    if (!locale.Translations.ContainsKey(language))
-                    {
-                        locale.Translations.Add(language, "");
-                        Log.LogMessage(MessageImportance.High, $"Added {{{language}}} to Locale {{{locale.ID}}}");
-                    }
+                    locale.Translations.Add(langCode, string.Empty);
+                    Log.LogMessage(MessageImportance.High, $"Added '{langCode}' to Locale '{locale.ID}'");
                 }
 
                 locale.Translations = locale.Translations.OrderBy(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
@@ -53,7 +50,7 @@ namespace Ryujinx.BuildValidationTasks
 
             string jsonString = JsonConvert.SerializeObject(json, Formatting.Indented);
 
-            using (StreamWriter sw = new StreamWriter(path))
+            using (StreamWriter sw = new(path))
             {
                 sw.Write(jsonString);
             }

src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs

@@ -62,7 +62,7 @@ namespace Ryujinx.Graphics.Vulkan
             _api = api;
             _physicalDevice = physicalDevice;
 
-            int totalFormats = Enum.GetNames(typeof(Format)).Length;
+            int totalFormats = Enum.GetNames<Format>().Length;
 
             _bufferTable = new FormatFeatureFlags[totalFormats];
             _optimalTable = new FormatFeatureFlags[totalFormats];

src/Ryujinx.Graphics.Vulkan/FormatTable.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         static FormatTable()
         {
-            _table = new VkFormat[Enum.GetNames(typeof(Format)).Length];
+            _table = new VkFormat[Enum.GetNames<Format>().Length];
             _reverseMap = new Dictionary<VkFormat, Format>();
 
 #pragma warning disable IDE0055 // Disable formatting

src/Ryujinx.Graphics.Vulkan/Queries/Counters.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries
         {
             _pipeline = pipeline;
 
-            int count = Enum.GetNames(typeof(CounterType)).Length;
+            int count = Enum.GetNames<CounterType>().Length;
 
             _counterQueues = new CounterQueue[count];
 

src/Ryujinx.HLE/HOS/Services/IpcService.cs

@@ -23,18 +23,18 @@ namespace Ryujinx.HLE.HOS.Services
 
         public IpcService(ServerBase server = null)
         {
-            CmifCommands = typeof(IpcService).Assembly.GetTypes()
+            CmifCommands = GetType().Assembly.GetTypes()
                 .Where(type => type == GetType())
                 .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
-                .SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandCmifAttribute))
-                .Select(command => (((CommandCmifAttribute)command).Id, methodInfo)))
+                .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>()
+                .Select(command => (command.Id, methodInfo)))
                 .ToDictionary(command => command.Id, command => command.methodInfo);
 
-            TipcCommands = typeof(IpcService).Assembly.GetTypes()
+            TipcCommands = GetType().Assembly.GetTypes()
                 .Where(type => type == GetType())
                 .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
-                .SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandTipcAttribute))
-                .Select(command => (((CommandTipcAttribute)command).Id, methodInfo)))
+                .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
+                .Select(command => (command.Id, methodInfo)))
                 .ToDictionary(command => command.Id, command => command.methodInfo);
 
             Server = server;

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -444,7 +444,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
         private ResultCode ScanInternal(IVirtualMemoryManager memory, ushort channel, ScanFilter scanFilter, ulong bufferPosition, ulong bufferSize, out ulong counter)
         {
-            ulong networkInfoSize = (ulong)Marshal.SizeOf(typeof(NetworkInfo));
+            ulong networkInfoSize = (ulong)Marshal.SizeOf<NetworkInfo>();
             ulong maxGames = bufferSize / networkInfoSize;
 
             MemoryHelper.FillWithZeros(memory, bufferPosition, (int)bufferSize);

src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs

@@ -94,7 +94,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
             {
                 if (_services.TryGetValue(name, out Type type))
                 {
-                    ServiceAttribute serviceAttribute = (ServiceAttribute)type.GetCustomAttributes(typeof(ServiceAttribute)).First(service => ((ServiceAttribute)service).Name == name);
+                    ServiceAttribute serviceAttribute = type.GetCustomAttributes<ServiceAttribute>().First(service => service.Name == name);
 
                     IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
 

src/Ryujinx.Horizon.Kernel.Generators/SyscallGenerator.cs

@@ -34,14 +34,14 @@ namespace Ryujinx.Horizon.Kernel.Generators
         private const string TypeResult = NamespaceHorizonCommon + "." + TypeResultName;
         private const string TypeExecutionContext = "IExecutionContext";
 
-        private static readonly string[] _expectedResults = new string[]
-        {
+        private static readonly string[] _expectedResults =
+        [
             $"{TypeResultName}.Success",
             $"{TypeKernelResultName}.TimedOut",
             $"{TypeKernelResultName}.Cancelled",
             $"{TypeKernelResultName}.PortRemoteClosed",
             $"{TypeKernelResultName}.InvalidState",
-        };
+        ];
 
         private readonly struct OutParameter
         {

src/Ryujinx.UI.Common/App/ApplicationData.cs

@@ -38,7 +38,7 @@ namespace Ryujinx.UI.App.Common
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 
-        public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed) ?? LocalizedNever();
+        public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n") ?? LocalizedNever();
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
 

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -105,7 +105,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 IsModified = false;
                 _playerId = value;
 
-                if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
+                if (!Enum.IsDefined<PlayerIndex>(_playerId))
                 {
                     _playerId = PlayerIndex.Player1;
 

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -287,9 +287,16 @@
                 <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">
                     <MenuItem Header="{ext:Locale MenuBarViewWindow720}" Tag="1280 720" Click="ChangeWindowSize_Click" />
                     <MenuItem Header="{ext:Locale MenuBarViewWindow1080}" Tag="1920 1080" Click="ChangeWindowSize_Click" />
+                    <MenuItem Header="{ext:Locale MenuBarViewWindow1440}" Tag="2560 1440" Click="ChangeWindowSize_Click" />
+                    <MenuItem Header="{ext:Locale MenuBarViewWindow2160}" Tag="3840 2160" Click="ChangeWindowSize_Click" />
                 </MenuItem>
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelp}">
+                <MenuItem
+                    Click="OpenAboutWindow"
+                    Header="{ext:Locale MenuBarHelpAbout}"
+                    Icon="{ext:Icon fa-solid fa-circle-info}"
+                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
                 <MenuItem
                     Name="UpdateMenuItem"
                     IsEnabled="{Binding CanUpdate}"
@@ -298,30 +305,26 @@
                     Icon="{ext:Icon mdi-update}"
                     ToolTip.Tip="{ext:Locale CheckUpdatesTooltip}" />
                 <Separator />
-                <MenuItem
-                    Click="MenuItem_OnClick"
-                    Header="{ext:Locale MenuBarHelpFaq}"
-                    Icon="{ext:Icon fa-github}"
-                    Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
-                    ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
-                <MenuItem
-                    Click="MenuItem_OnClick"
-                    Header="{ext:Locale MenuBarHelpSetup}"
-                    Icon="{ext:Icon fa-github}"
-                    Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
-                    ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
-                <MenuItem
-                    Click="MenuItem_OnClick"
-                    Header="{ext:Locale MenuBarHelpMultiplayer}"
-                    Icon="{ext:Icon fa-github}"
-                    Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
-                    ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
-                <Separator />
-                <MenuItem
-                    Click="OpenAboutWindow"
-                    Header="{ext:Locale MenuBarHelpAbout}"
-                    Icon="{ext:Icon fa-solid fa-circle-info}"
-                    ToolTip.Tip="{ext:Locale OpenAboutTooltip}" />
+                <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarHelpFaqAndGuides}" Icon="{ext:Icon fa-solid fa-question}" >
+                    <MenuItem
+                        Click="MenuItem_OnClick"
+                        Header="{ext:Locale MenuBarHelpFaq}"
+                        Icon="{ext:Icon fa-github}"
+                        Tag="https://github.com/GreemDev/Ryujinx/wiki/FAQ-and-Troubleshooting"
+                        ToolTip.Tip="{ext:Locale MenuBarHelpFaqTooltip}" />
+                    <MenuItem
+                        Click="MenuItem_OnClick"
+                        Header="{ext:Locale MenuBarHelpSetup}"
+                        Icon="{ext:Icon fa-github}"
+                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Ryujinx-Setup-&amp;-Configuration-Guide"
+                        ToolTip.Tip="{ext:Locale MenuBarHelpSetupTooltip}" />
+                    <MenuItem
+                        Click="MenuItem_OnClick"
+                        Header="{ext:Locale MenuBarHelpMultiplayer}"
+                        Icon="{ext:Icon fa-github}"
+                        Tag="https://github.com/GreemDev/Ryujinx/wiki/Multiplayer%E2%80%90(LDN%E2%80%90Local%E2%80%90Wireless)%E2%80%90Guide"
+                        ToolTip.Tip="{ext:Locale MenuBarHelpMultiplayerTooltip}" />
+                </MenuItem>
             </MenuItem>
         </Menu>
     </DockPanel>

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -52,7 +52,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void AspectRatioStatus_OnClick(object sender, RoutedEventArgs e)
         {
             AspectRatio aspectRatio = ConfigurationState.Instance.Graphics.AspectRatio.Value;
-            ConfigurationState.Instance.Graphics.AspectRatio.Value = (int)aspectRatio + 1 > Enum.GetNames(typeof(AspectRatio)).Length - 1 ? AspectRatio.Fixed4x3 : aspectRatio + 1;
+            ConfigurationState.Instance.Graphics.AspectRatio.Value = (int)aspectRatio + 1 > Enum.GetNames<AspectRatio>().Length - 1 ? AspectRatio.Fixed4x3 : aspectRatio + 1;
         }
 
         private void Refresh_OnClick(object sender, RoutedEventArgs e) => Window.LoadApplications();

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

@@ -181,15 +181,11 @@
                             SelectedTime="{Binding CurrentTime}"
                             Width="350"
                             ToolTip.Tip="{ext:Locale TimeTooltip}" />
-                    </StackPanel>
-                    <StackPanel
-                        Margin="350,0,0,10"
-                        Orientation="Horizontal">
                         <Button
+                            Margin="10, 0, 0, 0"
                             VerticalAlignment="Center"
                             Click="MatchSystemTime_OnClick"
                             Background="{DynamicResource SystemAccentColor}"
-                            Width="150"
                             ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
                             <TextBlock Text="{ext:Locale SettingsTabSystemSystemTimeMatch}" />
                         </Button>

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

@@ -1,7 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.ViewModels;
-using System;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
 namespace Ryujinx.Ava.UI.Views.Settings