From 2291be5d26fb422913f05f61bd5702fa297dae1c Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 23 Jan 2020 01:40:36 +0800
Subject: [PATCH] Merge string resources

---
 .../magisk/model/entity/recycler/HomeItems.kt |  12 +-
 .../entity/recycler/TappableHeadlineItem.kt   |   6 +-
 .../topjohnwu/magisk/ui/log/LogFragment.kt    |   2 +-
 .../magisk/ui/module/ModuleFragment.kt        |   2 +-
 .../magisk/ui/module/ModuleViewModel.kt       |   4 +-
 .../magisk/ui/safetynet/SafetynetFragment.kt  |   2 +-
 .../magisk/ui/settings/SettingsFragment.kt    |   2 +-
 .../magisk/ui/superuser/SuperuserFragment.kt  |   2 +-
 .../res/layout/fragment_safetynet_md2.xml     |   2 +-
 app/src/main/res/layout/item_policy_md2.xml   |   2 +-
 app/src/main/res/menu/menu_bottom_nav.xml     |   6 +-
 app/src/main/res/menu/menu_home_md2.xml       |   4 +-
 app/src/main/res/menu/menu_superuser_md2.xml  |   4 +-
 app/src/main/res/values-ar/strings.xml        |   2 +-
 app/src/main/res/values-az/strings.xml        |   2 +-
 app/src/main/res/values-bg/strings.xml        |   2 +-
 app/src/main/res/values-ca/strings.xml        |   2 +-
 app/src/main/res/values-cs/strings.xml        |   2 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-el/strings.xml        |   2 +-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values-et/strings.xml        |   2 +-
 app/src/main/res/values-fr/strings.xml        |   2 +-
 app/src/main/res/values-hi/strings.xml        |   2 +-
 app/src/main/res/values-hr/strings.xml        |   2 +-
 app/src/main/res/values-in/strings.xml        |   2 +-
 app/src/main/res/values-it/strings.xml        |   2 +-
 app/src/main/res/values-ja/strings.xml        |   2 +-
 app/src/main/res/values-ko/strings.xml        |   2 +-
 app/src/main/res/values-lt/strings.xml        |   2 +-
 app/src/main/res/values-mk/strings.xml        |   2 +-
 app/src/main/res/values-nb/strings.xml        |   2 +-
 app/src/main/res/values-nl/strings.xml        |   2 +-
 app/src/main/res/values-pl/strings.xml        |   2 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   2 +-
 app/src/main/res/values-pt-rPT/strings.xml    |   2 +-
 app/src/main/res/values-ro/strings.xml        |   2 +-
 app/src/main/res/values-ru/strings.xml        |   2 +-
 app/src/main/res/values-sk/strings.xml        |   2 +-
 app/src/main/res/values-sr/strings.xml        |   2 +-
 app/src/main/res/values-sv/strings.xml        |   2 +-
 app/src/main/res/values-th/strings.xml        |   2 +-
 app/src/main/res/values-tr/strings.xml        |   2 +-
 app/src/main/res/values-uk/strings.xml        |   2 +-
 app/src/main/res/values-vi/strings.xml        |   2 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   2 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   2 +-
 app/src/main/res/values/resources.xml         |   9 +-
 app/src/main/res/values/strings.xml           | 289 +++++++++++-------
 app/src/main/res/values/strings_md2.xml       | 109 -------
 50 files changed, 246 insertions(+), 279 deletions(-)
 delete mode 100644 app/src/main/res/values/strings_md2.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HomeItems.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HomeItems.kt
index 1281eb0f6..c52c2062c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HomeItems.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HomeItems.kt
@@ -26,7 +26,7 @@ sealed class HomeItem : ComparableRvItem<HomeItem>() {
     // region Children
     sealed class PayPal : HomeItem() {
         override val icon = R.drawable.ic_paypal
-        override val title = R.string.home_item_paypal
+        override val title = R.string.paypal
         override val link = "https://paypal.me/%s"
 
         // region Children
@@ -42,13 +42,13 @@ sealed class HomeItem : ComparableRvItem<HomeItem>() {
 
     object Patreon : HomeItem() {
         override val icon = R.drawable.ic_patreon
-        override val title = R.string.home_item_patreon
+        override val title = R.string.patreon
         override val link = Const.Url.PATREON_URL
     }
 
     sealed class Twitter : HomeItem() {
         override val icon = R.drawable.ic_twitter
-        override val title = R.string.home_item_twitter
+        override val title = R.string.twitter
         override val link = "https://twitter.com/%s"
 
         // region Children
@@ -70,7 +70,7 @@ sealed class HomeItem : ComparableRvItem<HomeItem>() {
 
     object Xda : HomeItem() {
         override val icon = R.drawable.ic_xda
-        override val title = R.string.home_item_xda
+        override val title = R.string.xda
         override val link = Const.Url.XDA_THREAD
     }
     // endregion
@@ -97,13 +97,13 @@ sealed class DeveloperItem : ComparableRvItem<DeveloperItem>() {
     object Mainline : DeveloperItem() {
         override val items =
             listOf(HomeItem.PayPal.Mainline, HomeItem.Patreon, HomeItem.Twitter.Mainline)
-        override val name = R.string.home_links_mainline
+        override val name = R.string.topjohnwu
     }
 
     object App : DeveloperItem() {
         override val items =
             listOf(HomeItem.PayPal.App, HomeItem.Twitter.App)
-        override val name = R.string.home_links_app
+        override val name = R.string.diareuse
     }
 
     object Project : DeveloperItem() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/TappableHeadlineItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/TappableHeadlineItem.kt
index 178f3dbd0..7bd7f3238 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/TappableHeadlineItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/TappableHeadlineItem.kt
@@ -27,12 +27,12 @@ sealed class TappableHeadlineItem : ComparableRvItem<TappableHeadlineItem>() {
     // --- objects
 
     object Hide : TappableHeadlineItem() {
-        override val title = R.string.magisk_hide_md2
+        override val title = R.string.magiskhide
         override val icon = R.drawable.ic_hide_md2
     }
 
     object Safetynet : TappableHeadlineItem() {
-        override val title = R.string.safetyNet
+        override val title = R.string.safetynet
         override val icon = R.drawable.ic_safetynet_md2
     }
 
@@ -41,4 +41,4 @@ sealed class TappableHeadlineItem : ComparableRvItem<TappableHeadlineItem>() {
         override val icon = R.drawable.ic_day_night
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
index 29db680cd..c49292d90 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
@@ -33,7 +33,7 @@ class LogFragment : CompatFragment<LogViewModel, FragmentLogMd2Binding>() {
     override fun onStart() {
         super.onStart()
         setHasOptionsMenu(true)
-        activity.title = resources.getString(R.string.section_log)
+        activity.title = resources.getString(R.string.logs)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
index 3167d27cd..dcefae0b3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
@@ -49,7 +49,7 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
     override fun onStart() {
         super.onStart()
         setHasOptionsMenu(true)
-        activity.title = resources.getString(R.string.section_modules)
+        activity.title = resources.getString(R.string.modules)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
index 97c04cf19..7a20c2db7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
@@ -71,7 +71,7 @@ class ModuleViewModel(
         it.bindExtra(BR.viewModel, this)
     }
 
-    private val itemNoneInstalled = TextItem(R.string.module_install_none)
+    private val itemNoneInstalled = TextItem(R.string.no_modules_found)
     private val itemNoneUpdatable = TextItem(R.string.module_update_none)
 
     private val itemsInstalledHelpers = ObservableArrayList<TextItem>().also {
@@ -116,7 +116,7 @@ class ModuleViewModel(
         ).also { it.hasButton = false }
 
         private val sectionActive = SectionTitle(
-            R.string.module_section_installed,
+            R.string.installed,
             R.string.reboot,
             R.drawable.ic_restart
         ).also { it.hasButton = false }
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
index f1de04f02..26d5b5ad4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
@@ -12,7 +12,7 @@ class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd
 
     override fun onStart() {
         super.onStart()
-        activity.setTitle(R.string.safetyNet)
+        activity.setTitle(R.string.safetynet)
     }
 
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
index 3d25b1a37..99f78f966 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
@@ -19,7 +19,7 @@ class SettingsFragment : CompatFragment<SettingsViewModel, FragmentSettingsMd2Bi
     override fun onStart() {
         super.onStart()
 
-        activity.title = resources.getString(R.string.section_settings)
+        activity.title = resources.getString(R.string.settings)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
index 4e674649c..bf076724e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
@@ -22,7 +22,7 @@ class SuperuserFragment : CompatFragment<SuperuserViewModel, FragmentSuperuserMd
 
     override fun onStart() {
         super.onStart()
-        activity.title = resources.getString(R.string.section_superuser)
+        activity.title = resources.getString(R.string.superuser)
         setHasOptionsMenu(true)
     }
 
diff --git a/app/src/main/res/layout/fragment_safetynet_md2.xml b/app/src/main/res/layout/fragment_safetynet_md2.xml
index 38a456def..38c6ab133 100644
--- a/app/src/main/res/layout/fragment_safetynet_md2.xml
+++ b/app/src/main/res/layout/fragment_safetynet_md2.xml
@@ -118,7 +118,7 @@
                     android:id="@+id/safetynet_android_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/system"
+                    android:text="@string/safetynet_system"
                     android:textAppearance="@style/AppearanceFoundation.Caption.Variant"
                     app:layout_constraintBottom_toTopOf="@+id/safetynet_attestation"
                     app:layout_constraintEnd_toStartOf="@+id/safetynet_android_version"
diff --git a/app/src/main/res/layout/item_policy_md2.xml b/app/src/main/res/layout/item_policy_md2.xml
index 0383e8684..a4fd1f59b 100644
--- a/app/src/main/res/layout/item_policy_md2.xml
+++ b/app/src/main/res/layout/item_policy_md2.xml
@@ -143,7 +143,7 @@
                     android:layout_height="wrap_content"
                     android:minHeight="24dp"
                     android:onClick="@{() -> item.toggleLog(viewModel)}"
-                    android:text="@string/superuser_toggle_log"
+                    android:text="@string/logs"
                     android:textAllCaps="false"
                     android:textAppearance="@style/AppearanceFoundation.Tiny"
                     android:textColor="@color/color_state_primary_transient"
diff --git a/app/src/main/res/menu/menu_bottom_nav.xml b/app/src/main/res/menu/menu_bottom_nav.xml
index dd797ea46..cd00503a5 100644
--- a/app/src/main/res/menu/menu_bottom_nav.xml
+++ b/app/src/main/res/menu/menu_bottom_nav.xml
@@ -11,13 +11,13 @@
     <item
         android:id="@+id/superuserFragment"
         android:icon="@drawable/ic_superuser_md2"
-        android:title="@string/section_superuser"
+        android:title="@string/superuser"
         tools:showAsAction="always" />
 
     <item
         android:id="@+id/modulesFragment"
         android:icon="@drawable/ic_module_md2"
-        android:title="@string/section_modules"
+        android:title="@string/modules"
         tools:showAsAction="always" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_home_md2.xml b/app/src/main/res/menu/menu_home_md2.xml
index 0825147da..2902b2df6 100644
--- a/app/src/main/res/menu/menu_home_md2.xml
+++ b/app/src/main/res/menu/menu_home_md2.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_settings_md2"
-        android:title="@string/section_settings"
+        android:title="@string/settings"
         app:showAsAction="ifRoom" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_superuser_md2.xml b/app/src/main/res/menu/menu_superuser_md2.xml
index c5e26ffd2..fd9ca5560 100644
--- a/app/src/main/res/menu/menu_superuser_md2.xml
+++ b/app/src/main/res/menu/menu_superuser_md2.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_log"
         android:icon="@drawable/ic_bug_md2"
-        android:title="@string/section_log"
+        android:title="@string/logs"
         app:showAsAction="ifRoom" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fbe808ace..621b7c7eb 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">الإضافات</string>
     <string name="downloads">التنزيلات</string>
     <string name="superuser">المستخدم المتميز</string>
-    <string name="log">السجل</string>
+    <string name="logs">السجل</string>
     <string name="settings">الإعدادات</string>
     <string name="install">التثبيت</string>
     <string name="unsupport_magisk_title">إصدار Magisk غير مدعوم</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 3ca98dcb7..d682b4909 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Əlavələr</string>
     <string name="downloads">Endirmələr</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Log</string>
     <string name="settings">Tənzimləmələr</string>
     <string name="install">Quraşdır</string>
     <string name="unsupport_magisk_title">Dəstəklənməyən Magisk Versiyası</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 6c920bd84..ce3755f38 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Модули</string>
     <string name="downloads">Изтегляния</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Дневник</string>
+    <string name="logs">Дневник</string>
     <string name="settings">Настройки</string>
     <string name="install">Инсталиране</string>
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 0471c1df8..2b55f5274 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Mòduls</string>
     <string name="downloads">Baixada</string>
     <string name="superuser">Superusuari</string>
-    <string name="log">Registre</string>
+    <string name="logs">Registre</string>
     <string name="settings">Configuració</string>
     <string name="install">Instal·lar</string>
     <string name="unsupport_magisk_title">Versió de Magisk incompatible</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index be0a93176..272c94eb2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Moduly</string>
     <string name="downloads">Stahování</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Log</string>
     <string name="settings">Nastavení</string>
     <string name="install">Instalovat</string>
     <string name="unsupport_magisk_title">Nepodporovaná verze Magisk</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dd9f3eabc..a0c55b4b5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Module</string>
     <string name="downloads">Downloads</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Log</string>
     <string name="settings">Einstellungen</string>
     <string name="install">Installieren</string>
     <string name="unsupport_magisk_title">Nicht unterstützte Magisk Version</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 38311bb25..dbe2b9691 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -4,7 +4,7 @@
 
     <string name="downloads">Λήψεις</string>
     <string name="superuser">Υπερχρήστης</string>
-    <string name="log">Αρχείο Καταγραφής</string>
+    <string name="logs">Αρχείο Καταγραφής</string>
     <string name="settings">Ρυθμίσεις</string>
     <string name="install">Εγκατάσταση</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 95ec435cd..eee679ccf 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Módulos</string>
     <string name="downloads">Descargas</string>
     <string name="superuser">Superusuario</string>
-    <string name="log">Registro</string>
+    <string name="logs">Registro</string>
     <string name="settings">Ajustes</string>
     <string name="install">Instalar</string>
     <string name="unsupport_magisk_title">Versión de Magisk no soportada</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index df63f0b5a..2ab8b51c9 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Moodulid</string>
     <string name="downloads">Allalaadimised</string>
     <string name="superuser">Superkasutaja</string>
-    <string name="log">Logi</string>
+    <string name="logs">Logi</string>
     <string name="settings">Seaded</string>
     <string name="install">Installi</string>
     <string name="unsupport_magisk_title">Mittetoetatud Magisk\'i versioon</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bd848c767..0036147b9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Modules</string>
     <string name="downloads">Téléchargements</string>
     <string name="superuser">Super‑utilisateur</string>
-    <string name="log">Journal</string>
+    <string name="logs">Journal</string>
     <string name="settings">Paramètres</string>
     <string name="install">Installer</string>
     <string name="unsupport_magisk_title">Version de Magisk non prise en charge</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index b4736fdec..b8e79f26f 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">मॉड्यूल</string>
     <string name="downloads">डाउनलोड</string>
     <string name="superuser">उत्तम उपयोगकर्ता</string>
-    <string name="log">अभिलेख</string>
+    <string name="logs">अभिलेख</string>
     <string name="settings">सेटिंग्स</string>
     <string name="install">स्थापित करें</string>
     <string name="unsupport_magisk_title">असमर्थित Magisk संस्करण</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 964a0d98a..b02ab77ca 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">Moduli</string>
     <string name="downloads">Preuzimanja</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Zapisnik događaja</string>
+    <string name="logs">Zapisnik događaja</string>
     <string name="settings">Postavke</string>
     <string name="install">Instaliranje</string>
 
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index b60a1c242..04f12397d 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -3,7 +3,7 @@
     <string name="modules">Modul</string>
     <string name="downloads">Unduhan</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Log</string>
     <string name="settings">Setelan</string>
     <string name="install">Pasang</string>
     <string name="unsupport_magisk_title">Versi Magisk Tidak Didukung</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b37b534b5..0484ef557 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Moduli</string>
     <string name="downloads">Download</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Registro eventi</string>
+    <string name="logs">Registro eventi</string>
     <string name="settings">Impostazioni</string>
     <string name="install">Installa</string>
     <string name="unsupport_magisk_title">Versione di Magisk non supportata</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fd02196b2..ea7a499ad 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">モジュール</string>
     <string name="downloads">ダウンロード</string>
     <string name="superuser">スーパーユーザー</string>
-    <string name="log">ログ</string>
+    <string name="logs">ログ</string>
     <string name="settings">設定</string>
     <string name="install">ｲﾝｽﾄｰﾙ</string>
     <string name="unsupport_magisk_title">対応していないMagiskバージョン</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 34c4a7d0f..677d588e1 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">모듈</string>
     <string name="downloads">다운로드</string>
     <string name="superuser">슈퍼유저</string>
-    <string name="log">로그</string>
+    <string name="logs">로그</string>
     <string name="settings">설정</string>
     <string name="install">설치</string>
     <string name="unsupport_magisk_title">지원되지 않는 Magisk 버전</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index b03ba36c1..a50d4fb81 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Papildiniai</string>
     <string name="downloads">Papildinių parduotuvė</string>
     <string name="superuser">Supervartotojas</string>
-    <string name="log">Įvykių sąrašas</string>
+    <string name="logs">Įvykių sąrašas</string>
     <string name="settings">Nustatymai</string>
     <string name="install">Instaliuoti</string>
 
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index ba525b832..494a164b6 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Модули</string>
     <string name="downloads">Преземања</string>
     <string name="superuser">Супер-корисник</string>
-    <string name="log">Записник</string>
+    <string name="logs">Записник</string>
     <string name="settings">Поставки</string>
     <string name="install">Инсталирај</string>
     <string name="unsupport_magisk_title">Неподдржана верзија на Magisk</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 275141605..25d38ebe2 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Moduler</string>
     <string name="downloads">Nedlastinger</string>
     <string name="superuser">Superbruker</string>
-    <string name="log">Logg</string>
+    <string name="logs">Logg</string>
     <string name="settings">Innstillinger</string>
     <string name="install">Installer</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5ee7c6acc..b78c643f0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">Modules</string>
     <string name="downloads">Downloads</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Log</string>
     <string name="settings">Instellingen</string>
     <string name="install">Installeren</string>
 
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5ba420156..e0b97f1c0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Moduły</string>
     <string name="downloads">Pobieranie</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Log</string>
     <string name="settings">Ustawienia</string>
     <string name="install">Instaluj</string>
     <string name="unsupport_magisk_title">Nieobsługiwana Wersja Magisk</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7ec7cd11d..b8a3671fb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">Módulos</string>
     <string name="downloads">Downloads</string>
     <string name="superuser">Superusuário</string>
-    <string name="log">Registro</string>
+    <string name="logs">Registro</string>
     <string name="settings">Configurações</string>
     <string name="install">Instalar</string>
     <string name="unsupport_magisk_title">Versão não suportada do Magisk</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 0f3a0da64..dffb6d55f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">Módulos</string>
     <string name="downloads">Transferir</string>
     <string name="superuser">root</string>
-    <string name="log">Registo</string>
+    <string name="logs">Registo</string>
     <string name="settings">Definições</string>
     <string name="install">Instalar</string>
 
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 545bd4240..062e72e41 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Module</string>
     <string name="downloads">Descărcări</string>
     <string name="superuser">Superutilizator</string>
-    <string name="log">Jurnal</string>
+    <string name="logs">Jurnal</string>
     <string name="settings">Setări</string>
     <string name="install">Instalează</string>
     <string name="unsupport_magisk_title">Versiune Magisk nesuportată</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8132e3f74..a03c4f6c9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Модули</string>
     <string name="downloads">Репозиторий</string>
     <string name="superuser">Суперпользователь</string>
-    <string name="log">Логи</string>
+    <string name="logs">Логи</string>
     <string name="settings">Настройки</string>
     <string name="install">Установка</string>
     <string name="unsupport_magisk_title">Неподдерживаемая версия Magisk</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 70e7ae955..d09c7b070 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Moduly</string>
     <string name="downloads">Sťahovanie</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Záznamy</string>
+    <string name="logs">Záznamy</string>
     <string name="settings">Nastavenia</string>
     <string name="install">Inštalovať</string>
     <string name="unsupport_magisk_title">Nepodporovaná verzia Magisku</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 337589fba..46316212e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">Модули</string>
     <string name="downloads">Преузимања</string>
     <string name="superuser">Супер-корисник</string>
-    <string name="log">Дневник</string>
+    <string name="logs">Дневник</string>
     <string name="settings">Подешавања</string>
     <string name="install">Инсталација</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2ce35d2a9..8aee2f0d4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -5,7 +5,7 @@
     <string name="modules">Moduler</string>
     <string name="downloads">Nerladdningar</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Logg</string>
+    <string name="logs">Logg</string>
     <string name="settings">Inställningar</string>
     <string name="install">Install</string>
 
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index c966803f2..7ca65bc09 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">โมดูล</string>
     <string name="downloads">ดาวน์โหลด</string>
     <string name="superuser">Superuser</string>
-    <string name="log">บันทึก</string>
+    <string name="logs">บันทึก</string>
     <string name="settings">ตั้งค่า</string>
     <string name="install">ติดตั้ง</string>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e8d71b3f3..605044ffb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Modüller</string>
     <string name="downloads">İndir</string>
     <string name="superuser">Yetkili kullanıcı</string>
-    <string name="log">Günlük</string>
+    <string name="logs">Günlük</string>
     <string name="settings">Ayarlar</string>
     <string name="install">Yükle</string>
     <string name="unsupport_magisk_title">Desteklenmeyen Magisk Sürümü</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d445db68c..4297c6daf 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Модулі</string>
     <string name="downloads">Завантаження</string>
     <string name="superuser">Суперкористувач</string>
-    <string name="log">Журнал</string>
+    <string name="logs">Журнал</string>
     <string name="settings">Налаштування</string>
     <string name="install">Встановлення</string>
     <string name="unsupport_magisk_title">Версія Magisk не підтримується</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f68e6d5c8..199d61e7f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">Mô-đun</string>
     <string name="downloads">Tải xuống</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Nhật ký</string>
+    <string name="logs">Nhật ký</string>
     <string name="settings">Thiết lập</string>
     <string name="install">Cài đặt</string>
     
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 075c5a4fd..9b50b86c0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">模块</string>
     <string name="downloads">下载</string>
     <string name="superuser">超级用户</string>
-    <string name="log">日志</string>
+    <string name="logs">日志</string>
     <string name="settings">设置</string>
     <string name="install">安装</string>
     <string name="unsupport_magisk_title">不支持的 Magisk 版本</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5bd6cccd9..d014e94ad 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -4,7 +4,7 @@
     <string name="modules">模組</string>
     <string name="downloads">線上模組庫</string>
     <string name="superuser">超級使用者</string>
-    <string name="log">紀錄</string>
+    <string name="logs">紀錄</string>
     <string name="settings">設定</string>
     <string name="install">安裝</string>
     <string name="unsupport_magisk_title">不支援的 Magisk 版本</string>
diff --git a/app/src/main/res/values/resources.xml b/app/src/main/res/values/resources.xml
index 9c785befd..f9cb5247f 100644
--- a/app/src/main/res/values/resources.xml
+++ b/app/src/main/res/values/resources.xml
@@ -5,7 +5,14 @@
     <string name="app_name" translatable="false">Magisk Manager</string>
     <string name="re_app_name" translatable="false">Manager</string>
     <string name="magisk" translatable="false">Magisk</string>
-    <string name="magiskhide" translatable="false">Magisk Hide</string>
+    <string name="magiskhide" translatable="false">MagiskHide</string>
     <string name="empty" translatable="false"/>
 
+    <string name="topjohnwu" translatable="false">\@topjohnwu</string>
+    <string name="diareuse" translatable="false">\@diareuse</string>
+    <string name="paypal" translatable="false">PayPal</string>
+    <string name="patreon" translatable="false">Patreon</string>
+    <string name="twitter" translatable="false">Twitter</string>
+    <string name="xda" translatable="false">XDA</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87e0a26fd..86a9a61a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,16 +1,51 @@
 <resources>
 
-    <!--Welcome Activity-->
+    <!--Sections-->
     <string name="modules">Modules</string>
     <string name="downloads">Downloads</string>
     <string name="superuser">Superuser</string>
-    <string name="log">Log</string>
+    <string name="logs">Logs</string>
     <string name="settings">Settings</string>
     <string name="install">Install</string>
-    <string name="unsupport_magisk_title">Unsupported Magisk Version</string>
-    <string name="unsupport_magisk_msg">This version of Magisk Manager does not support Magisk version lower than %1$s.\n\nThe app will behave as if no Magisk is installed, please upgrade Magisk as soon as possible.</string>
+    <string name="section_home">Home</string>
+    <string name="section_theme">Themes</string>
+    <string name="safetynet">SafetyNet</string>
+
+    <!--Home-->
+    <string name="no_connection">No connection available</string>
+    <string name="installed_error_md2">is not installed</string>
+    <string name="channel_error_md2">has invalid update channel!</string>
+    <string name="up_to_date_md2">is up to date</string>
+    <string name="obsolete_md2">can be updated!</string>
+    <string name="loading_md2">is loading…</string>
+    <string name="home_notice_content">Always make sure you\'re using open-source Magisk Manager. Manager of unknown source can perform malicious actions.</string>
+    <string name="home_notice_hide">Hide</string>
+    <string name="app_changelog">Changelog</string>
+    <string name="manager">Manager</string>
+
+    <string name="home_support_title">Support Us</string>
+    <string name="home_links_project">Project links</string>
+    <string name="home_item_source">Source</string>
+    <string name="home_support_content">Magisk is, and always will be, free and open-source. You can however show us that you care by sending a small donation.</string>
+
+    <string name="home_device_security">Security</string>
+    <string name="home_device_system">System</string>
+    <string name="home_device_build_style">A/B</string>
+    <string name="home_device_build_type">SAR</string>
+
+    <string name="home_device_security_secure">Secure</string>
+    <string name="home_device_security_outdated">Outdated</string>
+
+    <string name="home_extra_version">Version</string>
+    <string name="home_extra_code">Code</string>
+    <string name="home_extra_mode">Mode</string>
+    <string name="home_extra_connection">Connection</string>
+    <string name="home_extra_package">Package</string>
+
+    <string name="home_extra_mode_normal">Normal</string>
+    <string name="home_extra_mode_safe">Safe</string>
+    <string name="home_extra_mode_stub">Dynamic</string>
 
-    <!--Status Fragment-->
     <string name="magisk_version_error">Magisk is not installed</string>
     <string name="checking_for_updates">Checking for updates…</string>
     <string name="invalid_update_channel">Invalid Update Channel</string>
@@ -21,10 +56,6 @@
     <string name="safetyNet_res_invalid">The response is invalid</string>
     <string name="magisk_up_to_date">Magisk is up to date</string>
     <string name="manager_up_to_date">Magisk Manager is up to date</string>
-    <string name="advanced_settings_title">Advanced Settings</string>
-    <string name="keep_force_encryption">Preserve force encryption</string>
-    <string name="keep_dm_verity">Preserve AVB 2.0/dm-verity</string>
-    <string name="recovery_mode">Recovery Mode</string>
     <string name="current_installed">Installed: %1$s</string>
     <string name="latest_version">Latest: %1$s</string>
     <string name="uninstall">Uninstall</string>
@@ -33,6 +64,81 @@
     <string name="update">Update</string>
     <string name="core_only_enabled">(Core only mode enabled)</string>
 
+    <!--Install-->
+    <string name="advanced_settings_title">Advanced Settings</string>
+    <string name="keep_force_encryption">Preserve force encryption</string>
+    <string name="keep_dm_verity">Preserve AVB 2.0/dm-verity</string>
+    <string name="recovery_mode">Recovery Mode</string>
+    <string name="install_options_title">Options</string>
+    <string name="install_method_title">Method</string>
+    <string name="install_next">Next</string>
+    <string name="install_start">Let\'s go</string>
+    <string name="manager_download_install">Press to download and install</string>
+    <string name="download_zip_only">Download Zip Only</string>
+    <string name="direct_install">Direct Install (Recommended)</string>
+    <string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string>
+    <string name="install_inactive_slot_msg">Your device will be FORCED to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string>
+    <string name="select_method">Select Method</string>
+    <string name="setup_title">Additional Setup</string>
+    <string name="select_patch_file">Select and Patch a File</string>
+    <string name="patch_file_msg">Select a raw image (*.img) or an ODIN tarfile (*.tar)</string>
+    <string name="reboot_delay_toast">Rebooting in 5 seconds…</string>
+
+    <!--Superuser-->
+    <string name="su_request_title">Superuser Request</string>
+    <string name="deny">Deny</string>
+    <string name="prompt">Prompt</string>
+    <string name="grant">Grant</string>
+    <string name="su_warning">Grants full access to your device.\nDeny if you\'re not sure!</string>
+    <string name="forever">Forever</string>
+    <string name="once">Once</string>
+    <string name="tenmin">10 mins</string>
+    <string name="twentymin">20 mins</string>
+    <string name="thirtymin">30 mins</string>
+    <string name="sixtymin">60 mins</string>
+    <string name="su_allow_toast">%1$s was granted Superuser rights</string>
+    <string name="su_deny_toast">%1$s was denied Superuser rights</string>
+    <string name="no_apps_found">No apps found</string>
+    <string name="su_snack_grant">Superuser rights of %1$s are granted</string>
+    <string name="su_snack_deny">Superuser rights of %1$s are denied</string>
+    <string name="su_snack_notif_on">Notifications of %1$s are enabled</string>
+    <string name="su_snack_notif_off">Notifications of %1$s are disabled</string>
+    <string name="su_snack_log_on">Logging of %1$s is enabled</string>
+    <string name="su_snack_log_off">Logging of %1$s is disabled</string>
+    <string name="su_revoke_title">Revoke?</string>
+    <string name="su_revoke_msg">Confirm to revoke %1$s rights?</string>
+    <string name="toast">Toast</string>
+    <string name="none">None</string>
+
+    <string name="superuser_toggle_notification">Notifications</string>
+    <string name="superuser_toggle_revoke">Revoke</string>
+    <string name="superuser_policy_none">No app has asked for superuser permission yet.</string>
+
+    <!--Logs-->
+    <string name="log_data_none">You\'re log-free, try using your SU enabled apps more.</string>
+    <string name="log_data_magisk_none">Magisk logs are empty, that\'s weird.</string>
+    <string name="menuSaveLog">Save log</string>
+    <string name="menuReload">Reload</string>
+    <string name="menuClearLog">Clear log now</string>
+    <string name="logs_cleared">Log successfully cleared.</string>
+    <string name="pid">PID: %1$d</string>
+    <string name="target_uid">Target UID: %1$d</string>
+    <string name="command">Command: %1$s</string>
+
+    <!--SafetyNet-->
+    <string name="safetynet_attest_success">Success!</string>
+    <string name="safetynet_attest_failure">Attestation failed!</string>
+    <string name="safetynet_attest_loading">Just a sec…</string>
+    <string name="safetynet_attest_restart">Try again</string>
+    <string name="safetynet_system">System</string>
+
+    <!-- MagiskHide -->
+    <string name="show_system_app">Show system apps</string>
+    <string name="hide_filter_hint">Filter by name</string>
+    <string name="hide_scroll_up">Scroll up</string>
+    <string name="hide_filters">Filters</string>
+    <string name="hide_search">Search</string>
+
     <!--Module Fragment-->
     <string name="no_info_provided">(No info provided)</string>
     <string name="no_modules_found">No modules found</string>
@@ -46,8 +152,15 @@
     <string name="reboot_bootloader">Reboot to Bootloader</string>
     <string name="reboot_download">Reboot to Download</string>
     <string name="reboot_edl">Reboot to EDL</string>
-
-    <!--Repo Fragment-->
+    <string name="module_safe_mode_message">You\'re in safe mode. None of user modules will work.\nThis message will disappear once safe mode is disabled.</string>
+    <string name="module_version_author">%1$s by %2$s</string>
+    <string name="module_section_pending">Updates</string>
+    <string name="module_section_pending_action">Update all</string>
+    <string name="module_section_remote">Remote</string>
+    <string name="module_state_remove">Remove</string>
+    <string name="module_state_restore">Restore</string>
+    <string name="module_action_install_external">Install from storage</string>
+    <string name="module_update_none">Your modules are up to date!</string>
     <string name="update_available">Update Available</string>
     <string name="installed">Installed</string>
     <string name="not_installed">Not Installed</string>
@@ -56,68 +169,19 @@
     <string name="sort_by_name">Sort by name</string>
     <string name="sort_by_update">Sort by last update</string>
 
-    <!--Log Fragment-->
-    <string name="menuSaveLog">Save log</string>
-    <string name="menuReload">Reload</string>
-    <string name="menuClearLog">Clear log now</string>
-    <string name="logs_cleared">Log successfully cleared.</string>
-
-    <!--About Activity-->
-    <string name="app_changelog">Changelog</string>
-
-    <!-- System Components, Notifications -->
-    <string name="update_channel">Magisk Updates</string>
-    <string name="progress_channel">Progress Notifications</string>
-    <string name="download_complete">Download complete</string>
-    <string name="download_file_error">Error downloading file</string>
-    <string name="download_open_parent">Show in parent folder</string>
-    <string name="download_open_self">Show file</string>
-    <string name="magisk_update_title">Magisk Update Available!</string>
-    <string name="manager_update_title">Magisk Manager Update Available!</string>
-
-    <!-- Installation -->
-    <string name="manager_download_install">Press to download and install</string>
-    <string name="download_zip_only">Download Zip Only</string>
-    <string name="direct_install">Direct Install (Recommended)</string>
-    <string name="install_inactive_slot">Install to Inactive Slot (After OTA)</string>
-    <string name="install_inactive_slot_msg">Your device will be FORCED to boot to the current inactive slot after a reboot!\nOnly use this option after OTA is done.\nContinue?</string>
-    <string name="select_method">Select Method</string>
-    <string name="setup_title">Additional Setup</string>
-    <string name="select_patch_file">Select and Patch a File</string>
-    <string name="patch_file_msg">Select a raw image (*.img) or an ODIN tarfile (*.tar)</string>
-    <string name="reboot_delay_toast">Rebooting in 5 seconds…</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="repo_install_title">Install %1$s</string>
-    <string name="repo_install_msg">Do you want to install %1$s now?</string>
-    <string name="download">Download</string>
-    <string name="reboot">Reboot</string>
-    <string name="settings_reboot_toast">Reboot to apply settings</string>
-    <string name="release_notes">Release notes</string>
-    <string name="repo_cache_cleared">Repo cache cleared</string>
-    <string name="dtbo_patched_title">DTBO was patched!</string>
-    <string name="dtbo_patched_reboot">Magisk Manager has patched dtbo.img. Please reboot.</string>
-    <string name="flashing">Flashing…</string>
-    <string name="done">Done!</string>
-    <string name="failure">Failed</string>
-    <string name="hide_manager_title">Hiding Magisk Manager…</string>
-    <string name="hide_manager_fail_toast">Hide Magisk Manager failed.</string>
-    <string name="open_link_failed_toast">No application found to open the link</string>
-    <string name="warning">Warning</string>
-    <string name="complete_uninstall">Complete Uninstall</string>
-    <string name="restore_img">Restore Images</string>
-    <string name="restore_img_msg">Restoring…</string>
-    <string name="restore_done">Restoration done!</string>
-    <string name="restore_fail">Stock backup does not exist!</string>
-    <string name="proprietary_title">Download Proprietary Code</string>
-    <string name="proprietary_notice">Magisk Manager is FOSS and doesn\'t contain Google\'s proprietary SafetyNet API code.\n\nWill you allow Magisk Manager to download an extension (contains GoogleApiClient) for SafetyNet checks?</string>
-    <string name="setup_fail">Setup failed</string>
-    <string name="env_fix_title">Requires Additional Setup</string>
-    <string name="env_fix_msg">Your device needs additional setup for Magisk to work properly. It will download the Magisk setup zip, do you want to proceed now?</string>
-    <string name="setup_msg">Running environment setup…</string>
-    <string name="authenticate">Authenticate</string>
-
-    <!--Settings Activity -->
+    <!--Settings -->
+    <string name="settings_dark_mode_title">Theme Mode</string>
+    <string name="settings_dark_mode_message">Select mode which best suits your style!</string>
+    <string name="settings_dark_mode_light">Always Light</string>
+    <string name="settings_dark_mode_system">Follow System</string>
+    <string name="settings_dark_mode_dark">Always Dark</string>
+    <string name="settings_safe_mode_title">Safe Mode</string>
+    <string name="settings_core_only_summary" deprecated="true">Enable only core features. MagiskSU and MagiskHide will still be enabled, but no modules will be loaded</string>
+    <string name="settings_grid_span_count_title">Grid Column Size</string>
+    <string name="settings_grid_span_count_summary">Sets column size for all eligible grid lists. You can set this outside settings by performing pinch gesture.</string>
+    <string name="settings_grid_span_count_1">One item per line (Small Screens)</string>
+    <string name="settings_grid_span_count_2">Two items per line (Recommended)</string>
+    <string name="settings_grid_span_count_3">Three item per line (Tablet/TV)</string>
     <string name="settings_general_category">General</string>
     <string name="settings_dark_theme_title">Dark Theme</string>
     <string name="settings_dark_theme_summary">Enable dark theme</string>
@@ -139,15 +203,10 @@
     <string name="settings_update_beta">Beta</string>
     <string name="settings_update_custom">Custom Channel</string>
     <string name="settings_update_custom_msg">Insert a custom URL</string>
-    <!--deprecated-->
-    <string name="settings_core_only_title">Magisk Core Only Mode</string>
-    <!--deprecated-->
-    <string name="settings_core_only_summary">Enable only core features. MagiskSU and MagiskHide will still be enabled, but no modules will be loaded</string>
     <string name="settings_magiskhide_summary">Hide Magisk from various forms of detection</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Systemless hosts support for Adblock apps</string>
     <string name="settings_hosts_toast">Added systemless hosts module</string>
-
     <string name="settings_app_name">Type desired app name</string>
     <string name="settings_app_name_hint">New name</string>
     <string name="settings_app_name_helper">App will be repackaged to this name</string>
@@ -190,38 +249,48 @@
     <string name="isolate_summary">Each root session will have its own isolated namespace</string>
     <string name="settings_download_path_error">Error creating folder. It must be accessible from storage root directory and must not be a file.</string>
 
-    <!--Superuser-->
-    <string name="su_request_title">Superuser Request</string>
-    <string name="deny">Deny</string>
-    <string name="prompt">Prompt</string>
-    <string name="grant">Grant</string>
-    <string name="su_warning">Grants full access to your device.\nDeny if you\'re not sure!</string>
-    <string name="forever">Forever</string>
-    <string name="once">Once</string>
-    <string name="tenmin">10 mins</string>
-    <string name="twentymin">20 mins</string>
-    <string name="thirtymin">30 mins</string>
-    <string name="sixtymin">60 mins</string>
-    <string name="su_allow_toast">%1$s was granted Superuser rights</string>
-    <string name="su_deny_toast">%1$s was denied Superuser rights</string>
-    <string name="no_apps_found">No apps found</string>
-    <string name="su_snack_grant">Superuser rights of %1$s are granted</string>
-    <string name="su_snack_deny">Superuser rights of %1$s are denied</string>
-    <string name="su_snack_notif_on">Notifications of %1$s are enabled</string>
-    <string name="su_snack_notif_off">Notifications of %1$s are disabled</string>
-    <string name="su_snack_log_on">Logging of %1$s is enabled</string>
-    <string name="su_snack_log_off">Logging of %1$s is disabled</string>
-    <string name="su_revoke_title">Revoke?</string>
-    <string name="su_revoke_msg">Confirm to revoke %1$s rights?</string>
-    <string name="toast">Toast</string>
-    <string name="none">None</string>
+    <!--Notifications-->
+    <string name="update_channel">Magisk Updates</string>
+    <string name="progress_channel">Progress Notifications</string>
+    <string name="download_complete">Download complete</string>
+    <string name="download_file_error">Error downloading file</string>
+    <string name="download_open_parent">Show in parent folder</string>
+    <string name="download_open_self">Show file</string>
+    <string name="magisk_update_title">Magisk Update Available!</string>
+    <string name="manager_update_title">Magisk Manager Update Available!</string>
 
-    <!--Superuser logs-->
-    <string name="pid">PID: %1$d</string>
-    <string name="target_uid">Target UID: %1$d</string>
-    <string name="command">Command: %1$s</string>
-
-    <!-- MagiskHide -->
-    <string name="show_system_app">Show system apps</string>
+    <!--Toasts, Dialogs-->
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="repo_install_title">Install %1$s</string>
+    <string name="repo_install_msg">Do you want to install %1$s now?</string>
+    <string name="download">Download</string>
+    <string name="reboot">Reboot</string>
+    <string name="settings_reboot_toast">Reboot to apply settings</string>
+    <string name="release_notes">Release notes</string>
+    <string name="repo_cache_cleared">Repo cache cleared</string>
+    <string name="dtbo_patched_title">DTBO was patched!</string>
+    <string name="dtbo_patched_reboot">Magisk Manager has patched dtbo.img. Please reboot.</string>
+    <string name="flashing">Flashing…</string>
+    <string name="done">Done!</string>
+    <string name="failure">Failed</string>
+    <string name="hide_manager_title">Hiding Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">Hide Magisk Manager failed.</string>
+    <string name="open_link_failed_toast">No application found to open the link</string>
+    <string name="warning">Warning</string>
+    <string name="complete_uninstall">Complete Uninstall</string>
+    <string name="restore_img">Restore Images</string>
+    <string name="restore_img_msg">Restoring…</string>
+    <string name="restore_done">Restoration done!</string>
+    <string name="restore_fail">Stock backup does not exist!</string>
+    <string name="proprietary_title">Download Proprietary Code</string>
+    <string name="proprietary_notice">Magisk Manager is FOSS and doesn\'t contain Google\'s proprietary SafetyNet API code.\n\nWill you allow Magisk Manager to download an extension (contains GoogleApiClient) for SafetyNet checks?</string>
+    <string name="setup_fail">Setup failed</string>
+    <string name="env_fix_title">Requires Additional Setup</string>
+    <string name="env_fix_msg">Your device needs additional setup for Magisk to work properly. It will download the Magisk setup zip, do you want to proceed now?</string>
+    <string name="setup_msg">Running environment setup…</string>
+    <string name="authenticate">Authenticate</string>
+    <string name="unsupport_magisk_title">Unsupported Magisk Version</string>
+    <string name="unsupport_magisk_msg">This version of Magisk Manager does not support Magisk version lower than %1$s.\n\nThe app will behave as if no Magisk is installed, please upgrade Magisk as soon as possible.</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings_md2.xml b/app/src/main/res/values/strings_md2.xml
deleted file mode 100644
index e013ca4f2..000000000
--- a/app/src/main/res/values/strings_md2.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="manager">Manager</string>
-    <string name="system">System</string>
-
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-
-    <string name="no_connection">No connection available</string>
-
-    <string name="section_home">Home</string>
-    <string name="section_modules">@string/modules</string>
-    <string name="section_superuser">@string/superuser</string>
-    <string name="section_log">@string/log</string>
-    <string name="section_settings">@string/settings</string>
-    <string name="section_theme">Themes</string>
-
-    <string name="installed_error_md2">is not installed</string>
-    <string name="channel_error_md2">has invalid update channel!</string>
-    <string name="up_to_date_md2">is up to date</string>
-    <string name="obsolete_md2">can be updated!</string>
-    <string name="loading_md2">is loading…</string>
-
-    <string name="home_links_mainline">\@topjohnwu</string>
-    <string name="home_links_app">\@diareuse</string>
-    <string name="home_links_project">Project links</string>
-    <string name="home_item_paypal">PayPal</string>
-    <string name="home_item_patreon">Patreon</string>
-    <string name="home_item_twitter">Twitter</string>
-    <string name="home_item_source">Source</string>
-    <string name="home_item_xda">XDA</string>
-
-    <string name="home_notice_content">Always make sure you\'re using open-source Magisk Manager. Manager of unknown source can perform malicious actions.</string>
-    <string name="home_notice_hide">Hide</string>
-    <string name="home_support_title">Support Us</string>
-    <string name="home_support_content">Magisk is, and always will be, free and open-source. You can however show us that you care by sending a small donation.</string>
-
-    <string name="home_device_security">Security</string>
-    <string name="home_device_system">System</string>
-    <string name="home_device_build_style">A/B</string>
-    <string name="home_device_build_type">SAR</string>
-
-    <string name="home_device_security_secure">Secure</string>
-    <string name="home_device_security_outdated">Outdated</string>
-
-    <string name="home_extra_version">Version</string>
-    <string name="home_extra_code">Code</string>
-    <string name="home_extra_mode">Mode</string>
-    <string name="home_extra_connection">Connection</string>
-    <string name="home_extra_package">Package</string>
-
-    <string name="home_extra_mode_normal">Normal</string>
-    <string name="home_extra_mode_safe">Safe</string>
-    <string name="home_extra_mode_stub">Dynamic</string>
-
-    <string name="safetyNet">SafetyNet</string>
-    <!--ref. Magisk Hide-->
-    <string name="magisk_hide_md2">Hide</string>
-
-    <string name="safetynet_attest_success">Success!</string>
-    <string name="safetynet_attest_failure">Attestation failed!</string>
-    <string name="safetynet_attest_loading">Just a sec…</string>
-    <string name="safetynet_attest_restart">Try again</string>
-
-    <string name="settings_dark_mode_title">Theme Mode</string>
-    <string name="settings_dark_mode_message">Select mode which best suits your style!</string>
-    <string name="settings_dark_mode_light">Always Light</string>
-    <string name="settings_dark_mode_system">Follow System</string>
-    <string name="settings_dark_mode_dark">Always Dark</string>
-    <string name="settings_safe_mode_title">Safe Mode</string>
-    <string name="settings_safe_mode_summary">Disables everything but essential functionality within Magisk and Magisk Manager. Magisk Hide, as a separate subsystem, will stand unaffected.</string>
-    <string name="settings_grid_span_count_title">Grid Column Size</string>
-    <string name="settings_grid_span_count_summary">Sets column size for all eligible grid lists. You can set this outside settings by performing pinch gesture.</string>
-    <string name="settings_grid_span_count_1">One item per line (Small Screens)</string>
-    <string name="settings_grid_span_count_2">Two items per line (Recommended)</string>
-    <string name="settings_grid_span_count_3">Three item per line (Tablet/TV)</string>
-
-    <string name="install_options_title">Options</string>
-    <string name="install_method_title">Method</string>
-    <string name="install_next">Next</string>
-    <string name="install_start">Let\'s go</string>
-
-    <string name="module_safe_mode_message">You\'re in safe mode. None of user modules will work.\nThis message will disappear once safe mode is disabled.</string>
-    <string name="module_version_author">%1$s by %2$s</string>
-    <string name="module_section_pending">Updates</string>
-    <string name="module_section_pending_action">Update all</string>
-    <string name="module_section_installed">Installed</string>
-    <string name="module_section_remote">Remote</string>
-    <string name="module_state_remove">Remove</string>
-    <string name="module_state_restore">Restore</string>
-    <string name="module_action_install_external">Install from storage</string>
-    <string name="module_update_none">Your modules are up to date!</string>
-    <string name="module_install_none">No modules detected, try installing one from the list below.</string>
-
-    <string name="superuser_toggle_log">Logs</string>
-    <string name="superuser_toggle_notification">Notifications</string>
-    <string name="superuser_toggle_revoke">Revoke</string>
-    <string name="superuser_policy_none">No app has asked for superuser permission yet.</string>
-
-    <string name="hide_filter_hint">Filter by name</string>
-    <string name="hide_scroll_up">Scroll up</string>
-    <string name="hide_filters">Filters</string>
-    <string name="hide_search">Search</string>
-
-    <string name="log_data_none">You\'re log-free, try using your SU enabled apps more.</string>
-    <string name="log_data_magisk_none">Magisk logs are empty, that\'s weird.</string>
-
-</resources>
\ No newline at end of file