From 977955aadfc758a1a1715e5e452a0f0dc56b580d Mon Sep 17 00:00:00 2001
From: R-YaTian <47445484+R-YaTian@users.noreply.github.com>
Date: Mon, 21 Aug 2023 11:55:05 +0800
Subject: [PATCH 1/2] Fix typo for zh-Hans

---
 Goldleaf/romfs/Strings/zh-Hans.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Goldleaf/romfs/Strings/zh-Hans.json b/Goldleaf/romfs/Strings/zh-Hans.json
index 5d327727..a0a02556 100644
--- a/Goldleaf/romfs/Strings/zh-Hans.json
+++ b/Goldleaf/romfs/Strings/zh-Hans.json
@@ -297,7 +297,7 @@
     "正在等待 amiibo 输入...按 B 键可取消",
     "检测到 Amiibo：提取中",
     "到 emuiibo 文件夹...",
-    "amiibo提取完成",
+    "amiibo 提取完成",
     "浏览远程 PC",
     "主机尚未连接到 PC，请使用 USB-C 数据线连接",
     "提取实体 amiibo 数据以使用 emuiibo(amiibo 模拟)",
@@ -462,7 +462,7 @@
     "无法重启到选定的 payload...",
     "该 NSP 包含多个主内容",
     "该 NSP 包含以下主内容:",
-    "该内容未包含数据\n(可能是文件 title，或是尚未插入游戏卡带的空白卡带 Title)",
+    "该内容未包含数据\n(可能是已归档的 title，或是尚未插入游戏卡带的空白卡带 Title)",
     "查看上一个",
     "查看下一个",
     "其他",
@@ -473,7 +473,7 @@
     "存在同名文件夹。需要删除该文件夹吗？",
     "正在复制文件...",
     "正在复制文件夹...",
-    "忽略隐藏文件或者目录",
+    "忽略隐藏的文件或者目录",
     "安装NSP后显示删除提示",
-    "写入功能被禁用..."
+    "写入权限被禁用..."
 ]

From b05a1542da6cd97eb523366250c58edb28624fb8 Mon Sep 17 00:00:00 2001
From: R-YaTian <darkbluesky@outlook.com>
Date: Fri, 12 Apr 2024 23:31:45 +0800
Subject: [PATCH 2/2] Fix workflow, fix typos for zh-hans language and update
 submodules

---
 .github/workflows/main.yml | 8 +++-----
 Goldleaf/Makefile          | 2 +-
 Makefile                   | 8 +++-----
 Plutonium                  | 2 +-
 arc                        | 2 +-
 libusbhsfs                 | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c9445e38..c1aede9b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
     container: devkitpro/devkita64:latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@master
       with:
         submodules: recursive
 
@@ -38,9 +38,7 @@ jobs:
     - name: Build libusbhsfs dependencies
       run: |
         cd libusbhsfs
-        cd libntfs-3g; su -s /bin/bash nobody -c "dkp-makepkg -c -C -f" > /dev/null; sudo -n dkp-pacman -U --needed --noconfirm *.pkg.tar.* > /dev/null; cd ..
-        cd liblwext4; su -s /bin/bash nobody -c "dkp-makepkg -c -C -f" > /dev/null; sudo -n dkp-pacman -U --needed --noconfirm *.pkg.tar.* > /dev/null; cd ..
-        make BUILD_TYPE=GPL release
+        make BUILD_TYPE=GPL install -j$(nproc)
 
     - name: Build Goldleaf
       run: |
@@ -48,7 +46,7 @@ jobs:
         python3 arc/arc.py gen_cpp rc GLEAF Goldleaf/include/base_Results.gen.hpp
         make -j$(nproc)
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@master
       with:
         name: Goldleaf
         path: Goldleaf/Goldleaf.nro
diff --git a/Goldleaf/Makefile b/Goldleaf/Makefile
index 5ba1fe22..198c9222 100644
--- a/Goldleaf/Makefile
+++ b/Goldleaf/Makefile
@@ -74,7 +74,7 @@ LIBS	:= -lcurl -lz -lmbedtls -lmbedcrypto -lmbedx509 -lnx -lusbhsfs -lntfs-3g -l
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX) /run/media/xor/MDA/Nintendo/Switch/Proyectos/Plutonium/Plutonium $(CURDIR)/../libusbhsfs
+LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(CURDIR)/../Plutonium/Plutonium $(CURDIR)/../libusbhsfs
 
 
 #---------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 75e54b1a..0ffcbf7e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,21 +3,19 @@
 .PHONY: all dev allclean clean libclean setup arc
 
 all:
-	@$(MAKE) -C libusbhsfs/ BUILD_TYPE=GPL release
 	@$(MAKE) -C Plutonium/
 	@$(MAKE) -C Goldleaf/
 
 dev:
-	@$(MAKE) -C libusbhsfs/ BUILD_TYPE=GPL release
 	@$(MAKE) -C Plutonium/
 	@$(MAKE) -C Goldleaf/ DEV_PREFIX=-dev
 
 arc:
-	@python arc/arc.py gen_db default+$(CURDIR)/Goldleaf/include/base_Results.rc.hpp
-	@python arc/arc.py gen_cpp rc GLEAF $(CURDIR)/Goldleaf/include/base_Results.gen.hpp
+	@python arc/arc.py gen_db default+./Goldleaf/include/base_Results.rc.hpp
+	@python arc/arc.py gen_cpp rc GLEAF ./Goldleaf/include/base_Results.gen.hpp
 
 setup: arc
-	@$(MAKE) -C libusbhsfs/ fs-libs
+	@$(MAKE) -C libusbhsfs/ BUILD_TYPE=GPL install
 
 allclean: libclean clean
 
diff --git a/Plutonium b/Plutonium
index 205d6688..b56564b7 160000
--- a/Plutonium
+++ b/Plutonium
@@ -1 +1 @@
-Subproject commit 205d6688c0e282aeeddbb5bfb22d2e3a8ed0805c
+Subproject commit b56564b70d038c59eef875f2c3cf436859c827f2
diff --git a/arc b/arc
index 15633a3f..44cf5dee 160000
--- a/arc
+++ b/arc
@@ -1 +1 @@
-Subproject commit 15633a3fc3896e0aeb2aab88a85021a02b55babc
+Subproject commit 44cf5deecb2dc01b884e745206e51931684ad926
diff --git a/libusbhsfs b/libusbhsfs
index 9cfb86e1..b1ff8811 160000
--- a/libusbhsfs
+++ b/libusbhsfs
@@ -1 +1 @@
-Subproject commit 9cfb86e12505231305cc3d50dc086dd8c84786ff
+Subproject commit b1ff8811a762adf1b585b762b21308d458d43bfa