Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt

.github/workflows/canary.yml

@@ -54,7 +54,19 @@ jobs:
         with:
           name: "Canary ${{ steps.version_info.outputs.build_version }}"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          body: |            
+            # Canary builds:
+            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/${{ github.repository }}/releases/latest) instead if that sounds like something you don't want to deal with.
+            
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64 bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux arm 64 bit | [Canary Linux arm Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Canary macOS artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}
           omitBodyDuringUpdate: true
           owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
           repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -181,7 +193,19 @@ jobs:
           artifacts: "release_output/*.tar.gz,release_output/*.zip"
           #artifacts: "release_output/*.tar.gz,release_output/*.zip/*AppImage*"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Canary builds:
+            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/GreemDev/Ryujinx/releases/latest) instead if that sounds like something you don't want to deal with.
+
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            
+            "**Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
@@ -248,7 +272,19 @@ jobs:
           name: "Canary ${{ steps.version_info.outputs.build_version }}"
           artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Canary builds:
+            
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/GreemDev/Ryujinx/releases/latest) instead if that sounds like something you don't want to deal with.
+            
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true

.github/workflows/release.yml

@@ -53,7 +53,16 @@ jobs:
         with:
           name: ${{ steps.version_info.outputs.build_version }}
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Regular builds:
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | [Release Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Linux 64 bit | [Release Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux arm 64 bit | [Release Linux arm Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Release macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
           omitBodyDuringUpdate: true
           owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
           repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -176,7 +185,16 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Regular builds:
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+          
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
@@ -243,7 +261,16 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "publish/*.tar.gz, publish_headless/*.tar.gz"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
+          body: |
+            # Regular builds:
+            | Platform | Artifact |
+            |--|--|
+            | Windows 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-win_x64.zip |
+            | Linux 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz |
+            | Linux arm 64 bit | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz |
+            | Macos | https://github.com/${{ github.repository }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz |
+            
+            "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true

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" />

README.md

@@ -1,35 +1,26 @@
-<h1 align="center">
+<table align="center">
+    <tr>
+        <td align="center" width="25%">
+            <img src="https://raw.githubusercontent.com/GreemDev/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
+        </td>
+        <td align="center" width="75%">
+          
+# Ryujinx
+          
+[![Release workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml)
+[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/GreemDev/Ryujinx/releases/latest)
   <br>
-  <img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/master/distribution/misc/Logo.svg" alt="Ryujinx" width="150"></a>
+[![Canary workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml)
-  <br>
+[![Latest canary release](https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary)](https://github.com/GreemDev/Ryujinx-Canary/releases/latest)
-  <b>Ryujinx</b>
+        </td>
-  <br>
+    </tr>
-  <sub><sup><b>(REE-YOU-JINX)</b></sup></sub>
+</table>
-  <br>
-    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml">
-        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg"
-            alt="">
-    </a>
-    <a href="https://github.com/GreemDev/Ryujinx/releases/latest">
-        <img src="https://img.shields.io/github/v/release/GreemDev/Ryujinx"
-            alt="Latest Release">
-    </a>
-  <br>
-    <a href="https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml">
-        <img src="https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg"
-            alt="">
-    </a>
-    <a href="https://github.com/GreemDev/Ryujinx-Canary/releases/latest">
-        <img src="https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary"
-            alt="Latest Canary Release">
-    </a>
-</h1>
 
 <p align="center">
   Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
   This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
   It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on Github under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on GitHub under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
   <br />
 </p>
 <p align="center">

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"

distribution/macos/Info.plist

@@ -40,11 +40,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1</string>
+    <string>1.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>1.1.0</string>
+    <string>1.2.0</string>
     <key>NSHighResolutionCapable</key>
     <true/>
     <key>CSResourcesFileMapped</key>

distribution/macos/updater.sh

@@ -17,7 +17,7 @@ error_handler() {
     set the button_pressed to the button returned of the result
 
     if the button_pressed is \"Open Download Page\" then
-        open location \"https://ryujinx.org/download\"
+        open location \"https://ryujinx.app/download\"
     end if
     """
 
@@ -54,4 +54,4 @@ if [ "$#" -le 3 ]; then
     open -a "$INSTALL_DIRECTORY"
 else
     open -a "$INSTALL_DIRECTORY" --args "${APP_ARGUMENTS[@]}"
-fi
+fi

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/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs

@@ -1,6 +1,8 @@
 namespace Ryujinx.Common.Configuration.Hid.Controller
 {
-    public class JoyconConfigControllerStick<TButton, TStick> where TButton : unmanaged where TStick : unmanaged
+    public class JoyconConfigControllerStick<TButton, TStick> 
+        where TButton : unmanaged 
+        where TStick : unmanaged
     {
         public TStick Joystick { get; set; }
         public bool InvertStickX { get; set; }

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,54 @@
+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(776)]
+        // DestroyGroup()
+        public ResultCode DestroyGroup(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/Extensions/NcaExtensions.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
     {
         private static readonly TitleUpdateMetadataJsonSerializerContext _applicationSerializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
-        public static ProcessResult Load(this Nca nca, Switch device, Nca patchNca, Nca controlNca)
+        public static ProcessResult Load(this Nca nca, Switch device, Nca patchNca, Nca controlNca, BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
             // Extract RomFs and ExeFs from NCA.
             IStorage romFs = nca.GetRomFs(device, patchNca);
@@ -55,6 +55,10 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
             {
                 nacpData = controlNca.GetNacp(device);
             }
+            else if (customNacpData != null) // if the Application doesn't provide a nacp file but the Application provides an override, use the provided nacp override
+            {
+                nacpData = (BlitStruct<ApplicationControlProperty>)customNacpData;
+            }
 
             /* TODO: Rework this since it's wrong and doesn't work as it takes the DisplayVersion from a "potential" non-existent update.
 

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

@@ -98,12 +98,12 @@ namespace Ryujinx.HLE.Loaders.Processes
             return false;
         }
 
-        public bool LoadNca(string path)
+        public bool LoadNca(string path, BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
             FileStream file = new(path, FileMode.Open, FileAccess.Read);
             Nca nca = new(_device.Configuration.VirtualFileSystem.KeySet, file.AsStorage(false));
 
-            ProcessResult processResult = nca.Load(_device, null, null);
+            ProcessResult processResult = nca.Load(_device, null, null, customNacpData);
 
             if (processResult.ProcessId != 0 && _processesByPid.TryAdd(processResult.ProcessId, processResult))
             {

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 isFirmwareApplication = ProgramId <= 0x0100000000007FFF;
+
+            string name = !isFirmware
+                ? (isFirmwareApplication ? "Firmware Application " : "") + (!string.IsNullOrWhiteSpace(Name) ? Name : "<Unknown Name>")
+                : "Firmware";
+
             // TODO: LibHac npdm currently doesn't support version field.
-            string version = ProgramId > 0x0100000000007FFF
+            string version = !isFirmware
-                ? DisplayVersion
+                ? (!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/StructHelpers.cs

@@ -0,0 +1,37 @@
+using LibHac.Common;
+using LibHac.Ns;
+using System;
+using System.Text;
+
+namespace Ryujinx.HLE
+{
+    public static class StructHelpers
+    {
+        public static BlitStruct<ApplicationControlProperty> CreateCustomNacpData(string name, string version)
+        {
+            // https://switchbrew.org/wiki/NACP
+            const int OffsetOfDisplayVersion = 0x3060;
+            
+            // https://switchbrew.org/wiki/NACP#ApplicationTitle
+            const int TotalApplicationTitles = 0x10;
+            const int SizeOfApplicationTitle = 0x300;
+            const int OffsetOfApplicationPublisherStrings = 0x200;
+            
+            
+            var nacpData = new BlitStruct<ApplicationControlProperty>(1);
+
+            // name and publisher buffer
+            // repeat once for each locale (the ApplicationControlProperty has 16 locales)
+            for (int i = 0; i < TotalApplicationTitles; i++)
+            {
+                Encoding.ASCII.GetBytes(name).AsSpan().CopyTo(nacpData.ByteSpan[(i * SizeOfApplicationTitle)..]);
+                "Ryujinx"u8.CopyTo(nacpData.ByteSpan[(i * SizeOfApplicationTitle + OffsetOfApplicationPublisherStrings)..]);
+            }
+            
+            // version buffer
+            Encoding.ASCII.GetBytes(version).AsSpan().CopyTo(nacpData.ByteSpan[OffsetOfDisplayVersion..]);
+
+            return nacpData;
+        }
+    }
+}

src/Ryujinx.HLE/Switch.cs

@@ -1,3 +1,5 @@
+using LibHac.Common;
+using LibHac.Ns;
 using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common.Configuration;
@@ -111,7 +113,7 @@ namespace Ryujinx.HLE
 
         public bool LoadCart(string exeFsDir, string romFsFile = null) => Processes.LoadUnpackedNca(exeFsDir, romFsFile);
         public bool LoadXci(string xciFile, ulong applicationId = 0) => Processes.LoadXci(xciFile, applicationId);
-        public bool LoadNca(string ncaFile) => Processes.LoadNca(ncaFile);
+        public bool LoadNca(string ncaFile, BlitStruct<ApplicationControlProperty>? customNacpData = null) => Processes.LoadNca(ncaFile, customNacpData);
         public bool LoadNsp(string nspFile, ulong applicationId = 0) => Processes.LoadNsp(nspFile, applicationId);
         public bool LoadProgram(string fileName) => Processes.LoadNxo(fileName);
 

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

@@ -1,4 +1,5 @@
 using CommandLine;
+using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Common;
@@ -96,8 +97,13 @@ namespace Ryujinx.Headless.SDL2
             }
 
             Parser.Default.ParseArguments<Options>(args)
-            .WithParsed(Load)
+                .WithParsed(Load)
-            .WithNotParsed(errors => errors.Output());
+                .WithNotParsed(errors =>
+                {
+                    Logger.Error?.PrintMsg(LogClass.Application, "Error parsing command-line arguments:");
+                    
+                    errors.ForEach(err => Logger.Error?.PrintMsg(LogClass.Application, $" - {err.Tag}"));
+                });
         }
 
         private static InputConfig HandlePlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
@@ -579,8 +585,8 @@ namespace Ryujinx.Headless.SDL2
                 options.MultiplayerLanInterfaceId,
                 Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
                 false,
-                "",
+                string.Empty,
-                "",
+                string.Empty,
                 options.CustomVSyncInterval);
 
             return new Switch(configuration);

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.UI.Common/App/ApplicationLibrary.cs

@@ -1,5 +1,4 @@
 using DynamicData;
-using DynamicData.Kernel;
 using Gommon;
 using LibHac;
 using LibHac.Common;
@@ -37,14 +36,13 @@ using System.Threading.Tasks;
 using ContentType = LibHac.Ncm.ContentType;
 using MissingKeyException = LibHac.Common.Keys.MissingKeyException;
 using Path = System.IO.Path;
-using SpanHelpers = LibHac.Common.SpanHelpers;
 using TimeSpan = System.TimeSpan;
 
 namespace Ryujinx.UI.App.Common
 {
     public class ApplicationLibrary
     {
-        public static string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
+        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
         public Language DesiredLanguage { get; set; }
         public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
         public event EventHandler<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
@@ -191,12 +189,9 @@ namespace Ryujinx.UI.App.Common
                 }
             }
 
-            if (isExeFs)
+            return isExeFs 
-            {
+                ? GetApplicationFromExeFs(pfs, filePath) 
-                return GetApplicationFromExeFs(pfs, filePath);
+                : null;
-            }
-
-            return null;
         }
 
         /// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
@@ -512,10 +507,6 @@ namespace Ryujinx.UI.App.Common
                     case ".xci":
                     case ".nsp":
                         {
-                            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                                ? IntegrityCheckLevel.ErrorOnInvalid
-                                : IntegrityCheckLevel.None;
-
                             using IFileSystem pfs = PartitionFileSystemUtils.OpenApplicationFileSystem(filePath, _virtualFileSystem);
 
                             foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
@@ -604,7 +595,7 @@ namespace Ryujinx.UI.App.Common
                                     controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None)
                                         .OpenFile(ref nacpFile.Ref, "/control.nacp".ToU8Span(), OpenMode.Read)
                                         .ThrowIfFailure();
-                                    nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData),
+                                    nacpFile.Get.Read(out _, 0, LibHac.Common.SpanHelpers.AsByteSpan(ref controlData),
                                         ReadOption.None).ThrowIfFailure();
 
                                     var displayVersion = controlData.DisplayVersionString.ToString();
@@ -827,7 +818,7 @@ namespace Ryujinx.UI.App.Common
         {
             _downloadableContents.Edit(it =>
             {
-                DownloadableContentsHelper.SaveDownloadableContentsJson(_virtualFileSystem, application.IdBase, dlcs);
+                DownloadableContentsHelper.SaveDownloadableContentsJson(application.IdBase, dlcs);
 
                 it.Remove(it.Items.Where(item => item.Dlc.TitleIdBase == application.IdBase));
                 it.AddOrUpdate(dlcs);
@@ -839,7 +830,7 @@ namespace Ryujinx.UI.App.Common
         {
             _titleUpdates.Edit(it =>
             {
-                TitleUpdatesHelper.SaveTitleUpdatesJson(_virtualFileSystem, application.IdBase, updates);
+                TitleUpdatesHelper.SaveTitleUpdatesJson(application.IdBase, updates);
 
                 it.Remove(it.Items.Where(item => item.TitleUpdate.TitleIdBase == application.IdBase));
                 it.AddOrUpdate(updates);
@@ -1088,14 +1079,15 @@ namespace Ryujinx.UI.App.Common
 
         private bool AddAndAutoSelectUpdate(TitleUpdateModel update)
         {
-            var currentlySelected = TitleUpdates.Items.FirstOrOptional(it =>
+            if (update == null) return false;
+            
+            var currentlySelected = TitleUpdates.Items.FindFirst(it =>
                 it.TitleUpdate.TitleIdBase == update.TitleIdBase && it.IsSelected);
 
-            var shouldSelect = !currentlySelected.HasValue ||
+            var shouldSelect = currentlySelected.Check(curr => curr.TitleUpdate?.Version < update.Version);
-                               currentlySelected.Value.TitleUpdate.Version < update.Version;
 
             _titleUpdates.AddOrUpdate((update, shouldSelect));
-
+            
             if (currentlySelected.HasValue && shouldSelect)
             {
                 _titleUpdates.AddOrUpdate((currentlySelected.Value.TitleUpdate, false));
@@ -1464,7 +1456,7 @@ namespace Ryujinx.UI.App.Common
                     if (addedNewDlc)
                     {
                         var gameDlcs = it.Items.Where(dlc => dlc.Dlc.TitleIdBase == application.IdBase).ToList();
-                        DownloadableContentsHelper.SaveDownloadableContentsJson(_virtualFileSystem, application.IdBase,
+                        DownloadableContentsHelper.SaveDownloadableContentsJson(application.IdBase,
                             gameDlcs);
                     }
                 }
@@ -1483,11 +1475,11 @@ namespace Ryujinx.UI.App.Common
                     TitleUpdatesHelper.LoadTitleUpdatesJson(_virtualFileSystem, application.IdBase);
                 it.AddOrUpdate(savedUpdates);
 
-                var selectedUpdate = savedUpdates.FirstOrOptional(update => update.IsSelected);
+                var selectedUpdate = savedUpdates.FindFirst(update => update.IsSelected);
 
                 if (TryGetTitleUpdatesFromFile(application.Path, out var bundledUpdates))
                 {
-                    var savedUpdateLookup = savedUpdates.Select(update => update.Item1).ToHashSet();
+                    var savedUpdateLookup = savedUpdates.Select(update => update.Update).ToHashSet();
                     bool updatesChanged = false;
 
                     foreach (var update in bundledUpdates.OrderByDescending(bundled => bundled.Version))
@@ -1495,12 +1487,11 @@ namespace Ryujinx.UI.App.Common
                         if (!savedUpdateLookup.Contains(update))
                         {
                             bool shouldSelect = false;
-                            if (!selectedUpdate.HasValue || selectedUpdate.Value.Item1.Version < update.Version)
+                            if (selectedUpdate.Check(su => su.Update?.Version < update.Version))
                             {
                                 shouldSelect = true;
-                                if (selectedUpdate.HasValue)
+                                _titleUpdates.AddOrUpdate((selectedUpdate.Value.Update, false));
-                                    _titleUpdates.AddOrUpdate((selectedUpdate.Value.Item1, false));
+                                selectedUpdate = (update, true);
-                                selectedUpdate = DynamicData.Kernel.Optional<(TitleUpdateModel, bool IsSelected)>.Create((update, true));
                             }
 
                             modifiedVersion = modifiedVersion || shouldSelect;
@@ -1513,7 +1504,7 @@ namespace Ryujinx.UI.App.Common
                     if (updatesChanged)
                     {
                         var gameUpdates = it.Items.Where(update => update.TitleUpdate.TitleIdBase == application.IdBase).ToList();
-                        TitleUpdatesHelper.SaveTitleUpdatesJson(_virtualFileSystem, application.IdBase, gameUpdates);
+                        TitleUpdatesHelper.SaveTitleUpdatesJson(application.IdBase, gameUpdates);
                     }
                 }
             });
@@ -1525,14 +1516,14 @@ namespace Ryujinx.UI.App.Common
         private void SaveDownloadableContentsForGame(ulong titleIdBase)
         {
             var dlcs = DownloadableContents.Items.Where(dlc => dlc.Dlc.TitleIdBase == titleIdBase).ToList();
-            DownloadableContentsHelper.SaveDownloadableContentsJson(_virtualFileSystem, titleIdBase, dlcs);
+            DownloadableContentsHelper.SaveDownloadableContentsJson(titleIdBase, dlcs);
         }
 
         // Save the _currently tracked_ update state for the game
         private void SaveTitleUpdatesForGame(ulong titleIdBase)
         {
             var updates = TitleUpdates.Items.Where(update => update.TitleUpdate.TitleIdBase == titleIdBase).ToList();
-            TitleUpdatesHelper.SaveTitleUpdatesJson(_virtualFileSystem, titleIdBase, updates);
+            TitleUpdatesHelper.SaveTitleUpdatesJson(titleIdBase, updates);
         }
 
         // ApplicationData isnt live-updating (e.g. when an update gets applied) and so this is meant to trigger a refresh

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -1,16 +1,12 @@
-using ARMeilleure;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Configuration.Multiplayer;
-using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;
 using Ryujinx.UI.Common.Configuration.System;
 using Ryujinx.UI.Common.Configuration.UI;
 using System;
-using System.Collections.Generic;
 
 namespace Ryujinx.UI.Common.Configuration
 {
@@ -21,10 +17,10 @@ namespace Ryujinx.UI.Common.Configuration
             if (Instance != null)
             {
                 throw new InvalidOperationException("Configuration is already initialized");
-                }
+            }
 
             Instance = new ConfigurationState();
-                }
+        }
 
         public ConfigurationFileFormat ToFileFormat()
         {

src/Ryujinx.UI.Common/Helper/ConsoleHelper.cs

@@ -7,6 +7,24 @@ namespace Ryujinx.UI.Common.Helper
 {
     public static partial class ConsoleHelper
     {
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("kernel32")]
+        private static partial nint GetConsoleWindow();
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool ShowWindow(nint hWnd, int nCmdShow);
+
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        private static partial nint GetForegroundWindow();
+        
+        [SupportedOSPlatform("windows")]
+        [LibraryImport("user32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool SetForegroundWindow(nint hWnd);
+
         public static bool SetConsoleWindowStateSupported => OperatingSystem.IsWindows();
 
         public static void SetConsoleWindowState(bool show)
@@ -35,16 +53,11 @@ namespace Ryujinx.UI.Common.Helper
                 return;
             }
 
+            SetForegroundWindow(hWnd);
+
+            hWnd = GetForegroundWindow();
+
             ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
         }
-
-        [SupportedOSPlatform("windows")]
-        [LibraryImport("kernel32")]
-        private static partial nint GetConsoleWindow();
-
-        [SupportedOSPlatform("windows")]
-        [LibraryImport("user32")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool ShowWindow(nint hWnd, int nCmdShow);
     }
 }

src/Ryujinx.UI.Common/Helper/DownloadableContentsHelper.cs

@@ -42,7 +42,7 @@ namespace Ryujinx.UI.Common.Helper
             }
         }
 
-        public static void SaveDownloadableContentsJson(VirtualFileSystem vfs, ulong applicationIdBase, List<(DownloadableContentModel, bool IsEnabled)> dlcs)
+        public static void SaveDownloadableContentsJson(ulong applicationIdBase, List<(DownloadableContentModel, bool IsEnabled)> dlcs)
         {
             DownloadableContentContainer container = default;
             List<DownloadableContentContainer> downloadableContentContainerList = new();

src/Ryujinx.UI.Common/Helper/TitleUpdatesHelper.cs

@@ -28,7 +28,7 @@ namespace Ryujinx.UI.Common.Helper
     {
         private static readonly TitleUpdateMetadataJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
-        public static List<(TitleUpdateModel, bool IsSelected)> LoadTitleUpdatesJson(VirtualFileSystem vfs, ulong applicationIdBase)
+        public static List<(TitleUpdateModel Update, bool IsSelected)> LoadTitleUpdatesJson(VirtualFileSystem vfs, ulong applicationIdBase)
         {
             var titleUpdatesJsonPath = PathToGameUpdatesJson(applicationIdBase);
 
@@ -49,7 +49,7 @@ namespace Ryujinx.UI.Common.Helper
             }
         }
 
-        public static void SaveTitleUpdatesJson(VirtualFileSystem vfs, ulong applicationIdBase, List<(TitleUpdateModel, bool IsSelected)> updates)
+        public static void SaveTitleUpdatesJson(ulong applicationIdBase, List<(TitleUpdateModel, bool IsSelected)> updates)
         {
             var titleUpdateWindowData = new TitleUpdateMetadata
             {
@@ -77,7 +77,7 @@ namespace Ryujinx.UI.Common.Helper
             JsonHelper.SerializeToFile(titleUpdatesJsonPath, titleUpdateWindowData, _serializerContext.TitleUpdateMetadata);
         }
 
-        private static List<(TitleUpdateModel, bool IsSelected)> LoadTitleUpdates(VirtualFileSystem vfs, TitleUpdateMetadata titleUpdateMetadata, ulong applicationIdBase)
+        private static List<(TitleUpdateModel Update, bool IsSelected)> LoadTitleUpdates(VirtualFileSystem vfs, TitleUpdateMetadata titleUpdateMetadata, ulong applicationIdBase)
         {
             var result = new List<(TitleUpdateModel, bool IsSelected)>();
 

src/Ryujinx/App.axaml

@@ -11,7 +11,7 @@
         </ResourceDictionary>
     </Application.Resources>
     <Application.Styles>
-        <sty:FluentAvaloniaTheme PreferSystemTheme="False" />
+        <sty:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="False" />
         <StyleInclude Source="/Assets/Styles/Styles.xaml" />
     </Application.Styles>
 </Application>

src/Ryujinx/AppHost.cs

@@ -3,6 +3,8 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
+using LibHac.Common;
+using LibHac.Ns;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
@@ -670,7 +672,7 @@ namespace Ryujinx.Ava
             _cursorState = CursorStates.ForceChangeCursor;
         }
 
-        public async Task<bool> LoadGuestApplication()
+        public async Task<bool> LoadGuestApplication(BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
             InitializeSwitchInstance();
             MainWindow.UpdateGraphicsConfig();
@@ -740,7 +742,7 @@ namespace Ryujinx.Ava
             {
                 Logger.Info?.Print(LogClass.Application, "Loading as Firmware Title (NCA).");
 
-                if (!Device.LoadNca(ApplicationPath))
+                if (!Device.LoadNca(ApplicationPath, customNacpData))
                 {
                     Device.Dispose();
 
@@ -1137,7 +1139,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

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "انقر لفتح موقع ريوجينكس في متصفحك الافتراضي.",
   "AboutDisclaimerMessage": "ريوجينكس لا ينتمي إلى نينتندو™،\nأو أي من شركائها بأي شكل من الأشكال.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) يتم \nاستخدامه في محاكاة أمبيو لدينا.",
-  "AboutPatreonUrlTooltipMessage": "انقر لفتح صفحة ريوجينكس في باتريون في متصفحك الافتراضي.",
   "AboutGithubUrlTooltipMessage": "انقر لفتح صفحة ريوجينكس في غيت هاب في متصفحك الافتراضي.",
   "AboutDiscordUrlTooltipMessage": "انقر لفتح دعوة إلى خادم ريوجينكس في ديكسورد في متصفحك الافتراضي.",
-  "AboutTwitterUrlTooltipMessage": "انقر لفتح صفحة ريوجينكس في تويتر في متصفحك الافتراضي.",
   "AboutRyujinxAboutTitle": "حول:",
-  "AboutRyujinxAboutContent": "ريوجينكس هو محاكي لجهاز نينتندو سويتش™.\nمن فضلك ادعمنا على باتريون.\nاحصل على آخر الأخبار على تويتر أو ديسكورد.\nيمكن للمطورين المهتمين بالمساهمة معرفة المزيد على غيت هاب أو ديسكورد.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "تتم صيانته بواسطة:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "انقر لفتح صفحة المساهمين في متصفحك الافتراضي.",
-  "AboutRyujinxSupprtersTitle": "مدعوم على باتريون بواسطة:",
   "AmiiboSeriesLabel": "مجموعة أميبو",
   "AmiiboCharacterLabel": "شخصية",
   "AmiiboScanButtonLabel": "فحصه",
@@ -702,6 +700,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 فقط",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "إضافة ملفات جديدة...",
   "UpdaterExtracting": "استخراج التحديث...",
   "UpdaterDownloading": "تحميل التحديث...",
-  "Game": "لعبة",
   "Docked": "تركيب بالمنصة",
   "Handheld": "محمول",
   "ConnectionError": "خطأ في الاتصال",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "الغش متوفر لـ {0} [{1}]",
   "BuildId": "معرف البناء:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "المحتويات القابلة للتنزيل {0}",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/de_DE.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Klicke hier, um die Ryujinx Website im Standardbrowser zu öffnen.",
   "AboutDisclaimerMessage": "Ryujinx ist in keinster Weise weder mit Nintendo™, \nnoch mit deren Partnern verbunden.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) wird in unserer Amiibo \nEmulation benutzt.",
-  "AboutPatreonUrlTooltipMessage": "Klicke hier, um die Ryujinx Patreon Seite im Standardbrowser zu öffnen.",
   "AboutGithubUrlTooltipMessage": "Klicke hier, um die Ryujinx GitHub Seite im Standardbrowser zu öffnen.",
   "AboutDiscordUrlTooltipMessage": "Klicke hier, um eine Einladung zum Ryujinx Discord Server im Standardbrowser zu öffnen.",
-  "AboutTwitterUrlTooltipMessage": "Klicke hier, um die Ryujinx Twitter Seite im Standardbrowser zu öffnen.",
   "AboutRyujinxAboutTitle": "Über:",
-  "AboutRyujinxAboutContent": "Ryujinx ist ein Nintendo Switch™ Emulator.\nBitte unterstütze uns auf Patreon.\nAuf Twitter oder Discord erfährst du alle Neuigkeiten.\nEntwickler, die an einer Mitarbeit interessiert sind, können auf GitHub oder Discord mehr erfahren.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Entwickelt von:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Klicke hier, um die Liste der Mitwirkenden im Standardbrowser zu öffnen.",
-  "AboutRyujinxSupprtersTitle": "Unterstützt auf Patreon von:",
   "AmiiboSeriesLabel": "Amiibo-Serie",
   "AmiiboCharacterLabel": "Charakter",
   "AmiiboScanButtonLabel": "Einscannen",
@@ -702,6 +700,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",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "Neue Dateien hinzufügen...",
   "UpdaterExtracting": "Update extrahieren...",
   "UpdaterDownloading": "Update herunterladen...",
-  "Game": "Spiel",
   "Docked": "Docked",
   "Handheld": "Handheld",
   "ConnectionError": "Verbindungsfehler.",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "Cheats verfügbar für {0} [{1}]",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
   "BuildId": "BuildId:",
-  "DlcWindowHeading": "DLC verfügbar für {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/el_GR.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Κάντε κλικ για να ανοίξετε τον ιστότοπο Ryujinx στο προεπιλεγμένο πρόγραμμα περιήγησης.",
   "AboutDisclaimerMessage": "Το Ryujinx δεν είναι συνδεδεμένο με τη Nintendo™,\nούτε με κανέναν από τους συνεργάτες της, με οποιονδήποτε τρόπο.",
   "AboutAmiiboDisclaimerMessage": "Το AmiiboAPI (www.amiiboapi.com) χρησιμοποιείται\nστην προσομοίωση Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx Patreon στο προεπιλεγμένο πρόγραμμα περιήγησης.",
   "AboutGithubUrlTooltipMessage": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx GitHub στο προεπιλεγμένο πρόγραμμα περιήγησης.",
   "AboutDiscordUrlTooltipMessage": "Κάντε κλικ για να ανοίξετε μία πρόσκληση στον διακομιστή Ryujinx Discord στο προεπιλεγμένο πρόγραμμα περιήγησης.",
-  "AboutTwitterUrlTooltipMessage": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx Twitter στο προεπιλεγμένο πρόγραμμα περιήγησης.",
   "AboutRyujinxAboutTitle": "Σχετικά με:",
-  "AboutRyujinxAboutContent": "Το Ryujinx είναι ένας εξομοιωτής για το Nintendo Switch™.\nΥποστηρίξτε μας στο Patreon.\nΛάβετε όλα τα τελευταία νέα στο Twitter ή στο Discord.\nΟι προγραμματιστές που ενδιαφέρονται να συνεισφέρουν μπορούν να μάθουν περισσότερα στο GitHub ή στο Discord μας.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Συντηρείται από:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Κάντε κλικ για να ανοίξετε τη σελίδα Συνεισφέροντες στο προεπιλεγμένο πρόγραμμα περιήγησης.",
-  "AboutRyujinxSupprtersTitle": "Υποστηρίζεται στο Patreon από:",
   "AmiiboSeriesLabel": "Σειρά Amiibo",
   "AmiiboCharacterLabel": "Χαρακτήρας",
   "AmiiboScanButtonLabel": "Σαρώστε το",
@@ -702,6 +700,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",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "Προσθήκη Νέων Αρχείων...",
   "UpdaterExtracting": "Εξαγωγή Ενημέρωσης...",
   "UpdaterDownloading": "Λήψη Ενημέρωσης...",
-  "Game": "Παιχνίδι",
   "Docked": "Προσκολλημένο",
   "Handheld": "Χειροκίνητο",
   "ConnectionError": "Σφάλμα Σύνδεσης.",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "Διαθέσιμα Cheats για {0} [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/en_US.json

@@ -564,15 +564,13 @@
   "AboutUrlTooltipMessage": "Click to open the Ryujinx website in your default browser.",
   "AboutDisclaimerMessage": "Ryujinx is not affiliated with Nintendo™,\nor any of its partners, in any way.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) is used\nin our Amiibo emulation.",
-  "AboutPatreonUrlTooltipMessage": "Click to open the Ryujinx Patreon page in your default browser.",
   "AboutGithubUrlTooltipMessage": "Click to open the Ryujinx GitHub page in your default browser.",
   "AboutDiscordUrlTooltipMessage": "Click to open an invite to the Ryujinx Discord server in your default browser.",
-  "AboutTwitterUrlTooltipMessage": "Click to open the Ryujinx Twitter page in your default browser.",
   "AboutRyujinxAboutTitle": "About:",
-  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nPlease support us on Patreon.\nGet all the latest news on our Twitter or Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Maintained By:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Click to open the Contributors page in your default browser.",
-  "AboutRyujinxSupprtersTitle": "Supported on Patreon By:",
   "AmiiboSeriesLabel": "Amiibo Series",
   "AmiiboCharacterLabel": "Character",
   "AmiiboScanButtonLabel": "Scan It",
@@ -714,6 +712,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",
@@ -727,7 +728,6 @@
   "UpdaterAddingFiles": "Adding New Files...",
   "UpdaterExtracting": "Extracting Update...",
   "UpdaterDownloading": "Downloading Update...",
-  "Game": "Game",
   "Docked": "Docked",
   "Handheld": "Handheld",
   "ConnectionError": "Connection Error.",
@@ -800,7 +800,7 @@
   "CheatWindowHeading": "Cheats Available for {0} [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/es_ES.json

@@ -1,7 +1,7 @@
 {
   "Language": "Español (ES)",
   "MenuBarFileOpenApplet": "Abrir applet",
-  "MenuBarFileOpenAppletOpenMiiApplet": "Mii Edit Applet",
+  "MenuBarFileOpenAppletOpenMiiApplet": "Applet Editor Mii",
   "MenuBarFileOpenAppletOpenMiiAppletToolTip": "Abre el editor de Mii en modo autónomo",
   "SettingsTabInputDirectMouseAccess": "Acceso directo al ratón",
   "SettingsTabSystemMemoryManagerMode": "Modo del administrador de memoria:",
@@ -32,12 +32,12 @@
   "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",
+  "MenuBarFileToolsInstallKeysFromFile": "Instalar keys de KEYS o ZIP",
-  "MenuBarFileToolsInstallKeysFromFolder": "Install keys from a directory",
+  "MenuBarFileToolsInstallKeysFromFolder": "Instalar keys de un directorio",
   "MenuBarToolsManageFileTypes": "Administrar tipos de archivo",
   "MenuBarToolsInstallFileTypes": "Instalar tipos de archivo",
   "MenuBarToolsUninstallFileTypes": "Desinstalar tipos de archivo",
-  "MenuBarToolsXCITrimmer": "Trim XCI Files",
+  "MenuBarToolsXCITrimmer": "Recortar archivos XCI",
   "MenuBarView": "_View",
   "MenuBarViewWindow": "Tamaño Ventana",
   "MenuBarViewWindow720": "720p",
@@ -89,11 +89,11 @@
   "GameListContextMenuOpenModsDirectoryToolTip": "Abre el directorio que contiene los Mods de la Aplicación.",
   "GameListContextMenuOpenSdModsDirectory": "Abrir Directorio de Mods de Atmosphere\n\n\n\n\n\n",
   "GameListContextMenuOpenSdModsDirectoryToolTip": "Abre el directorio alternativo de la tarjeta SD de Atmosphere que contiene los Mods de la Aplicación. Útil para los mods que están empaquetados para el hardware real.",
-  "GameListContextMenuTrimXCI": "Check and Trim XCI File",
+  "GameListContextMenuTrimXCI": "Verificar y recortar archivo XCI",
-  "GameListContextMenuTrimXCIToolTip": "Check and Trim XCI File to Save Disk Space",
+  "GameListContextMenuTrimXCIToolTip": "Verificar y recortar archivo XCI para ahorrar espacio en disco",
   "StatusBarGamesLoaded": "{0}/{1} juegos cargados",
   "StatusBarSystemVersion": "Versión del sistema: {0}",
-  "StatusBarXCIFileTrimming": "Trimming XCI File '{0}'",
+  "StatusBarXCIFileTrimming": "Recortando el siguiente archivo XCI: '{0}'",
   "LinuxVmMaxMapCountDialogTitle": "Límite inferior para mapeos de memoria detectado",
   "LinuxVmMaxMapCountDialogTextPrimary": "¿Quieres aumentar el valor de vm.max_map_count a {0}?",
   "LinuxVmMaxMapCountDialogTextSecondary": "Algunos juegos podrían intentar crear más mapeos de memoria de los permitidos. Ryujinx se bloqueará tan pronto como se supere este límite.",
@@ -480,7 +480,7 @@
   "DialogUninstallFileTypesSuccessMessage": "¡Tipos de archivos desinstalados con éxito!",
   "DialogUninstallFileTypesErrorMessage": "No se pudo desinstalar los tipos de archivo.",
   "DialogOpenSettingsWindowLabel": "Abrir ventana de opciones",
-  "DialogOpenXCITrimmerWindowLabel": "XCI Trimmer Window",
+  "DialogOpenXCITrimmerWindowLabel": "Ventana recortador XCI",
   "DialogControllerAppletTitle": "Applet de mandos",
   "DialogMessageDialogErrorExceptionMessage": "Error al mostrar cuadro de diálogo: {0}",
   "DialogSoftwareKeyboardErrorExceptionMessage": "Error al mostrar teclado de software: {0}",
@@ -509,13 +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}",
+  "DialogKeysInstallerKeysNotFoundErrorMessage": "Se halló un archivo Keys inválido en {0}",
-  "DialogKeysInstallerKeysInstallTitle": "Install Keys",
+  "DialogKeysInstallerKeysInstallTitle": "Instalar Keys",
-  "DialogKeysInstallerKeysInstallMessage": "New Keys file will be installed.",
+  "DialogKeysInstallerKeysInstallMessage": "Un nuevo archivo Keys será instalado.",
-  "DialogKeysInstallerKeysInstallSubMessage": "\n\nThis may replace some of the current installed Keys.",
+  "DialogKeysInstallerKeysInstallSubMessage": "\n\nEsto puede reemplazar algunas de las Keys actualmente instaladas.",
-  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDo you want to continue?",
+  "DialogKeysInstallerKeysInstallConfirmMessage": "\n\nDeseas continuar?",
-  "DialogKeysInstallerKeysInstallWaitMessage": "Installing Keys...",
+  "DialogKeysInstallerKeysInstallWaitMessage": "Instalando Keys...",
-  "DialogKeysInstallerKeysInstallSuccessMessage": "New Keys file successfully installed.",
+  "DialogKeysInstallerKeysInstallSuccessMessage": "Nuevo archivo Keys instalado con éxito.",
   "DialogUserProfileDeletionWarningMessage": "Si eliminas el perfil seleccionado no quedará ningún otro perfil",
   "DialogUserProfileDeletionConfirmMessage": "¿Quieres eliminar el perfil seleccionado?",
   "DialogUserProfileUnsavedChangesTitle": "Advertencia - Cambios sin guardar",
@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Haz clic para abrir el sitio web de Ryujinx en tu navegador predeterminado.",
   "AboutDisclaimerMessage": "Ryujinx no tiene afiliación alguna con Nintendo™,\nni con ninguno de sus socios.",
   "AboutAmiiboDisclaimerMessage": "Utilizamos AmiiboAPI (www.amiiboapi.com)\nen nuestra emulación de Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Haz clic para abrir el Patreon de Ryujinx en tu navegador predeterminado.",
   "AboutGithubUrlTooltipMessage": "Haz clic para abrir el GitHub de Ryujinx en tu navegador predeterminado.",
   "AboutDiscordUrlTooltipMessage": "Haz clic para recibir una invitación al Discord de Ryujinx en tu navegador predeterminado.",
-  "AboutTwitterUrlTooltipMessage": "Haz clic para abrir el Twitter de Ryujinx en tu navegador predeterminado.",
   "AboutRyujinxAboutTitle": "Acerca de:",
-  "AboutRyujinxAboutContent": "Ryujinx es un emulador para Nintendo Switch™.\nPor favor, apóyanos en Patreon.\nEncuentra las noticias más recientes en nuestro Twitter o Discord.\nDesarrolladores interesados en contribuir pueden encontrar más información en GitHub o Discord.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Mantenido por:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Haz clic para abrir la página de contribuidores en tu navegador predeterminado.",
-  "AboutRyujinxSupprtersTitle": "Apoyado en Patreon Por:",
   "AmiiboSeriesLabel": "Serie de Amiibo",
   "AmiiboCharacterLabel": "Personaje",
   "AmiiboScanButtonLabel": "Escanear",
@@ -688,20 +686,23 @@
   "OpenSetupGuideMessage": "Abrir la guía de instalación",
   "NoUpdate": "No actualizado",
   "TitleUpdateVersionLabel": "Versión {0} - {1}",
-  "TitleBundledUpdateVersionLabel": "Bundled: Version {0}",
+  "TitleBundledUpdateVersionLabel": "Incorporado: Versión {0}",
-  "TitleBundledDlcLabel": "Bundled:",
+  "TitleBundledDlcLabel": "Incorporado:",
-  "TitleXCIStatusPartialLabel": "Partial",
+  "TitleXCIStatusPartialLabel": "Parcial",
-  "TitleXCIStatusTrimmableLabel": "Untrimmed",
+  "TitleXCIStatusTrimmableLabel": "Sin recortar",
-  "TitleXCIStatusUntrimmableLabel": "Trimmed",
+  "TitleXCIStatusUntrimmableLabel": "Recortado",
-  "TitleXCIStatusFailedLabel": "(Failed)",
+  "TitleXCIStatusFailedLabel": "(Fallido)",
-  "TitleXCICanSaveLabel": "Save {0:n0} Mb",
+  "TitleXCICanSaveLabel": "Ahorra {0:n0} Mb",
-  "TitleXCISavingLabel": "Saved {0:n0} Mb",
+  "TitleXCISavingLabel": "{0:n0} Mb ahorrado(s)",
   "RyujinxInfo": "Ryujinx - Info",
   "RyujinxConfirm": "Ryujinx - Confirmación",
   "FileDialogAllTypes": "Todos los tipos",
   "Never": "Nunca",
   "SwkbdMinCharacters": "Debe tener al menos {0} caracteres",
   "SwkbdMinRangeCharacters": "Debe tener {0}-{1} caracteres",
+  "CabinetTitle": "Diálogo Gabinete",
+  "CabinetDialog": "Ingresa el nuevo nombre de tu Amiibo",
+  "CabinetScanDialog": "Escanea tu Amiibo ahora.",
   "SoftwareKeyboard": "Teclado de software",
   "SoftwareKeyboardModeNumeric": "Debe ser sólo 0-9 o '.'",
   "SoftwareKeyboardModeAlphabet": "Solo deben ser caracteres no CJK",
@@ -715,7 +716,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.",
@@ -748,44 +748,44 @@
   "SelectDlcDialogTitle": "Selecciona archivo(s) de DLC",
   "SelectUpdateDialogTitle": "Selecciona archivo(s) de actualización",
   "SelectModDialogTitle": "Seleccionar un directorio de Mods",
-  "TrimXCIFileDialogTitle": "Check and Trim XCI File",
+  "TrimXCIFileDialogTitle": "Verificar y recortar archivo XCI",
-  "TrimXCIFileDialogPrimaryText": "This function will first check the empty space and then trim the XCI File to save disk space.",
+  "TrimXCIFileDialogPrimaryText": "Esta función verificará el espacio vacío y después recortará el archivo XCI para ahorrar espacio en disco",
-  "TrimXCIFileDialogSecondaryText": "Current File Size: {0:n} MB\nGame Data Size: {1:n} MB\nDisk Space Savings: {2:n} MB",
+  "TrimXCIFileDialogSecondaryText": "Tamaño de archivo actual: {0:n} MB\nTamaño de datos de juego: {1:n} MB\nAhorro de espacio en disco: {2:n} MB",
-  "TrimXCIFileNoTrimNecessary": "XCI File does not need to be trimmed. Check logs for further details",
+  "TrimXCIFileNoTrimNecessary": "El archivo XCI no necesita ser recortado. Verifica los logs para más detalles.",
-  "TrimXCIFileNoUntrimPossible": "XCI File cannot be untrimmed. Check logs for further details",
+  "TrimXCIFileNoUntrimPossible": "El recorte del archivo XCI no puede ser deshecho. Verifica los registros para más detalles.",
-  "TrimXCIFileReadOnlyFileCannotFix": "XCI File is Read Only and could not be made writable. Check logs for further details",
+  "TrimXCIFileReadOnlyFileCannotFix": "El archivo XCI es de solo Lectura y no se le puede escribir. Lee el registro para más información.",
-  "TrimXCIFileFileSizeChanged": "XCI File has changed in size since it was scanned. Please check the file is not being written to and try again.",
+  "TrimXCIFileFileSizeChanged": "El archivo XCI ha cambiado de tamaño desde que fue escaneado. Verifica que no se esté escribiendo al archivo y vuelve a intentarlo.",
-  "TrimXCIFileFreeSpaceCheckFailed": "XCI File has data in the free space area, it is not safe to trim",
+  "TrimXCIFileFreeSpaceCheckFailed": "El archivo XCI tiene datos en el área de espacio libre, no es seguro recortar.",
-  "TrimXCIFileInvalidXCIFile": "XCI File contains invalid data. Check logs for further details",
+  "TrimXCIFileInvalidXCIFile": "El archivo XCI contiene datos inválidos. Lee el registro para más información.",
-  "TrimXCIFileFileIOWriteError": "XCI File could not be opened for writing. Check logs for further details",
+  "TrimXCIFileFileIOWriteError": "El archivo XCI no se puede abrir para escribirlo. Lee el registro para más información.",
-  "TrimXCIFileFailedPrimaryText": "Trimming of the XCI file failed",
+  "TrimXCIFileFailedPrimaryText": "El recorte del archivo XCI falló",
-  "TrimXCIFileCancelled": "The operation was cancelled",
+  "TrimXCIFileCancelled": "La operación fue cancelada",
-  "TrimXCIFileFileUndertermined": "No operation was performed",
+  "TrimXCIFileFileUndertermined": "No se realizó ninguna operación",
   "UserProfileWindowTitle": "Administrar perfiles de usuario",
   "CheatWindowTitle": "Administrar cheats",
   "DlcWindowTitle": "Administrar contenido descargable",
   "ModWindowTitle": "Administrar Mods para {0} ({1})",
   "UpdateWindowTitle": "Administrar actualizaciones",
-  "XCITrimmerWindowTitle": "XCI File Trimmer",
+  "XCITrimmerWindowTitle": "Recortador de archivos XCI",
-  "XCITrimmerTitleStatusCount": "{0} of {1} Title(s) Selected",
+  "XCITrimmerTitleStatusCount": "{0} de {1} Título(s) seleccionado(s)",
-  "XCITrimmerTitleStatusCountWithFilter": "{0} of {1} Title(s) Selected ({2} displayed)",
+  "XCITrimmerTitleStatusCountWithFilter": "{0} de {1} Título(s) seleccionado(s) ({2} mostrado(s))",
-  "XCITrimmerTitleStatusTrimming": "Trimming {0} Title(s)...",
+  "XCITrimmerTitleStatusTrimming": "Recortando {0} Título(s)...",
-  "XCITrimmerTitleStatusUntrimming": "Untrimming {0} Title(s)...",
+  "XCITrimmerTitleStatusUntrimming": "Deshaciendo recorte de {0} Título(s)...",
-  "XCITrimmerTitleStatusFailed": "Failed",
+  "XCITrimmerTitleStatusFailed": "Fallido",
-  "XCITrimmerPotentialSavings": "Potential Savings",
+  "XCITrimmerPotentialSavings": "Ahorro potencial",
-  "XCITrimmerActualSavings": "Actual Savings",
+  "XCITrimmerActualSavings": "Ahorro real",
   "XCITrimmerSavingsMb": "{0:n0} Mb",
-  "XCITrimmerSelectDisplayed": "Select Shown",
+  "XCITrimmerSelectDisplayed": "Seleccionar mostrado(s)",
-  "XCITrimmerDeselectDisplayed": "Deselect Shown",
+  "XCITrimmerDeselectDisplayed": "Deseleccionar mostrado(s)",
-  "XCITrimmerSortName": "Title",
+  "XCITrimmerSortName": "Título",
-  "XCITrimmerSortSaved": "Space Savings",
+  "XCITrimmerSortSaved": "Ahorro de espacio",
-  "XCITrimmerTrim": "Trim",
+  "XCITrimmerTrim": "Recortar",
-  "XCITrimmerUntrim": "Untrim",
+  "XCITrimmerUntrim": "Deshacer recorte",
   "UpdateWindowUpdateAddedMessage": "{0} nueva(s) actualización(es) agregada(s)",
   "UpdateWindowBundledContentNotice": "Las actualizaciones agrupadas no pueden ser eliminadas, solamente deshabilitadas.",
   "CheatWindowHeading": "Cheats disponibles para {0} [{1}]",
   "BuildId": "Id de compilación:",
-  "DlcWindowHeading": "Contenido descargable disponible para {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "Se agregaron {0} nuevo(s) contenido(s) descargable(s)",
   "AutoloadDlcAddedMessage": "Se agregaron {0} nuevo(s) contenido(s) descargable(s)",
   "AutoloadDlcRemovedMessage": "Se eliminaron {0} contenido(s) descargable(s) faltantes",
@@ -793,7 +793,7 @@
   "AutoloadUpdateRemovedMessage": "Se eliminaron {0} actualización(es) faltantes",
   "ModWindowHeading": "{0} Mod(s)",
   "UserProfilesEditProfile": "Editar selección",
-  "Continue": "Continue",
+  "Continue": "Continuar",
   "Cancel": "Cancelar",
   "Save": "Guardar",
   "Discard": "Descartar",

src/Ryujinx/Assets/Locales/fr_FR.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Cliquez pour ouvrir le site de Ryujinx dans votre navigateur par défaut.",
   "AboutDisclaimerMessage": "Ryujinx n'est pas affilié à Nintendo™,\nou à aucun de ses partenaires, de quelque manière que ce soit.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) est utilisé\ndans notre émulation Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Cliquez pour ouvrir la page Patreon de Ryujinx dans votre navigateur par défaut.",
   "AboutGithubUrlTooltipMessage": "Cliquez pour ouvrir la page GitHub de Ryujinx dans votre navigateur par défaut.",
   "AboutDiscordUrlTooltipMessage": "Cliquez pour ouvrir une invitation au serveur Discord de Ryujinx dans votre navigateur par défaut.",
-  "AboutTwitterUrlTooltipMessage": "Cliquez pour ouvrir la page Twitter de Ryujinx dans votre navigateur par défaut.",
   "AboutRyujinxAboutTitle": "À propos :",
-  "AboutRyujinxAboutContent": "Ryujinx est un émulateur pour la Nintendo Switch™.\nMerci de nous soutenir sur Patreon.\nObtenez toutes les dernières actualités sur notre Twitter ou notre Discord.\nLes développeurs intéressés à contribuer peuvent en savoir plus sur notre GitHub ou notre Discord.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Maintenu par :",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Cliquez pour ouvrir la page Contributeurs dans votre navigateur par défaut.",
-  "AboutRyujinxSupprtersTitle": "Supporté sur Patreon par :",
   "AmiiboSeriesLabel": "Séries Amiibo",
   "AmiiboCharacterLabel": "Personnage",
   "AmiiboScanButtonLabel": "Scanner",
@@ -702,6 +700,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",
@@ -715,7 +716,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.",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "Cheats disponibles pour {0} [{1}]",
   "BuildId": "BuildId :",
   "DlcWindowBundledContentNotice": "Les DLC inclus avec le jeu ne peuvent pas être supprimés mais peuvent être désactivés.",
-  "DlcWindowHeading": "{0} Contenu(s) téléchargeable(s)",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} nouveau(x) contenu(s) téléchargeable(s) ajouté(s)",
   "AutoloadDlcAddedMessage": "{0} nouveau(x) contenu(s) téléchargeable(s) ajouté(s)",
   "AutoloadDlcRemovedMessage": "{0} contenu(s) téléchargeable(s) manquant(s) supprimé(s)",

src/Ryujinx/Assets/Locales/he_IL.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "לחץ כדי לפתוח את אתר ריוג'ינקס בדפדפן ברירת המחדל שלך.",
   "AboutDisclaimerMessage": "ריוג'ינקס אינה מזוהת עם נינטנדו,\nאו שוטפייה בכל דרך שהיא.",
   "AboutAmiiboDisclaimerMessage": "ממשק אמיבו (www.amiiboapi.com) משומש בהדמיית האמיבו שלנו.",
-  "AboutPatreonUrlTooltipMessage": "לחץ כדי לפתוח את דף הפטראון של ריוג'ינקס בדפדפן ברירת המחדל שלך.",
   "AboutGithubUrlTooltipMessage": "לחץ כדי לפתוח את דף הגיטהב של ריוג'ינקס בדפדפן ברירת המחדל שלך.",
   "AboutDiscordUrlTooltipMessage": "לחץ כדי לפתוח הזמנה לשרת הדיסקורד של ריוג'ינקס בדפדפן ברירת המחדל שלך.",
-  "AboutTwitterUrlTooltipMessage": "לחץ כדי לפתוח את דף הטוויטר של Ryujinx בדפדפן ברירת המחדל שלך.",
   "AboutRyujinxAboutTitle": "אודות:",
-  "AboutRyujinxAboutContent": "ריוג'ינקס הוא אמולטור עבור הנינטנדו סוויץ' (כל הזכויות שמורות).\nבבקשה תתמכו בנו בפטראון.\nקבל את כל החדשות האחרונות בטוויטר או בדיסקורד שלנו.\nמפתחים המעוניינים לתרום יכולים לקבל מידע נוסף ב-גיטהאב או ב-דיסקורד שלנו.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "מתוחזק על ידי:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "לחץ כדי לפתוח את דף התורמים בדפדפן ברירת המחדל שלך.",
-  "AboutRyujinxSupprtersTitle": "תמוך באמצעות Patreon",
   "AmiiboSeriesLabel": "סדרת אמיבו",
   "AmiiboCharacterLabel": "דמות",
   "AmiiboScanButtonLabel": "סרוק את זה",
@@ -702,6 +700,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",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "מוסיף קבצים חדשים...",
   "UpdaterExtracting": "מחלץ עדכון...",
   "UpdaterDownloading": "מוריד עדכון...",
-  "Game": "משחק",
   "Docked": "בתחנת עגינה",
   "Handheld": "נייד",
   "ConnectionError": "שגיאת חיבור",

src/Ryujinx/Assets/Locales/it_IT.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Clicca per aprire il sito web di Ryujinx nel tuo browser predefinito.",
   "AboutDisclaimerMessage": "Ryujinx non è affiliato con Nintendo™,\no i suoi partner, in alcun modo.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) è usata\nnella nostra emulazione Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Clicca per aprire la pagina Patreon di Ryujinx nel tuo browser predefinito.",
   "AboutGithubUrlTooltipMessage": "Clicca per aprire la pagina GitHub di Ryujinx nel tuo browser predefinito.",
   "AboutDiscordUrlTooltipMessage": "Clicca per aprire un invito al server Discord di Ryujinx nel tuo browser predefinito.",
-  "AboutTwitterUrlTooltipMessage": "Clicca per aprire la pagina Twitter di Ryujinx nel tuo browser predefinito.",
   "AboutRyujinxAboutTitle": "Informazioni:",
-  "AboutRyujinxAboutContent": "Ryujinx è un emulatore per la console Nintendo Switch™.\nSostienici su Patreon.\nRicevi tutte le ultime notizie sul nostro Twitter o su Discord.\nGli sviluppatori interessati a contribuire possono trovare più informazioni sul nostro GitHub o Discord.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Mantenuto da:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Clicca per aprire la pagina dei contributori nel tuo browser predefinito.",
-  "AboutRyujinxSupprtersTitle": "Supportato su Patreon da:",
   "AmiiboSeriesLabel": "Serie Amiibo",
   "AmiiboCharacterLabel": "Personaggio",
   "AmiiboScanButtonLabel": "Scansiona",
@@ -702,6 +700,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",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "Aggiunta dei nuovi file...",
   "UpdaterExtracting": "Estrazione dell'aggiornamento...",
   "UpdaterDownloading": "Download dell'aggiornamento...",
-  "Game": "Gioco",
   "Docked": "TV",
   "Handheld": "Portatile",
   "ConnectionError": "Errore di connessione.",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "Trucchi disponibili per {0} [{1}]",
   "BuildId": "ID Build",
   "DlcWindowBundledContentNotice": "i DLC \"impacchettati\" non possono essere rimossi, ma solo disabilitati.",
-  "DlcWindowHeading": "DLC disponibili per {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} nuovo/i contenuto/i scaricabile/i aggiunto/i",
   "AutoloadDlcAddedMessage": "{0} contenuto/i scaricabile/i aggiunto/i",
   "AutoloadDlcRemovedMessage": "{0} contenuto/i scaricabile/i mancante/i rimosso/i",

src/Ryujinx/Assets/Locales/ja_JP.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "クリックするとデフォルトのブラウザで Ryujinx のウェブサイトを開きます.",
   "AboutDisclaimerMessage": "Ryujinx は Nintendo™ および\nそのパートナー企業とは一切関係ありません.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) は\nAmiibo エミュレーションに使用されています.",
-  "AboutPatreonUrlTooltipMessage": "クリックするとデフォルトのブラウザで Ryujinx の Patreon ページを開きます.",
   "AboutGithubUrlTooltipMessage": "クリックするとデフォルトのブラウザで Ryujinx の Github ページを開きます.",
   "AboutDiscordUrlTooltipMessage": "クリックするとデフォルトのブラウザで Ryujinx の Discord サーバを開きます.",
-  "AboutTwitterUrlTooltipMessage": "クリックするとデフォルトのブラウザで Ryujinx の Twitter ページを開きます.",
   "AboutRyujinxAboutTitle": "Ryujinx について:",
-  "AboutRyujinxAboutContent": "Ryujinx は Nintendo Switch™ のエミュレータです.\nPatreon で私達の活動を支援してください.\n最新の情報は Twitter または Discord から取得できます.\n貢献したい開発者の方は GitHub または Discord で詳細をご確認ください.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "開発者:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "クリックするとデフォルトのブラウザで 貢献者のページを開きます.",
-  "AboutRyujinxSupprtersTitle": "Patreon での支援者:",
   "AmiiboSeriesLabel": "Amiibo シリーズ",
   "AmiiboCharacterLabel": "キャラクタ",
   "AmiiboScanButtonLabel": "スキャン",
@@ -702,6 +700,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文字以外のみ",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "新規ファイルを追加中...",
   "UpdaterExtracting": "アップデートを展開中...",
   "UpdaterDownloading": "アップデートをダウンロード中...",
-  "Game": "ゲーム",
   "Docked": "ドッキング",
   "Handheld": "携帯",
   "ConnectionError": "接続エラー.",
@@ -785,7 +785,7 @@
   "UpdateWindowBundledContentNotice": "Bundled updates cannot be removed, only disabled.",
   "CheatWindowHeading": "利用可能なチート {0} [{1}]",
   "BuildId": "ビルドID:",
-  "DlcWindowHeading": "利用可能な DLC {0} [{1}]",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/ko_KR.json

@@ -1,7 +1,7 @@
 {
   "Language": "한국어",
   "MenuBarFileOpenApplet": "애플릿 열기",
-  "MenuBarFileOpenAppletOpenMiiApplet": "Mii Edit Applet",
+  "MenuBarFileOpenAppletOpenMiiApplet": "Mii 편집 애플릿",
   "MenuBarFileOpenAppletOpenMiiAppletToolTip": "독립 실행형 모드로 Mii 편집기 애플릿 열기",
   "SettingsTabInputDirectMouseAccess": "마우스 직접 접근",
   "SettingsTabSystemMemoryManagerMode": "메모리 관리자 모드 :",
@@ -484,7 +484,7 @@
   "DialogControllerAppletTitle": "컨트롤러 애플릿",
   "DialogMessageDialogErrorExceptionMessage": "메시지 대화 상자 표시 오류 : {0}",
   "DialogSoftwareKeyboardErrorExceptionMessage": "소프트웨어 키보드 표시 오류 : {0}",
-  "DialogErrorAppletErrorExceptionMessage": "ErrorApplet 대화 상자 표시 오류 : {0}",
+  "DialogErrorAppletErrorExceptionMessage": "애플릿 오류류 대화 상자 표시 오류 : {0}",
   "DialogUserErrorDialogMessage": "{0}: {1}",
   "DialogUserErrorDialogInfoMessage": "\n이 오류를 해결하는 방법에 대한 자세한 내용은 설정 가이드를 참조하세요.",
   "DialogUserErrorDialogTitle": "Ryujinx 오류 ({0})",
@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "클릭하면 기본 브라우저에서 Ryujinx 웹사이트가 열립니다.",
   "AboutDisclaimerMessage": "Ryujinx는 Nintendo™\n또는 그 파트너와 제휴한 바가 없습니다.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI(www.amiiboapi.com)는\nAmiibo 에뮬레이션에 사용됩니다.",
-  "AboutPatreonUrlTooltipMessage": "클릭하면 기본 브라우저에서 Ryujinx Patreon 페이지가 열립니다.",
   "AboutGithubUrlTooltipMessage": "클릭하면 기본 브라우저에서 Ryujinx GitHub 페이지가 열립니다.",
   "AboutDiscordUrlTooltipMessage": "클릭하면 기본 브라우저에서 Ryujinx 디스코드 서버 초대장이 열립니다.",
-  "AboutTwitterUrlTooltipMessage": "클릭하면 기본 브라우저에서 Ryujinx 트위터 페이지가 열립니다.",
   "AboutRyujinxAboutTitle": "정보 :",
-  "AboutRyujinxAboutContent": "Ryujinx는 Nintendo Switch™용 에뮬레이터입니다.\nPatreon에서 저희를 후원해 주세요.\nTwitter나 Discord에서 최신 뉴스를 모두 받아보세요.\n기여에 관심이 있는 개발자는 GitHub이나 Discord에서 자세한 내용을 알아볼 수 있습니다.",
+  "AboutRyujinxAboutContent": "Ryujinx는 Nintendo Switch™용 에뮬레이터입니다.\n모든 최신 소식을 Discord에서 확인하세요.\n기여에 관심이 있는 개발자는 GitHub 또는 Discord에서 자세한 내용을 확인할 수 있습니다.",
   "AboutRyujinxMaintainersTitle": "유지 관리 :",
+  "AboutRyujinxFormerMaintainersTitle": "이전 관리자 :",
   "AboutRyujinxMaintainersContentTooltipMessage": "클릭하면 기본 브라우저에서 기여자 페이지가 열립니다.",
-  "AboutRyujinxSupprtersTitle": "Patreon에서 후원 :",
   "AmiiboSeriesLabel": "Amiibo 시리즈",
   "AmiiboCharacterLabel": "캐릭터",
   "AmiiboScanButtonLabel": "스캔하기",
@@ -702,6 +700,9 @@
   "Never": "절대 안 함",
   "SwkbdMinCharacters": "{0}자 이상이어야 함",
   "SwkbdMinRangeCharacters": "{0}-{1}자 길이여야 함",
+  "CabinetTitle": "캐비닛 대화 상자",
+  "CabinetDialog": "Amiibo의 새 이름 입력하기",
+  "CabinetScanDialog": "지금 Amiibo를 스캔하세요.",
   "SoftwareKeyboard": "소프트웨어 키보드",
   "SoftwareKeyboardModeNumeric": "0-9 또는 '.'만 가능",
   "SoftwareKeyboardModeAlphabet": "CJK 문자가 아닌 문자만 가능",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "새 파일 추가...",
   "UpdaterExtracting": "업데이트 추출...",
   "UpdaterDownloading": "업데이트 내려받기 중...",
-  "Game": "게임",
   "Docked": "도킹",
   "Handheld": "휴대",
   "ConnectionError": "연결 오류가 발생했습니다.",
@@ -779,14 +779,14 @@
   "XCITrimmerDeselectDisplayed": "표시됨 선택 취소",
   "XCITrimmerSortName": "타이틀",
   "XCITrimmerSortSaved": "공간 절약s",
-  "XCITrimmerTrim": "Trim",
+  "XCITrimmerTrim": "트림",
-  "XCITrimmerUntrim": "Untrim",
+  "XCITrimmerUntrim": "언트림",
   "UpdateWindowUpdateAddedMessage": "{0}개의 새 업데이트가 추가됨",
   "UpdateWindowBundledContentNotice": "번들 업데이트는 제거할 수 없으며, 비활성화만 가능합니다.",
   "CheatWindowHeading": "{0} [{1}]에 사용 가능한 치트",
   "BuildId": "빌드ID:",
   "DlcWindowBundledContentNotice": "번들 DLC는 제거할 수 없으며 비활성화만 가능합니다.",
-  "DlcWindowHeading": "{1} ({2})에 내려받기 가능한 콘텐츠 {0}개 사용 가능",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0}개의 새로운 내려받기 가능한 콘텐츠가 추가됨",
   "AutoloadDlcAddedMessage": "{0}개의 새로운 내려받기 가능한 콘텐츠가 추가됨",
   "AutoloadDlcRemovedMessage": "{0}개의 내려받기 가능한 콘텐츠가 제거됨",

src/Ryujinx/Assets/Locales/no_NO.json

@@ -0,0 +1,785 @@
+{
+  "Language": "Norsk",
+  "MenuBarFileOpenApplet": "Åpne Program",
+  "MenuBarFileOpenAppletOpenMiiAppletToolTip": "Åpne Mii Redigerings program i eget vindu",
+  "SettingsTabInputDirectMouseAccess": "Direkte tilgang med Mus",
+  "SettingsTabSystemMemoryManagerMode": "Memory Manager-modus",
+  "SettingsTabSystemMemoryManagerModeSoftware": "Programvare",
+  "SettingsTabSystemMemoryManagerModeHost": "Vert (rask)",
+  "SettingsTabSystemMemoryManagerModeHostUnchecked": "Vert Ukontrollert (raskets, utrygt)",
+  "SettingsTabSystemUseHypervisor": "Bruk Hypervisor",
+  "MenuBarFile": "_Fil",
+  "MenuBarFileOpenFromFile": "_Last inn program fra fil",
+  "MenuBarFileOpenFromFileError": "Ingen apper ble funnet i valgt fil.",
+  "MenuBarFileOpenUnpacked": "Last inn _Upakket spill",
+  "MenuBarFileOpenEmuFolder": "Åpne Ryujinx mappe",
+  "MenuBarFileOpenLogsFolder": "Åpne Logg mappen",
+  "MenuBarFileExit": "_Avslutt",
+  "MenuBarOptions": "_Alternativer",
+  "MenuBarOptionsToggleFullscreen": "Fullskjermsvisning av/på",
+  "MenuBarOptionsStartGamesInFullscreen": "Start spill i Fullskjermmodus",
+  "MenuBarOptionsStopEmulation": "Stopp Emulering",
+  "MenuBarOptionsSettings": "_Innstillinger",
+  "MenuBarOptionsManageUserProfiles": "_Administrere Brukerprofiler",
+  "MenuBarActions": "_Handlinger",
+  "MenuBarOptionsSimulateWakeUpMessage": "Simuler oppvåknings-melding",
+  "MenuBarActionsScanAmiibo": "Skann en Amiibo",
+  "MenuBarTools": "_Verktøy",
+  "MenuBarToolsInstallFirmware": "Installer fastvare",
+  "MenuBarFileToolsInstallFirmwareFromFile": "Installer en fastvare fra XCI eller ZIP",
+  "MenuBarFileToolsInstallFirmwareFromDirectory": "Installer en fastvare fra en mappe",
+  "MenuBarToolsManageFileTypes": "Behandle filtyper",
+  "MenuBarToolsInstallFileTypes": "Installer filtyper",
+  "MenuBarToolsUninstallFileTypes": "Avinstaller filtyper",
+  "MenuBarView": "_Vis",
+  "MenuBarViewWindow": "Vindu størrelse",
+  "MenuBarViewWindow720": "720p",
+  "MenuBarViewWindow1080": "1080p",
+  "MenuBarHelp": "_Hjelp",
+  "MenuBarHelpCheckForUpdates": "Se etter oppdateringer",
+  "MenuBarHelpAbout": "Om",
+  "MenuSearch": "Søk ...",
+  "GameListHeaderFavorite": "Fav",
+  "GameListHeaderIcon": "Ikon",
+  "GameListHeaderApplication": "Navn",
+  "GameListHeaderDeveloper": "Utvikler",
+  "GameListHeaderVersion": "Versjon",
+  "GameListHeaderTimePlayed": "Spilletid",
+  "GameListHeaderLastPlayed": "Sist Spilt",
+  "GameListHeaderFileExtension": "Fil Eks.",
+  "GameListHeaderFileSize": "Fil Størrelse",
+  "GameListHeaderPath": "Bane",
+  "GameListContextMenuOpenUserSaveDirectory": "Åpne bruker lagrings mappe",
+  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Åpner mappen som inneholder programmets bruker lagring",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Åpne lagringsmappe for enheten",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Åpner mappen som inneholder programmets lagringsenhet",
+  "GameListContextMenuOpenBcatSaveDirectory": "Åpne BCAT lagringsmappe",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Åpner mappen som inneholder programmets BCAT-lagring",
+  "GameListContextMenuManageTitleUpdates": "Administrer titteloppdateringer",
+  "GameListContextMenuManageTitleUpdatesToolTip": "Åpner vinduet Tittel - Oppdateringskontroll",
+  "GameListContextMenuManageDlc": "Administrer DLC",
+  "GameListContextMenuManageDlcToolTip": "Åpner DLC håndteringsvinduet",
+  "GameListContextMenuCacheManagement": "Cache administrasjon",
+  "GameListContextMenuCacheManagementPurgePptc": "Start PPTC gjenoppbygging",
+  "GameListContextMenuCacheManagementPurgePptcToolTip": "Utløs PPTC for å gjenoppbygge ved oppstart av neste spill-start",
+  "GameListContextMenuCacheManagementPurgeShaderCache": "Tøm shader cache",
+  "GameListContextMenuCacheManagementPurgeShaderCacheToolTip": "Sletter applikasjonens shader cache",
+  "GameListContextMenuCacheManagementOpenPptcDirectory": "Åpne PPTC mappe",
+  "GameListContextMenuCacheManagementOpenPptcDirectoryToolTip": "Åpner mappen som inneholder programmets PPTC cache",
+  "GameListContextMenuCacheManagementOpenShaderCacheDirectory": "Åpne Shader Cache-mappen",
+  "GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip": "Åpner mappen som inneholder Programmets shader cache",
+  "GameListContextMenuExtractData": "Hent ut data",
+  "GameListContextMenuExtractDataExeFS": "ExeFS",
+  "GameListContextMenuExtractDataExeFSToolTip": "Pakk ut ExeFS seksjonen fra Programmets gjeldende konfigurasjon (inkludert oppdateringer)",
+  "GameListContextMenuExtractDataRomFS": "RomFS",
+  "GameListContextMenuExtractDataRomFSToolTip": "Pakk ut RomFS seksjonen fra applikasjonens gjeldende konfigurasjon (inkludert oppdateringer)",
+  "GameListContextMenuExtractDataLogo": "Logo",
+  "GameListContextMenuExtractDataLogoToolTip": "Pakk ut Logo-seksjonen fra applikasjonens gjeldende konfigurasjon (inkludert oppdateringer)",
+  "GameListContextMenuCreateShortcut": "Lag programsnarvei",
+  "GameListContextMenuCreateShortcutToolTip": "Lag en snarvei på skrivebordet som starter den valgte Applikasjonen",
+  "GameListContextMenuCreateShortcutToolTipMacOS": "Lag snarvei i macOSs Program-mappen som starter det valgte programmet",
+  "GameListContextMenuOpenModsDirectory": "Åpne Modifikasjonsmappen",
+  "GameListContextMenuOpenModsDirectoryToolTip": "Åpner mappen som inneholder programmets modifikasjoner",
+  "GameListContextMenuOpenSdModsDirectory": "Åpne Atmosfære modifikasjons mappen",
+  "GameListContextMenuOpenSdModsDirectoryToolTip": "Åpner den alternative SD-kortets Atmosfære-mappe som inneholder programmoduser. Nyttig for modifikasjoner som er pakket for ekte maskinvare.",
+  "StatusBarGamesLoaded": "{0}/{1} Spill Lastet",
+  "StatusBarSystemVersion": "System versjon: {0}",
+  "LinuxVmMaxMapCountDialogTitle": "Lav grense for minnetildelinger oppdaget",
+  "LinuxVmMaxMapCountDialogTextPrimary": "Ønsker du å øke verdien av vm.max_map_count til {0}",
+  "LinuxVmMaxMapCountDialogTextSecondary": "Noen spill kan prøve å lage flere minnekartlegging enn det som er tillatt. Ryujinx vil krasjes så snart denne grensen overskrides.",
+  "LinuxVmMaxMapCountDialogButtonUntilRestart": "Ja, frem til neste omstart",
+  "LinuxVmMaxMapCountDialogButtonPersistent": "Ja, permanent",
+  "LinuxVmMaxMapCountWarningTextPrimary": "Den maksimale mengden Minnetilordninger er lavere enn anbefalt.",
+  "LinuxVmMaxMapCountWarningTextSecondary": "Gjeldende verdi av vm.max_map_count ({0}) er lavere enn {1}. Noen spill kan prøve å lage flere minnedelinger enn det som er tillatt. Ryujinx vil kræsje så snart denne grensen overskrides.\n\nDet kan hende du ønsker å enten øke grensen eller installere pkexec manuelt, slik at Ryujinx kan hjelpe til med det.",
+  "Settings": "Innstillinger",
+  "SettingsTabGeneral": "Brukergrensesnitt",
+  "SettingsTabGeneralGeneral": "Generelt",
+  "SettingsTabGeneralEnableDiscordRichPresence": "Aktiver Discord Rik Tilstedeværelse",
+  "SettingsTabGeneralCheckUpdatesOnLaunch": "Se etter oppdateringer ved oppstart",
+  "SettingsTabGeneralShowConfirmExitDialog": "Vis \"Bekreft Avslutt\" vinduet",
+  "SettingsTabGeneralRememberWindowState": "Husk vinduets størrelse/posisjon",
+  "SettingsTabGeneralHideCursor": "Skjul musepeker:",
+  "SettingsTabGeneralHideCursorNever": "Aldri",
+  "SettingsTabGeneralHideCursorOnIdle": "Når inaktiv",
+  "SettingsTabGeneralHideCursorAlways": "Alltid",
+  "SettingsTabGeneralGameDirectories": "Spillmapper",
+  "SettingsTabGeneralAdd": "Legg til",
+  "SettingsTabGeneralRemove": "Fjern",
+  "SettingsTabSystem": "System",
+  "SettingsTabSystemCore": "Kjerne",
+  "SettingsTabSystemSystemRegion": "System region:",
+  "SettingsTabSystemSystemRegionJapan": "Japan",
+  "SettingsTabSystemSystemRegionUSA": "USA",
+  "SettingsTabSystemSystemRegionEurope": "Europa",
+  "SettingsTabSystemSystemRegionAustralia": "Australia",
+  "SettingsTabSystemSystemRegionChina": "Kina",
+  "SettingsTabSystemSystemRegionKorea": "Korea",
+  "SettingsTabSystemSystemRegionTaiwan": "Taiwan",
+  "SettingsTabSystemSystemLanguage": "Systemspråk",
+  "SettingsTabSystemSystemLanguageJapanese": "Japansk",
+  "SettingsTabSystemSystemLanguageAmericanEnglish": "Amerikansk engelsk",
+  "SettingsTabSystemSystemLanguageFrench": "Fransk",
+  "SettingsTabSystemSystemLanguageGerman": "Tysk",
+  "SettingsTabSystemSystemLanguageItalian": "Italiensk",
+  "SettingsTabSystemSystemLanguageSpanish": "Spansk",
+  "SettingsTabSystemSystemLanguageChinese": "Kinesisk",
+  "SettingsTabSystemSystemLanguageKorean": "Koreansk",
+  "SettingsTabSystemSystemLanguageDutch": "Nederlandsk",
+  "SettingsTabSystemSystemLanguagePortuguese": "Portugisisk",
+  "SettingsTabSystemSystemLanguageRussian": "Russisk",
+  "SettingsTabSystemSystemLanguageTaiwanese": "Taiwansk",
+  "SettingsTabSystemSystemLanguageBritishEnglish": "Britisk engelsk",
+  "SettingsTabSystemSystemLanguageCanadianFrench": "Canadisk Fransk",
+  "SettingsTabSystemSystemLanguageLatinAmericanSpanish": "Latinamerikansk spansk",
+  "SettingsTabSystemSystemLanguageSimplifiedChinese": "Forenklet kinesisk",
+  "SettingsTabSystemSystemLanguageTraditionalChinese": "Tradisjonell Kinesisk",
+  "SettingsTabSystemSystemTimeZone": "System Tidssone:",
+  "SettingsTabSystemSystemTime": "System tid:",
+  "SettingsTabSystemEnableVsync": "VSynk",
+  "SettingsTabSystemEnablePptc": "PPTC (Profilert Vedvarende Oversettelseshurtigbuffer)",
+  "SettingsTabSystemEnableFsIntegrityChecks": "FS Integritetssjekk",
+  "SettingsTabSystemAudioBackend": "Lyd Backend:",
+  "SettingsTabSystemAudioBackendDummy": "Dummy",
+  "SettingsTabSystemAudioBackendOpenAL": "OpenAL",
+  "SettingsTabSystemAudioBackendSoundIO": "Lyd Inn/Ut",
+  "SettingsTabSystemAudioBackendSDL2": "SDL2",
+  "SettingsTabSystemHacks": "Hacks",
+  "SettingsTabSystemHacksNote": "Kan forårsake ustabilitet",
+  "SettingsTabSystemExpandDramSize": "Utvid DRAM til 8GiB",
+  "SettingsTabSystemIgnoreMissingServices": "Ignorer manglende tjenester",
+  "SettingsTabGraphics": "Grafikk",
+  "SettingsTabGraphicsAPI": "Grafikk API",
+  "SettingsTabGraphicsEnableShaderCache": "Aktiver Shader Cachen",
+  "SettingsTabGraphicsAnisotropicFiltering": "Anisotropisk filtrering:",
+  "SettingsTabGraphicsAnisotropicFilteringAuto": "Automatisk",
+  "SettingsTabGraphicsAnisotropicFiltering2x": "2x",
+  "SettingsTabGraphicsAnisotropicFiltering4x": "4x",
+  "SettingsTabGraphicsAnisotropicFiltering8x": "8x",
+  "SettingsTabGraphicsAnisotropicFiltering16x": "16x",
+  "SettingsTabGraphicsResolutionScale": "Oppløsnings skala:",
+  "SettingsTabGraphicsResolutionScaleCustom": "Egendefinert (anbefales ikke)",
+  "SettingsTabGraphicsResolutionScaleNative": "Naturlig (720p/1080p)",
+  "SettingsTabGraphicsResolutionScale2x": "2 x (1440p/2160p)",
+  "SettingsTabGraphicsResolutionScale3x": "3x (2160p/3240p)",
+  "SettingsTabGraphicsResolutionScale4x": "4x (2880p/4320p) (anbefales ikke)",
+  "SettingsTabGraphicsAspectRatio": "Bildeformat",
+  "SettingsTabGraphicsAspectRatio4x3": "4:3",
+  "SettingsTabGraphicsAspectRatio16x9": "16:9",
+  "SettingsTabGraphicsAspectRatio16x10": "16:10",
+  "SettingsTabGraphicsAspectRatio21x9": "21:9",
+  "SettingsTabGraphicsAspectRatio32x9": "32:9",
+  "SettingsTabGraphicsAspectRatioStretch": "Strekk for og Tilpasse vindu",
+  "SettingsTabGraphicsDeveloperOptions": "Utvikleralternativer",
+  "SettingsTabGraphicsShaderDumpPath": "Grafikk Shader Dump bane:",
+  "SettingsTabLogging": "Logging",
+  "SettingsTabLoggingLogging": "Logging",
+  "SettingsTabLoggingEnableLoggingToFile": "Aktiver logging til fil",
+  "SettingsTabLoggingEnableStubLogs": "Aktiver Stub-logger",
+  "SettingsTabLoggingEnableInfoLogs": "Aktiver informasjonslogger",
+  "SettingsTabLoggingEnableWarningLogs": "Aktiver varsellogger",
+  "SettingsTabLoggingEnableErrorLogs": "Aktiver feillogger",
+  "SettingsTabLoggingEnableTraceLogs": "Aktiver spor logger",
+  "SettingsTabLoggingEnableGuestLogs": "Aktiver gjestelogger",
+  "SettingsTabLoggingEnableFsAccessLogs": "Aktiver Fs tilgangslogger",
+  "SettingsTabLoggingFsGlobalAccessLogMode": "Fs Global Access-logg-modus:",
+  "SettingsTabLoggingDeveloperOptions": "Utvikleralternativer",
+  "SettingsTabLoggingDeveloperOptionsNote": "Advarsel: Vil redusere ytelsen",
+  "SettingsTabLoggingGraphicsBackendLogLevel": "Grafikk Backend-loggnivå:",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Ingen",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Feil",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Tregere",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Alle",
+  "SettingsTabLoggingEnableDebugLogs": "Aktiver feilsøkingslogger",
+  "SettingsTabInput": "Inndata",
+  "SettingsTabInputEnableDockedMode": "Forankret modus",
+  "SettingsTabInputDirectKeyboardAccess": "Direkte tastaturtilgang",
+  "SettingsButtonSave": "Lagre",
+  "SettingsButtonClose": "Lukk",
+  "SettingsButtonOk": "OK",
+  "SettingsButtonCancel": "Avbryt",
+  "SettingsButtonApply": "Bruk",
+  "ControllerSettingsPlayer": "Spiller",
+  "ControllerSettingsPlayer1": "Spiller 1",
+  "ControllerSettingsPlayer2": "Spiller 2",
+  "ControllerSettingsPlayer3": "Spiller 3",
+  "ControllerSettingsPlayer4": "Spiller 4",
+  "ControllerSettingsPlayer5": "Spiller 5",
+  "ControllerSettingsPlayer6": "Spiller 6",
+  "ControllerSettingsPlayer7": "Spiller 7",
+  "ControllerSettingsPlayer8": "Spiller 8",
+  "ControllerSettingsHandheld": "Håndholdt",
+  "ControllerSettingsInputDevice": "Inndataenhet",
+  "ControllerSettingsRefresh": "Oppdater",
+  "ControllerSettingsDeviceDisabled": "Deaktivert",
+  "ControllerSettingsControllerType": "Kontrollertype",
+  "ControllerSettingsControllerTypeHandheld": "Håndholdt",
+  "ControllerSettingsControllerTypeProController": "Pro Controller",
+  "ControllerSettingsControllerTypeJoyConPair": "JoyCon Par",
+  "ControllerSettingsControllerTypeJoyConLeft": "JoyCon venstre",
+  "ControllerSettingsControllerTypeJoyConRight": "JoyCon høyre",
+  "ControllerSettingsProfile": "Profil",
+  "ControllerSettingsProfileDefault": "Standard",
+  "ControllerSettingsLoad": "Last",
+  "ControllerSettingsAdd": "Legg til",
+  "ControllerSettingsRemove": "Fjern",
+  "ControllerSettingsButtons": "Knapper",
+  "ControllerSettingsButtonA": "A",
+  "ControllerSettingsButtonB": "B",
+  "ControllerSettingsButtonX": "X",
+  "ControllerSettingsButtonY": "Y",
+  "ControllerSettingsButtonPlus": "+",
+  "ControllerSettingsButtonMinus": "-",
+  "ControllerSettingsDPad": "Retningsfelt",
+  "ControllerSettingsDPadUp": "Opp",
+  "ControllerSettingsDPadDown": "Ned",
+  "ControllerSettingsDPadLeft": "Venstre",
+  "ControllerSettingsDPadRight": "Høyre",
+  "ControllerSettingsStickButton": "Knapp",
+  "ControllerSettingsStickUp": "Opp",
+  "ControllerSettingsStickDown": "Ned",
+  "ControllerSettingsStickLeft": "Venstre",
+  "ControllerSettingsStickRight": "Høyre",
+  "ControllerSettingsStickStick": "Styrespak",
+  "ControllerSettingsStickInvertXAxis": "Inverter Styrespak X",
+  "ControllerSettingsStickInvertYAxis": "Inverter Styrespak Y",
+  "ControllerSettingsStickDeadzone": "Død sone:",
+  "ControllerSettingsLStick": "Venstre styrespak",
+  "ControllerSettingsRStick": "Høyre styrespak",
+  "ControllerSettingsTriggersLeft": "Utløsere venstre",
+  "ControllerSettingsTriggersRight": "Utløsere høyre",
+  "ControllerSettingsTriggersButtonsLeft": "Utløserknapper Venstre",
+  "ControllerSettingsTriggersButtonsRight": "Utløserknapper høyre",
+  "ControllerSettingsTriggers": "Utløsere",
+  "ControllerSettingsTriggerL": "L",
+  "ControllerSettingsTriggerR": "R",
+  "ControllerSettingsTriggerZL": "ZL",
+  "ControllerSettingsTriggerZR": "ZR",
+  "ControllerSettingsLeftSL": "SL",
+  "ControllerSettingsLeftSR": "SR",
+  "ControllerSettingsRightSL": "SL",
+  "ControllerSettingsRightSR": "SR",
+  "ControllerSettingsExtraButtonsLeft": "Knapper til venstre",
+  "ControllerSettingsExtraButtonsRight": "Knapper til høyre",
+  "ControllerSettingsMisc": "Diverse",
+  "ControllerSettingsTriggerThreshold": "Utløser terskel:",
+  "ControllerSettingsMotion": "Bevegelse",
+  "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Bruk CemuHook kompatibel bevegelse",
+  "ControllerSettingsMotionControllerSlot": "Kontrollertype:",
+  "ControllerSettingsMotionMirrorInput": "Speilvend",
+  "ControllerSettingsMotionRightJoyConSlot": "Høyre JoyCon set:",
+  "ControllerSettingsMotionServerHost": "Server Vert:",
+  "ControllerSettingsMotionGyroSensitivity": "Gyro følsomhet:",
+  "ControllerSettingsMotionGyroDeadzone": "Gyro Dødsone:",
+  "ControllerSettingsSave": "Lagre",
+  "ControllerSettingsClose": "Lukk",
+  "KeyUnknown": "Ukjent",
+  "KeyShiftLeft": "Skift venstre",
+  "KeyShiftRight": "Skift høyre",
+  "KeyControlLeft": "Ctrl venstre",
+  "KeyMacControlLeft": "⌃ Venstre",
+  "KeyControlRight": "Ctrl høyre",
+  "KeyMacControlRight": "⌃ Høyre",
+  "KeyAltLeft": "Alt Venstre",
+  "KeyMacAltLeft": "⌥ Venstre",
+  "KeyAltRight": "Alt høyre",
+  "KeyMacAltRight": "⌥ Høyre",
+  "KeyWinLeft": "⊞ Venstre",
+  "KeyMacWinLeft": "⌘ Venstre",
+  "KeyWinRight": "⊞ Høyre",
+  "KeyMacWinRight": "⌘ Høyre",
+  "KeyMenu": "Meny",
+  "KeyUp": "Opp",
+  "KeyDown": "Ned",
+  "KeyLeft": "Venstre",
+  "KeyRight": "Høyre",
+  "KeyEnter": "Enter",
+  "KeyEscape": "Esc-tast",
+  "KeySpace": "Mellomrom",
+  "KeyTab": "Tab",
+  "KeyBackSpace": "Tilbaketast",
+  "KeyInsert": "Sett inn",
+  "KeyDelete": "Slett",
+  "KeyPageUp": "Side opp",
+  "KeyPageDown": "Side ned",
+  "KeyHome": "Hjem",
+  "KeyEnd": "Avslutt",
+  "KeyCapsLock": "Skiftelås",
+  "KeyScrollLock": "Rullelås",
+  "KeyPrintScreen": "Skjermbilde",
+  "KeyPause": "Stans midlertidig",
+  "KeyNumLock": "Numerisk Lås",
+  "KeyClear": "Tøm",
+  "KeyKeypad0": "Numerisk 0",
+  "KeyKeypad1": "Numerisk 1",
+  "KeyKeypad2": "Numerisk 2",
+  "KeyKeypad3": "Numerisk 3",
+  "KeyKeypad4": "Numerisk 4",
+  "KeyKeypad5": "Numerisk 5",
+  "KeyKeypad6": "Numerisk 6",
+  "KeyKeypad7": "Numerisk 7",
+  "KeyKeypad8": "Numerisk 8",
+  "KeyKeypad9": "Numerisk 9",
+  "KeyKeypadDivide": "Numerisk Dele",
+  "KeyKeypadMultiply": "Numerisk Multiplisere",
+  "KeyKeypadSubtract": "Numerisk Subtrakt",
+  "KeyKeypadAdd": "Numerisk Legg til",
+  "KeyKeypadDecimal": "Numerisk Desimal",
+  "KeyKeypadEnter": "Numerisk Enter",
+  "KeyNumber0": "0",
+  "KeyNumber1": "1",
+  "KeyNumber2": "2",
+  "KeyNumber3": "3",
+  "KeyNumber4": "4",
+  "KeyNumber5": "5",
+  "KeyNumber6": "6",
+  "KeyNumber7": "7",
+  "KeyNumber8": "8",
+  "KeyNumber9": "9",
+  "KeyTilde": "~",
+  "KeyGrave": "`",
+  "KeyMinus": "-",
+  "KeyPlus": "+",
+  "KeyBracketLeft": "[",
+  "KeyBracketRight": "]",
+  "KeySemicolon": ";",
+  "KeyQuote": "\"",
+  "KeyComma": ",",
+  "KeyPeriod": ".",
+  "KeySlash": "/",
+  "KeyBackSlash": "\\",
+  "KeyUnbound": "Ikke bundet",
+  "GamepadLeftStick": "Venstre Styrespak Trykk",
+  "GamepadRightStick": "R Styrespak Trykk",
+  "GamepadLeftShoulder": "Venstre Skulder",
+  "GamepadRightShoulder": "Høyre Skulder",
+  "GamepadLeftTrigger": "Venstre utløser",
+  "GamepadRightTrigger": "Høyre utløser",
+  "GamepadDpadUp": "Opp",
+  "GamepadDpadDown": "Ned",
+  "GamepadDpadLeft": "Venstre",
+  "GamepadDpadRight": "Høyre",
+  "GamepadMinus": "-",
+  "GamepadPlus": "+",
+  "GamepadGuide": "Veiledning",
+  "GamepadMisc1": "Diverse",
+  "GamepadPaddle1": "Paddle 1",
+  "GamepadPaddle2": "Paddle 2",
+  "GamepadPaddle3": "Paddle 3",
+  "GamepadPaddle4": "Paddle 4",
+  "GamepadTouchpad": "Berøringsplate",
+  "GamepadSingleLeftTrigger0": "Venstre utløser 0",
+  "GamepadSingleRightTrigger0": "Høyre utløser 0",
+  "GamepadSingleLeftTrigger1": "Venstre utløser 1",
+  "GamepadSingleRightTrigger1": "Høyre utløser 1",
+  "StickLeft": "Venstre styrespak",
+  "StickRight": "Høyre styrespak",
+  "UserProfilesSelectedUserProfile": "Valgt brukerprofil:",
+  "UserProfilesSaveProfileName": "Lagre profilnavnet",
+  "UserProfilesChangeProfileImage": "Endre profilbilde",
+  "UserProfilesAvailableUserProfiles": "Tilgjengelige brukerprofiler:",
+  "UserProfilesAddNewProfile": "Opprett Profil",
+  "UserProfilesDelete": "Slett",
+  "UserProfilesClose": "Lukk",
+  "ProfileNameSelectionWatermark": "Velg ett kallenavn",
+  "ProfileImageSelectionTitle": "Valg av profilbilde",
+  "ProfileImageSelectionHeader": "Velg et profilbilde",
+  "ProfileImageSelectionNote": "Du kan importere et tilpasset profilbilde, eller velge en avatar fra system fastvare",
+  "ProfileImageSelectionImportImage": "Importer bildefil",
+  "ProfileImageSelectionSelectAvatar": "Velg fastvare profilbilde",
+  "InputDialogTitle": "Input Dialog",
+  "InputDialogOk": "OK",
+  "InputDialogCancel": "Avbryt",
+  "InputDialogAddNewProfileTitle": "Velg profilnavnet",
+  "InputDialogAddNewProfileHeader": "Vennligst skriv inn et profilnavn",
+  "InputDialogAddNewProfileSubtext": "(Maks lengde: {0})",
+  "AvatarChoose": "Velg profilbilde",
+  "AvatarSetBackgroundColor": "Angi bakgrunnsfarge",
+  "AvatarClose": "Lukk",
+  "ControllerSettingsLoadProfileToolTip": "Last inn profil",
+  "ControllerSettingsAddProfileToolTip": "Legg til profil",
+  "ControllerSettingsRemoveProfileToolTip": "Fjern profil",
+  "ControllerSettingsSaveProfileToolTip": "Lagre Profil",
+  "MenuBarFileToolsTakeScreenshot": "Ta skjermbilde",
+  "MenuBarFileToolsHideUi": "Skjul brukergrensesnitt",
+  "GameListContextMenuRunApplication": "Kjør programmet",
+  "GameListContextMenuToggleFavorite": "Vis/Skjul favoritter",
+  "GameListContextMenuToggleFavoriteToolTip": "Vis/Skjul favorittstatus for spillet",
+  "SettingsTabGeneralTheme": "Tema:",
+  "SettingsTabGeneralThemeAuto": "Automatisk",
+  "SettingsTabGeneralThemeDark": "Mørk",
+  "SettingsTabGeneralThemeLight": "Lys",
+  "ControllerSettingsConfigureGeneral": "Konfigurer",
+  "ControllerSettingsRumble": "Vibrasjon",
+  "ControllerSettingsRumbleStrongMultiplier": "Sterk Vibrasjon multiplikator",
+  "ControllerSettingsRumbleWeakMultiplier": "Svak Vibrasjon multiplikator",
+  "DialogMessageSaveNotAvailableMessage": "Det er ingen lagrede data for {0} [{1:x16}]",
+  "DialogMessageSaveNotAvailableCreateSaveMessage": "Vil du lage lagrede data for dette spillet",
+  "DialogConfirmationTitle": "Ryujinx - Bekreftelse",
+  "DialogUpdaterTitle": "Ryujinx – Oppdaterer",
+  "DialogErrorTitle": "Ryujinx - Feil",
+  "DialogWarningTitle": "Ryujinx - Advarsel",
+  "DialogExitTitle": "Ryujinx - Avslutt",
+  "DialogErrorMessage": "Ryujinx har støtt på ett problem",
+  "DialogExitMessage": "Er du sikker på at du ønsker å lukke Ryujinx?",
+  "DialogExitSubMessage": "Alle ulagrede data vil gå tapt!",
+  "DialogMessageCreateSaveErrorMessage": "Det oppstod en feil under oppretting av den angitte lagredata: {0}",
+  "DialogMessageFindSaveErrorMessage": "Det oppstod en feil under oppretting av den angitte lagredata: {0}",
+  "FolderDialogExtractTitle": "Velg mappen å pakke ut i",
+  "DialogNcaExtractionMessage": "Trekker ut {0} seksjonen fra {1}...",
+  "DialogNcaExtractionTitle": "Ryujinx - NCA Seksjon Ekstraktor",
+  "DialogNcaExtractionMainNcaNotFoundErrorMessage": "Uttrekksfeil. Hoveddelen av NCA var ikke tilstede i valgt fil.",
+  "DialogNcaExtractionCheckLogErrorMessage": "Uttrekkingsfeil. Les loggfilen for mer informasjon.",
+  "DialogNcaExtractionSuccessMessage": "Utvinningen er fullført.",
+  "DialogUpdaterConvertFailedMessage": "Kunne ikke konvertere gjeldende Ryujinx-versjon.",
+  "DialogUpdaterCancelUpdateMessage": "Avbryter oppdatering!",
+  "DialogUpdaterAlreadyOnLatestVersionMessage": "Du bruker allerede den nyeste versjonen av Ryujinx!",
+  "DialogUpdaterFailedToGetVersionMessage": "En feil oppstod ved forsøk på å få utgivelsesinformasjon fra GitHub Utgivelse. Dette kan forårsakes hvis en ny utgave blir samlet av GitHub Handlinger. Prøv igjen om noen minutter.",
+  "DialogUpdaterConvertFailedGithubMessage": "Kan ikke konvertere mottatt Ryujinx-versjon fra Github Utgivelse.",
+  "DialogUpdaterDownloadingMessage": "Laster ned oppdatering...",
+  "DialogUpdaterExtractionMessage": "Pakker ut oppdatering...",
+  "DialogUpdaterRenamingMessage": "Endrer navn på oppdatering...",
+  "DialogUpdaterAddingFilesMessage": "Legger til ny oppdatering...",
+  "DialogUpdaterCompleteMessage": "Oppdateringen er fullført!",
+  "DialogUpdaterRestartMessage": "Vil du starte Ryujinx på nytt nå?",
+  "DialogUpdaterNoInternetMessage": "Du er ikke tilkoblet internett",
+  "DialogUpdaterNoInternetSubMessage": "Kontroller at du har en fungerende Internett-tilkobling!",
+  "DialogUpdaterDirtyBuildMessage": "Du kan ikke oppdatere en skitten versjon av Ryujinx!",
+  "DialogUpdaterDirtyBuildSubMessage": "Vennligst last ned Ryujinx på https://ryujinx.org/ hvis du ser etter en støttet versjon.",
+  "DialogRestartRequiredMessage": "Omstart Kreves",
+  "DialogThemeRestartMessage": "Temaet har blitt lagret. En omstart kreves for å bruke temaet.",
+  "DialogThemeRestartSubMessage": "Vil du starte på nytt",
+  "DialogFirmwareInstallEmbeddedMessage": "Ønsker du å installere fastvaren innebygd i dette spillet? (Firmware {0})",
+  "DialogFirmwareInstallEmbeddedSuccessMessage": "Det ble ikke funnet noen installert fastvare, men Ryujinx kunne installere fastvare {0} fra det oppgitte spillet.\nemulatoren vil nå starte.",
+  "DialogFirmwareNoFirmwareInstalledMessage": "Ingen fastvare installert",
+  "DialogFirmwareInstalledMessage": "fastvare {0} ble installert",
+  "DialogInstallFileTypesSuccessMessage": "Filtyper ble installert!",
+  "DialogInstallFileTypesErrorMessage": "Kunne ikke installere filtyper.",
+  "DialogUninstallFileTypesSuccessMessage": "Filtyper ble avinstallert!",
+  "DialogUninstallFileTypesErrorMessage": "Kunne ikke avinstallere filtyper.",
+  "DialogOpenSettingsWindowLabel": "Åpne innstillinger-vinduet",
+  "DialogControllerAppletTitle": "Kontroller Applet",
+  "DialogMessageDialogErrorExceptionMessage": "Feil ved visning av meldings-dialog: {0}",
+  "DialogSoftwareKeyboardErrorExceptionMessage": "Feil ved visning av programvaretastatur: {0}",
+  "DialogErrorAppletErrorExceptionMessage": "Feil ved visning av Feilmeldingsdialog: {0}",
+  "DialogUserErrorDialogMessage": "{0}: {1}",
+  "DialogUserErrorDialogInfoMessage": "\nFor mer informasjon om hvordan du fikser denne feilen, følg vår oppsettsveiledning.",
+  "DialogUserErrorDialogTitle": "Ryujinx Feilmelding ({0})",
+  "DialogAmiiboApiTitle": "Amiibo API",
+  "DialogAmiiboApiFailFetchMessage": "En feil oppstod under henting av informasjon fra API.",
+  "DialogAmiiboApiConnectErrorMessage": "Kan ikke koble til Amiibo API server. Tjenesten kan være nede, eller du må kanskje verifisere at din internettforbindelse er tilkoblet.",
+  "DialogProfileInvalidProfileErrorMessage": "Profil {0} er ikke kompatibel med den gjeldende inndata konfigurasjonen",
+  "DialogProfileDefaultProfileOverwriteErrorMessage": "Standard profil kan ikke overskrives",
+  "DialogProfileDeleteProfileTitle": "Sletter profil",
+  "DialogProfileDeleteProfileMessage": "Denne handlingen er irreversibel, er du sikker på at du vil fortsette?",
+  "DialogWarning": "Advarsel",
+  "DialogPPTCDeletionMessage": "Du er i ferd med å bygge en PPTC i køen ved neste oppstart av:\n\n{0}\n\nEr du sikker på at du vil fortsette?",
+  "DialogPPTCDeletionErrorMessage": "Feil under rensing av PPTC cache ved {0}: {1}",
+  "DialogShaderDeletionMessage": "Du er i ferd med å slette Shader cachen for :\n\n{0}\n\nEr du sikker på at du vil fortsette?",
+  "DialogShaderDeletionErrorMessage": "Feil under tømming av Shader cache ved {0}: {1}",
+  "DialogRyujinxErrorMessage": "Ryujinx har støtt på ett problem",
+  "DialogInvalidTitleIdErrorMessage": "UI-feil: Det valgte spillet har ikke en gyldig tittel-ID",
+  "DialogFirmwareInstallerFirmwareNotFoundErrorMessage": "En gyldig systemfastvare ble ikke funnet i {0}.",
+  "DialogFirmwareInstallerFirmwareInstallTitle": "Installer fastvare {0}",
+  "DialogFirmwareInstallerFirmwareInstallMessage": "Systemversjon {0} vil bli installert.",
+  "DialogFirmwareInstallerFirmwareInstallSubMessage": "\n\nDette erstatter den gjeldende systemversjonen {0}.",
+  "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "Vil du fortsette?",
+  "DialogFirmwareInstallerFirmwareInstallWaitMessage": "Installerer fastvare...",
+  "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "Systemversjon {0} ble installert.",
+  "DialogUserProfileDeletionWarningMessage": "Det vil ikke være noen profiler å åpnes hvis valgt profil blir slettet",
+  "DialogUserProfileDeletionConfirmMessage": "Vil du slette den valgte profilen",
+  "DialogUserProfileUnsavedChangesTitle": "Advarsel - Ulagrede endringer",
+  "DialogUserProfileUnsavedChangesMessage": "Du har gjort endringer i denne brukerprofilen som ikke er lagret.",
+  "DialogUserProfileUnsavedChangesSubMessage": "Vil du forkaste endringene dine?",
+  "DialogControllerSettingsModifiedConfirmMessage": "Innstillinger for gjeldende kontroller har blitt oppdatert.",
+  "DialogControllerSettingsModifiedConfirmSubMessage": "Vil du lagre?",
+  "DialogLoadFileErrorMessage": "{0}. Feilet fil: {1}",
+  "DialogModAlreadyExistsMessage": "Modifikasjon eksisterer allerede",
+  "DialogModInvalidMessage": "Den angitte mappen inneholder ikke en modifikasjon!",
+  "DialogModDeleteNoParentMessage": "Kunne ikke slette: Fant ikke overordnet mappe for mod \"{0}\"!",
+  "DialogDlcNoDlcErrorMessage": "Den angitte filen inneholder ikke en DLC for den valgte tittelen!",
+  "DialogPerformanceCheckLoggingEnabledMessage": "Du har sporing aktivert, noe som er designet til å bli brukt av utviklere.",
+  "DialogPerformanceCheckLoggingEnabledConfirmMessage": "For optimal ytelse er det anbefalt å deaktivere spor-logging. Ønsker du å deaktivere spor-logging nå?",
+  "DialogPerformanceCheckShaderDumpEnabledMessage": "Du har aktiv dumping av shader, som bare er laget for å brukes av utviklere.",
+  "DialogPerformanceCheckShaderDumpEnabledConfirmMessage": "For optimal ytelse er det anbefalt å deaktivere dumping. Ønsker du å deaktivere shader dumping nå?",
+  "DialogLoadAppGameAlreadyLoadedMessage": "Et spill er allerede lastet inn",
+  "DialogLoadAppGameAlreadyLoadedSubMessage": "Slutt å emulere eller lukk emulatoren før du starter et annet spill.",
+  "DialogUpdateAddUpdateErrorMessage": "Den angitte filen inneholder ikke en oppdatering for den valgte tittelen!",
+  "DialogSettingsBackendThreadingWarningTitle": "Advarsel - Backend Tråd",
+  "DialogSettingsBackendThreadingWarningMessage": "Ryujinx må startes på nytt etter at dette alternativet er endret slik at det tas i bruk helt. Avhengig av plattformen din, må du kanskje manuelt skru av driveren's egen flertråder når du bruker Ryujinx's.",
+  "DialogModManagerDeletionWarningMessage": "Du er i ferd med å slette modifikasjonen: {0}\n\ner du sikker på at du vil fortsette?",
+  "DialogModManagerDeletionAllWarningMessage": "Du er i ferd med å slette alle modifikasjonene for denne tittelen: {0}\n\ner du sikker på at du vil fortsette?",
+  "SettingsTabGraphicsFeaturesOptions": "Funksjoner",
+  "SettingsTabGraphicsBackendMultithreading": "Grafikk Backend Fleroppgavekjøring",
+  "CommonAuto": "Automatisk",
+  "CommonOff": "Av",
+  "CommonOn": "På",
+  "InputDialogYes": "Ja",
+  "InputDialogNo": "Nei",
+  "DialogProfileInvalidProfileNameErrorMessage": "Filnavnet inneholder ugyldige tegn. Prøv på nytt.",
+  "MenuBarOptionsPauseEmulation": "Stans midlertidig",
+  "MenuBarOptionsResumeEmulation": "Gjenoppta",
+  "AboutUrlTooltipMessage": "Klikk for å åpne Ryujinx nettsiden i din standardnettleser.",
+  "AboutDisclaimerMessage": "Ryujinx er ikke knyttet til NintendoTM,\neller noen av samarbeidspartnerne sine, på noen som helst måte.",
+  "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) brukes sammen med\ni vår Amiibo-emulsjon.",
+  "AboutPatreonUrlTooltipMessage": "Klikk for å åpne Ryujinx Patreon-siden i din standardnettleser.",
+  "AboutGithubUrlTooltipMessage": "Klikk for å åpne Ryujinx GitHub siden i din standardnettleser.",
+  "AboutDiscordUrlTooltipMessage": "Klikk for å åpne en invitasjon til Ryujinx Discord-serveren i nettleseren din.",
+  "AboutTwitterUrlTooltipMessage": "Klikk for å åpne Ryujinx Twitter-siden i din standardnettleser.",
+  "AboutRyujinxAboutTitle": "Om:",
+  "AboutRyujinxAboutContent": "Ryujinx er en emulator for Nintendo SwitchTM.\nVennligst støtt oss på Patreon.\nFå alle de siste nyhetene på vår Twitter eller Discord.\nUtviklere som er interessert i å bidra kan finne ut mer på GitHub eller Discord.",
+  "AboutRyujinxMaintainersTitle": "Vedlikeholdt av:",
+  "AboutRyujinxMaintainersContentTooltipMessage": "Klikk for å åpne Bidragsyter-siden i standardleseren din.",
+  "AboutRyujinxSupprtersTitle": "Støttet på Patreon av:",
+  "AmiiboSeriesLabel": "Amibo Serie",
+  "AmiiboCharacterLabel": "Karakter",
+  "AmiiboScanButtonLabel": "Skanne det",
+  "AmiiboOptionsShowAllLabel": "Vis alle Amiibo",
+  "AmiiboOptionsUsRandomTagLabel": "Hack: Bruk tilfeldig tag-Uuid",
+  "DlcManagerTableHeadingEnabledLabel": "Aktivert",
+  "DlcManagerTableHeadingTitleIdLabel": "Tittel ID",
+  "DlcManagerTableHeadingContainerPathLabel": "Beholder bane",
+  "DlcManagerTableHeadingFullPathLabel": "Fullstendig bane",
+  "DlcManagerRemoveAllButton": "Fjern alle",
+  "DlcManagerEnableAllButton": "Aktiver alle",
+  "DlcManagerDisableAllButton": "Deaktiver alle",
+  "ModManagerDeleteAllButton": "Slett alt",
+  "MenuBarOptionsChangeLanguage": "Endre språk",
+  "MenuBarShowFileTypes": "Vis Filtyper",
+  "CommonSort": "Sorter",
+  "CommonShowNames": "Vis navn",
+  "CommonFavorite": "Favoritt",
+  "OrderAscending": "Stigende",
+  "OrderDescending": "Synkende",
+  "SettingsTabGraphicsFeatures": "Funksjoner & forbedringer",
+  "ErrorWindowTitle": "Feilvindu",
+  "ToggleDiscordTooltip": "Velg om Ryujinx skal vises på din \"spillende\" Discord aktivitet eller ikke",
+  "AddGameDirBoxTooltip": "Angi en spillmappe for å legge til i listen",
+  "AddGameDirTooltip": "Legg til en spillmappe i listen",
+  "RemoveGameDirTooltip": "Fjern valgt spillmappe",
+  "CustomThemeCheckTooltip": "Bruk et egendefinert Avalonia tema for GUI for å endre utseende til emulatormenyene",
+  "CustomThemePathTooltip": "Bane til egendefinert GUI-tema",
+  "CustomThemeBrowseTooltip": "Søk etter et egendefinert GUI-tema",
+  "DockModeToggleTooltip": "Forankret modus gjør at systemet oppføre seg som en forankret Nintendo Switch. Dette forbedrer grafikkkvaliteten i de fleste spill. Motsatt vil deaktivering av dette gjøre at systemet oppføre seg som en håndholdt Nintendo Switch, noe som reduserer grafikkkvaliteten.\n\nKonfigurer spiller 1 kontroller hvis du planlegger å bruke forankret modus; konfigurer håndholdte kontroller hvis du planlegger å bruke håndholdte modus.\n\nLa PÅ hvis du er usikker.",
+  "DirectKeyboardTooltip": "Direkte tastaturtilgang (HID) støtte. Gir deg spill-tilgang til tastaturet som en tekstinnlegg-enhet.\n\nfungerer kun med spill som lokalt støtter tastaturbruk på Ninteno SwitchTM maskinvare.\n\nLa være AV hvis du er usikker.",
+  "DirectMouseTooltip": "Direkte musepeker (HID) støtte. Gir deg spill-tilgang til musepeker.\n\nfungerer kun med spill som lokalt støtter musepekere på Ninteno SwitchTM maskinvare.\n\nNår aktivert, kan det hende touch funksjoner ikke fungerer\n\nLa være AV hvis du er usikker.",
+  "RegionTooltip": "Endre systemregion",
+  "LanguageTooltip": "Endre systemspråk",
+  "TimezoneTooltip": "Endre systemtidssone",
+  "TimeTooltip": "Endre systemtid",
+  "VSyncToggleTooltip": "Emuler konsollens loddrett synkronisering. på ett vis en bildefrekvens begrensning for de fleste spill; deaktivering kan få spill til å kjøre med høyere hastighet, eller til å laste skjermene tar lengre tid eller sitter fast.\n\nkan byttes inn i spillet med en hurtigtast for preferansen (F1 som standard). Vi anbefaler å gjøre dette hvis du planlegger å deaktivere dette.\n\nLa være PÅ hvis du er usikker.",
+  "PptcToggleTooltip": "Lagrer oversatte JIT funksjoner så de ikke trenger og bli oversatt hver gang spillet laster.\n\nKan redusere hakkete spilling og gjør at spillet starter opp raskere ved første oppstart.\n\nLa være PÅ om usikker.",
+  "FsIntegrityToggleTooltip": "Sjekker for korrupte filer ved oppstart av et spill, og dersom korrupte filer oppdages, viser en hashfeil i loggen.\n\nhar ingen innvirkning på ytelsen og er ment å hjelpe med feilsøking.\n\nLa være PÅ hvis usikker.",
+  "AudioBackendTooltip": "Endrer backend brukt til å gjengi lyd.\n\nSDL2 er foretrukket, mens OpenAL og SoundIO brukes som reserveløsning. Dummy kommer ikke til å ha lyd.\n\nSett til SDL2 hvis usikker.",
+  "MemoryManagerTooltip": "Endre hvordan gjesteminne tilordnes og åpnes. Påvirker emulator CPU-ytelsen veldig mye.\n\nSett til HOST UNCHECKED hvis usikker.",
+  "MemoryManagerSoftwareTooltip": "Bruk en programvareside tabell for adresseoversettelse. Høyeste nøyaktighet, men tregeste ytelse.",
+  "MemoryManagerHostTooltip": "Direkte kartminne i vertens adresseområde. Mye raskere JIT kompilering og utførelse.",
+  "MemoryManagerUnsafeTooltip": "Direkte kartminne, men ikke masker adressen i gjesteadressen før du har tilgang. raskere, men på bekostning av sikkerhet. gjeste-programmet kan få tilgang til minne fra hvor som helst i Ryujinx, så bare kjøre programmer du stoler på med denne modusen.",
+  "UseHypervisorTooltip": "Bruk Hypervisor i stedet for JIT. Det øker ytelsen mye hvis det er tilgjengelig, men det kan være ustabilt i den nåværende tilstanden.",
+  "DRamTooltip": "Bruker en alternativ minnemodus med 8GiB i DRAM for og etterligne Switch utvikler modeller.\n\nDette er bare nyttig for teksturpakker eller 4k oppløsningsmoduler. Forbedrer IKKE ytelsen.\n\nLa AV hvis usikker.",
+  "IgnoreMissingServicesTooltip": "Ignorerer ikke implementerte Horisont OS-tjenester. Dette kan hjelpe med å omgå krasj ved oppstart av enkelte spill.\n\nLa AV hvis du er usikker.",
+  "GraphicsBackendThreadingTooltip": "Utfører grafikkbackend kommandoer på en annen tråd.\n\nØker hastigheten for shaderkomprimering, reduserer hakking og forbedrer ytelsen til GPU-drivere uten å spre støtten fra sine egne. Litt bedre ytelse på drivere med flertråd.\n\nSett for å AUTO hvis usikker.",
+  "GalThreadingTooltip": "Utfører grafikkbackend kommandoer på en annen tråd.\n\nØker hastigheten for shaderkomprimering, reduserer hakking og forbedrer ytelsen til GPU-drivere uten flertråd støtte. Litt bedre ytelse på drivere med flertråd.\n\nSett for å AUTO hvis usikker.",
+  "ShaderCacheToggleTooltip": "Lagrer en disk shader cache som reduserer hakking jo flere ganger du spiller.\n\nLa være PÅ om usikker.",
+  "ResolutionScaleTooltip": "Dobler spillets gjengivelse.\n\nNoen få spill fungerer kanskje ikke med dette aktivert og kan se veldig pikselert ut selv når gjengivelsen er økt; for de spillene, så kan det hende du må bruke modifikasjoner som fjerner anti-aliasing eller som øker den interne gjengivelsen. For og bruke sistnenvte, så vil du helst bruke \"Native\".\n\nHa til tanke at 4x er unødig for virituelt alle maskiner.",
+  "ResolutionScaleEntryTooltip": "Det er mer sannsynlig at flytende punktoppløsning skalaer som 1.5. Ikke-integrerte skalaer forårsaker problemer eller krasj.",
+  "AnisotropyTooltip": "Nivå av Anisotropisk filtrering. Sett til Auto for å bruke verdien som kreves av spillet.",
+  "AspectRatioTooltip": "Sideforhold angitt til gjengitt vindu.\n\nBare bytt dette om du bruker en modifikasjon som forandrer Sideforholdet på spillet ditt, ellers vil grafikken bli strukket.\n\nLa være på 16:9 om usikker.",
+  "ShaderDumpPathTooltip": "Grafikk Shader Dump bane",
+  "FileLogTooltip": "Lagrer konsoll-logging til en loggfil på harddisken. Påvirker ikke ytelsen.",
+  "StubLogTooltip": "Skriver ut log meldinger i konsollen. Påvirker ikke ytelsen.",
+  "InfoLogTooltip": "Skriver ut info loggmeldinger i konsollen. Påvirker ikke ytelse.",
+  "WarnLogTooltip": "Skriver ut varselloggmeldinger i konsollen. påvirker ikke ytelsen.",
+  "ErrorLogTooltip": "Skriver ut feilloggmeldinger i konsollen. Påvirker ikke ytelse.",
+  "TraceLogTooltip": "Skriver ut sporbare loggmeldinger i konsollen. påvirker ikke ytelsen.",
+  "GuestLogTooltip": "Skriver ut gjesteloggmeldinger i konsollen. påvirker ikke ytelsen.",
+  "FileAccessLogTooltip": "Skriver ut filtilgang til loggmeldinger i konsollen.",
+  "FSAccessLogModeTooltip": "Aktiverer FS tilgang loggutgang til konsollen. Mulige moduser er 0-3",
+  "DeveloperOptionTooltip": "Bruk med forsiktighet",
+  "OpenGlLogLevel": "Krever riktige loggnivåer aktivert",
+  "DebugLogTooltip": "Skriver ut loggmeldinger i konsollen.\n\nBruk bare dette hvis et medlem har gitt spesifikke instruksjoner, siden det vil gjøre loggene vanskelig å lese og forverre emulatorytelse.",
+  "LoadApplicationFileTooltip": "Åpne filutforsker for å velge en Switch kompatibel fil å laste",
+  "LoadApplicationFolderTooltip": "Åpne en filutforsker for å velge en Switch kompatibel, upakket applikasjon for å laste",
+  "OpenRyujinxFolderTooltip": "Åpne Ryujinx filsystem-mappen",
+  "OpenRyujinxLogsTooltip": "Åpner mappen hvor logger er lagret",
+  "ExitTooltip": "Avslutt Ryujinx",
+  "OpenSettingsTooltip": "Åpne innstillinger-vinduet",
+  "OpenProfileManagerTooltip": "Åpne vindu for brukerprofiler",
+  "StopEmulationTooltip": "Stopp emuleringen av dette spillet og gå tilbake til spill valg",
+  "CheckUpdatesTooltip": "Se etter oppdateringer til Ryujinx",
+  "OpenAboutTooltip": "Åpne Om Vindu",
+  "GridSize": "Rutenett størrelse",
+  "GridSizeTooltip": "Endre størrelsen på rutenettet elementer",
+  "SettingsTabSystemSystemLanguageBrazilianPortuguese": "Brasiliansk portugisisk",
+  "AboutRyujinxContributorsButtonHeader": "Se alle bidragsytere",
+  "SettingsTabSystemAudioVolume": "Lydnivå: ",
+  "AudioVolumeTooltip": "Endre lydenivå",
+  "SettingsTabSystemEnableInternetAccess": "Internett-tilgang for gjeste/LAN-modus",
+  "EnableInternetAccessTooltip": "Tillater emulert applikasjon å koble til Internett.\n\nSpill med en LAN-modus kan koble til hverandre når dette er aktivert og systemene er koblet til det samme tilgangspunktet. Dette inkluderer ekte konsoller også.\n\ntillater IKKE tilkobling til Nintendo servere. Kan forårsake krasjing i enkelte spill som prøver å koble til Internett.\n\nLa stå AV hvis du er usikker.",
+  "GameListContextMenuManageCheatToolTip": "Administrer juksemoduser",
+  "GameListContextMenuManageCheat": "Administrer juksemoduser",
+  "GameListContextMenuManageModToolTip": "Administrer modifikasjoner",
+  "GameListContextMenuManageMod": "Administrer modifikasjoner",
+  "ControllerSettingsStickRange": "Omfang:",
+  "DialogStopEmulationTitle": "Ryujinx - Stopp emulasjon",
+  "DialogStopEmulationMessage": "Er du sikker på at du vil stoppe emulasjonen?",
+  "SettingsTabCpu": "Prosessor",
+  "SettingsTabAudio": "Lyd",
+  "SettingsTabNetwork": "Nettverk",
+  "SettingsTabNetworkConnection": "Nettverk tilkobling",
+  "SettingsTabCpuCache": "CPU-buffer",
+  "SettingsTabCpuMemory": "Prosessor modus",
+  "DialogUpdaterFlatpakNotSupportedMessage": "Vennligst oppdater Ryujinx via FlatHub.",
+  "UpdaterDisabledWarningTitle": "Oppdatering Deaktivert!",
+  "ControllerSettingsRotate90": "Roter 90° med klokken",
+  "IconSize": "Ikon størrelse",
+  "IconSizeTooltip": "Endre størrelsen på spillikonene",
+  "MenuBarOptionsShowConsole": "Vis konsoll",
+  "ShaderCachePurgeError": "Feil under tømming av shader cache ved {0}: {1}",
+  "UserErrorNoKeys": "Finner ikke nøkler",
+  "UserErrorNoFirmware": "Fastvare ikke funnet",
+  "UserErrorFirmwareParsingFailed": "Fastvare analysefeil",
+  "UserErrorApplicationNotFound": "Applikasjon ikke funnet",
+  "UserErrorUnknown": "Ukjent feil",
+  "UserErrorUndefined": "Udefinert feil",
+  "UserErrorNoKeysDescription": "Ryujinx kunne ikke finne 'prod.keys' filen din",
+  "UserErrorNoFirmwareDescription": "Ryujinx kunne ikke finne noen fastvare installert",
+  "UserErrorFirmwareParsingFailedDescription": "Ryujinx klarte ikke å analysere levert fastvare. Dette er vanligvis forårsaket av utdaterte nøkler.",
+  "UserErrorApplicationNotFoundDescription": "Ryujinx kunne ikke finne en gyldig applikasjon på den gitte banen.",
+  "UserErrorUnknownDescription": "En ukjent feil oppstod!",
+  "UserErrorUndefinedDescription": "En udefinert feil oppstod! Dette burde ikke skje, vennligst kontakt en utvikler!",
+  "OpenSetupGuideMessage": "Åpne oppsettsveiledningen",
+  "NoUpdate": "Ingen oppdatering",
+  "TitleUpdateVersionLabel": "Versjon {0}",
+  "TitleBundledUpdateVersionLabel": "Pakket: Versjon {0}",
+  "TitleBundledDlcLabel": "Pakket:",
+  "RyujinxInfo": "Ryujinx - Informasjon",
+  "RyujinxConfirm": "Ryujinx - Bekreftelse",
+  "FileDialogAllTypes": "Alle typer",
+  "Never": "Aldri",
+  "SwkbdMinCharacters": "Må være minimum {0} tegn lang",
+  "SwkbdMinRangeCharacters": "Må være {0}-{1} tegn",
+  "SoftwareKeyboard": "Programvare Tastatur",
+  "SoftwareKeyboardModeNumeric": "Må kun være 0-9 eller '.'",
+  "SoftwareKeyboardModeAlphabet": "Må kun være uten CJK-tegn",
+  "SoftwareKeyboardModeASCII": "Må være kun ASCII-tekst",
+  "ControllerAppletControllers": "Støttede kontrollere:",
+  "ControllerAppletPlayers": "Spillere:",
+  "ControllerAppletDescription": "Din nåværende konfigurasjon er ugyldig. Åpne innstillinger og konfigurer inndata.",
+  "ControllerAppletDocked": "Docked modus. Håndholdt kontroll skal være deaktivert.",
+  "UpdaterRenaming": "Omdøper gamle filer...",
+  "UpdaterRenameFailed": "Oppdateringen kunne ikke gi filen nytt navn: {0}",
+  "UpdaterAddingFiles": "Legger til nye filer...",
+  "UpdaterExtracting": "Pakker ut oppdatering...",
+  "UpdaterDownloading": "Laster ned oppdatering...",
+  "Game": "Spill",
+  "Docked": "Forankret",
+  "Handheld": "Håndholdt",
+  "ConnectionError": "Tilkoblingsfeil",
+  "AboutPageDeveloperListMore": "{0} og mer...",
+  "ApiError": "API feil.",
+  "LoadingHeading": "Laster {0}",
+  "CompilingPPTC": "Sammensetter PTC",
+  "CompilingShaders": "Samler Shaders",
+  "AllKeyboards": "Alle tastaturer",
+  "OpenFileDialogTitle": "Velg en støttet fil for å åpne",
+  "OpenFolderDialogTitle": "Velg en mappe med et pakket ut spill",
+  "AllSupportedFormats": "Alle støttede formater",
+  "RyujinxUpdater": "Ryujinx Oppgradering",
+  "SettingsTabHotkeys": "Hurtigtaster for tastatur",
+  "SettingsTabHotkeysHotkeys": "Hurtigtaster for tastatur",
+  "SettingsTabHotkeysToggleVsyncHotkey": "Aktiver/deaktiver VSync:",
+  "SettingsTabHotkeysScreenshotHotkey": "Skjermbilde",
+  "SettingsTabHotkeysShowUiHotkey": "Vis UI:",
+  "SettingsTabHotkeysPauseHotkey": "Stans midlertidig:",
+  "SettingsTabHotkeysToggleMuteHotkey": "Demp:",
+  "ControllerMotionTitle": "Innstillinger for bevegelses kontroll",
+  "ControllerRumbleTitle": "Innstillinger for Vibrasjon",
+  "SettingsSelectThemeFileDialogTitle": "Velg tema fil",
+  "SettingsXamlThemeFile": "Xaml tema-fil",
+  "AvatarWindowTitle": "Administrer kontoer - Profilbilde",
+  "Amiibo": "Amiibo",
+  "Unknown": "Ukjent",
+  "Usage": "Forbruk",
+  "Writable": "Skrivbart",
+  "SelectDlcDialogTitle": "Velg DLC-filer",
+  "SelectUpdateDialogTitle": "Velg oppdateringsfiler",
+  "SelectModDialogTitle": "Velg modifikasjons mappe",
+  "UserProfileWindowTitle": "Bruker Profiler Behandler",
+  "CheatWindowTitle": "Juksing behandler",
+  "DlcWindowTitle": "Behandle nedlastbart innhold for {0} ({1})",
+  "ModWindowTitle": "Administrere Modifikasjoner for {0} ({1})",
+  "UpdateWindowTitle": "Tittel oppdatering behandler",
+  "CheatWindowHeading": "Juks tilgjengelig for {0} [{1}]",
+  "BuildId": "VersjonsId:",
+  "DlcWindowHeading": "{0} Nedlastbare innhold(er)",
+  "ModWindowHeading": "{0} Modifikasjoner(s)",
+  "UserProfilesEditProfile": "Rediger Valgte",
+  "Cancel": "Avbryt",
+  "Save": "Lagre",
+  "Discard": "Forkast",
+  "Paused": "Satt på pause",
+  "UserProfilesSetProfileImage": "Angi profilbilde",
+  "UserProfileEmptyNameError": "Navn er påkrevd",
+  "UserProfileNoImageError": "Profilbilde må være angitt",
+  "GameUpdateWindowHeading": "Administrer oppdateringer for {0} ({1})",
+  "SettingsTabHotkeysResScaleUpHotkey": "Øke oppløsning:",
+  "SettingsTabHotkeysResScaleDownHotkey": "Reduser oppløsning:",
+  "UserProfilesName": "Navn:",
+  "UserProfilesUserId": "Bruker ID:",
+  "SettingsTabGraphicsBackend": "Grafikk Backend",
+  "SettingsTabGraphicsBackendTooltip": "Velg grafikkbackend som skal brukes i emulatoren.\n\nVulkan er generelt bedre for alle moderne grafikkort, så lenge driverne er oppdatert. Vulkan har også en raskere sammenstilling av Shader (mindre hakkete) på alle GPU-leverandører.\n\nOpenGL kan oppnå bedre resultater for eldre Nvidia GPU-er, på eldre AMD GPU-er på Linux, eller på GPU-er med lavere VRAM, selv om skyggekompileringsutløser vil være større.\n\nSett til Vulkan hvis du er usikker. Sett til OpenGL hvis ikke GPU-en støtter Vulkan selv med de nyeste grafikkdriverne.",
+  "SettingsEnableTextureRecompression": "Aktiver teksturkomprimering",
+  "SettingsEnableTextureRecompressionTooltip": "Kompresser ASTC-teksturer for å redusere VRAM-bruk.\n\nSpill som bruker dette teksturformatet, inkluderer Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder and The Legend of Zelda: Tears of the Kingdom.\n\nGrafikkkort med 4GiB VRAM eller mindre, vil sannsynligvis krasje på et tidspunkt når spillene kjører.\n\nAktiver bare hvis du går tom for VRAM på nevnte spill. La AV om du er usikker.",
+  "SettingsTabGraphicsPreferredGpu": "Foretrukket GPU",
+  "SettingsTabGraphicsPreferredGpuTooltip": "Velg grafikkkortet som skal brukes sammen med Vulkan grafikkbackenden\n\nPåvirker ikke GPU-er som OpenGL skal bruke.\n\nSett til GPU-merket som \"dGPU\" hvis usikker. Hvis det ikke det er en, la være uberørt.",
+  "SettingsAppRequiredRestartMessage": "Ryujinx Omstart nødvendig",
+  "SettingsGpuBackendRestartMessage": "Grafikk Backend eller GPU-innstillinger er endret. Dette krever en omstart for å aktiveres",
+  "SettingsGpuBackendRestartSubMessage": "Vil du starte på nytt nå?",
+  "RyujinxUpdaterMessage": "Ønsker du å oppdatere Ryujinx til den nyeste versjonen?",
+  "SettingsTabHotkeysVolumeUpHotkey": "Øk Volum:",
+  "SettingsTabHotkeysVolumeDownHotkey": "Reduser Volum:",
+  "SettingsEnableMacroHLE": "Aktiver Makro HLE",
+  "SettingsEnableMacroHLETooltip": "High-level emulering av GPU makrokode.\n\nForbedrer ytelse, men kan forårsake grafiske glitches i noen spill.\n\nForlat PÅ hvis usikker.",
+  "SettingsEnableColorSpacePassthrough": "Fargeromsgjennomgang",
+  "SettingsEnableColorSpacePassthroughTooltip": "Dirigerer Vulkan backenden til å gå gjennom farge informasjonen uten og spesifisere en fargeromsgjennomgang. For brukere med en bred spillvisning kan dette resultere i mer vibrerende farger og få riktig farge.",
+  "VolumeShort": "Vol",
+  "UserProfilesManageSaves": "Administrer lagring",
+  "DeleteUserSave": "Vil du slette bruker data for dette spillet?",
+  "IrreversibleActionNote": "Denne handlingen er ikke reverserbar.",
+  "SaveManagerHeading": "Administrer lagring for {0} ({1})",
+  "SaveManagerTitle": "Lagre behandler",
+  "Name": "Navn",
+  "Size": "Størrelse",
+  "Search": "Søk",
+  "UserProfilesRecoverLostAccounts": "Gjenopprett tapte kontoer",
+  "Recover": "Gjenopprett",
+  "UserProfilesRecoverHeading": "Lagring ble funnet for følgende kontoer",
+  "UserProfilesRecoverEmptyList": "Ingen profiler å gjenopprette",
+  "GraphicsAATooltip": "Aktiverer anti-aliasing til spill render.\n\nFXAA vil gjøre det meste av bildet, mens SMAA vil forsøke å finne berørte kanter og glatte dem ut.\n\nAnbefales ikke til bruk i forbindelse med FSR-skaleringsfilteret.\n\nDette valget kan endres mens et spill kjører ved å klikke \"Apply\" nedenfor; du kan bare flytte innstillingsvinduet til du finner det foretrukne utseendet til et spill.\n\nForlat på NONE hvis usikker.",
+  "GraphicsAALabel": "Kantutjevning:",
+  "GraphicsScalingFilterLabel": "Skaleringsfilter:",
+  "GraphicsScalingFilterTooltip": "Velg det skaleringsfilteret som skal brukes når du bruker oppløsningsskalaen.\n\nBilinear fungerer godt for 3D-spill og er et trygt standardalternativ.\n\nNærmeste anbefales for pixel kunst-spill.\n\nFSR 1.0 er bare et skarpere filter, ikke anbefalt for bruk med FXAA eller SMAA.\n\nOmrådeskalering anbefales når nedskalering er større enn utgangsvinduet. Den kan brukes til å oppnå en superprøvetaket anti-aliasingseffekt når en nedskalerer med mer enn 2x.\n\nDette valget kan endres mens et spill kjører ved å klikke \"Apply\" nedenfor; du kan bare flytte innstillingsvinduet til du finner det foretrukne utseendet til et spill.\n\nLa være på BILINEAR hvis usikker.",
+  "GraphicsScalingFilterBilinear": "Bilinear",
+  "GraphicsScalingFilterNearest": "Nærmeste",
+  "GraphicsScalingFilterFsr": "FSR",
+  "GraphicsScalingFilterArea": "Område",
+  "GraphicsScalingFilterLevelLabel": "Nivå",
+  "GraphicsScalingFilterLevelTooltip": "Definer FSR 1,0 skarpere nivå. Høyere er skarpere.",
+  "SmaaLow": "SMAA lav",
+  "SmaaMedium": "SMAA Middels",
+  "SmaaHigh": "SMAA høy",
+  "SmaaUltra": "SMAA Ultra",
+  "UserEditorTitle": "Rediger bruker",
+  "UserEditorTitleCreate": "Opprett bruker",
+  "SettingsTabNetworkInterface": "Nettverksgrensesnitt",
+  "NetworkInterfaceTooltip": "Nettverksgrensesnittets grensesnitt brukt for LAN/LDN funksjoner.\n\ni konjuksjon med en VPN eller XLink Kai og ett spill med LAN støtte, kan bli brukt til og spoofe ett \"samme-nettverk\" tilkobling over nettet.\n\nLa være på DEFAULT om usikker.",
+  "NetworkInterfaceDefault": "Standard",
+  "PackagingShaders": "Pakker Shaders",
+  "AboutChangelogButton": "Vis endringslogg på GitHub",
+  "AboutChangelogButtonTooltipMessage": "Klikk for å åpne endringsloggen for denne versjonen i din nettleser.",
+  "SettingsTabNetworkMultiplayer": "Flerspiller",
+  "MultiplayerMode": "Modus:",
+  "MultiplayerModeTooltip": "Endre LDN flerspillermodus.\n\nLdnMitm vil endre lokal trådløst/lokal spillfunksjonalitet i spill som skal fungere som om den var LAN, noe som tillater lokal, samme nettverk forbindelser med andre Ryujinx instanser og hacket Nintendo Switch konsoller som har installert ldn_mitm-modulen.\n\nFlerspiller krever at alle spillerne er på samme versjon (dvs. Super Smash Bros. Ultimat v13.0.1 kan ikke koble til v13.0.0).\n\nForlat DEAKTIVERT hvis usikker.",
+  "MultiplayerModeDisabled": "Deaktivert",
+  "MultiplayerModeLdnMitm": "ldn_mitm"
+}

src/Ryujinx/Assets/Locales/pl_PL.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Kliknij, aby otworzyć stronę Ryujinx w domyślnej przeglądarce.",
   "AboutDisclaimerMessage": "Ryujinx nie jest w żaden sposób powiązany z Nintendo™,\nani z żadnym z jej partnerów.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) jest używane\nw naszej emulacji Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Kliknij, aby otworzyć stronę Patreon Ryujinx w domyślnej przeglądarce.",
   "AboutGithubUrlTooltipMessage": "Kliknij, aby otworzyć stronę GitHub Ryujinx w domyślnej przeglądarce.",
   "AboutDiscordUrlTooltipMessage": "Kliknij, aby otworzyć zaproszenie na serwer Discord Ryujinx w domyślnej przeglądarce.",
-  "AboutTwitterUrlTooltipMessage": "Kliknij, aby otworzyć stronę Twitter Ryujinx w domyślnej przeglądarce.",
   "AboutRyujinxAboutTitle": "O Aplikacji:",
-  "AboutRyujinxAboutContent": "Ryujinx to emulator Nintendo Switch™.\nWspieraj nas na Patreonie.\nOtrzymuj najnowsze wiadomości na naszym Twitterze lub Discordzie.\nDeweloperzy zainteresowani współpracą mogą dowiedzieć się więcej na naszym GitHubie lub Discordzie.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Utrzymywany Przez:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Kliknij, aby otworzyć stronę Współtwórcy w domyślnej przeglądarce.",
-  "AboutRyujinxSupprtersTitle": "Wspierani na Patreonie Przez:",
   "AmiiboSeriesLabel": "Seria Amiibo",
   "AmiiboCharacterLabel": "Postać",
   "AmiiboScanButtonLabel": "Zeskanuj",
@@ -702,6 +700,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",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "Dodawanie Nowych Plików...",
   "UpdaterExtracting": "Wypakowywanie Aktualizacji...",
   "UpdaterDownloading": "Pobieranie Aktualizacji...",
-  "Game": "Gra",
   "Docked": "Zadokowany",
   "Handheld": "Przenośny",
   "ConnectionError": "Błąd Połączenia.",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "Kody Dostępne dla {0} [{1}]",
   "BuildId": "Identyfikator wersji:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Zawartości do Pobrania dostępna dla {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/pt_BR.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Clique para abrir o site do Ryujinx no seu navegador padrão.",
   "AboutDisclaimerMessage": "Ryujinx não é afiliado com a Nintendo™,\nou qualquer um de seus parceiros, de nenhum modo.",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) é usado\nem nossa emulação de Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Clique para abrir a página do Patreon do Ryujinx no seu navegador padrão.",
   "AboutGithubUrlTooltipMessage": "Clique para abrir a página do GitHub do Ryujinx no seu navegador padrão.",
   "AboutDiscordUrlTooltipMessage": "Clique para abrir um convite ao servidor do Discord do Ryujinx no seu navegador padrão.",
-  "AboutTwitterUrlTooltipMessage": "Clique para abrir a página do Twitter do Ryujinx no seu navegador padrão.",
   "AboutRyujinxAboutTitle": "Sobre:",
-  "AboutRyujinxAboutContent": "Ryujinx é um emulador de Nintendo Switch™.\nPor favor, nos dê apoio no Patreon.\nFique por dentro de todas as novidades no Twitter ou Discord.\nDesenvolvedores com interesse em contribuir podem conseguir mais informações no GitHub ou Discord.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Mantido por:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Clique para abrir a página de contribuidores no seu navegador padrão.",
-  "AboutRyujinxSupprtersTitle": "Apoiado no Patreon por:",
   "AmiiboSeriesLabel": "Franquia Amiibo",
   "AmiiboCharacterLabel": "Personagem",
   "AmiiboScanButtonLabel": "Escanear",
@@ -701,6 +699,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.",
@@ -714,7 +715,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.",
@@ -785,7 +785,7 @@
   "CheatWindowHeading": "Cheats disponíveis para {0} [{1}]",
   "BuildId": "ID da Build:",
   "DlcWindowBundledContentNotice": "DLCs incorporadas não podem ser removidas, apenas desativadas.",
-  "DlcWindowHeading": "{0} DLCs disponíveis para {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} novo(s) conteúdo(s) para download adicionado(s)",
   "AutoloadDlcAddedMessage": "{0} novo(s) conteúdo(s) para download adicionado(s)",
   "AutoloadDlcRemovedMessage": "{0} conteúdo(s) para download ausente(s) removido(s)",

src/Ryujinx/Assets/Locales/ru_RU.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Нажмите, чтобы открыть веб-сайт Ryujinx",
   "AboutDisclaimerMessage": "Ryujinx никоим образом не связан ни с Nintendo™, ни с кем-либо из ее партнеров.",
   "AboutAmiiboDisclaimerMessage": "Amiibo API (www.amiiboapi.com) используется для эмуляции Amiibo.",
-  "AboutPatreonUrlTooltipMessage": "Нажмите, чтобы открыть страницу Ryujinx на Patreon",
   "AboutGithubUrlTooltipMessage": "Нажмите, чтобы открыть страницу Ryujinx на GitHub",
   "AboutDiscordUrlTooltipMessage": "Нажмите, чтобы открыть приглашение на сервер Ryujinx в Discord",
-  "AboutTwitterUrlTooltipMessage": "Нажмите, чтобы открыть страницу Ryujinx в X (бывший Twitter)",
   "AboutRyujinxAboutTitle": "О программе:",
-  "AboutRyujinxAboutContent": "Ryujinx — это эмулятор Nintendo Switch™.\nПожалуйста, поддержите нас на Patreon.\nЧитайте последние новости в наших X (Twitter) или Discord.\nРазработчики, заинтересованные в участии, могут ознакомиться с проектом на GitHub или в Discord.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Разработка:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Нажмите, чтобы открыть страницу с участниками",
-  "AboutRyujinxSupprtersTitle": "Поддержка на Patreon:",
   "AmiiboSeriesLabel": "Серия Amiibo",
   "AmiiboCharacterLabel": "Персонаж",
   "AmiiboScanButtonLabel": "Сканировать",
@@ -702,6 +700,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-символов",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "Добавление новых файлов...",
   "UpdaterExtracting": "Извлечение обновления...",
   "UpdaterDownloading": "Загрузка обновления...",
-  "Game": "Игра",
   "Docked": "Стационарный режим",
   "Handheld": "Портативный режим",
   "ConnectionError": "Ошибка соединения",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "Доступные читы для {0} [{1}]",
   "BuildId": "ID версии:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} DLC",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/th_TH.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "คลิกเพื่อเปิดเว็บไซต์ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ",
   "AboutDisclaimerMessage": "ทางผู้พัฒนาโปรแกรม Ryujinx ไม่มีส่วนเกี่ยวข้องกับทางบริษัท Nintendo™\nหรือพันธมิตรใดๆ ทั้งสิ้น!",
   "AboutAmiiboDisclaimerMessage": "AmiiboAPI (www.amiiboapi.com) ถูกใช้\nในการจำลอง อะมิโบ ของเรา",
-  "AboutPatreonUrlTooltipMessage": "คลิกเพื่อเปิดหน้า Patreon ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ",
   "AboutGithubUrlTooltipMessage": "คลิกเพื่อเปิดหน้า Github ของ Ryujinx  บนเบราว์เซอร์เริ่มต้นของคุณ",
   "AboutDiscordUrlTooltipMessage": "คลิกเพื่อเปิดคำเชิญเข้าสู่เซิร์ฟเวอร์ Discord ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ",
-  "AboutTwitterUrlTooltipMessage": "คลิกเพื่อเปิดหน้าเพจ Twitter ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ",
   "AboutRyujinxAboutTitle": "เกี่ยวกับ:",
-  "AboutRyujinxAboutContent": "Ryujinx เป็นอีมูเลเตอร์สำหรับ Nintendo Switch™\nโปรดสนับสนุนเราบน Patreon\nรับข่าวสารล่าสุดทั้งหมดบน Twitter หรือ Discord ของเรา\nนักพัฒนาที่สนใจจะมีส่วนร่วมสามารถดูข้อมูลเพิ่มเติมได้ที่ GitHub หรือ Discord ของเรา",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "ได้รับการดูแลโดย:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "คลิกเพื่อเปิดหน้าผู้มีส่วนร่วมบนเบราว์เซอร์เริ่มต้นของคุณ",
-  "AboutRyujinxSupprtersTitle": "ผู้สนับสนุนบน Patreon:",
   "AmiiboSeriesLabel": "Amiibo Series",
   "AmiiboCharacterLabel": "ตัวละคร",
   "AmiiboScanButtonLabel": "สแกนเลย",
@@ -702,6 +700,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 เท่านั้น",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "กำลังเพิ่มไฟล์ใหม่...",
   "UpdaterExtracting": "กำลังแยกการอัปเดต...",
   "UpdaterDownloading": "กำลังดาวน์โหลดอัปเดต...",
-  "Game": "เกมส์",
   "Docked": "ด็อก",
   "Handheld": "แฮนด์เฮลด์",
   "ConnectionError": "การเชื่อมต่อล้มเหลว",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "สูตรโกงมีให้สำหรับ {0} [{1}]",
   "BuildId": "รหัสการสร้าง:",
   "DlcWindowBundledContentNotice": "แพ็ค DLC ไม่สามารถลบทิ้งได้ สามารถปิดใช้งานได้เท่านั้น",
-  "DlcWindowHeading": "{0} DLC ที่สามารถดาวน์โหลดได้",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} DLC ใหม่ที่เพิ่มเข้ามา",
   "AutoloadDlcAddedMessage": "{0} ใหม่ที่เพิ่มเข้ามา",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/tr_TR.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "Ryujinx'in websitesini varsayılan tarayıcınızda açmak için tıklayın.",
   "AboutDisclaimerMessage": "Ryujinx, Nintendo™ veya ortaklarıyla herhangi bir şekilde bağlantılı değildir.",
   "AboutAmiiboDisclaimerMessage": "Amiibo emülasyonumuzda \nAmiiboAPI (www.amiiboapi.com) kullanılmaktadır.",
-  "AboutPatreonUrlTooltipMessage": "Ryujinx'in Patreon sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
   "AboutGithubUrlTooltipMessage": "Ryujinx'in GitHub sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
   "AboutDiscordUrlTooltipMessage": "Varsayılan tarayıcınızda Ryujinx'in Discord'una bir davet açmak için tıklayın.",
-  "AboutTwitterUrlTooltipMessage": "Ryujinx'in Twitter sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
   "AboutRyujinxAboutTitle": "Hakkında:",
-  "AboutRyujinxAboutContent": "Ryujinx bir Nintendo Switch™ emülatörüdür.\nLütfen bizi Patreon'da destekleyin.\nEn son haberleri Twitter veya Discord'umuzdan alın.\nKatkıda bulunmak isteyen geliştiriciler GitHub veya Discord üzerinden daha fazla bilgi edinebilir.",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "Geliştiriciler:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "Katkıda bulunanlar sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
-  "AboutRyujinxSupprtersTitle": "Patreon Destekleyicileri:",
   "AmiiboSeriesLabel": "Amiibo Serisi",
   "AmiiboCharacterLabel": "Karakter",
   "AmiiboScanButtonLabel": "Tarat",
@@ -702,6 +700,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",
@@ -715,7 +716,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ı.",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "{0} için Hile mevcut [{1}]",
   "BuildId": "BuildId:",
   "DlcWindowBundledContentNotice": "Bundled DLC cannot be removed, only disabled.",
-  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcAddedMessage": "{0} new downloadable content(s) added",
   "AutoloadDlcRemovedMessage": "{0} missing downloadable content(s) removed",

src/Ryujinx/Assets/Locales/zh_CN.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "在浏览器中打开 Ryujinx 模拟器官网。",
   "AboutDisclaimerMessage": "Ryujinx 与 Nintendo™ 以及其合作伙伴没有任何关联。",
   "AboutAmiiboDisclaimerMessage": "我们的 Amiibo 模拟使用了\nAmiiboAPI (www.amiiboapi.com)。",
-  "AboutPatreonUrlTooltipMessage": "在浏览器中打开 Ryujinx 的 Patreon 赞助页。",
   "AboutGithubUrlTooltipMessage": "在浏览器中打开 Ryujinx 的 GitHub 代码库。",
   "AboutDiscordUrlTooltipMessage": "在浏览器中打开 Ryujinx 的 Discord 邀请链接。",
-  "AboutTwitterUrlTooltipMessage": "在浏览器中打开 Ryujinx 的 Twitter 主页。",
   "AboutRyujinxAboutTitle": "关于：",
-  "AboutRyujinxAboutContent": "Ryujinx 是一款 Nintendo Switch™ 模拟器。\n您可以在 Patreon 上赞助 Ryujinx。\n关注 Twitter 或 Discord 可以获取模拟器最新动态。\n如果您对开发感兴趣，欢迎来 GitHub 或 Discord 加入我们！",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "开发维护人员名单：",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "在浏览器中打开贡献者页面",
-  "AboutRyujinxSupprtersTitle": "感谢 Patreon 上的赞助者：",
   "AmiiboSeriesLabel": "Amiibo 系列",
   "AmiiboCharacterLabel": "角色",
   "AmiiboScanButtonLabel": "扫描",
@@ -702,6 +700,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": "仅支持非中文字符",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "安装更新中...",
   "UpdaterExtracting": "正在提取更新...",
   "UpdaterDownloading": "下载更新中...",
-  "Game": "游戏",
   "Docked": "主机模式",
   "Handheld": "掌机模式",
   "ConnectionError": "连接错误。",

src/Ryujinx/Assets/Locales/zh_TW.json

@@ -552,15 +552,13 @@
   "AboutUrlTooltipMessage": "在預設瀏覽器中開啟 Ryujinx 網站。",
   "AboutDisclaimerMessage": "Ryujinx 和 Nintendo™\n或其任何合作夥伴完全沒有關聯。",
   "AboutAmiiboDisclaimerMessage": "我們在 Amiibo 模擬中\n使用了 AmiiboAPI (www.amiiboapi.com)。",
-  "AboutPatreonUrlTooltipMessage": "在預設瀏覽器中開啟 Ryujinx 的 Patreon 網頁。",
   "AboutGithubUrlTooltipMessage": "在預設瀏覽器中開啟 Ryujinx 的 GitHub 網頁。",
   "AboutDiscordUrlTooltipMessage": "在預設瀏覽器中開啟 Ryujinx 的 Discord 邀請連結。",
-  "AboutTwitterUrlTooltipMessage": "在預設瀏覽器中開啟 Ryujinx 的 Twitter 網頁。",
   "AboutRyujinxAboutTitle": "關於：",
-  "AboutRyujinxAboutContent": "Ryujinx 是一款 Nintendo Switch™ 模擬器。\n請在 Patreon 上支持我們。\n關注我們的 Twitter 或 Discord 取得所有最新消息。\n對於有興趣貢獻的開發者，可以在我們的 GitHub 或 Discord 上了解更多資訊。",
+  "AboutRyujinxAboutContent": "Ryujinx is an emulator for the Nintendo Switch™.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitHub or Discord.",
   "AboutRyujinxMaintainersTitle": "維護者:",
+  "AboutRyujinxFormerMaintainersTitle": "Formerly Maintained By:",
   "AboutRyujinxMaintainersContentTooltipMessage": "在預設瀏覽器中開啟貢獻者的網頁",
-  "AboutRyujinxSupprtersTitle": "Patreon 支持者:",
   "AmiiboSeriesLabel": "Amiibo 系列",
   "AmiiboCharacterLabel": "角色",
   "AmiiboScanButtonLabel": "掃描",
@@ -702,6 +700,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)",
@@ -715,7 +716,6 @@
   "UpdaterAddingFiles": "正在加入新檔案...",
   "UpdaterExtracting": "正在提取更新...",
   "UpdaterDownloading": "正在下載更新...",
-  "Game": "遊戲",
   "Docked": "底座模式",
   "Handheld": "手提模式",
   "ConnectionError": "連線錯誤。",
@@ -786,7 +786,7 @@
   "CheatWindowHeading": "可用於 {0} [{1}] 的密技",
   "BuildId": "組建識別碼:",
   "DlcWindowBundledContentNotice": "附帶的 DLC 只能被停用而無法被刪除。",
-  "DlcWindowHeading": "{0} 個可下載內容",
+  "DlcWindowHeading": "{0} DLC(s) available",
   "DlcWindowDlcAddedMessage": "已加入 {0} 個 DLC",
   "AutoloadDlcAddedMessage": "已加入 {0} 個 DLC",
   "AutoloadDlcRemovedMessage": "已刪除 {0} 個遺失的 DLC",

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -4,18 +4,6 @@
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
-            <SolidColorBrush x:Key="ThemeAccentColorBrush"
-                             Color="{DynamicResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="ThemeAccentBrush4"
-                             Color="{DynamicResource ThemeAccentColor4}" />
-            <Color x:Key="SystemAccentColor">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark3">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight3">#FF00C3E3</Color>
-            <Color x:Key="ThemeAccentColor4">#FFe8e8e8</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
@@ -26,6 +14,7 @@
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
             <Color x:Key="Switch">#FF2EEAC9</Color>
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
@@ -33,18 +22,6 @@
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
-            <SolidColorBrush x:Key="ThemeAccentColorBrush"
-                             Color="{DynamicResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="ThemeAccentBrush4"
-                             Color="{DynamicResource ThemeAccentColor4}" />
-            <Color x:Key="SystemAccentColor">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark3">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight1">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight2">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorLight3">#FF00C3E3</Color>
-            <Color x:Key="ThemeAccentColor4">#FFe8e8e8</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
@@ -59,18 +36,7 @@
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
-            <SolidColorBrush x:Key="ThemeAccentColorBrush"
-                             Color="{DynamicResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="ThemeAccentBrush4"
-                             Color="{DynamicResource ThemeAccentColor4}" />
             <Color x:Key="ControlFillColorSecondary">#008AA8</Color>
-            <Color x:Key="SystemAccentColor">#FF00C3E3</Color>
-            <Color x:Key="SystemAccentColorDark1">#FF99b000</Color>
-            <Color x:Key="SystemAccentColorDark2">#FF006d7d</Color>
-            <Color x:Key="SystemAccentColorDark3">#FF00525E</Color>
-            <Color x:Key="SystemAccentColorLight1">#FF00dbff</Color>
-            <Color x:Key="SystemAccentColorLight2">#FF19dfff</Color>
-            <Color x:Key="SystemAccentColorLight3">#FF33e3ff</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</Color>
             <Color x:Key="ThemeControlBorderColor">#FF505050</Color>

src/Ryujinx/Common/Markup/BasicMarkupExtension.cs

@@ -17,13 +17,13 @@ namespace Ryujinx.Ava.Common.Markup
         public virtual string Name => "Item";
         public virtual Action<object, T?>? Setter => null;
 
-        protected abstract T? GetValue();
+        protected abstract T? Value { get; }
 
         protected virtual void ConfigureBindingExtension(CompiledBindingExtension _) { }
 
         private ClrPropertyInfo PropertyInfo =>
             new(Name,
-                _ => GetValue(),
+                _ => Value,
                 Setter as Action<object, object?>,
                 typeof(T));
 

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -6,17 +6,17 @@ namespace Ryujinx.Ava.Common.Markup
 {
     internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
     {
-        protected override Icon GetValue() => new() { Value = iconString };
+        protected override Icon Value => new() { Value = iconString };
     }
     
     internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
     {
-        protected override Icon GetValue() => new() { Value = iconString, Animation = IconAnimation.Spin };
+        protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
     }
     
     internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
     {
-        protected override string GetValue() => LocaleManager.Instance[key];
+        protected override string Value => LocaleManager.Instance[key];
 
         protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
             => bindingExtension.Source = LocaleManager.Instance;

src/Ryujinx/Common/XCIFileTrimmerMainWindowLog.cs

@@ -1,24 +0,0 @@
-using Avalonia.Threading;
-using Ryujinx.Ava.UI.ViewModels;
-
-namespace Ryujinx.Ava.Common
-{
-    internal class XCIFileTrimmerMainWindowLog : Ryujinx.Common.Logging.XCIFileTrimmerLog
-    {
-        private readonly MainWindowViewModel _viewModel;
-
-        public XCIFileTrimmerMainWindowLog(MainWindowViewModel viewModel)
-        {
-            _viewModel = viewModel;
-        }
-
-        public override void Progress(long current, long total, string text, bool complete)
-        {
-            Dispatcher.UIThread.Post(() =>
-            {
-                _viewModel.StatusBarProgressMaximum = (int)(total);
-                _viewModel.StatusBarProgressValue = (int)(current);
-            });
-        }
-    }
-}

src/Ryujinx/Common/XCIFileTrimmerWindowLog.cs

@@ -1,23 +0,0 @@
-using Avalonia.Threading;
-using Ryujinx.Ava.UI.ViewModels;
-
-namespace Ryujinx.Ava.Common
-{
-    internal class XCIFileTrimmerWindowLog : Ryujinx.Common.Logging.XCIFileTrimmerLog
-    {
-        private readonly XCITrimmerViewModel _viewModel;
-
-        public XCIFileTrimmerWindowLog(XCITrimmerViewModel viewModel)
-        {
-            _viewModel = viewModel;
-        }
-
-        public override void Progress(long current, long total, string text, bool complete)
-        {
-            Dispatcher.UIThread.Post(() =>
-            {
-                _viewModel.SetProgress((int)(current), (int)(total));
-            });
-        }
-    }
-}

src/Ryujinx/Common/XCITrimmerLog.cs

@@ -0,0 +1,45 @@
+using Avalonia.Threading;
+using Ryujinx.Ava.UI.ViewModels;
+
+namespace Ryujinx.Ava.Common
+{
+    public static class XCITrimmerLog
+    {
+        internal class MainWindow : Ryujinx.Common.Logging.XCIFileTrimmerLog
+        {
+            private readonly MainWindowViewModel _viewModel;
+
+            public MainWindow(MainWindowViewModel viewModel)
+            {
+                _viewModel = viewModel;
+            }
+
+            public override void Progress(long current, long total, string text, bool complete)
+            {
+                Dispatcher.UIThread.Post(() =>
+                {
+                    _viewModel.StatusBarProgressMaximum = (int)(total);
+                    _viewModel.StatusBarProgressValue = (int)(current);
+                });
+            }
+        }
+        
+        internal class TrimmerWindow : Ryujinx.Common.Logging.XCIFileTrimmerLog
+        {
+            private readonly XCITrimmerViewModel _viewModel;
+
+            public TrimmerWindow(XCITrimmerViewModel viewModel)
+            {
+                _viewModel = viewModel;
+            }
+
+            public override void Progress(long current, long total, string text, bool complete)
+            {
+                Dispatcher.UIThread.Post(() =>
+                {
+                    _viewModel.SetProgress((int)(current), (int)(total));
+                });
+            }
+        }
+    }
+}

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/Controls/ApplicationGridView.axaml

@@ -91,7 +91,7 @@
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
                             FontSize="16"
-                            Foreground="{DynamicResource SystemAccentColor}"
+                            Foreground="{DynamicResource FavoriteApplicationIconColor}"
                             IsVisible="{Binding Favorite}"
                             Symbol="StarFilled" />
                     </Grid>

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -146,7 +146,7 @@
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Top"
                                     FontSize="16"
-                                    Foreground="{DynamicResource SystemAccentColor}"
+                                    Foreground="{DynamicResource FavoriteApplicationIconColor}"
                                     IsVisible="{Binding Favorite}"
                                     Symbol="StarFilled" />
                             </Grid>

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -45,7 +45,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public string Developers => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.AboutPageDeveloperListMore, "gdkchan, Ac_K, marysaka, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, GoffyDude, TSRBerry, IsaacMarovitz, GreemDev");
+        public string Developers => "GreemDev";
+
+        public string FormerDevelopers => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.AboutPageDeveloperListMore, "gdkchan, Ac_K, marysaka, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, GoffyDude, TSRBerry, IsaacMarovitz");
 
         public AboutWindowViewModel()
         {

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -10,6 +10,7 @@ using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
 using LibHac.Common;
+using LibHac.Ns;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
@@ -70,7 +71,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 +276,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();
             }
@@ -401,7 +402,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool OpenDeviceSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
 
-        public bool TrimXCIEnabled => Ryujinx.Common.Utilities.XCIFileTrimmer.CanTrim(SelectedApplication.Path, new Common.XCIFileTrimmerMainWindowLog(this));
+        public bool TrimXCIEnabled => XCIFileTrimmer.CanTrim(SelectedApplication.Path, new XCITrimmerLog.MainWindow(this));
 
         public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
 
@@ -1497,7 +1498,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;
 
@@ -1897,7 +1898,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public async Task LoadApplication(ApplicationData application, bool startFullscreen = false)
+        public async Task LoadApplication(ApplicationData application, bool startFullscreen = false, BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
             if (AppHost != null)
             {
@@ -1935,7 +1936,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 this,
                 TopLevel);
 
-            if (!await AppHost.LoadGuestApplication())
+            if (!await AppHost.LoadGuestApplication(customNacpData))
             {
                 AppHost.DisposeContext();
                 AppHost = null;
@@ -2164,7 +2165,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 return;
             }
 
-            var trimmer = new XCIFileTrimmer(filename, new Common.XCIFileTrimmerMainWindowLog(this));
+            var trimmer = new XCIFileTrimmer(filename, new XCITrimmerLog.MainWindow(this));
 
             if (trimmer.CanBeTrimmed)
             {

src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs

@@ -33,7 +33,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private const string _FileExtXCI = "XCI";
 
         private readonly Ryujinx.Common.Logging.XCIFileTrimmerLog _logger;
-        private readonly ApplicationLibrary _applicationLibrary;
+        private ApplicationLibrary ApplicationLibrary => _mainWindowViewModel.ApplicationLibrary;
         private Optional<XCITrimmerFileModel> _processingApplication = null;
         private AvaloniaList<XCITrimmerFileModel> _allXCIFiles = new();
         private AvaloniaList<XCITrimmerFileModel> _selectedXCIFiles = new();
@@ -47,15 +47,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public XCITrimmerViewModel(MainWindowViewModel mainWindowViewModel)
         {
-            _logger = new XCIFileTrimmerWindowLog(this);
+            _logger = new XCITrimmerLog.TrimmerWindow(this);
             _mainWindowViewModel = mainWindowViewModel;
-            _applicationLibrary = _mainWindowViewModel.ApplicationLibrary;
             LoadXCIApplications();
         }
 
         private void LoadXCIApplications()
         {
-            var apps = _applicationLibrary.Applications.Items
+            var apps = ApplicationLibrary.Applications.Items
                 .Where(app => app.FileExtension == _FileExtXCI);
 
             foreach (var xciApp in apps)
@@ -68,7 +67,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             string path,
             OperationOutcome operationOutcome = OperationOutcome.Undetermined)
         {
-            var xciApp = _applicationLibrary.Applications.Items.First(app => app.FileExtension == _FileExtXCI && app.Path == path);
+            var xciApp = ApplicationLibrary.Applications.Items.First(app => app.FileExtension == _FileExtXCI && app.Path == path);
             return XCITrimmerFileModel.FromApplicationData(xciApp, _logger) with { ProcessingOutcome = operationOutcome };
         }
 
@@ -538,4 +537,4 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
     }
-}
+}

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

@@ -14,9 +14,9 @@
     <DockPanel HorizontalAlignment="Stretch">
         <Image
             Name="RyuLogo"
-            Margin="7,0"
+            Margin="2, 1,-1, 0"
-            Height="25"
+            Height="36"
-            Width="25"
+            Width="36"
             ToolTip.Tip="{Binding Title}"
             Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.UI.Common" />
         <Menu

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

@@ -3,7 +3,9 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Gommon;
+using LibHac.Common;
 using LibHac.Ncm;
+using LibHac.Ns;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
@@ -11,6 +13,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Utilities;
+using Ryujinx.HLE;
 using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;
@@ -19,6 +22,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
@@ -123,18 +127,24 @@ namespace Ryujinx.Ava.UI.Views.Main
 
         public async void OpenMiiApplet(object sender, RoutedEventArgs e)
         {
-            string contentPath = ViewModel.ContentManager.GetInstalledContentPath(0x0100000000001009, StorageId.BuiltInSystem, NcaContentType.Program);
+            const string AppletName = "miiEdit";
+            const ulong AppletProgramId = 0x0100000000001009;
+            const string AppletVersion = "1.0.0";
+            
+            string contentPath = ViewModel.ContentManager.GetInstalledContentPath(AppletProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
 
             if (!string.IsNullOrEmpty(contentPath))
             {
                 ApplicationData applicationData = new()
                 {
-                    Name = "miiEdit",
+                    Name = AppletName,
-                    Id = 0x0100000000001009,
+                    Id = AppletProgramId,
-                    Path = contentPath,
+                    Path = contentPath
                 };
+                
+                var nacpData = StructHelpers.CreateCustomNacpData(AppletName, AppletVersion);
 
-                await ViewModel.LoadApplication(applicationData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen);
+                await ViewModel.LoadApplication(applicationData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
             }
         }
 
@@ -200,7 +210,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 +219,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}" />
+                IsVisible="{Binding IsGameRunning}" />
-            <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">
             <TextBlock
                 Name="FirmwareStatus"
-                Margin="0"
+                Margin="5, 0, 0, 0"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 Text="{ext:Locale StatusBarSystemVersion}" />

src/Ryujinx/UI/Windows/AboutWindow.axaml

@@ -36,7 +36,8 @@
                         HorizontalAlignment="Center"
                         Spacing="10">
                         <Image
-                            Height="80"
+                            Height="90"
+                            Width="90"
                             Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.UI.Common"
                             HorizontalAlignment="Center"
                             IsHitTestVisible="True" />
@@ -165,7 +166,16 @@
                     Text="{ext:Locale AboutRyujinxMaintainersTitle}" />
                 <TextBlock
                     FontSize="10"
-                    Text="{Binding Developers}"
+                    Margin="0, 0, 0, 5"
+                    TextWrapping="Wrap"
+                    Text="{Binding Developers}"/>
+                <TextBlock
+                    FontSize="15"
+                    FontWeight="Bold"
+                    Text="{ext:Locale AboutRyujinxFormerMaintainersTitle}" />
+                <TextBlock
+                    FontSize="10"
+                    Text="{Binding FormerDevelopers}"
                     TextWrapping="Wrap" />
                 <Button
                     Padding="5"

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

@@ -33,7 +33,7 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutWindow(),
+                Content = new AboutWindow()
             };
 
             Style closeButton = new(x => x.Name("CloseButton"));

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

@@ -61,23 +61,17 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void RemoveDLC(object sender, RoutedEventArgs e)
         {
-            if (sender is Button button)
+            if (sender is Button { DataContext: DownloadableContentModel dlc })
             {
-                if (button.DataContext is DownloadableContentModel model)
+                ViewModel.Remove(dlc);
-                {
-                    ViewModel.Remove(model);
-                }
             }
         }
 
         private void OpenLocation(object sender, RoutedEventArgs e)
         {
-            if (sender is Button button)
+            if (sender is Button { DataContext: DownloadableContentModel dlc })
             {
-                if (button.DataContext is DownloadableContentModel model)
+                OpenHelper.LocateFile(dlc.ContainerPath);
-                {
-                    OpenHelper.LocateFile(model.ContainerPath);
-                }
             }
         }
 

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()
+                await Updater.BeginUpdateAsync()
-                    .ContinueWith(
+                    .Catch(task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"));
-                        task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"), 
-                        TaskContinuationOptions.OnlyOnFaulted);
             }
         }
 

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)
             {
@@ -75,14 +74,7 @@ namespace Ryujinx.Ava
                 _platformExt = $"linux_{arch}.tar.gz";
             }
 
-            Version newVersion;
+            if (!Version.TryParse(Program.Version, out Version currentVersion))
-            Version currentVersion;
-
-            try
-            {
-                currentVersion = Version.Parse(Program.Version);
-            }
-            catch
             {
                 Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {App.FullAppName} version!");
 
@@ -165,11 +157,7 @@ namespace Ryujinx.Ava
                 return;
             }
 
-            try
+            if (!Version.TryParse(_buildVer, out Version newVersion))
-            {
-                newVersion = Version.Parse(_buildVer);
-            }
-            catch
             {
                 Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {App.FullAppName} version from GitHub!");
 
@@ -225,7 +213,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 +223,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 +246,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 +266,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) =>