Merge branch 'main' into dev

This commit is contained in:
ShirkNeko
2025-04-03 23:33:04 +08:00
committed by GitHub
4 changed files with 10 additions and 8 deletions

View File

@@ -22,7 +22,7 @@ curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setu
``` ```
``` ```
curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setup.sh" | bash -s susfs-dev curl -LSs "https://raw.githubusercontent.com/ShirkNeko/SukiSU-Ultra/main/kernel/setup.sh" | bash -s susfs-dev
``` ```
Use main branching Use main branching
@@ -32,7 +32,7 @@ curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setu
Use dev branchingWith support for non-GKI devices Use dev branchingWith support for non-GKI devices
``` ```
curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setup.sh" | bash -s main curl -LSs "https://raw.githubusercontent.com/ShirkNeko/SukiSU-Ultra/main/kernel/setup.sh" | bash -s main
``` ```
## How to use integrated susfs ## How to use integrated susfs

View File

@@ -21,13 +21,13 @@ curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setu
``` ```
``` ```
curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setup.sh" | bash -s susfs-dev curl -LSs "https://raw.githubusercontent.com/ShirkNeko/SukiSU-Ultra/main/kernel/setup.sh" | bash -s susfs-dev
``` ```
使用 main 分支 使用 main 分支
``` ```
curl -LSs "https://raw.githubusercontent.com/ShirkNeko/KernelSU/main/kernel/setup.sh" | bash -s main curl -LSs "https://raw.githubusercontent.com/ShirkNeko/SukiSU-Ultra/main/kernel/setup.sh" | bash -s main
``` ```

View File

@@ -1,3 +1,5 @@
package shirkneko.zako.sukisu.ui.screen
import android.app.Activity.RESULT_OK import android.app.Activity.RESULT_OK
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

View File

@@ -229,10 +229,10 @@
<string name="kpm_uninstall_confirm">确定要卸载内核模块 %1$s 吗?</string> <string name="kpm_uninstall_confirm">确定要卸载内核模块 %1$s 吗?</string>
<string name="kpm_uninstall_success">卸载成功</string> <string name="kpm_uninstall_success">卸载成功</string>
<string name="kpm_uninstall_failed">卸载失败</string> <string name="kpm_uninstall_failed">卸载失败</string>
<string name="kpm_install">加载kpm模块</string> <string name="kpm_install">加载 kpm 模块</string>
<string name="kpm_install_confirm">确认加载吗?</string> <string name="kpm_install_confirm">确认加载吗?</string>
<string name="kpm_install_success">加载kpm模块成功</string> <string name="kpm_install_success">加载 kpm 模块成功</string>
<string name="kpm_install_failed">加载kpm模块失败</string> <string name="kpm_install_failed">加载 kpm 模块失败</string>
<string name="home_kpm_version">KPM 版本</string> <string name="home_kpm_version">KPM 版本</string>
<string name="kpm_control">执行</string> <string name="kpm_control">执行</string>
<string name="close_notice">关闭</string> <string name="close_notice">关闭</string>
@@ -248,4 +248,4 @@
<string name="home_ContributionCard_kernelsu">SukiSU Ultra展望</string> <string name="home_ContributionCard_kernelsu">SukiSU Ultra展望</string>
<string name="home_click_to_ContributionCard_kernelsu">SukiSU Ultra未来将会成为一个相对独立的KSU分支但是依然感谢官方KernelSU和MKSU等做出的贡献</string> <string name="home_click_to_ContributionCard_kernelsu">SukiSU Ultra未来将会成为一个相对独立的KSU分支但是依然感谢官方KernelSU和MKSU等做出的贡献</string>
<string name="more_settings_simplicity_mode">简洁模式</string> <string name="more_settings_simplicity_mode">简洁模式</string>
</resources> </resources>