Merge remote-tracking branch 'origin/master'

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.Cpu/AppleHv/HvMemoryManager.cs

@@ -230,25 +230,20 @@ namespace Ryujinx.Cpu.AppleHv
         {
             if (size == 0)
             {
-                return Enumerable.Empty<HostMemoryRange>();
+                yield break;
             }
 
             var guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
-                return null;
+                yield break;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
-
-            for (int i = 0; i < regions.Length; i++)
+            foreach (var guestRegion in guestRegions)
             {
-                var guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
-                regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
+                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
-
-            return regions;
         }
 
         /// <inheritdoc/>
@@ -256,23 +251,24 @@ namespace Ryujinx.Cpu.AppleHv
         {
             if (size == 0)
             {
-                return Enumerable.Empty<MemoryRange>();
+                yield break;
             }
 
-            return GetPhysicalRegionsImpl(va, size);
+            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
+            {
+                yield return physicalRegion;
+            }
         }
 
-        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
-
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -280,14 +276,14 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    regions.Add(new MemoryRange(regionStart, regionSize));
+                    yield return new MemoryRange(regionStart, regionSize);
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -296,9 +292,7 @@ namespace Ryujinx.Cpu.AppleHv
                 regionSize += PageSize;
             }
 
-            regions.Add(new MemoryRange(regionStart, regionSize));
-
-            return regions;
+            yield return new MemoryRange(regionStart, regionSize);
         }
 
         /// <remarks>

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -250,25 +250,20 @@ namespace Ryujinx.Cpu.Jit
         {
             if (size == 0)
             {
-                return Enumerable.Empty<HostMemoryRange>();
+                yield break;
             }
 
             var guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
-                return null;
+                yield break;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
-
-            for (int i = 0; i < regions.Length; i++)
+            foreach (var guestRegion in guestRegions)
             {
-                var guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
-                regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
+                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
-
-            return regions;
         }
 
         /// <inheritdoc/>
@@ -276,23 +271,24 @@ namespace Ryujinx.Cpu.Jit
         {
             if (size == 0)
             {
-                return Enumerable.Empty<MemoryRange>();
+                yield break;
             }
 
-            return GetPhysicalRegionsImpl(va, size);
+            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
+            {
+                yield return physicalRegion;
+            }
         }
 
-        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
-
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -300,14 +296,14 @@ namespace Ryujinx.Cpu.Jit
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    regions.Add(new MemoryRange(regionStart, regionSize));
+                    yield return new MemoryRange(regionStart, regionSize);
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -316,9 +312,7 @@ namespace Ryujinx.Cpu.Jit
                 regionSize += PageSize;
             }
 
-            regions.Add(new MemoryRange(regionStart, regionSize));
-
-            return regions;
+            yield return new MemoryRange(regionStart, regionSize);
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs

@@ -475,17 +475,15 @@ namespace Ryujinx.Cpu.Jit
             return GetPhysicalRegionsImpl(va, size);
         }
 
-        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
-
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -493,14 +491,14 @@ namespace Ryujinx.Cpu.Jit
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    regions.Add(new MemoryRange(regionStart, regionSize));
+                    yield return new MemoryRange(regionStart, regionSize);
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -509,9 +507,7 @@ namespace Ryujinx.Cpu.Jit
                 regionSize += PageSize;
             }
 
-            regions.Add(new MemoryRange(regionStart, regionSize));
-
-            return regions;
+            yield return new MemoryRange(regionStart, regionSize);
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/StackWalker.cs

@@ -8,8 +8,6 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
     {
         public IEnumerable<ulong> GetCallStack(nint framePointer, nint codeRegionStart, int codeRegionSize, nint codeRegion2Start, int codeRegion2Size)
         {
-            List<ulong> functionPointers = new();
-
             while (true)
             {
                 nint functionPointer = Marshal.ReadIntPtr(framePointer, nint.Size);
@@ -20,11 +18,9 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
                     break;
                 }
 
-                functionPointers.Add((ulong)functionPointer - 4);
+                yield return (ulong)functionPointer - 4;
                 framePointer = Marshal.ReadIntPtr(framePointer);
             }
-
-            return functionPointers;
         }
     }
 }

src/Ryujinx.Graphics.Vulkan/BufferMirrorRangeList.cs

@@ -168,16 +168,14 @@ namespace Ryujinx.Graphics.Vulkan
             return BinarySearch(list, offset, size) >= 0;
         }
 
-        public readonly List<Range> FindOverlaps(int offset, int size)
+        public readonly IEnumerable<Range> FindOverlaps(int offset, int size)
         {
             var list = _ranges;
             if (list == null)
             {
-                return null;
+                yield break;
             }
 
-            List<Range> result = null;
-
             int index = BinarySearch(list, offset, size);
 
             if (index >= 0)
@@ -189,12 +187,10 @@ namespace Ryujinx.Graphics.Vulkan
 
                 do
                 {
-                    (result ??= new List<Range>()).Add(list[index++]);
+                    yield return list[index++];
                 }
                 while (index < list.Count && list[index].OverlapsWith(offset, size));
             }
-
-            return result;
         }
 
         private static int BinarySearch(List<Range> list, int offset, int size)

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/Horizon.cs

@@ -341,7 +341,7 @@ namespace Ryujinx.HLE.HOS
         {
             if (VirtualAmiibo.ApplicationBytes.Length > 0)
             {
-                VirtualAmiibo.ApplicationBytes = new byte[0];
+                VirtualAmiibo.ApplicationBytes = Array.Empty<byte>();
                 VirtualAmiibo.InputBin = string.Empty;
             }
             if (NfpDevices[nfpDeviceId].State == NfpDeviceState.SearchingForTag)
@@ -356,7 +356,7 @@ namespace Ryujinx.HLE.HOS
             VirtualAmiibo.InputBin = path;
             if (VirtualAmiibo.ApplicationBytes.Length > 0)
             {
-                VirtualAmiibo.ApplicationBytes = new byte[0];
+                VirtualAmiibo.ApplicationBytes = Array.Empty<byte>();
             }
             byte[] encryptedData = File.ReadAllBytes(path);
             VirtualAmiiboFile newFile = AmiiboBinReader.ReadBinFile(encryptedData);

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -357,7 +357,6 @@ namespace Ryujinx.HLE.HOS
         {
             string cheatName = DefaultCheatName;
             List<string> instructions = new();
-            List<Cheat> cheats = new();
 
             using StreamReader cheatData = cheatFile.OpenText();
             while (cheatData.ReadLine() is { } line)
@@ -373,13 +372,13 @@ namespace Ryujinx.HLE.HOS
 
                         Logger.Warning?.Print(LogClass.ModLoader, $"Ignoring cheat '{cheatFile.FullName}' because it is malformed");
 
-                        return Array.Empty<Cheat>();
+                        yield break;
                     }
 
                     // Add the previous section to the list.
                     if (instructions.Count > 0)
                     {
-                        cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
+                        yield return new Cheat($"<{cheatName} Cheat>", cheatFile, instructions);
                     }
 
                     // Start a new cheat section.
@@ -396,10 +395,8 @@ namespace Ryujinx.HLE.HOS
             // Add the last section being processed.
             if (instructions.Count > 0)
             {
-                cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
+                yield return new Cheat($"<{cheatName} Cheat>", cheatFile, instructions);
             }
-
-            return cheats;
         }
 
         // Assumes searchDirPaths don't overlap

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/Nfc/Nfp/VirtualAmiibo.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
     static class VirtualAmiibo
     {
         public static uint OpenedApplicationAreaId;
-        public static byte[] ApplicationBytes = new byte[0];
+        public static byte[] ApplicationBytes = Array.Empty<byte>();
         public static string InputBin = string.Empty;
         public static string NickName = string.Empty;
         private static readonly AmiiboJsonSerializerContext _serializerContext = AmiiboJsonSerializerContext.Default;
@@ -137,7 +137,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
             if (ApplicationBytes.Length > 0)
             {
                 byte[] bytes = ApplicationBytes;
-                ApplicationBytes = new byte[0];
+                ApplicationBytes = Array.Empty<byte>();
                 return bytes;
             }
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);

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.Memory/AddressSpaceManager.cs

@@ -106,10 +106,13 @@ namespace Ryujinx.Memory
         {
             if (size == 0)
             {
-                return Enumerable.Empty<HostMemoryRange>();
+                yield break;
             }
 
-            return GetHostRegionsImpl(va, size);
+            foreach (var hostRegion in GetHostRegionsImpl(va, size))
+            {
+                yield return hostRegion;
+            }
         }
 
         /// <inheritdoc/>
@@ -117,51 +120,36 @@ namespace Ryujinx.Memory
         {
             if (size == 0)
             {
-                return Enumerable.Empty<MemoryRange>();
+                yield break;
             }
 
             var hostRegions = GetHostRegionsImpl(va, size);
             if (hostRegions == null)
             {
-                return null;
+                yield break;
             }
 
-            var regions = new MemoryRange[hostRegions.Count];
-
             ulong backingStart = (ulong)_backingMemory.Pointer;
             ulong backingEnd = backingStart + _backingMemory.Size;
 
-            int count = 0;
-
-            for (int i = 0; i < regions.Length; i++)
+            foreach (var hostRegion in hostRegions)
             {
-                var hostRegion = hostRegions[i];
-
                 if (hostRegion.Address >= backingStart && hostRegion.Address < backingEnd)
                 {
-                    regions[count++] = new MemoryRange(hostRegion.Address - backingStart, hostRegion.Size);
+                    yield return new MemoryRange(hostRegion.Address - backingStart, hostRegion.Size);
                 }
             }
-
-            if (count != regions.Length)
-            {
-                return new ArraySegment<MemoryRange>(regions, 0, count);
-            }
-
-            return regions;
         }
 
-        private List<HostMemoryRange> GetHostRegionsImpl(ulong va, ulong size)
+        private IEnumerable<HostMemoryRange> GetHostRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, size, out va);
 
-            var regions = new List<HostMemoryRange>();
-
             nuint regionStart = GetHostAddress(va);
             ulong regionSize = PageSize;
 
@@ -169,14 +157,14 @@ namespace Ryujinx.Memory
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 nuint newHostAddress = GetHostAddress(va + PageSize);
 
                 if (GetHostAddress(va) + PageSize != newHostAddress)
                 {
-                    regions.Add(new HostMemoryRange(regionStart, regionSize));
+                    yield return new HostMemoryRange(regionStart, regionSize);
                     regionStart = newHostAddress;
                     regionSize = 0;
                 }
@@ -185,9 +173,7 @@ namespace Ryujinx.Memory
                 regionSize += PageSize;
             }
 
-            regions.Add(new HostMemoryRange(regionStart, regionSize));
-
-            return regions;
+            yield return new HostMemoryRange(regionStart, regionSize);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Ryujinx/Assets/locales.json

@@ -1125,6 +1125,30 @@
         "zh_TW": "檢查更新"
       }
     },
+    {
+      "ID": "MenuBarHelpFaqAndGuides",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "FAQ & Guides",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "MenuBarHelpFaq",
       "Translations": {
@@ -3771,7 +3795,7 @@
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Match PC Time",
+        "en_US": "Resync to PC Date & Time",
         "es_ES": "",
         "fr_FR": "",
         "he_IL": "",
@@ -14571,7 +14595,7 @@
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Change System Time to match your PC's date & time.",
+        "en_US": "Resync System Time to match your PC's current date & time.\n\nThis is not an active setting, it can still fall out of sync; in which case just click this button again.",
         "es_ES": "",
         "fr_FR": "",
         "he_IL": "",

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

@@ -97,7 +97,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 if (IsModified)
                 {
-                    
+
                     _playerIdChoose = value;
                     return;
                 }
@@ -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

@@ -290,6 +290,11 @@
                 </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 +303,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