further simplify the firmware ProgramId check

Removed the "Game:" prefix in front of FPS.

.gitignore

@@ -175,3 +175,6 @@ PublishProfiles/
 
 # Glade backup files
 *.glade~
+
+# Ignore MacOS Attribute Files
+._*

Directory.Packages.props

@@ -38,7 +38,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.6.6" />
+    <PackageVersion Include="Gommon" Version="2.6.8" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />

distribution/linux/Ryujinx.sh

@@ -14,7 +14,7 @@ if [ -z "$RYUJINX_BIN" ]; then
     exit 1
 fi
 
-COMMAND="env DOTNET_EnableAlternateStackCheck=1"
+COMMAND="env LANG=C.UTF-8 DOTNET_EnableAlternateStackCheck=1"
 
 if command -v gamemoderun > /dev/null 2>&1; then
     COMMAND="$COMMAND gamemoderun"

src/ARMeilleure/ARMeilleure.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/ARMeilleure/Common/AddressTableLevel.cs

@@ -36,9 +36,9 @@ namespace ARMeilleure.Common
         /// </summary>
         /// <param name="address">Guest address</param>
         /// <returns>Value of the <see cref="AddressTableLevel"/> from the specified guest <paramref name="address"/></returns>
-        public int GetValue(ulong address)
+        public long GetValue(ulong address)
         {
-            return (int)((address & Mask) >> Index);
+            return (long)((address & Mask) >> Index);
         }
     }
 }

src/ARMeilleure/Instructions/InstEmitSystem.cs

@@ -88,7 +88,7 @@ namespace ARMeilleure.Instructions
                     EmitSetTpidrEl0(context);
                     return;
                 case 0b11_011_1101_0000_101:
-                    EmitGetTpidr2El0(context);
+                    EmitSetTpidr2El0(context);
                     return;
 
                 default:
@@ -291,5 +291,16 @@ namespace ARMeilleure.Instructions
 
             context.Store(context.Add(nativeContext, Const((ulong)NativeContext.GetTpidrEl0Offset())), value);
         }
+
+        private static void EmitSetTpidr2El0(ArmEmitterContext context)
+        {
+            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
+
+            Operand value = GetIntOrZR(context, op.Rt);
+
+            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
+
+            context.Store(context.Add(nativeContext, Const((ulong)NativeContext.GetTpidr2El0Offset())), value);
+        }
     }
 }

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -30,7 +30,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 6992; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 6997; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";

src/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio.Backends.SDL2/Ryujinx.Audio.Backends.SDL2.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Audio/Ryujinx.Audio.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Common/Ryujinx.Common.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Cpu/AddressTable.cs

@@ -238,7 +238,7 @@ namespace ARMeilleure.Common
             {
                 TEntry* page = GetPage(address);
 
-                int index = Levels[^1].GetValue(address);
+                long index = Levels[^1].GetValue(address);
 
                 EnsureMapped((IntPtr)(page + index));
 

src/Ryujinx.Cpu/Ryujinx.Cpu.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Device/Ryujinx.Graphics.Device.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Host1x/Ryujinx.Graphics.Host1x.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Video/Ryujinx.Graphics.Video.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs

@@ -182,6 +182,16 @@ namespace Ryujinx.Graphics.Vulkan
                     return false;
                 }
             }
+            
+            //Prevent the sum of descriptors from exceeding MaxPushDescriptors
+            int totalDescriptors = 0;
+            foreach (ResourceDescriptor desc in layout.Sets.First().Descriptors)
+            {
+                if (!reserved.Contains(desc.Binding))
+                    totalDescriptors += desc.Count;
+            }
+            if (totalDescriptors > gd.Capabilities.MaxPushDescriptors)
+                return false;
 
             return true;
         }

src/Ryujinx.HLE.Generators/Ryujinx.HLE.Generators.csproj

@@ -6,6 +6,7 @@
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
         <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
         <IsRoslynComponent>true</IsRoslynComponent>
+        <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
     </PropertyGroup>
 
     <ItemGroup>

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -21,6 +21,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using Path = System.IO.Path;
 
 namespace Ryujinx.HLE.FileSystem
@@ -474,6 +475,74 @@ namespace Ryujinx.HLE.FileSystem
             FinishInstallation(temporaryDirectory, registeredDirectory);
         }
 
+        public void InstallKeys(string keysSource, string installDirectory)
+        {
+            if (Directory.Exists(keysSource))
+            {
+                foreach (var filePath in Directory.EnumerateFiles(keysSource, "*.keys"))
+                {
+                    VerifyKeysFile(filePath);
+                    File.Copy(filePath, Path.Combine(installDirectory, Path.GetFileName(filePath)), true);
+                }
+
+                return;
+            }
+
+            if (!File.Exists(keysSource))
+            {
+                throw new FileNotFoundException("Keys file does not exist.");
+            }
+
+            FileInfo info = new(keysSource);
+
+            using FileStream file = File.OpenRead(keysSource);
+
+            switch (info.Extension)
+            {
+                case ".zip":
+                    using (ZipArchive archive = ZipFile.OpenRead(keysSource))
+                    {
+                        InstallKeysFromZip(archive, installDirectory);
+                    }
+                    break;
+                case ".keys":
+                    VerifyKeysFile(keysSource);
+                    File.Copy(keysSource, Path.Combine(installDirectory, info.Name), true);
+                    break;
+                default:
+                    throw new InvalidFirmwarePackageException("Input file is not a valid key package");
+            }
+        }
+
+        private void InstallKeysFromZip(ZipArchive archive, string installDirectory)
+        {
+            string temporaryDirectory = Path.Combine(installDirectory, "temp");
+            if (Directory.Exists(temporaryDirectory))
+            {
+                Directory.Delete(temporaryDirectory, true);
+            }
+            Directory.CreateDirectory(temporaryDirectory);
+            foreach (var entry in archive.Entries)
+            {
+                if (Path.GetExtension(entry.FullName).Equals(".keys", StringComparison.OrdinalIgnoreCase))
+                {
+                    string extractDestination = Path.Combine(temporaryDirectory, entry.Name);
+                    entry.ExtractToFile(extractDestination, overwrite: true);
+                    try
+                    {
+                        VerifyKeysFile(extractDestination);
+                        File.Move(extractDestination, Path.Combine(installDirectory, entry.Name), true);
+                    }
+                    catch (Exception)
+                    {
+                        Directory.Delete(temporaryDirectory, true);
+                        throw;
+                    }
+                }
+            }
+            Directory.Delete(temporaryDirectory, true);
+        }
+
         private void FinishInstallation(string temporaryDirectory, string registeredDirectory)
         {
             if (Directory.Exists(registeredDirectory))
@@ -947,5 +1016,70 @@ namespace Ryujinx.HLE.FileSystem
 
             return null;
         }
+
+        public void VerifyKeysFile(string filePath)
+        {
+            // Verify the keys file format refers to https://github.com/Thealexbarney/LibHac/blob/master/KEYS.md
+            string genericPattern = @"^[a-z0-9_]+ = [a-z0-9]+$";
+            string titlePattern = @"^[a-z0-9]{32} = [a-z0-9]{32}$";
+
+            if (File.Exists(filePath))
+            {
+                // Read all lines from the file
+                string fileName = Path.GetFileName(filePath);
+                string[] lines = File.ReadAllLines(filePath);
+
+                bool verified = false;
+                switch (fileName)
+                {
+                    case "prod.keys":
+                        verified = verifyKeys(lines, genericPattern);
+                        break;
+                    case "title.keys":
+                        verified = verifyKeys(lines, titlePattern);
+                        break;
+                    case "console.keys":
+                        verified = verifyKeys(lines, genericPattern);
+                        break;
+                    case "dev.keys":
+                        verified = verifyKeys(lines, genericPattern);
+                        break;
+                    default:
+                        throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
+                }
+                if (!verified)
+                {
+                    throw new FormatException($"Invalid \"{filePath}\" file format.");
+                }
+            } else
+            {
+                throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
+            }
+        }
+
+        private bool verifyKeys(string[] lines, string regex)
+        {
+            foreach (string line in lines)
+            {
+                if (!Regex.IsMatch(line, regex))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public bool AreKeysAlredyPresent(string pathToCheck)
+        {
+            string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };
+            foreach (var file in fileNames)
+            {
+                if (File.Exists(Path.Combine(pathToCheck, file)))
+                {
+                    return true;                    
+                }
+            }
+            return false;
+        }
     }
 }

src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs

@@ -223,9 +223,10 @@ namespace Ryujinx.HLE.FileSystem
         {
             KeySet ??= KeySet.CreateDefaultKeySet();
 
-            string keyFile = null;
+            string prodKeyFile = null;
             string titleKeyFile = null;
             string consoleKeyFile = null;
+            string devKeyFile = null;
 
             if (AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile)
             {
@@ -236,13 +237,14 @@ namespace Ryujinx.HLE.FileSystem
 
             void LoadSetAtPath(string basePath)
             {
-                string localKeyFile = Path.Combine(basePath, "prod.keys");
+                string localProdKeyFile = Path.Combine(basePath, "prod.keys");
                 string localTitleKeyFile = Path.Combine(basePath, "title.keys");
                 string localConsoleKeyFile = Path.Combine(basePath, "console.keys");
+                string localDevKeyFile = Path.Combine(basePath, "dev.keys");
 
-                if (File.Exists(localKeyFile))
+                if (File.Exists(localProdKeyFile))
                 {
-                    keyFile = localKeyFile;
+                    prodKeyFile = localProdKeyFile;
                 }
 
                 if (File.Exists(localTitleKeyFile))
@@ -254,9 +256,14 @@ namespace Ryujinx.HLE.FileSystem
                 {
                     consoleKeyFile = localConsoleKeyFile;
                 }
+
+                if (File.Exists(localDevKeyFile))
+                {
+                    devKeyFile = localDevKeyFile;
+                }
             }
 
-            ExternalKeyReader.ReadKeyFile(KeySet, keyFile, titleKeyFile, consoleKeyFile, null);
+            ExternalKeyReader.ReadKeyFile(KeySet, prodKeyFile, devKeyFile, titleKeyFile, consoleKeyFile, null);
         }
 
         public void ImportTickets(IFileSystem fs)

src/Ryujinx.HLE/HOS/Applets/AppletManager.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Applets.Browser;
+using Ryujinx.HLE.HOS.Applets.Cabinet;
 using Ryujinx.HLE.HOS.Applets.Dummy;
 using Ryujinx.HLE.HOS.Applets.Error;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
@@ -23,14 +24,14 @@ namespace Ryujinx.HLE.HOS.Applets
                 case AppletId.SoftwareKeyboard:
                     return new SoftwareKeyboardApplet(system);
                 case AppletId.LibAppletWeb:
-                    return new BrowserApplet(system);
                 case AppletId.LibAppletShop:
-                    return new BrowserApplet(system);
                 case AppletId.LibAppletOff:
-                    return new BrowserApplet(system);
+                    return new BrowserApplet();
                 case AppletId.MiiEdit:
                     Logger.Warning?.Print(LogClass.Application, $"Please use the MiiEdit inside File/Open Applet");
                     return new DummyApplet(system);
+                case AppletId.Cabinet:
+                    return new CabinetApplet(system);
             }
 
             Logger.Warning?.Print(LogClass.Application, $"Applet {applet} not implemented!");

src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs

@@ -18,13 +18,6 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
         private List<BrowserArgument> _arguments;
         private ShimKind _shimKind;
 
-        public BrowserApplet(Horizon system) { }
-
-        public ResultCode GetResult()
-        {
-            return ResultCode.Success;
-        }
-
         public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
         {
             _normalSession = normalSession;

src/Ryujinx.HLE/HOS/Applets/Cabinet/CabinetApplet.cs

@@ -0,0 +1,182 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.Common.Memory;
+using Ryujinx.HLE.HOS.Services.Am.AppletAE;
+using Ryujinx.HLE.HOS.Services.Hid.HidServer;
+using Ryujinx.HLE.HOS.Services.Hid;
+using Ryujinx.HLE.HOS.Services.Nfc.Nfp;
+using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Ryujinx.HLE.HOS.Applets.Cabinet
+{
+    internal unsafe class CabinetApplet : IApplet
+    {
+        private readonly Horizon _system;
+        private AppletSession _normalSession;
+
+        public event EventHandler AppletStateChanged;
+
+        public CabinetApplet(Horizon system)
+        {
+            _system = system;
+        }
+
+        public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
+        {
+            _normalSession = normalSession;
+
+            byte[] launchParams = _normalSession.Pop();
+            byte[] startParamBytes = _normalSession.Pop();
+
+            StartParamForAmiiboSettings startParam = IApplet.ReadStruct<StartParamForAmiiboSettings>(startParamBytes);
+
+            Logger.Stub?.PrintStub(LogClass.ServiceAm, $"CabinetApplet Start Type: {startParam.Type}");
+
+            switch (startParam.Type)
+            {
+                case 0:
+                    StartNicknameAndOwnerSettings(ref startParam);
+                    break;
+                case 1:
+                case 3:
+                    StartFormatter(ref startParam);
+                    break;
+                default:
+                    Logger.Error?.Print(LogClass.ServiceAm, $"Unknown AmiiboSettings type: {startParam.Type}");
+                    break;
+            }
+
+            // Prepare the response
+            ReturnValueForAmiiboSettings returnValue = new()
+            {
+                AmiiboSettingsReturnFlag = (byte)AmiiboSettingsReturnFlag.HasRegisterInfo,
+                DeviceHandle = new DeviceHandle
+                {
+                    Handle = 0 // Dummy device handle
+                },
+                RegisterInfo = startParam.RegisterInfo
+            };
+
+            // Push the response
+            _normalSession.Push(BuildResponse(returnValue));
+            AppletStateChanged?.Invoke(this, null);
+
+            _system.ReturnFocus();
+
+            return ResultCode.Success;
+        }
+
+        public ResultCode GetResult()
+        {
+            _system.Device.System.NfpDevices.RemoveAt(0);
+            return ResultCode.Success;
+        }
+
+        private void StartFormatter(ref StartParamForAmiiboSettings startParam)
+        {
+            // Initialize RegisterInfo
+            startParam.RegisterInfo = new RegisterInfo();
+        }
+
+        private void StartNicknameAndOwnerSettings(ref StartParamForAmiiboSettings startParam)
+        {
+            _system.Device.UIHandler.DisplayCabinetDialog(out string newName);
+            byte[] nameBytes = Encoding.UTF8.GetBytes(newName);
+            Array41<byte> nickName = new Array41<byte>();
+            nameBytes.CopyTo(nickName.AsSpan());
+            startParam.RegisterInfo.Nickname = nickName;
+            NfpDevice devicePlayer1 = new()
+            {
+                NpadIdType = NpadIdType.Player1,
+                Handle = HidUtils.GetIndexFromNpadIdType(NpadIdType.Player1),
+                State = NfpDeviceState.SearchingForTag,
+            };
+            _system.Device.System.NfpDevices.Add(devicePlayer1);
+            _system.Device.UIHandler.DisplayCabinetMessageDialog();
+            string amiiboId = string.Empty;
+            bool scanned = false;
+            while (!scanned)
+            {
+                for (int i = 0; i < _system.Device.System.NfpDevices.Count; i++)
+                {
+                    if (_system.Device.System.NfpDevices[i].State == NfpDeviceState.TagFound)
+                    {
+                        amiiboId = _system.Device.System.NfpDevices[i].AmiiboId;
+                        scanned = true;
+                    }
+                }
+            }
+            VirtualAmiibo.UpdateNickName(amiiboId, newName);
+        }
+
+        private static byte[] BuildResponse(ReturnValueForAmiiboSettings returnValue)
+        {
+            int size = Unsafe.SizeOf<ReturnValueForAmiiboSettings>();
+            byte[] bytes = new byte[size];
+
+            fixed (byte* bytesPtr = bytes)
+            {
+                Unsafe.Write(bytesPtr, returnValue);
+            }
+
+            return bytes;
+        }
+
+        #region Structs
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public unsafe struct TagInfo
+        {
+            public fixed byte Data[0x58];
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public unsafe struct StartParamForAmiiboSettings
+        {
+            public byte ZeroValue; // Left at zero by sdknso
+            public byte Type;
+            public byte Flags;
+            public byte AmiiboSettingsStartParamOffset28;
+            public ulong AmiiboSettingsStartParam0;
+
+            public TagInfo TagInfo; // Only enabled when flags bit 1 is set
+            public RegisterInfo RegisterInfo; // Only enabled when flags bit 2 is set
+
+            public fixed byte StartParamExtraData[0x20];
+
+            public fixed byte Reserved[0x24];
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public unsafe struct ReturnValueForAmiiboSettings
+        {
+            public byte AmiiboSettingsReturnFlag;
+            private byte Padding1;
+            private byte Padding2;
+            private byte Padding3;
+            public DeviceHandle DeviceHandle;
+            public TagInfo TagInfo;
+            public RegisterInfo RegisterInfo;
+            public fixed byte IgnoredBySdknso[0x24];
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        public struct DeviceHandle
+        {
+            public ulong Handle;
+        }
+
+        public enum AmiiboSettingsReturnFlag : byte
+        {
+            Cancel = 0,
+            HasTagInfo = 2,
+            HasRegisterInfo = 4,
+            HasTagInfoAndRegisterInfo = 6
+        }
+
+        #endregion
+    }
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs

@@ -117,11 +117,6 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        public ResultCode GetResult()
-        {
-            return ResultCode.Success;
-        }
-
         private static byte[] BuildResponse(ControllerSupportResultInfo result)
         {
             using MemoryStream stream = MemoryStreamManager.Shared.GetStream();

src/Ryujinx.HLE/HOS/Applets/Dummy/DummyApplet.cs

@@ -11,11 +11,14 @@ namespace Ryujinx.HLE.HOS.Applets.Dummy
     {
         private readonly Horizon _system;
         private AppletSession _normalSession;
+        
         public event EventHandler AppletStateChanged;
+        
         public DummyApplet(Horizon system)
         {
             _system = system;
         }
+        
         public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
         {
             _normalSession = normalSession;
@@ -24,10 +27,7 @@ namespace Ryujinx.HLE.HOS.Applets.Dummy
             _system.ReturnFocus();
             return ResultCode.Success;
         }
-        private static T ReadStruct<T>(byte[] data) where T : struct
-        {
-            return MemoryMarshal.Read<T>(data.AsSpan());
-        }
+        
         private static byte[] BuildResponse()
         {
             using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
@@ -35,9 +35,5 @@ namespace Ryujinx.HLE.HOS.Applets.Dummy
             writer.Write((ulong)ResultCode.Success);
             return stream.ToArray();
         }
-        public ResultCode GetResult()
-        {
-            return ResultCode.Success;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -203,10 +203,5 @@ namespace Ryujinx.HLE.HOS.Applets.Error
                 _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Number: {applicationErrorArg.ErrorNumber} (Details)", "\n" + detailsText, buttons.ToArray());
             }
         }
-
-        public ResultCode GetResult()
-        {
-            return ResultCode.Success;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Applets/IApplet.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Applets
         ResultCode Start(AppletSession normalSession,
                          AppletSession interactiveSession);
 
-        ResultCode GetResult();
+        ResultCode GetResult() => ResultCode.Success;
 
         bool DrawTo(RenderingSurfaceInfo surfaceInfo, IVirtualMemoryManager destination, ulong position) => false;
 

src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs

@@ -37,11 +37,6 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        public ResultCode GetResult()
-        {
-            return ResultCode.Success;
-        }
-
         private byte[] BuildResponse()
         {
             UserProfile currentUser = _system.AccountManager.LastOpenedUser;

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs

@@ -144,11 +144,6 @@ namespace Ryujinx.HLE.HOS.Applets
             }
         }
 
-        public ResultCode GetResult()
-        {
-            return ResultCode.Success;
-        }
-
         private bool IsKeyboardActive()
         {
             return _backgroundState >= InlineKeyboardState.Appearing && _backgroundState < InlineKeyboardState.Disappearing;

src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/TRef.cs

@@ -2,7 +2,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 {
     /// <summary>
     /// Wraps a type in a class so it gets stored in the GC managed heap. This is used as communication mechanism
-    /// between classed that need to be disposed and, thus, can't share their references.
+    /// between classes that need to be disposed and, thus, can't share their references.
     /// </summary>
     /// <typeparam name="T">The internal type.</typeparam>
     class TRef<T>

src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/IServiceCreator.cs

@@ -5,5 +5,23 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.Lp2p
     class IServiceCreator : IpcService
     {
         public IServiceCreator(ServiceCtx context) { }
+
+        [CommandCmif(0)]
+        // CreateNetworkService(pid, u64, u32) -> object<nn::ldn::detail::ISfService>
+        public ResultCode CreateNetworkService(ServiceCtx context)
+        {
+            MakeObject(context, new ISfService(context));
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(8)]
+        // CreateNetworkServiceMonitor(pid, u64) -> object<nn::ldn::detail::ISfServiceMonitor>
+        public ResultCode CreateNetworkServiceMonitor(ServiceCtx context)
+        {
+            MakeObject(context, new ISfServiceMonitor(context));
+
+            return ResultCode.Success;
+        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/ISfService.cs

@@ -0,0 +1,45 @@
+using Ryujinx.Common.Logging;
+
+namespace Ryujinx.HLE.HOS.Services.Ldn.Lp2p
+{
+    class ISfService : IpcService
+    {
+        public ISfService(ServiceCtx context) { }
+
+        [CommandCmif(0)]
+        // Initialize()
+        public ResultCode Initialize(ServiceCtx context)
+        {
+            context.ResponseData.Write(0);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(768)]
+        // CreateGroup(buffer<nn::lp2p::GroupInfo, 0x31)
+        public ResultCode CreateGroup(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(1536)]
+        // SendToOtherGroup(nn::lp2p::MacAddress, nn::lp2p::GroupId, s16, s16, u32, buffer<unknown, 0x21>)
+        public ResultCode SendToOtherGroup(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(1544)]
+        // RecvFromOtherGroup(u32, buffer<unknown, 0x22>) -> (nn::lp2p::MacAddress, u16, s16, u32, s32)
+        public ResultCode RecvFromOtherGroup(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+    }
+}

src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/ISfServiceMonitor.cs

@@ -0,0 +1,86 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Ipc;
+using Ryujinx.HLE.HOS.Kernel.Threading;
+using Ryujinx.Horizon.Common;
+using System;
+
+namespace Ryujinx.HLE.HOS.Services.Ldn.Lp2p
+{
+    class ISfServiceMonitor : IpcService
+    {
+        private readonly KEvent _stateChangeEvent;
+        private readonly KEvent _jointEvent;
+        private int _stateChangeEventHandle = 0;
+        private int _jointEventHandle = 0;
+
+        public ISfServiceMonitor(ServiceCtx context)
+        {
+            _stateChangeEvent = new KEvent(context.Device.System.KernelContext);
+            _jointEvent = new KEvent(context.Device.System.KernelContext);
+        }
+
+        [CommandCmif(0)]
+        // Initialize()
+        public ResultCode Initialize(ServiceCtx context)
+        {
+            context.ResponseData.Write(0);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(256)]
+        // AttachNetworkInterfaceStateChangeEvent() -> handle<copy>
+        public ResultCode AttachNetworkInterfaceStateChangeEvent(ServiceCtx context)
+        {
+            if (context.Process.HandleTable.GenerateHandle(_stateChangeEvent.ReadableEvent, out _stateChangeEventHandle) != Result.Success)
+            {
+                throw new InvalidOperationException("Out of handles!");
+            }
+
+            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_stateChangeEventHandle);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(288)]
+        // GetGroupInfo(buffer<nn::lp2p::GroupInfo, 0x32>)
+        public ResultCode GetGroupInfo(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(296)]
+        // GetGroupInfo2(buffer<nn::lp2p::GroupInfo, 0x32>, buffer<nn::lp2p::GroupInfo, 0x31>)
+        public ResultCode GetGroupInfo2(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(312)]
+        // GetIpConfig(buffer<unknown<0x100>, 0x1a>)
+        public ResultCode GetIpConfig(ServiceCtx context)
+        {
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
+
+            return ResultCode.Success;
+        }
+
+        [CommandCmif(328)]
+        // AttachNetworkInterfaceStateChangeEvent() -> handle<copy>
+        public ResultCode AttachJoinEvent(ServiceCtx context)
+        {
+            if (context.Process.HandleTable.GenerateHandle(_jointEvent.ReadableEvent, out _jointEventHandle) != Result.Success)
+            {
+                throw new InvalidOperationException("Out of handles!");
+            }
+
+            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_jointEventHandle);
+
+            return ResultCode.Success;
+        }
+    }
+}

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs

@@ -1,3 +1,5 @@
+using Gommon;
+using Humanizer;
 using NetCoreServer;
 using Open.Nat;
 using Ryujinx.Common.Logging;
@@ -153,7 +155,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
             if (_publicPort != 0)
             {
-                _ = Task.Delay(PortLeaseRenew * 1000, _disposedCancellation.Token).ContinueWith((task) => Task.Run(RefreshLease));
+                _ = Executor.ExecuteAfterDelayAsync(
+                    PortLeaseRenew.Seconds(), 
+                    _disposedCancellation.Token,
+                    RefreshLease);
             }
 
             _natDevice = device;
@@ -257,7 +262,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
             }
 
-            _ = Task.Delay(PortLeaseRenew, _disposedCancellation.Token).ContinueWith((task) => Task.Run(RefreshLease));
+            _ = Executor.ExecuteAfterDelayAsync(
+                PortLeaseRenew.Milliseconds(),
+                _disposedCancellation.Token,
+                RefreshLease);
         }
 
         public bool TryRegisterUser(P2pProxySession session, ExternalProxyConfig config)

src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs

@@ -93,6 +93,13 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
             return registerInfo;
         }
 
+        public static void UpdateNickName(string amiiboId, string newNickName)
+        {
+            VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
+            virtualAmiiboFile.NickName = newNickName;
+            SaveAmiiboFile(virtualAmiiboFile);
+        }
+
         public static bool OpenApplicationArea(string amiiboId, uint applicationAreaId)
         {
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);

src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs

@@ -84,12 +84,19 @@ namespace Ryujinx.HLE.Loaders.Processes
                 return false;
             }
 
+            bool isFirmware = ProgramId is >= 0x0100000000000819 and <= 0x010000000000081C;
+            bool isMiiEdit = ProgramId == 0x0100000000001009;
+            
+            string name = !isFirmware
+                ? isMiiEdit ? "miiEdit from Firmware" : (!string.IsNullOrWhiteSpace(Name) ? Name : "<Unknown Name>")
+                : "Firmware";
+
             // TODO: LibHac npdm currently doesn't support version field.
-            string version = ProgramId > 0x0100000000007FFF
-                ? DisplayVersion
+            string version = !isFirmware && !isMiiEdit
+                ? (!string.IsNullOrWhiteSpace(DisplayVersion) ? DisplayVersion : "<Unknown Version>")
                 : device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?";
 
-            Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {Name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");
+            Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");
 
             return true;
         }

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.HLE/UI/IHostUIHandler.cs

@@ -24,6 +24,18 @@ namespace Ryujinx.HLE.UI
         /// <returns>True when OK is pressed, False otherwise.</returns>
         bool DisplayMessageDialog(ControllerAppletUIArgs args);
 
+        /// <summary>
+        /// Displays an Input Dialog box to the user so they can enter the Amiibo's new name
+        /// </summary>
+        /// <param name="userText">Text that the user entered. Set to `null` on internal errors</param>
+        /// <returns>True when OK is pressed, False otherwise. Also returns True on internal errors</returns>
+        bool DisplayCabinetDialog(out string userText);
+
+        /// <summary>
+        /// Displays a Message Dialog box to the user to notify them to scan the Amiibo.
+        /// </summary>
+        void DisplayCabinetMessageDialog();
+
         /// <summary>
         /// Tell the UI that we need to transition to another program.
         /// </summary>

src/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj

@@ -9,6 +9,7 @@
     <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
     <SigningCertificate Condition=" '$(SigningCertificate)' == '' ">-</SigningCertificate>
     <TieredPGO>true</TieredPGO>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Headless.SDL2/WindowBase.cs

@@ -1,4 +1,5 @@
 using Humanizer;
+using LibHac.Tools.Fs;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
@@ -485,6 +486,19 @@ namespace Ryujinx.Headless.SDL2
             return true;
         }
 
+        public bool DisplayCabinetDialog(out string userText)
+        {
+            // SDL2 doesn't support input dialogs
+            userText = "Ryujinx";
+
+            return true;
+        }
+
+        public void DisplayCabinetMessageDialog()
+        {
+            SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags.SDL_MESSAGEBOX_INFORMATION, "Cabinet Dialog", "Please scan your Amiibo now.", WindowHandle);
+        }
+
         public bool DisplayMessageDialog(ControllerAppletUIArgs args)
         {
             if (_ignoreControllerApplet) return false;

src/Ryujinx.Horizon.Common/Ryujinx.Horizon.Common.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Horizon.Kernel.Generators/Ryujinx.Horizon.Kernel.Generators.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Horizon/Ryujinx.Horizon.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Input.SDL2/Ryujinx.Input.SDL2.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Input/Ryujinx.Input.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Memory/Ryujinx.Memory.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Configurations>Debug;Release</Configurations>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>Debug;Release</Configurations>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup>

src/Ryujinx.Tests/Ryujinx.Tests.csproj

@@ -10,6 +10,7 @@
     <TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">linux</TargetOS>
     <Configurations>Debug;Release</Configurations>
     <RunSettingsFilePath>$(MSBuildProjectDirectory)\.runsettings</RunSettingsFilePath>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <PropertyGroup>

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx.UI.LocaleGenerator/Ryujinx.UI.LocaleGenerator.csproj

@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ryujinx/AppHost.cs

@@ -1137,7 +1137,7 @@ namespace Ryujinx.Ava
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                LocaleManager.Instance[LocaleKeys.Game] + $": {Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
+                $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
                 $"FIFO: {Device.Statistics.GetFifoPercent():00.00} %",
                 _displayCount));
         }

src/Ryujinx/Assets/Locales/ar_SA.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "تثبيت البرنامج الثابت",
   "MenuBarFileToolsInstallFirmwareFromFile": "تثبيت برنامج ثابت من XCI أو ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "تثبيت برنامج ثابت من مجلد",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "إدارة أنواع الملفات",
   "MenuBarToolsInstallFileTypes": "تثبيت أنواع الملفات",
   "MenuBarToolsUninstallFileTypes": "إزالة أنواع الملفات",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\nهل تريد المتابعة؟",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "تثبيت البرنامج الثابت...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "تم تثبيت إصدار النظام {0} بنجاح.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "لن تكون هناك ملفات الشخصية أخرى لفتحها إذا تم حذف الملف الشخصي المحدد",
   "DialogUserProfileDeletionConfirmMessage": "هل تريد حذف الملف الشخصي المحدد",
   "DialogUserProfileUnsavedChangesTitle": "تحذير - التغييرات غير محفوظة",
@@ -692,6 +702,9 @@
   "Never": "مطلقا",
   "SwkbdMinCharacters": "يجب أن يبلغ طوله {0} حرفا على الأقل",
   "SwkbdMinRangeCharacters": "يجب أن يتكون من {0}-{1} حرفا",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "لوحة المفاتيح البرمجية",
   "SoftwareKeyboardModeNumeric": "يجب أن يكون 0-9 أو '.' فقط",
   "SoftwareKeyboardModeAlphabet": "يجب أن تكون الأحرف غير CJK فقط",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "إضافة ملفات جديدة...",
   "UpdaterExtracting": "استخراج التحديث...",
   "UpdaterDownloading": "تحميل التحديث...",
-  "Game": "لعبة",
   "Docked": "تركيب بالمنصة",
   "Handheld": "محمول",
   "ConnectionError": "خطأ في الاتصال",

src/Ryujinx/Assets/Locales/de_DE.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Firmware installieren",
   "MenuBarFileToolsInstallFirmwareFromFile": "Firmware von einer XCI- oder einer ZIP-Datei installieren",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Firmware aus einem Verzeichnis installieren",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Dateitypen verwalten",
   "MenuBarToolsInstallFileTypes": "Dateitypen installieren",
   "MenuBarToolsUninstallFileTypes": "Dateitypen deinstallieren",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nMöchtest du fortfahren?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Firmware wird installiert...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Systemversion {0} wurde erfolgreich installiert.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Es können keine anderen Profile geöffnet werden, wenn das ausgewählte Profil gelöscht wird.",
   "DialogUserProfileDeletionConfirmMessage": "Möchtest du das ausgewählte Profil löschen?",
   "DialogUserProfileUnsavedChangesTitle": "Warnung - Nicht gespeicherte Änderungen",
@@ -692,6 +702,9 @@
   "Never": "Niemals",
   "SwkbdMinCharacters": "Muss mindestens {0} Zeichen lang sein",
   "SwkbdMinRangeCharacters": "Muss {0}-{1} Zeichen lang sein",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Software-Tastatur",
   "SoftwareKeyboardModeNumeric": "Darf nur 0-9 oder \".\" sein",
   "SoftwareKeyboardModeAlphabet": "Keine CJK-Zeichen",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Neue Dateien hinzufügen...",
   "UpdaterExtracting": "Update extrahieren...",
   "UpdaterDownloading": "Update herunterladen...",
-  "Game": "Spiel",
   "Docked": "Docked",
   "Handheld": "Handheld",
   "ConnectionError": "Verbindungsfehler.",

src/Ryujinx/Assets/Locales/el_GR.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Εγκατάσταση Firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Εγκατάσταση Firmware από XCI ή ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Εγκατάσταση Firmware από τοποθεσία",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Διαχείριση τύπων αρχείων",
   "MenuBarToolsInstallFileTypes": "Εγκαταστήσετε τύπους αρχείων.",
   "MenuBarToolsUninstallFileTypes": "Απεγκαταστήσετε τύπους αρχείων",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nΘέλετε να συνεχίσετε;",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Εγκατάσταση Firmware...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Η έκδοση συστήματος {0} εγκαταστάθηκε με επιτυχία.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Δεν θα υπάρχουν άλλα προφίλ εάν διαγραφεί το επιλεγμένο",
   "DialogUserProfileDeletionConfirmMessage": "Θέλετε να διαγράψετε το επιλεγμένο προφίλ",
   "DialogUserProfileUnsavedChangesTitle": "Προσοχή - Μην Αποθηκευμένες Αλλαγές.",
@@ -692,6 +702,9 @@
   "Never": "Ποτέ",
   "SwkbdMinCharacters": "Πρέπει να έχει μήκος τουλάχιστον {0} χαρακτήρες",
   "SwkbdMinRangeCharacters": "Πρέπει να έχει μήκος {0}-{1} χαρακτήρες",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Εικονικό Πληκτρολόγιο",
   "SoftwareKeyboardModeNumeric": "Πρέπει να είναι 0-9 ή '.' μόνο",
   "SoftwareKeyboardModeAlphabet": "Πρέπει να μην είναι μόνο χαρακτήρες CJK",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Προσθήκη Νέων Αρχείων...",
   "UpdaterExtracting": "Εξαγωγή Ενημέρωσης...",
   "UpdaterDownloading": "Λήψη Ενημέρωσης...",
-  "Game": "Παιχνίδι",
   "Docked": "Προσκολλημένο",
   "Handheld": "Χειροκίνητο",
   "ConnectionError": "Σφάλμα Σύνδεσης.",

src/Ryujinx/Assets/Locales/en_US.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Install Firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Install a firmware from XCI or ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Install a firmware from a directory",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Manage file types",
   "MenuBarToolsInstallFileTypes": "Install file types",
   "MenuBarToolsUninstallFileTypes": "Uninstall file types",
@@ -518,6 +521,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nDo you want to continue?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Installing firmware...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "System version {0} successfully installed.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "There would be no other profiles to be opened if selected profile is deleted",
   "DialogUserProfileDeletionConfirmMessage": "Do you want to delete the selected profile",
   "DialogUserProfileUnsavedChangesTitle": "Warning - Unsaved Changes",
@@ -704,6 +714,9 @@
   "Never": "Never",
   "SwkbdMinCharacters": "Must be at least {0} characters long",
   "SwkbdMinRangeCharacters": "Must be {0}-{1} characters long",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Software Keyboard",
   "SoftwareKeyboardModeNumeric": "Must be 0-9 or '.' only",
   "SoftwareKeyboardModeAlphabet": "Must be non CJK-characters only",
@@ -717,7 +730,6 @@
   "UpdaterAddingFiles": "Adding New Files...",
   "UpdaterExtracting": "Extracting Update...",
   "UpdaterDownloading": "Downloading Update...",
-  "Game": "Game",
   "Docked": "Docked",
   "Handheld": "Handheld",
   "ConnectionError": "Connection Error.",

src/Ryujinx/Assets/Locales/es_ES.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Instalar firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Instalar firmware desde un archivo XCI o ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Instalar firmware desde una carpeta",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Administrar tipos de archivo",
   "MenuBarToolsInstallFileTypes": "Instalar tipos de archivo",
   "MenuBarToolsUninstallFileTypes": "Desinstalar tipos de archivo",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n¿Continuar?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Instalando firmware...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Versión de sistema {0} instalada con éxito.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Si eliminas el perfil seleccionado no quedará ningún otro perfil",
   "DialogUserProfileDeletionConfirmMessage": "¿Quieres eliminar el perfil seleccionado?",
   "DialogUserProfileUnsavedChangesTitle": "Advertencia - Cambios sin guardar",
@@ -692,6 +702,9 @@
   "Never": "Nunca",
   "SwkbdMinCharacters": "Debe tener al menos {0} caracteres",
   "SwkbdMinRangeCharacters": "Debe tener {0}-{1} caracteres",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Teclado de software",
   "SoftwareKeyboardModeNumeric": "Debe ser sólo 0-9 o '.'",
   "SoftwareKeyboardModeAlphabet": "Solo deben ser caracteres no CJK",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Añadiendo nuevos archivos...",
   "UpdaterExtracting": "Extrayendo actualización...",
   "UpdaterDownloading": "Descargando actualización...",
-  "Game": "Juego",
   "Docked": "Dock/TV",
   "Handheld": "Portátil",
   "ConnectionError": "Error de conexión.",

src/Ryujinx/Assets/Locales/fr_FR.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Installer un firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Installer un firmware depuis un fichier XCI ou ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Installer un firmware depuis un dossier",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Gérer les types de fichiers",
   "MenuBarToolsInstallFileTypes": "Installer les types de fichiers",
   "MenuBarToolsUninstallFileTypes": "Désinstaller les types de fichiers",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nVoulez-vous continuer ?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Installation du firmware...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Version du système {0} installée avec succès.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Il n'y aurait aucun autre profil à ouvrir si le profil sélectionné est supprimé",
   "DialogUserProfileDeletionConfirmMessage": "Voulez-vous supprimer le profil sélectionné ?",
   "DialogUserProfileUnsavedChangesTitle": "Avertissement - Modifications non enregistrées",
@@ -692,6 +702,9 @@
   "Never": "Jamais",
   "SwkbdMinCharacters": "Doit comporter au moins {0} caractères",
   "SwkbdMinRangeCharacters": "Doit comporter entre {0} et {1} caractères",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Clavier logiciel",
   "SoftwareKeyboardModeNumeric": "Doit être 0-9 ou '.' uniquement",
   "SoftwareKeyboardModeAlphabet": "Doit être uniquement des caractères non CJK",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Ajout des nouveaux fichiers...",
   "UpdaterExtracting": "Extraction de la mise à jour…",
   "UpdaterDownloading": "Téléchargement de la mise à jour...",
-  "Game": "Jeu",
   "Docked": "Mode station d'accueil",
   "Handheld": "Mode Portable",
   "ConnectionError": "Erreur de connexion.",

src/Ryujinx/Assets/Locales/he_IL.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "התקן קושחה",
   "MenuBarFileToolsInstallFirmwareFromFile": "התקן קושחה מקובץ- ZIP/XCI",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "התקן קושחה מתוך תקייה",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "ניהול סוגי קבצים",
   "MenuBarToolsInstallFileTypes": "סוגי קבצי התקנה",
   "MenuBarToolsUninstallFileTypes": "סוגי קבצי הסרה",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nהאם ברצונך להמשיך?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "מתקין קושחה...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "גרסת המערכת {0} הותקנה בהצלחה.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "לא יהיו פרופילים אחרים שייפתחו אם הפרופיל שנבחר יימחק",
   "DialogUserProfileDeletionConfirmMessage": "האם ברצונך למחוק את הפרופיל שנבחר",
   "DialogUserProfileUnsavedChangesTitle": "אזהרה - שינויים לא שמורים",
@@ -692,6 +702,9 @@
   "Never": "אף פעם",
   "SwkbdMinCharacters": "לפחות {0} תווים",
   "SwkbdMinRangeCharacters": "באורך {0}-{1} תווים",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "מקלדת וירטואלית",
   "SoftwareKeyboardModeNumeric": "חייב להיות בין 0-9 או '.' בלבד",
   "SoftwareKeyboardModeAlphabet": "מחויב להיות ללא אותיות CJK",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "מוסיף קבצים חדשים...",
   "UpdaterExtracting": "מחלץ עדכון...",
   "UpdaterDownloading": "מוריד עדכון...",
-  "Game": "משחק",
   "Docked": "בתחנת עגינה",
   "Handheld": "נייד",
   "ConnectionError": "שגיאת חיבור",

src/Ryujinx/Assets/Locales/it_IT.json

@@ -28,6 +28,9 @@
   "MenuBarToolsInstallFirmware": "Installa firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Installa un firmware da file XCI o ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Installa un firmare da una cartella",
+  "MenuBarToolsInstallKeys": "Installa Chiavi",
+  "MenuBarFileToolsInstallKeysFromFile": "Installa Chiavi da file KEYS o ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Installa Chiavi da una Cartella",
   "MenuBarToolsManageFileTypes": "Gestisci i tipi di file",
   "MenuBarToolsInstallFileTypes": "Installa i tipi di file",
   "MenuBarToolsUninstallFileTypes": "Disinstalla i tipi di file",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nVuoi continuare?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Installazione del firmware...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "La versione del sistema {0} è stata installata.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "E' stato trovato un file di chiavi invalido ' {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Installa Chavi",
+  "DialogKeysInstallerKeysInstallMessage": "Un nuovo file di Chiavi sarà intallato.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nQuesto potrebbe sovrascrivere alcune delle Chiavi già installate.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nVuoi continuare?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installando le chiavi...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "Nuovo file di chiavi installato con successo.",
   "DialogUserProfileDeletionWarningMessage": "Non ci sarebbero altri profili da aprire se il profilo selezionato viene cancellato",
   "DialogUserProfileDeletionConfirmMessage": "Vuoi eliminare il profilo selezionato?",
   "DialogUserProfileUnsavedChangesTitle": "Attenzione - Modifiche Non Salvate",
@@ -692,6 +702,9 @@
   "Never": "Mai",
   "SwkbdMinCharacters": "Non può avere meno di {0} caratteri",
   "SwkbdMinRangeCharacters": "Può avere da {0} a {1} caratteri",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Tastiera software",
   "SoftwareKeyboardModeNumeric": "Deve essere solo 0-9 o '.'",
   "SoftwareKeyboardModeAlphabet": "Deve essere solo caratteri non CJK",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Aggiunta dei nuovi file...",
   "UpdaterExtracting": "Estrazione dell'aggiornamento...",
   "UpdaterDownloading": "Download dell'aggiornamento...",
-  "Game": "Gioco",
   "Docked": "TV",
   "Handheld": "Portatile",
   "ConnectionError": "Errore di connessione.",

src/Ryujinx/Assets/Locales/ja_JP.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "ファームウェアをインストール",
   "MenuBarFileToolsInstallFirmwareFromFile": "XCI または ZIP からファームウェアをインストール",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "ディレクトリからファームウェアをインストール",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "ファイル形式を管理",
   "MenuBarToolsInstallFileTypes": "ファイル形式をインストール",
   "MenuBarToolsUninstallFileTypes": "ファイル形式をアンインストール",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n続けてよろしいですか?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "ファームウェアをインストール中...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "システムバージョン {0} が正常にインストールされました.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "選択されたプロファイルを削除すると,プロファイルがひとつも存在しなくなります",
   "DialogUserProfileDeletionConfirmMessage": "選択されたプロファイルを削除しますか",
   "DialogUserProfileUnsavedChangesTitle": "警告 - 保存されていない変更",
@@ -692,6 +702,9 @@
   "Never": "決して",
   "SwkbdMinCharacters": "最低 {0} 文字必要です",
   "SwkbdMinRangeCharacters": "{0}-{1} 文字にしてください",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "ソフトウェアキーボード",
   "SoftwareKeyboardModeNumeric": "0-9 または '.' のみでなければなりません",
   "SoftwareKeyboardModeAlphabet": "CJK文字以外のみ",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "新規ファイルを追加中...",
   "UpdaterExtracting": "アップデートを展開中...",
   "UpdaterDownloading": "アップデートをダウンロード中...",
-  "Game": "ゲーム",
   "Docked": "ドッキング",
   "Handheld": "携帯",
   "ConnectionError": "接続エラー.",

src/Ryujinx/Assets/Locales/ko_KR.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "펌웨어 설치",
   "MenuBarFileToolsInstallFirmwareFromFile": "XCI 또는 ZIP으로 펌웨어 설치",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "디렉터리에서 펌웨어 설치",
+  "MenuBarToolsInstallKeys": "설치 키",
+  "MenuBarFileToolsInstallKeysFromFile": "키나 ZIP에서 키 설치",
+  "MenuBarFileToolsInstallKeysFromFolder": "디렉터리에서 키 설치",
   "MenuBarToolsManageFileTypes": "파일 형식 관리",
   "MenuBarToolsInstallFileTypes": "파일 형식 설치",
   "MenuBarToolsUninstallFileTypes": "파일 형식 제거",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n계속하시겠습니까?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "펌웨어 설치 중...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "시스템 버전 {0}이(가) 설치되었습니다.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "{0}에서 잘못된 키 파일이 발견",
+  "DialogKeysInstallerKeysInstallTitle": "설치 키",
+  "DialogKeysInstallerKeysInstallMessage": "새로운 키 파일이 설치됩니다.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\n이로 인해 현재 설치된 키 중 일부가 대체될 수 있습니다.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\n계속하시겠습니까?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "키 설치 중...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "새로운 키 파일이 성공적으로 설치되었습니다.",
   "DialogUserProfileDeletionWarningMessage": "선택한 프로필을 삭제하면 다른 프로필을 열 수 없음",
   "DialogUserProfileDeletionConfirmMessage": "선택한 프로필을 삭제하시겠습니까?",
   "DialogUserProfileUnsavedChangesTitle": "경고 - 저장되지 않은 변경 사항",
@@ -692,6 +702,9 @@
   "Never": "절대 안 함",
   "SwkbdMinCharacters": "{0}자 이상이어야 함",
   "SwkbdMinRangeCharacters": "{0}-{1}자 길이여야 함",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "소프트웨어 키보드",
   "SoftwareKeyboardModeNumeric": "0-9 또는 '.'만 가능",
   "SoftwareKeyboardModeAlphabet": "CJK 문자가 아닌 문자만 가능",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "새 파일 추가...",
   "UpdaterExtracting": "업데이트 추출...",
   "UpdaterDownloading": "업데이트 내려받기 중...",
-  "Game": "게임",
   "Docked": "도킹",
   "Handheld": "휴대",
   "ConnectionError": "연결 오류가 발생했습니다.",

src/Ryujinx/Assets/Locales/pl_PL.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Zainstaluj oprogramowanie",
   "MenuBarFileToolsInstallFirmwareFromFile": "Zainstaluj oprogramowanie z XCI lub ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Zainstaluj oprogramowanie z katalogu",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Zarządzaj rodzajami plików",
   "MenuBarToolsInstallFileTypes": "Typy plików instalacyjnych",
   "MenuBarToolsUninstallFileTypes": "Typy plików dezinstalacyjnych",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nCzy chcesz kontynuować?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Instalowanie firmware'u...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Wersja systemu {0} została pomyślnie zainstalowana.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Nie będzie innych profili do otwarcia, jeśli wybrany profil zostanie usunięty",
   "DialogUserProfileDeletionConfirmMessage": "Czy chcesz usunąć wybrany profil",
   "DialogUserProfileUnsavedChangesTitle": "Uwaga - Niezapisane zmiany",
@@ -692,6 +702,9 @@
   "Never": "Nigdy",
   "SwkbdMinCharacters": "Musi mieć co najmniej {0} znaków",
   "SwkbdMinRangeCharacters": "Musi mieć długość od {0}-{1} znaków",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Klawiatura Oprogramowania",
   "SoftwareKeyboardModeNumeric": "Może składać się jedynie z 0-9 lub '.'",
   "SoftwareKeyboardModeAlphabet": "Nie może zawierać znaków CJK",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Dodawanie Nowych Plików...",
   "UpdaterExtracting": "Wypakowywanie Aktualizacji...",
   "UpdaterDownloading": "Pobieranie Aktualizacji...",
-  "Game": "Gra",
   "Docked": "Zadokowany",
   "Handheld": "Przenośny",
   "ConnectionError": "Błąd Połączenia.",

src/Ryujinx/Assets/Locales/pt_BR.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "_Instalar firmware",
   "MenuBarFileToolsInstallFirmwareFromFile": "Instalar firmware a partir de um arquivo ZIP/XCI",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Instalar firmware a partir de um diretório",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Gerenciar tipos de arquivo",
   "MenuBarToolsInstallFileTypes": "Instalar tipos de arquivo",
   "MenuBarToolsUninstallFileTypes": "Desinstalar tipos de arquivos",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nDeseja continuar?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Instalando firmware...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Versão do sistema {0} instalada com sucesso.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Não haveria nenhum perfil selecionado se o perfil atual fosse deletado",
   "DialogUserProfileDeletionConfirmMessage": "Deseja deletar o perfil selecionado",
   "DialogUserProfileUnsavedChangesTitle": "Alerta - Alterações não salvas",
@@ -691,6 +701,9 @@
   "Never": "Nunca",
   "SwkbdMinCharacters": "Deve ter pelo menos {0} caracteres",
   "SwkbdMinRangeCharacters": "Deve ter entre {0}-{1} caracteres",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Teclado por Software",
   "SoftwareKeyboardModeNumeric": "Deve ser somente 0-9 ou '.'",
   "SoftwareKeyboardModeAlphabet": "Apenas devem ser caracteres não CJK.",
@@ -704,7 +717,6 @@
   "UpdaterAddingFiles": "Adicionando novos arquivos...",
   "UpdaterExtracting": "Extraíndo atualização...",
   "UpdaterDownloading": "Baixando atualização...",
-  "Game": "Jogo",
   "Docked": "TV",
   "Handheld": "Portátil",
   "ConnectionError": "Erro de conexão.",

src/Ryujinx/Assets/Locales/ru_RU.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Установка прошивки",
   "MenuBarFileToolsInstallFirmwareFromFile": "Установить прошивку из XCI или ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Установить прошивку из папки",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Управление типами файлов",
   "MenuBarToolsInstallFileTypes": "Установить типы файлов",
   "MenuBarToolsUninstallFileTypes": "Удалить типы файлов",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nПродолжить?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Установка прошивки...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Прошивка версии {0} успешно установлена.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Если выбранный профиль будет удален, другие профили не будут открываться.",
   "DialogUserProfileDeletionConfirmMessage": "Удалить выбранный профиль?",
   "DialogUserProfileUnsavedChangesTitle": "Внимание - Несохраненные изменения",
@@ -692,6 +702,9 @@
   "Never": "Никогда",
   "SwkbdMinCharacters": "Должно быть не менее {0} символов.",
   "SwkbdMinRangeCharacters": "Должно быть {0}-{1} символов",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Программная клавиатура",
   "SoftwareKeyboardModeNumeric": "Должно быть в диапазоне 0-9 или '.'",
   "SoftwareKeyboardModeAlphabet": "Не должно быть CJK-символов",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Добавление новых файлов...",
   "UpdaterExtracting": "Извлечение обновления...",
   "UpdaterDownloading": "Загрузка обновления...",
-  "Game": "Игра",
   "Docked": "Стационарный режим",
   "Handheld": "Портативный режим",
   "ConnectionError": "Ошибка соединения",

src/Ryujinx/Assets/Locales/th_TH.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "ติดตั้งเฟิร์มแวร์",
   "MenuBarFileToolsInstallFirmwareFromFile": "ติดตั้งเฟิร์มแวร์จาก ไฟล์ XCI หรือ ไฟล์ ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "ติดตั้งเฟิร์มแวร์จากไดเร็กทอรี",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "จัดการประเภทไฟล์",
   "MenuBarToolsInstallFileTypes": "ติดตั้งประเภทไฟล์",
   "MenuBarToolsUninstallFileTypes": "ถอนการติดตั้งประเภทไฟล์",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nคุณต้องการดำเนินการต่อหรือไม่?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "กำลังติดตั้งเฟิร์มแวร์...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "ระบบเวอร์ชั่น {0} ติดตั้งเรียบร้อยแล้ว",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "จะไม่มีโปรไฟล์อื่นให้เปิดหากโปรไฟล์ที่เลือกถูกลบ",
   "DialogUserProfileDeletionConfirmMessage": "คุณต้องการลบโปรไฟล์ที่เลือกหรือไม่?",
   "DialogUserProfileUnsavedChangesTitle": "คำเตือน - มีการเปลี่ยนแปลงที่ไม่ได้บันทึก",
@@ -692,6 +702,9 @@
   "Never": "ไม่ต้อง",
   "SwkbdMinCharacters": "ต้องมีความยาวของตัวอักษรอย่างน้อย {0} ตัว",
   "SwkbdMinRangeCharacters": "ต้องมีความยาวของตัวอักษร {0}-{1} ตัว",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "ซอฟต์แวร์คีย์บอร์ด",
   "SoftwareKeyboardModeNumeric": "ต้องเป็น 0-9 หรือ '.' เท่านั้น",
   "SoftwareKeyboardModeAlphabet": "ต้องเป็นตัวอักษรที่ไม่ใช่ประเภท CJK เท่านั้น",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "กำลังเพิ่มไฟล์ใหม่...",
   "UpdaterExtracting": "กำลังแยกการอัปเดต...",
   "UpdaterDownloading": "กำลังดาวน์โหลดอัปเดต...",
-  "Game": "เกมส์",
   "Docked": "ด็อก",
   "Handheld": "แฮนด์เฮลด์",
   "ConnectionError": "การเชื่อมต่อล้มเหลว",

src/Ryujinx/Assets/Locales/tr_TR.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Yazılım Yükle",
   "MenuBarFileToolsInstallFirmwareFromFile": "XCI veya ZIP'ten Yazılım Yükle",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Bir Dizin Üzerinden Yazılım Yükle",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Dosya uzantılarını yönet",
   "MenuBarToolsInstallFileTypes": "Dosya uzantılarını yükle",
   "MenuBarToolsUninstallFileTypes": "Dosya uzantılarını kaldır",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nDevam etmek istiyor musunuz?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Firmware yükleniyor...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Sistem sürümü {0} başarıyla yüklendi.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Seçilen profil silinirse kullanılabilen başka profil kalmayacak",
   "DialogUserProfileDeletionConfirmMessage": "Seçilen profili silmek istiyor musunuz",
   "DialogUserProfileUnsavedChangesTitle": "Uyarı - Kaydedilmemiş Değişiklikler",
@@ -692,6 +702,9 @@
   "Never": "Hiçbir Zaman",
   "SwkbdMinCharacters": "En az {0} karakter uzunluğunda olmalı",
   "SwkbdMinRangeCharacters": "{0}-{1} karakter uzunluğunda olmalı",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Yazılım Klavyesi",
   "SoftwareKeyboardModeNumeric": "Sadece 0-9 veya '.' olabilir",
   "SoftwareKeyboardModeAlphabet": "Sadece CJK-characters olmayan karakterler olabilir",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Yeni Dosyalar Ekleniyor...",
   "UpdaterExtracting": "Güncelleme Ayrıştırılıyor...",
   "UpdaterDownloading": "Güncelleme İndiriliyor...",
-  "Game": "Oyun",
   "Docked": "Docked",
   "Handheld": "El tipi",
   "ConnectionError": "Bağlantı Hatası.",

src/Ryujinx/Assets/Locales/uk_UA.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "Установити прошивку",
   "MenuBarFileToolsInstallFirmwareFromFile": "Установити прошивку з XCI або ZIP",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "Установити прошивку з теки",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "Керувати типами файлів",
   "MenuBarToolsInstallFileTypes": "Установити типи файлів",
   "MenuBarToolsUninstallFileTypes": "Видалити типи файлів",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\nВи хочете продовжити?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Встановлення прошивки...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Версію системи {0} успішно встановлено.",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "Якщо вибраний профіль буде видалено, інші профілі не відкриватимуться",
   "DialogUserProfileDeletionConfirmMessage": "Ви хочете видалити вибраний профіль",
   "DialogUserProfileUnsavedChangesTitle": "Увага — Незбережені зміни",
@@ -692,6 +702,9 @@
   "Never": "Ніколи",
   "SwkbdMinCharacters": "Мінімальна кількість символів: {0}",
   "SwkbdMinRangeCharacters": "Має бути {0}-{1} символів",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "Програмна клавіатура",
   "SoftwareKeyboardModeNumeric": "Повинно бути лише 0-9 або “.”",
   "SoftwareKeyboardModeAlphabet": "Повинно бути лише не CJK-символи",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "Додавання нових файлів...",
   "UpdaterExtracting": "Видобування оновлення...",
   "UpdaterDownloading": "Завантаження оновлення...",
-  "Game": "Гра",
   "Docked": "Док-станція",
   "Handheld": "Портативний",
   "ConnectionError": "Помилка з'єднання.",

src/Ryujinx/Assets/Locales/zh_CN.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "安装系统固件",
   "MenuBarFileToolsInstallFirmwareFromFile": "从 XCI 或 ZIP 文件中安装系统固件",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "从文件夹中安装系统固件",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "管理文件扩展名",
   "MenuBarToolsInstallFileTypes": "关联文件扩展名",
   "MenuBarToolsUninstallFileTypes": "取消关联扩展名",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n是否继续？",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "安装系统固件中...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "成功安装系统固件版本 {0} 。",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "删除后将没有可用的账户",
   "DialogUserProfileDeletionConfirmMessage": "是否删除所选账户",
   "DialogUserProfileUnsavedChangesTitle": "警告 - 有未保存的更改",
@@ -692,6 +702,9 @@
   "Never": "从不",
   "SwkbdMinCharacters": "不少于 {0} 个字符",
   "SwkbdMinRangeCharacters": "必须为 {0}-{1} 个字符",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "软键盘",
   "SoftwareKeyboardModeNumeric": "只能输入 0-9 或 \".\"",
   "SoftwareKeyboardModeAlphabet": "仅支持非中文字符",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "安装更新中...",
   "UpdaterExtracting": "正在提取更新...",
   "UpdaterDownloading": "下载更新中...",
-  "Game": "游戏",
   "Docked": "主机模式",
   "Handheld": "掌机模式",
   "ConnectionError": "连接错误。",

src/Ryujinx/Assets/Locales/zh_TW.json

@@ -31,6 +31,9 @@
   "MenuBarToolsInstallFirmware": "安裝韌體",
   "MenuBarFileToolsInstallFirmwareFromFile": "從 XCI 或 ZIP 安裝韌體",
   "MenuBarFileToolsInstallFirmwareFromDirectory": "從資料夾安裝韌體",
+  "MenuBarToolsInstallKeys": "Install Keys",
+  "MenuBarFileToolsInstallKeysFromFile": "Install keys from KEYS or ZIP",
+  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
   "MenuBarToolsManageFileTypes": "管理檔案類型",
   "MenuBarToolsInstallFileTypes": "安裝檔案類型",
   "MenuBarToolsUninstallFileTypes": "移除檔案類型",
@@ -506,6 +509,13 @@
   "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n您確定要繼續嗎?",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "正在安裝韌體...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "成功安裝系統版本 {0}。",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "An invalid Keys file was found in {0}",
+  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
   "DialogUserProfileDeletionWarningMessage": "如果刪除選取的設定檔，將無法開啟其他設定檔",
   "DialogUserProfileDeletionConfirmMessage": "您是否要刪除所選設定檔",
   "DialogUserProfileUnsavedChangesTitle": "警告 - 未儲存的變更",
@@ -692,6 +702,9 @@
   "Never": "從不",
   "SwkbdMinCharacters": "長度必須至少為 {0} 個字元",
   "SwkbdMinRangeCharacters": "長度必須為 {0} 到 {1} 個字元",
+  "CabinetTitle": "Cabinet Dialog",
+  "CabinetDialog": "Enter your Amiibo's new name",
+  "CabinetScanDialog": "Please scan your Amiibo now.",
   "SoftwareKeyboard": "軟體鍵盤",
   "SoftwareKeyboardModeNumeric": "必須是 0 到 9 或「.」",
   "SoftwareKeyboardModeAlphabet": "必須是「非中日韓字元」 (non CJK)",
@@ -705,7 +718,6 @@
   "UpdaterAddingFiles": "正在加入新檔案...",
   "UpdaterExtracting": "正在提取更新...",
   "UpdaterDownloading": "正在下載更新...",
-  "Game": "遊戲",
   "Docked": "底座模式",
   "Handheld": "手提模式",
   "ConnectionError": "連線錯誤。",

src/Ryujinx/Ryujinx.csproj

@@ -11,6 +11,7 @@
     <TieredPGO>true</TieredPGO>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -7,6 +7,7 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using Ryujinx.UI.Common.Configuration;
@@ -155,6 +156,55 @@ namespace Ryujinx.Ava.UI.Applet
             return error || okPressed;
         }
 
+        public bool DisplayCabinetDialog(out string userText)
+        {
+            ManualResetEvent dialogCloseEvent = new(false);
+            bool okPressed = false;
+            string inputText = "My Amiibo";
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                try
+                {
+                    _parent.ViewModel.AppHost.NpadManager.BlockInputUpdates();
+                    SoftwareKeyboardUIArgs args = new SoftwareKeyboardUIArgs();
+                    args.KeyboardMode = KeyboardMode.Default;
+                    args.InitialText = "Ryujinx";
+                    args.StringLengthMin = 1;
+                    args.StringLengthMax = 25;
+                    (UserResult result, string userInput) = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.CabinetDialog], args);
+                    if (result == UserResult.Ok)
+                    {
+                        inputText = userInput;
+                        okPressed = true;
+                    }
+                }
+                finally
+                {
+                    dialogCloseEvent.Set();
+                }
+            });
+            dialogCloseEvent.WaitOne();
+            _parent.ViewModel.AppHost.NpadManager.UnblockInputUpdates();
+            userText = inputText;
+            return okPressed;
+        }
+
+        public void DisplayCabinetMessageDialog()
+        {
+            ManualResetEvent dialogCloseEvent = new(false);
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                dialogCloseEvent.Set();
+                await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.CabinetScanDialog],
+                string.Empty,
+                LocaleManager.Instance[LocaleKeys.InputDialogOk],
+                string.Empty,
+                LocaleManager.Instance[LocaleKeys.CabinetTitle]);
+            });
+            dialogCloseEvent.WaitOne();
+        }
+
+
         public void ExecuteProgram(Switch device, ProgramSpecifyKind kind, ulong value)
         {
             device.Configuration.UserChannelPersistence.ExecuteProgram(kind, value);

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -70,7 +70,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private string _gpuStatusText;
         private string _shaderCountText;
         private bool _isAmiiboRequested;
-        private bool _showRightmostSeparator;
+        private bool _showShaderCompilationHint;
         private bool _isGameRunning;
         private bool _isFullScreen;
         private int _progressMaximum;
@@ -275,12 +275,12 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool ShowFirmwareStatus => !ShowLoadProgress;
 
-        public bool ShowRightmostSeparator
+        public bool ShowShaderCompilationHint
         {
-            get => _showRightmostSeparator;
+            get => _showShaderCompilationHint;
             set
             {
-                _showRightmostSeparator = value;
+                _showShaderCompilationHint = value;
 
                 OnPropertyChanged();
             }
@@ -1271,6 +1271,108 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private async Task HandleKeysInstallation(string filename)
+        {
+            try
+            {
+                string systemDirectory = AppDataManager.KeysDirPath;
+                if (AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && Directory.Exists(AppDataManager.KeysDirPathUser))
+                {
+                    systemDirectory = AppDataManager.KeysDirPathUser;
+                }
+
+                string dialogTitle = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogKeysInstallerKeysInstallTitle);
+                string dialogMessage = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogKeysInstallerKeysInstallMessage);
+
+                bool alreadyKesyInstalled = ContentManager.AreKeysAlredyPresent(systemDirectory);
+                if (alreadyKesyInstalled)
+                {
+                    dialogMessage += LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogKeysInstallerKeysInstallSubMessage);
+                }
+
+                dialogMessage += LocaleManager.Instance[LocaleKeys.DialogKeysInstallerKeysInstallConfirmMessage];
+
+                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
+                    dialogTitle,
+                    dialogMessage,
+                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
+                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
+                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
+
+                UpdateWaitWindow waitingDialog = new(dialogTitle, LocaleManager.Instance[LocaleKeys.DialogKeysInstallerKeysInstallWaitMessage]);
+
+                if (result == UserResult.Yes)
+                {
+                    Logger.Info?.Print(LogClass.Application, $"Installing Keys");
+
+                    Thread thread = new(() =>
+                    {
+                        Dispatcher.UIThread.InvokeAsync(delegate
+                        {
+                            waitingDialog.Show();
+                        });
+
+                        try
+                        {
+                            ContentManager.InstallKeys(filename, systemDirectory);
+
+                            Dispatcher.UIThread.InvokeAsync(async delegate
+                            {
+                                waitingDialog.Close();
+
+                                string message = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogKeysInstallerKeysInstallSuccessMessage);
+
+                                await ContentDialogHelper.CreateInfoDialog(
+                                    dialogTitle,
+                                    message,
+                                    LocaleManager.Instance[LocaleKeys.InputDialogOk],
+                                    string.Empty,
+                                    LocaleManager.Instance[LocaleKeys.RyujinxInfo]);
+
+                                Logger.Info?.Print(LogClass.Application, message);
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            Dispatcher.UIThread.InvokeAsync(async () =>
+                            {
+                                waitingDialog.Close();
+
+                                string message = ex.Message;
+                                if(ex is FormatException)
+                                {
+                                    message = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogKeysInstallerKeysNotFoundErrorMessage, filename);
+                                }
+
+                                await ContentDialogHelper.CreateErrorDialog(message);
+                            });
+                        }
+                        finally
+                        {
+                            VirtualFileSystem.ReloadKeySet();
+                        }
+                    })
+                    {
+                        Name = "GUI.KeysInstallerThread",
+                    };
+
+                    thread.Start();
+                }
+            }
+            catch (MissingKeyException ex)
+            {
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime)
+                {
+                    Logger.Error?.Print(LogClass.Application, ex.ToString());
+
+                    await UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys);
+                }
+            }
+            catch (Exception ex)
+            {
+                await ContentDialogHelper.CreateErrorDialog(ex.Message);
+            }
+        }
         private void ProgressHandler<T>(T state, int current, int total) where T : Enum
         {
             Dispatcher.UIThread.Post(() =>
@@ -1395,7 +1497,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     VolumeStatusText = args.VolumeStatus;
                     FifoStatusText = args.FifoStatus;
 
-                    ShaderCountText = (ShowRightmostSeparator = args.ShaderCount > 0)
+                    ShaderCountText = (ShowShaderCompilationHint = args.ShaderCount > 0)
                         ? $"{LocaleManager.Instance[LocaleKeys.CompilingShaders]}: {args.ShaderCount}"
                         : string.Empty;
 
@@ -1559,6 +1661,53 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public async Task InstallKeysFromFile()
+        {
+            var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            {
+                AllowMultiple = false,
+                FileTypeFilter = new List<FilePickerFileType>
+                {
+                    new(LocaleManager.Instance[LocaleKeys.FileDialogAllTypes])
+                    {
+                        Patterns = new[] { "*.keys", "*.zip" },
+                        AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci", "public.zip-archive" },
+                        MimeTypes = new[] { "application/keys", "application/zip" },
+                    },
+                    new("KEYS")
+                    {
+                        Patterns = new[] { "*.keys" },
+                        AppleUniformTypeIdentifiers = new[] { "com.ryujinx.xci" },
+                        MimeTypes = new[] { "application/keys" },
+                    },
+                    new("ZIP")
+                    {
+                        Patterns = new[] { "*.zip" },
+                        AppleUniformTypeIdentifiers = new[] { "public.zip-archive" },
+                        MimeTypes = new[] { "application/zip" },
+                    },
+                },
+            });
+
+            if (result.Count > 0)
+            {
+                await HandleKeysInstallation(result[0].Path.LocalPath);
+            }
+        }
+
+        public async Task InstallKeysFromFolder()
+        {
+            var result = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+            {
+                AllowMultiple = false,
+            });
+
+            if (result.Count > 0)
+            {
+                await HandleKeysInstallation(result[0].Path.LocalPath);
+            }
+        }
+
         public void OpenRyujinxFolder()
         {
             OpenHelper.OpenFolder(AppDataManager.BaseDirPath);

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

@@ -260,6 +260,10 @@
                     IsEnabled="{Binding IsGameRunning}" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarTools}">
+                <MenuItem Header="{ext:Locale MenuBarToolsInstallKeys}" Icon="{ext:Icon fa-solid fa-key}" IsEnabled="{Binding EnableNonGameRunningControls}">
+                    <MenuItem Command="{Binding InstallKeysFromFile}" Header="{ext:Locale MenuBarFileToolsInstallKeysFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallKeysFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallKeysFromFolder}" Icon="{ext:Icon mdi-folder-cog}" />
+                </MenuItem>
                 <MenuItem Header="{ext:Locale MenuBarToolsInstallFirmware}" Icon="{ext:Icon fa-solid fa-download}" IsEnabled="{Binding EnableNonGameRunningControls}">
                     <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromFile}" Icon="{ext:Icon mdi-file-cog}" />
                     <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />

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

@@ -200,7 +200,6 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                
                 ViewModel.WindowState = WindowState.Normal;
 
                 Window.Arrange(new Rect(Window.Position.X, Window.Position.Y, windowWidthScaled, windowHeightScaled));
@@ -210,7 +209,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         public async void CheckForUpdates(object sender, RoutedEventArgs e)
         {
             if (Updater.CanUpdate(true))
-                await Window.BeginUpdateAsync(true);
+                await Updater.BeginUpdateAsync(true);
         }
 
         public async void OpenXCITrimmerWindow(object sender, RoutedEventArgs e) => await XCITrimmerWindow.Show(ViewModel);

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

@@ -23,7 +23,7 @@
         Background="{DynamicResource ThemeContentBackgroundColor}"
         DockPanel.Dock="Bottom"
         IsVisible="{Binding ShowMenuAndStatusBar}"
-        ColumnDefinitions="Auto,Auto,*,Auto">
+        ColumnDefinitions="Auto,Auto,*,Auto,Auto">
         <StackPanel
             Grid.Column="0"
             Margin="5"
@@ -284,14 +284,27 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding FifoStatusText}"
                 TextAlignment="Start" />
+        </StackPanel>
+        <StackPanel
+            Grid.Column="3"
+            Margin="0, 0, 5, 0"
+            IsVisible="{Binding IsGameRunning}"
+            VerticalAlignment="Center"
+            Orientation="Horizontal">
+            <TextBlock
+                Name="ShaderCount"
+                Margin="5,0,5,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                IsVisible="{Binding ShowShaderCompilationHint}"
+                Text="{Binding ShaderCountText}" />
             <Border
                 Width="2"
                 Height="12"
                 Margin="0"
                 BorderBrush="Gray"
-                Background="Gray"
                 BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+                IsVisible="{Binding ShowShaderCompilationHint}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -308,35 +321,29 @@
                 BorderThickness="1"
                 IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
-                Margin="5,0,5,0"
+                Margin="5,0,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding GpuNameText}"
                 TextAlignment="Start" />
+        </StackPanel>
+        <StackPanel
+            Grid.Column="4"
+            Margin="0,0,5,0"
+            VerticalAlignment="Center"
+            IsVisible="{Binding ShowFirmwareStatus}"
+            Orientation="Horizontal">
             <Border
                 Width="2"
                 Height="12"
                 Margin="0"
                 BorderBrush="Gray"
                 BorderThickness="1"
-                IsVisible="{Binding ShowRightmostSeparator}" />
-            <TextBlock
-                Name="ShaderCount"
-                Margin="5,0,5,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Text="{Binding ShaderCountText}" />
-        </StackPanel>
-        <StackPanel
-            Grid.Column="3"
-            Margin="0,0,5,0"
-            VerticalAlignment="Center"
-            IsVisible="{Binding ShowFirmwareStatus}"
-            Orientation="Horizontal">
+                IsVisible="{Binding IsGameRunning}" />
             <TextBlock
                 Name="FirmwareStatus"
-                Margin="0"
+                Margin="5, 0, 0, 0"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 Text="{ext:Locale StatusBarSystemVersion}" />

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -7,6 +7,7 @@ using Avalonia.Threading;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Windowing;
+using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
@@ -387,10 +388,8 @@ namespace Ryujinx.Ava.UI.Windows
 
             if (ConfigurationState.Instance.CheckUpdatesOnStart && !CommandLineState.HideAvailableUpdates && Updater.CanUpdate())
             {
-                await this.BeginUpdateAsync()
-                    .ContinueWith(
-                        task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"), 
-                        TaskContinuationOptions.OnlyOnFaulted);
+                await Updater.BeginUpdateAsync()
+                    .Catch(task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"));
             }
         }
 

src/Ryujinx/Updater.cs

@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
 using Gommon;
@@ -51,7 +50,7 @@ namespace Ryujinx.Ava
 
         private static readonly string[] _windowsDependencyDirs = [];
 
-        public static async Task BeginUpdateAsync(this Window mainWindow, bool showVersionUpToDate = false)
+        public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
         {
             if (_running)
             {
@@ -225,7 +224,7 @@ namespace Ryujinx.Ava
                     ? $"Canary {currentVersion} -> Canary {newVersion}"
                     : $"{currentVersion} -> {newVersion}";
                 
-                RequestUserToUpdate:
+            RequestUserToUpdate:
                 // Show a message asking the user if they want to update
                 UserResult shouldUpdate = await ContentDialogHelper.CreateUpdaterChoiceDialog(
                     LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
@@ -235,7 +234,7 @@ namespace Ryujinx.Ava
                 switch (shouldUpdate)
                 {
                     case UserResult.Yes:
-                        await UpdateRyujinx(mainWindow, _buildUrl);
+                        await UpdateRyujinx(_buildUrl);
                         break;
                     // Secondary button maps to no, which in this case is the show changelog button.
                     case UserResult.No:
@@ -258,7 +257,7 @@ namespace Ryujinx.Ava
             return result;
         }
 
-        private static async Task UpdateRyujinx(Window parent, string downloadUrl)
+        private static async Task UpdateRyujinx(string downloadUrl)
         {
             _updateSuccessful = false;
 
@@ -278,7 +277,7 @@ namespace Ryujinx.Ava
                 SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
                 IconSource = new SymbolIconSource { Symbol = Symbol.Download },
                 ShowProgressBar = true,
-                XamlRoot = parent,
+                XamlRoot = App.MainWindow,
             };
 
             taskDialog.Opened += (s, e) =>

src/Spv.Generator/Spv.Generator.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
 </Project>