diff --git a/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java b/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
index b4840adb8..e383e2e81 100644
--- a/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
+++ b/app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
@@ -121,7 +121,7 @@ public class FlashActivity extends Activity {
case Const.Value.FLASH_MAGISK:
new InstallMagisk(this, console, logs, uri, InstallMagisk.DIRECT_MODE).exec();
break;
- case Const.Value.FLASH_SECOND_SLOT:
+ case Const.Value.FLASH_INACTIVE_SLOT:
new InstallMagisk(this, console, logs, uri, InstallMagisk.SECOND_SLOT_MODE).exec();
break;
case Const.Value.PATCH_BOOT:
diff --git a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java
index c59e224b5..66d2aad90 100644
--- a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java
+++ b/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java
@@ -70,7 +70,7 @@ class InstallMethodDialog extends AlertDialog.Builder {
Intent intent = new Intent(context, FlashActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setData(uri).putExtra(Const.Key.FLASH_ACTION,
- Const.Value.FLASH_SECOND_SLOT);
+ Const.Value.FLASH_INACTIVE_SLOT);
context.startActivity(intent);
}
};
@@ -80,7 +80,7 @@ class InstallMethodDialog extends AlertDialog.Builder {
});
}
- private class SelectBoot extends DownloadReceiver {
+ private static class SelectBoot extends DownloadReceiver {
private Intent data;
diff --git a/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java
index 6fcb2bb9d..d224f484f 100644
--- a/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java
+++ b/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java
@@ -32,7 +32,7 @@ public class MagiskInstallDialog extends CustomAlertDialog {
}
String s = ShellUtils.fastCmd("grep_prop ro.build.ab_update");
if (!s.isEmpty() && Boolean.parseBoolean(s)) {
- options.add(mm.getString(R.string.install_second_slot));
+ options.add(mm.getString(R.string.install_inactive_slot));
}
new InstallMethodDialog(activity, options, filename).show();
});
diff --git a/app/src/full/res/values-bg/strings.xml b/app/src/full/res/values-bg/strings.xml
index 329c22514..5723b9215 100644
--- a/app/src/full/res/values-bg/strings.xml
+++ b/app/src/full/res/values-bg/strings.xml
@@ -100,7 +100,6 @@
Изтегляне само на архив
Модифициране на Boot образа
Директно инсталиране (Препоръчва се)
- Инсталиране на втория слот (След OTA)
Избор на метод
Избраната версия на Magisk не поддържа модифициране на Boot образи
Изберете стоков Boot образ с формат .img или .img.tar
diff --git a/app/src/full/res/values-de/strings.xml b/app/src/full/res/values-de/strings.xml
index 178cafc69..121e4683d 100644
--- a/app/src/full/res/values-de/strings.xml
+++ b/app/src/full/res/values-de/strings.xml
@@ -99,7 +99,6 @@
Zip-Datei nur herunterladen
Boot-Image-Datei patchen
Direkt installieren (empfohlen)
- Installiere auf zweiten Slot (Nach OTA)
Methode auswählen
Magisk Zielversion unterstützt das Patchen des Boot-Images nicht
Selektiere das originale Boot image dump im Format .img oder .img.tar
diff --git a/app/src/full/res/values-el/strings.xml b/app/src/full/res/values-el/strings.xml
index 2a1247bad..10291865b 100644
--- a/app/src/full/res/values-el/strings.xml
+++ b/app/src/full/res/values-el/strings.xml
@@ -100,7 +100,6 @@
Λήψη Zip Μόνο
Εφαρμογή Patch στο Αρχείο Εικόνας Boot
Απευθείας Εγκατάσταση (Προτείνεται)
- Εγκατάσταση σε Second Slot (Μετά από ΟΤΑ)
Επιλογή Μεθόδου
Αυτή η Magisk έκδοση δεν υποστηρίζει patch του boot image αρχείου
Επιλογή stock boot image dump σε μορφή .img ή .img.tar
diff --git a/app/src/full/res/values-es/strings.xml b/app/src/full/res/values-es/strings.xml
index 91b14e207..057be94e7 100644
--- a/app/src/full/res/values-es/strings.xml
+++ b/app/src/full/res/values-es/strings.xml
@@ -100,7 +100,6 @@
Descargar sólo el archivo ZIP
Parcheo de la imagen boot
Instalación Directa (Recomendado)
- Instalación en el segundo espacio (Después de OTA)
Seleccionar Método
La versión de Magisk no admite el parcheo de la imagen boot
Seleccione el volcado de la imagen boot en formato .img o .img.tar
diff --git a/app/src/full/res/values-et/strings.xml b/app/src/full/res/values-et/strings.xml
index a13a53aac..2da608d0f 100644
--- a/app/src/full/res/values-et/strings.xml
+++ b/app/src/full/res/values-et/strings.xml
@@ -101,7 +101,6 @@
Laadi ainult ZIP alla
Paika käivituspildi fail
Otsene install (soovitatud)
- Installi teise lahtrisse (pärast üle õhu uuendust)
Vali meetod
Magisk\'i sihtversioon ei toeta käivituspildi faili paikamist
Vali originaalne käivituspildi väljastus .img või .img.tar vormingus
diff --git a/app/src/full/res/values-fr/strings.xml b/app/src/full/res/values-fr/strings.xml
index 0c48a79ca..cbe571bcc 100644
--- a/app/src/full/res/values-fr/strings.xml
+++ b/app/src/full/res/values-fr/strings.xml
@@ -99,7 +99,6 @@
Uniquement télécharger le zip
Patch Fichier Image Démarrage
Installation directe (Recommendée)
- Installer dans le second Slot (Après OTA)
Sélectionner le méthode
La version cible de Magisk ne prend pas en charge la correction de fichier image de démarrage
Sélectionnez l\'image par défaut de démarrage stockée au format .img ou .img.tar
diff --git a/app/src/full/res/values-hr/strings.xml b/app/src/full/res/values-hr/strings.xml
index 99b7a8a93..fc435a140 100644
--- a/app/src/full/res/values-hr/strings.xml
+++ b/app/src/full/res/values-hr/strings.xml
@@ -90,7 +90,6 @@
Preuzmi samo zip
Zakrpa datoteke za podizanje sustava
Izravna instalacija (preporuča se)
- Instalirajte na drugo mjesto (nakon OTA-e)
Odaberite metodu
Ciljana verzija Magiska ne podržava zakrpu datoteke za podizanje sustava
Odaberite standardnu datoteku za podizanje sustava u .img ili .img.tar formatu
diff --git a/app/src/full/res/values-in/strings.xml b/app/src/full/res/values-in/strings.xml
index b9570dc9e..fabfa0ba6 100644
--- a/app/src/full/res/values-in/strings.xml
+++ b/app/src/full/res/values-in/strings.xml
@@ -100,7 +100,6 @@
Unduh Zip Saja
Tambal File Boot Image
Pasang Langsung (Direkomendasikan)
- Pasang ke Slot Kedua (Setelah OTA)
Pilih Metode
Versi target Magisk tidak mendukung penambalan file boot image
Pilih stock boot image dump dalam format .img atau .img.tar
diff --git a/app/src/full/res/values-it/strings.xml b/app/src/full/res/values-it/strings.xml
index f42521b7f..750eeb0df 100644
--- a/app/src/full/res/values-it/strings.xml
+++ b/app/src/full/res/values-it/strings.xml
@@ -100,8 +100,7 @@
Scarica solo il file zip
Aggiorna l\'immagine di boot
Installazione diretta (raccomandata)
- Installa nel secondo slot (dopo OTA)
- Seleziona un metodo
+ Seleziona un metodo
La versione Magisk di destinazione non supporta l\'aggiornamento dell\'immagine di boot
Seleziona l\'immagine originale di boot in formato .img o img.tar
Disinstallazione completa
diff --git a/app/src/full/res/values-ja/strings.xml b/app/src/full/res/values-ja/strings.xml
index 90256c041..f34b9dbde 100644
--- a/app/src/full/res/values-ja/strings.xml
+++ b/app/src/full/res/values-ja/strings.xml
@@ -100,7 +100,6 @@
ZIPのみダウンロード
Bootイメージのパッチ
直接インストール (推奨)
- 第2スロットへインストール (OTA後)
方法の選択
指定されたMagiskバージョンはBootイメージのパッチに対応していません
StockのBootイメージ (.img または .img.tar形式) を選択してください
diff --git a/app/src/full/res/values-lt/strings.xml b/app/src/full/res/values-lt/strings.xml
index bd78ab148..7e6a2796e 100644
--- a/app/src/full/res/values-lt/strings.xml
+++ b/app/src/full/res/values-lt/strings.xml
@@ -99,7 +99,6 @@
Atsisiųsti zip failą
Ištaisyti boot failą
Tiesioginis instaliavimas (Rekomenduojamas)
- Instaliuoti į antrą vietą (Po OTA)
Pasirinkite metodą
Pasirinkta Magisk versija nepalaiko pakeitimų boot faile
Pasirinkti boot failą .img ar .img.tar formate
diff --git a/app/src/full/res/values-nl/strings.xml b/app/src/full/res/values-nl/strings.xml
index b184ca3b7..0ac1b63fa 100644
--- a/app/src/full/res/values-nl/strings.xml
+++ b/app/src/full/res/values-nl/strings.xml
@@ -100,7 +100,6 @@
Alleen zip downloaden
Boot image-bestand patchen
Direct installeren (aangeraden)
- Op tweede positie installeren (na OTA)
Methode kiezen
Magisk versie ondersteund geen boot image-bestand patchen
Kies originele boot image-dump in .img- of .img.tar-formaat
diff --git a/app/src/full/res/values-pl/strings.xml b/app/src/full/res/values-pl/strings.xml
index 7d05f3293..c38007379 100644
--- a/app/src/full/res/values-pl/strings.xml
+++ b/app/src/full/res/values-pl/strings.xml
@@ -99,7 +99,6 @@
Pobierz Tylko Zip
Patchowanie Pliku Boot Image
Bezpośrednia instalacja (Zalecane)
- Zainstaluj na Drugim Slocie (Po OTA)
Wybierz Metodę
Wersja docelowa programu Magisk nie obsługuje ładowania pliku boot image
Wybierz stock boot image w formacie .img lub .img.tar
diff --git a/app/src/full/res/values-pt-rBR/strings.xml b/app/src/full/res/values-pt-rBR/strings.xml
index 722b008fa..0e64fcc28 100644
--- a/app/src/full/res/values-pt-rBR/strings.xml
+++ b/app/src/full/res/values-pt-rBR/strings.xml
@@ -100,7 +100,6 @@
Baixar Zip Apenas
Emendar Arquivo de Imagem de Inicialização
Instalação Direta (Recomendado)
- Instalar no Segundo Slot (Após OTA)
Selecionar Método
A versão alvo do Magisk não suporta emendamento de imagem de inicialização
Selecionar depósito de imagem de inicialização de fábrica no formato .img ou .img.tar
diff --git a/app/src/full/res/values-ro/strings.xml b/app/src/full/res/values-ro/strings.xml
index 7d20171c2..bbb7e042e 100644
--- a/app/src/full/res/values-ro/strings.xml
+++ b/app/src/full/res/values-ro/strings.xml
@@ -94,7 +94,6 @@
Doar descărcare fişier Zip
Modificare fişier imagine Boot
Instalare directă (Recomandat)
- Instalare în slotul secund (După OTA)
Selectaţi metoda
Versiunea Magisk nu acceptă modificarea imaginii de Boot
Selectaţi formatul .img sau .img.tar pentru imaginea de Boot stoc
diff --git a/app/src/full/res/values-ru/strings.xml b/app/src/full/res/values-ru/strings.xml
index 312b9fa2b..f30921b15 100644
--- a/app/src/full/res/values-ru/strings.xml
+++ b/app/src/full/res/values-ru/strings.xml
@@ -99,7 +99,6 @@
Загрузка установочного ZIP
Пропатчить образ ядра (boot.img)
Прямая установка (Рекомендуется)
- Установка во Второй Слот (После OTA)
Выбор способа
Целевая версия Magisk не поддерживает патчинг boot-образов
Выберите файл ядра (boot) - *.img или *.img.tar
diff --git a/app/src/full/res/values-sr/strings.xml b/app/src/full/res/values-sr/strings.xml
index c4f61d851..2888f2b51 100644
--- a/app/src/full/res/values-sr/strings.xml
+++ b/app/src/full/res/values-sr/strings.xml
@@ -93,7 +93,6 @@
Преузми само Зип
Закрпи фајл слике покретања
Директна Инсталација (Препоручено)
- Инсталирај у Други Слот (После ОТА)
Изабери Методу
Циљана Магиск верзија не подржава закрпу фајла слике покретања
Изабери испис фабричког фајла слике покретања у .img или img.tar формату
diff --git a/app/src/full/res/values-tr/strings.xml b/app/src/full/res/values-tr/strings.xml
index 55a4d6c00..e8f8735d8 100644
--- a/app/src/full/res/values-tr/strings.xml
+++ b/app/src/full/res/values-tr/strings.xml
@@ -99,7 +99,6 @@
Yalnızca Zip Dosyasını İndir
Önyükleme İmaj Dosyasını Yamala
Doğrudan Yükle (Önerilen)
- İkinci Yuvaya Yükle (OTA\'dan sonra)
Yöntem Seçin
Hedef Magisk sürümü önyükleme imaj dosyasını yamalamayı desteklemiyor
.img veya .img.tar formatında stok önyükleme imajını seçin
diff --git a/app/src/full/res/values-uk/strings.xml b/app/src/full/res/values-uk/strings.xml
index 7bbb01e58..ac5692b9f 100644
--- a/app/src/full/res/values-uk/strings.xml
+++ b/app/src/full/res/values-uk/strings.xml
@@ -99,7 +99,6 @@
Тільки завантажити
Пропатчити boot образ
Пряме встановлення (рекомендовано)
- Встановити в Другий Слот (після OTA)
Виберіть спосіб
Цільова версія Magisk не підтримує пропатчування boot образу
Виберіть оригінальний дамп boot образу в форматі .img чи .img.tar
diff --git a/app/src/full/res/values-zh-rCN/strings.xml b/app/src/full/res/values-zh-rCN/strings.xml
index d9ed1b663..78b0ba3cd 100644
--- a/app/src/full/res/values-zh-rCN/strings.xml
+++ b/app/src/full/res/values-zh-rCN/strings.xml
@@ -99,7 +99,6 @@
仅下载 Zip
修补 Boot 镜像文件
直接安装(推荐)
- 安装到第二分区(安装完OTA后)
选择安装方法
目标安装版本不支持修补 Boot 镜像文件
选择原厂 Boot 镜像备份;支持 .img 以及 .img.tar 格式
diff --git a/app/src/full/res/values-zh-rTW/strings.xml b/app/src/full/res/values-zh-rTW/strings.xml
index 051cf9315..202e3a49c 100644
--- a/app/src/full/res/values-zh-rTW/strings.xml
+++ b/app/src/full/res/values-zh-rTW/strings.xml
@@ -180,7 +180,6 @@
還原完成!
原廠 boot 映像備份不存在!
選擇原廠 boot 映像備份;支援 .img 以及 .img.tar 格式
- 安裝到第二分區 (安裝完OTA後)
SafetyNet API 錯誤
下載非開源程式
Magisk Manager 是一個 100% 開源的程式,因此不會包含 Google 私有所有權的 SafetyNet API 程式碼。\n\n你允許 Magisk Manager 下載一個擴充包 (包含 GoogleApiClient) 以執行 SafetyNet 檢查嗎?
diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml
index 53d387b5e..86c8ae264 100644
--- a/app/src/full/res/values/strings.xml
+++ b/app/src/full/res/values/strings.xml
@@ -99,7 +99,7 @@
Download Zip Only
Patch Boot Image File
Direct Install (Recommended)
- Install to Second Slot (After OTA)
+ Install to Inactive Slot (After OTA)
Select Method
Target Magisk version doesn\'t support boot image file patching
Select stock boot image dump in .img or .img.tar format
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Const.java b/app/src/main/java/com/topjohnwu/magisk/utils/Const.java
index b7ffbb5aa..84260febb 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Const.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Const.java
@@ -155,7 +155,7 @@ public class Const {
public static final String FLASH_ZIP = "flash";
public static final String PATCH_BOOT = "patch";
public static final String FLASH_MAGISK = "magisk";
- public static final String FLASH_SECOND_SLOT = "slot";
+ public static final String FLASH_INACTIVE_SLOT = "slot";
public static final String UNINSTALL = "uninstall";
public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
public static final int ORDER_NAME = 0;