diff options
author | Ethan Yonker <dees_troy@teamw.in> | 2018-07-20 19:22:33 +0200 |
---|---|---|
committer | Ethan Yonker <dees_troy@teamw.in> | 2018-07-20 20:45:16 +0200 |
commit | fa67cbf18bc43ff8cda34b91acdb43feb1214777 (patch) | |
tree | 651c1743cda4e2787cd08b15fea839b30c42fe46 /gui | |
parent | 3.2.2 (diff) | |
download | android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.tar android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.tar.gz android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.tar.bz2 android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.tar.lz android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.tar.xz android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.tar.zst android_bootable_recovery-fa67cbf18bc43ff8cda34b91acdb43feb1214777.zip |
Diffstat (limited to 'gui')
24 files changed, 24 insertions, 297 deletions
diff --git a/gui/action.cpp b/gui/action.cpp index 3d497ca5c..fb05d77b4 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -1607,8 +1607,7 @@ int GUIAction::installsu(std::string arg __unused) if (simulate) { simulate_progress_bar(); } else { - if (!TWFunc::Install_SuperSU()) - op_status = 1; + LOGERR("Installing SuperSU was deprecated from TWRP.\n"); } operation_end(op_status); diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index f460e6fee..5bbfe9029 100644 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -2737,7 +2737,7 @@ <button style="main_button_half_width"> <placement x="%col2_x_left%" y="%row15a_y%"/> - <text>{@su_cancel=Do not Install}</text> + <text>{@install_cancel=Do not Install}</text> <action function="reboot">%tw_reboot_param%</action> </button> @@ -4726,51 +4726,6 @@ </action> </page> - <page name="installsu"> - <template name="page"/> - - <text style="text_l"> - <placement x="%col1_x_header%" y="%row3_header_y%"/> - <text>{@reboot_hdr=Reboot}</text> - </text> - - <text style="text_m"> - <placement x="%col1_x_header%" y="%row4_header_y%"/> - <text>{@su_hdr=SuperSU Check}</text> - </text> - - <text style="text_m_accent"> - <placement x="%center_x%" y="%row2_y%" placement="5"/> - <text>{@su_note1=Your device does not appear to be rooted.}</text> - </text> - - <text style="text_m"> - <placement x="%center_x%" y="%row4_y%" placement="5"/> - <text>{@su_note2=Install SuperSU now?}</text> - </text> - - <text style="text_m"> - <placement x="%center_x%" y="%row5_y%" placement="5"/> - <text>{@su_note3=This will root your device.}</text> - </text> - - <button style="main_button_half_width"> - <placement x="%col2_x_left%" y="%row15a_y%"/> - <text>{@su_cancel=Do not Install}</text> - <action function="set">tw_page_done=1</action> - </button> - - <slider> - <text>{@swipe_su_to_install=Swipe to Install}</text> - <actions> - <action function="set">tw_action=installsu</action> - <action function="set">tw_action_text1={@su_installing=Installing SuperSU}</action> - <action function="set">tw_action_text2=</action> - <action function="page">singleaction_page</action> - </actions> - </slider> - </page> - <page name="slideout"> <fill color="%background_color%"> <placement x="0" y="%row2_header_y%" w="%screen_width%" h="%slideout_bg_height%"/> diff --git a/gui/theme/common/languages/cz.xml b/gui/theme/common/languages/cz.xml index 479562217..4ba5c2cf9 100644 --- a/gui/theme/common/languages/cz.xml +++ b/gui/theme/common/languages/cz.xml @@ -441,14 +441,7 @@ <string name="sideload_usage">Použití: adb sideload název.zip</string> <string name="sideload_complete">ADB Sideload dokončený</string> <string name="reboot_hdr">Restart</string> - <string name="su_hdr">Kontrola SuperSU</string> - <string name="su_note1">Vaše zařízení se netváří jako rootnuté.</string> - <string name="su_note2">Instalovat SuperSU nyní?</string> - <string name="su_note3">Toto rootne vaše zařízení.</string> - <string name="su_cancel">Neinstalovat</string> - <string name="swipe_su_to_install">Potáhnutím nainstalovat</string> - <string name="swipe_su_install"> Instalovat</string> - <string name="su_installing">Instalace SuperSU</string> + <string name="install_cancel">Neinstalovat</string> <string name="sel_storage_list">Vyberte úložiště</string> <string name="ok_btn">OK</string> <string name="no_kernel_selinux">Kernel nemá podporu pro čtení obsahu SELinux.</string> diff --git a/gui/theme/common/languages/de.xml b/gui/theme/common/languages/de.xml index e629ec37d..6ff801457 100644 --- a/gui/theme/common/languages/de.xml +++ b/gui/theme/common/languages/de.xml @@ -475,14 +475,7 @@ <string name="fixing_contexts">Korrigiere Kontexte...</string> <string name="fix_contexts_complete">Korrektur der Kontexte abgeschlossen</string> <string name="reboot_hdr">Neustart</string> - <string name="su_hdr">SuperSU-Check</string> - <string name="su_note1">Anscheinend besteht kein Root-Zugriff auf das Gerät.</string> - <string name="su_note2">SuperSU jetzt installieren?</string> - <string name="su_note3">Dies wird Root-Zugriff auf dem Gerät einrichten.</string> - <string name="su_cancel">Nicht installieren</string> - <string name="swipe_su_to_install">Installation starten</string> - <string name="swipe_su_install">Installieren</string> - <string name="su_installing">Installiere SuperSU</string> + <string name="install_cancel">Nicht installieren</string> <string name="sel_storage_list">Speicher auswählen</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/el.xml b/gui/theme/common/languages/el.xml index 271b08721..ffb960f5f 100644 --- a/gui/theme/common/languages/el.xml +++ b/gui/theme/common/languages/el.xml @@ -464,14 +464,7 @@ <string name="fixing_contexts">Διόρθωση δικαιωμάτων...</string> <string name="fix_contexts_complete">Η Διόρθωση δικαιωμάτων ολοκληρώθηκε</string> <string name="reboot_hdr">Επανεκκίνηση</string> - <string name="su_hdr">Έλεγχος SuperSU</string> - <string name="su_note1">Η συσκευή σας δεν φαίνεται να έχει root.</string> - <string name="su_note2">Εγκατάσταση SuperSU τώρα;</string> - <string name="su_note3">Αυτό κάνει root στην συσκευή σας.</string> - <string name="su_cancel">Μην εγκαταστήσετε</string> - <string name="swipe_su_to_install">Σύρετε για εγκατάσταση</string> - <string name="swipe_su_install"> Εγκατάσταση</string> - <string name="su_installing">Εγκατάσταση SuperSU</string> + <string name="install_cancel">Μην εγκαταστήσετε</string> <string name="sel_storage_list">Επιλέξτε Αποθ. χώρο</string> <string name="ok_btn">OΚ</string> <string name="no_kernel_selinux">Το Kernel δεν υποστηρίζει την ανάγνωση περιεχομένων SELinux.</string> diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml index 3677bb468..afba59a02 100644 --- a/gui/theme/common/languages/en.xml +++ b/gui/theme/common/languages/en.xml @@ -477,14 +477,7 @@ <string name="fixing_contexts">Fixing Contexts...</string> <string name="fix_contexts_complete">Fix Contexts Complete</string> <string name="reboot_hdr">Reboot</string> - <string name="su_hdr">SuperSU Check</string> - <string name="su_note1">Your device does not appear to be rooted.</string> - <string name="su_note2">Install SuperSU now?</string> - <string name="su_note3">This will root your device.</string> - <string name="su_cancel">Do Not Install</string> - <string name="swipe_su_to_install">Swipe to Install</string> - <string name="swipe_su_install"> Install</string> - <string name="su_installing">Installing SuperSU</string> + <string name="install_cancel">Do Not Install</string> <string name="sel_storage_list">Select Storage</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/es.xml b/gui/theme/common/languages/es.xml index ffb3a8dcd..1f200618e 100644 --- a/gui/theme/common/languages/es.xml +++ b/gui/theme/common/languages/es.xml @@ -453,14 +453,7 @@ <string name="fixing_contexts">Fijando Contextos...</string> <string name="fix_contexts_complete">Fijar Contextos Completado</string> <string name="reboot_hdr">Reiniciar</string> - <string name="su_hdr">Comprobar SuperSU</string> - <string name="su_note1">Parece que tú dispositivo no esta rooteado.</string> - <string name="su_note2">Instalar SuperSU ahora?</string> - <string name="su_note3">Esto rooteara su dispositivo.</string> - <string name="su_cancel">No instalar</string> - <string name="swipe_su_to_install">Desliza para instalar</string> - <string name="swipe_su_install"> Instalar</string> - <string name="su_installing">Instalado SuperSU</string> + <string name="install_cancel">No instalar</string> <string name="sel_storage_list">Seleccionar Almacenamiento</string> <string name="ok_btn">OK</string> <string name="no_kernel_selinux">Kernel no tiene soporte para la lectura de los contextos de SELinux.</string> diff --git a/gui/theme/common/languages/fr.xml b/gui/theme/common/languages/fr.xml index 80e781a62..61516a8db 100644 --- a/gui/theme/common/languages/fr.xml +++ b/gui/theme/common/languages/fr.xml @@ -450,14 +450,7 @@ <string name="fixing_perms">Réparation des permissions...</string> <string name="fix_perms_complete">Réparation des permissions complétée</string> <string name="reboot_hdr">Redémarrer</string> - <string name="su_hdr">Vérification SuperSU</string> - <string name="su_note1">Votre appareil ne semble pas être rooté.</string> - <string name="su_note2">Installer SuperSU maintenant?</string> - <string name="su_note3">Ceci va rooter votre appareil.</string> - <string name="su_cancel">Ne pas installer</string> - <string name="swipe_su_to_install">Glisser pour installer</string> - <string name="swipe_su_install">Installer</string> - <string name="su_installing">Installation de SuperSU</string> + <string name="install_cancel">Ne pas installer</string> <string name="sel_storage_list">Sélection du stockage</string> <string name="ok_btn">OK</string> <string name="no_kernel_selinux">Le noyau ne supporte pas la lecture des contextes SELinux.</string> diff --git a/gui/theme/common/languages/hu.xml b/gui/theme/common/languages/hu.xml index da60bbbd5..6141cdeea 100644 --- a/gui/theme/common/languages/hu.xml +++ b/gui/theme/common/languages/hu.xml @@ -475,14 +475,7 @@ <string name="fixing_contexts">Kontextus javítása...</string> <string name="fix_contexts_complete">Kontextus javítása kész</string> <string name="reboot_hdr">Újraindítás</string> - <string name="su_hdr">SuperSU ellenőrzés</string> - <string name="su_note1">A készüléke nem tűnik rootoltnak.</string> - <string name="su_note2">SuperSU telepítése most?</string> - <string name="su_note3">Ez rootolni fogja a készülékét.</string> - <string name="su_cancel">Ne telepítse</string> - <string name="swipe_su_to_install">Csúsztasson a telepítéshez</string> - <string name="swipe_su_install"> Telepítés</string> - <string name="su_installing">SuperSU telepítése</string> + <string name="install_cancel">Ne telepítse</string> <string name="sel_storage_list">Válasszon tárolót</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/it.xml b/gui/theme/common/languages/it.xml index 71f7636b3..5d21eac7b 100644 --- a/gui/theme/common/languages/it.xml +++ b/gui/theme/common/languages/it.xml @@ -475,14 +475,7 @@ <string name="fixing_contexts">Ripristino dei contesti in corso...</string> <string name="fix_contexts_complete">Ripristino dei contesti completato</string> <string name="reboot_hdr">Riavvio</string> - <string name="su_hdr">Verifica SuperSU</string> - <string name="su_note1">Il tuo dispositivo non sembra disporre di accesso root.</string> - <string name="su_note2">Installare SuperSU ora?</string> - <string name="su_note3">Ciò ti garantirà privilegi di root.</string> - <string name="su_cancel">Non installare</string> - <string name="swipe_su_to_install">Scorri per installare</string> - <string name="swipe_su_install"> Installa</string> - <string name="su_installing">Installazione di SuperSU in corso...</string> + <string name="install_cancel">Non installare</string> <string name="sel_storage_list">Scegli archivio</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml index e716a91a3..f5ec9bb5a 100644 --- a/gui/theme/common/languages/nl.xml +++ b/gui/theme/common/languages/nl.xml @@ -462,14 +462,7 @@ <string name="fixing_contexts">Repareren van Contexts...</string> <string name="fix_contexts_complete">Het repareren van Contexts is gereed</string> <string name="reboot_hdr">Herstart</string> - <string name="su_hdr">SuperSU Controle</string> - <string name="su_note1">Uw apparaat lijkt niet geroot te zijn.</string> - <string name="su_note2">Installeer SuperSU nu?</string> - <string name="su_note3">Dit zal uw apparaat rooten.</string> - <string name="su_cancel">Installeer niet</string> - <string name="swipe_su_to_install">Veeg om te installeren</string> - <string name="swipe_su_install"> Installeren</string> - <string name="su_installing">Installeren van SuperSU</string> + <string name="install_cancel">Installeer niet</string> <string name="sel_storage_list">Selecteer opslag</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/pl.xml b/gui/theme/common/languages/pl.xml index 77a6aa84f..a67de0694 100644 --- a/gui/theme/common/languages/pl.xml +++ b/gui/theme/common/languages/pl.xml @@ -462,14 +462,7 @@ <string name="fixing_contexts">Naprawianie uprawnień...</string> <string name="fix_contexts_complete">Naprawianie uprawnień zakończone</string> <string name="reboot_hdr">Restart</string> - <string name="su_hdr">Sprawdzanie SuperSU</string> - <string name="su_note1">Twoje urządzenie nie jest zrootowane.</string> - <string name="su_note2">Zainstalować SuperSU teraz?</string> - <string name="su_note3">To zrootuje twoje urządzenie.</string> - <string name="su_cancel">Nie instaluj</string> - <string name="swipe_su_to_install">Przesuń, aby zainstalować</string> - <string name="swipe_su_install"> Instaluj</string> - <string name="su_installing">Instalowanie SuperSU</string> + <string name="install_cancel">Nie instaluj</string> <string name="sel_storage_list">Wybierz pamięć</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/pt_BR.xml b/gui/theme/common/languages/pt_BR.xml index fa7fa099f..88deb0c23 100644 --- a/gui/theme/common/languages/pt_BR.xml +++ b/gui/theme/common/languages/pt_BR.xml @@ -441,14 +441,7 @@ <string name="sideload_usage">Uso: adb sideload filename.zip</string> <string name="sideload_complete">ADB Sideload completa</string> <string name="reboot_hdr">Reiniciar</string> - <string name="su_hdr">Seleção de Super Usuário</string> - <string name="su_note1">Seu dispositivo não aparece para ser enraizado.</string> - <string name="su_note2">Instalar Super Usuário agora?</string> - <string name="su_note3">Isto enraizará seu dispositivo.</string> - <string name="su_cancel">Não instale</string> - <string name="swipe_su_to_install">Deslize para instalar</string> - <string name="swipe_su_install"> Instalar</string> - <string name="su_installing">Instalação Super Usuário</string> + <string name="install_cancel">Não instale</string> <string name="sel_storage_list">Selecionar armazenamento</string> <string name="ok_btn">OK</string> <string name="no_kernel_selinux">Kernel não tem suporte para leitura de contextos do SELinux.</string> diff --git a/gui/theme/common/languages/pt_PT.xml b/gui/theme/common/languages/pt_PT.xml index 1244f9b7d..6b5bc6c18 100644 --- a/gui/theme/common/languages/pt_PT.xml +++ b/gui/theme/common/languages/pt_PT.xml @@ -477,14 +477,7 @@ <string name="fixing_contexts">A corrigir contextos...</string> <string name="fix_contexts_complete">Correção de contextos concluída</string> <string name="reboot_hdr">Reiniciar</string> - <string name="su_hdr">Permissão ROOT</string> - <string name="su_note1">O seu dispositivo parece não ter ROOT</string> - <string name="su_note2">Pretende instalar o binário su?</string> - <string name="su_note3">O mesmo permitirá dar ROOT ao dispositivo.</string> - <string name="su_cancel">Não instalar</string> - <string name="swipe_su_to_install"> Deslize para dar ROOT</string> - <string name="swipe_su_install"> Dar ROOT</string> - <string name="su_installing">A instalar SuperSU</string> + <string name="install_cancel">Não instalar</string> <string name="sel_storage_list">Selecionar armazenamento</string> <string name="ok_btn">OK</string> diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml index 76eff8844..ba4d93012 100644 --- a/gui/theme/common/languages/ru.xml +++ b/gui/theme/common/languages/ru.xml @@ -472,14 +472,7 @@ <string name="fixing_contexts">Исправление контекста...</string> <string name="fix_contexts_complete">Исправление контекста завершено</string> <string name="reboot_hdr">Перезагрузка</string> - <string name="su_hdr">Проверика SuperSU</string> - <string name="su_note1">В вашем устройстве отсутствует рут-доступ.</string> - <string name="su_note2">Установить SuperSU сейчас?</string> - <string name="su_note3">Рут-доступ будет активирован.</string> - <string name="su_cancel">Не устанавливать</string> - <string name="swipe_su_to_install">Свайп для установки</string> - <string name="swipe_su_install"> Установка</string> - <string name="su_installing">Установка SuperSU</string> + <string name="install_cancel">Не устанавливать</string> <string name="sel_storage_list">Выберите накопитель</string> <string name="ok_btn">OK</string> <!-- Various console messages - these consist of user displayed messages, oftentimes errors --> diff --git a/gui/theme/common/languages/sk.xml b/gui/theme/common/languages/sk.xml index e216e740b..b8e2fc52c 100644 --- a/gui/theme/common/languages/sk.xml +++ b/gui/theme/common/languages/sk.xml @@ -441,14 +441,7 @@ <string name="sideload_usage">Použitie: adb sideload názov.zip</string> <string name="sideload_complete">ADB Sideload dokončený</string> <string name="reboot_hdr">Reštart</string> - <string name="su_hdr">Kontrola SuperSU</string> - <string name="su_note1">Vaše zariadenie nemá ROOT.</string> - <string name="su_note2">Chcete nainštalovať SuperSU?</string> - <string name="su_note3">Toto povolí ROOT práva na vašom zariadení.</string> - <string name="su_cancel">Neinštalovať</string> - <string name="swipe_su_to_install">Potiahnite pre inštaláciu ROOT</string> - <string name="swipe_su_install"> Inštalovať</string> - <string name="su_installing">Inštalácia SuperSU</string> + <string name="install_cancel">Neinštalovať</string> <string name="sel_storage_list">Vyberte úložisko</string> <string name="ok_btn">OK</string> <string name="no_kernel_selinux">Kernel nemá podporu pre čítanie obsahu SELinux.</string> diff --git a/gui/theme/common/languages/sl.xml b/gui/theme/common/languages/sl.xml index e94dd215e..5b0853e9e 100644 --- a/gui/theme/common/languages/sl.xml +++ b/gui/theme/common/languages/sl.xml @@ -441,14 +441,7 @@ <string name="sideload_usage">Uporaba: adb sideload filename.zip</string> <string name="sideload_complete">Stransko nalaganje ADB končano</string> <string name="reboot_hdr">Pon. zaženi</string> - <string name="su_hdr">Preveri SuperSU</string> - <string name="su_note1">Videti je, da vaša naprava nima skrbniškega dostopa.</string> - <string name="su_note2">Namesti SuperSU zdaj?</string> - <string name="su_note3">To bo omogočilo skrbniški dostop na napravi.</string> - <string name="su_cancel">Ne namesti</string> - <string name="swipe_su_to_install">Povlecite za namestitev</string> - <string name="swipe_su_install"> Namesti</string> - <string name="su_installing">Nameščanje SuperSU-ja</string> + <string name="install_cancel">Ne namesti</string> <string name="sel_storage_list">Izberite pomnilniško napravo</string> <string name="ok_btn">V redu</string> <string name="no_kernel_selinux">Jedro nima podpore za branje vsebin SELinux.</string> diff --git a/gui/theme/common/languages/tr.xml b/gui/theme/common/languages/tr.xml index f585adf04..4c10fdf47 100644 --- a/gui/theme/common/languages/tr.xml +++ b/gui/theme/common/languages/tr.xml @@ -477,14 +477,7 @@ <string name="fixing_contexts">Bağlamlar Düzeltiliyor...</string> <string name="fix_contexts_complete">Bağlamları Düzeltme Tamamlandı</string> <string name="reboot_hdr">Yeniden Başlat</string> - <string name="su_hdr">SuperSU Denetimi</string> - <string name="su_note1">Cihazınız rootlanmamış görünüyor.</string> - <string name="su_note2">SuperSU şimdi yüklensin mi?</string> - <string name="su_note3">Bu işlem cihazınızı rootlayacaktır.</string> - <string name="su_cancel">Yükleme</string> - <string name="swipe_su_to_install">Yüklemek için Kaydır</string> - <string name="swipe_su_install"> Yükle</string> - <string name="su_installing">SuperSU Yükleniyor</string> + <string name="install_cancel">Yükleme</string> <string name="sel_storage_list">Depolama Seç</string> <string name="ok_btn">Tamam</string> diff --git a/gui/theme/common/languages/uk.xml b/gui/theme/common/languages/uk.xml index 2a0112e4f..a3ea7ddd8 100644 --- a/gui/theme/common/languages/uk.xml +++ b/gui/theme/common/languages/uk.xml @@ -456,14 +456,7 @@ <string name="fixing_contexts">Виправлення контексту...</string> <string name="fix_contexts_complete">Виправлення контексту завершено</string> <string name="reboot_hdr">Перезавантаження</string> - <string name="su_hdr">Перевірити SuperSU</string> - <string name="su_note1">Пристрій не має рут.</string> - <string name="su_note2">Встановити SuperSU зараз?</string> - <string name="su_note3">Пристрій буде рутовано.</string> - <string name="su_cancel">Не встановлювати</string> - <string name="swipe_su_to_install">Встановити</string> - <string name="swipe_su_install"> Встановлення</string> - <string name="su_installing">Встановлення SuperSU</string> + <string name="install_cancel">Не встановлювати</string> <string name="sel_storage_list">Вибір сховища</string> <!-- Various console messages - these consist of user displayed messages, oftentimes errors --> diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index 0d1d6d8a2..11769227f 100644 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -2932,7 +2932,7 @@ <button style="main_button_half_height"> <placement x="%indent%" y="%row16_y%"/> - <text>{@su_cancel=Do not Install}</text> + <text>{@install_cancel=Do not Install}</text> <action function="reboot">%tw_reboot_param%</action> </button> @@ -4708,51 +4708,6 @@ </action> </page> - <page name="installsu"> - <template name="page"/> - - <text style="text_l"> - <placement x="%col1_x_header%" y="%row3_header_y%"/> - <text>{@reboot_hdr=Reboot}</text> - </text> - - <text style="text_m"> - <placement x="%col1_x_header%" y="%row4_header_y%"/> - <text>{@su_hdr=SuperSU Check}</text> - </text> - - <text style="text_m_accent"> - <placement x="%center_x%" y="%row2_y%" placement="5"/> - <text>{@su_note1=Your device does not appear to be rooted.}</text> - </text> - - <text style="text_m"> - <placement x="%center_x%" y="%row4_y%" placement="5"/> - <text>{@su_note2=Install SuperSU now?}</text> - </text> - - <text style="text_m"> - <placement x="%center_x%" y="%row5_y%" placement="5"/> - <text>{@su_note3=This will root your device.}</text> - </text> - - <button style="main_button_half_height"> - <placement x="%indent%" y="%row18a_y%"/> - <text>{@su_cancel=Do not Install}</text> - <action function="set">tw_page_done=1</action> - </button> - - <slider> - <text>{@swipe_su_to_install=Swipe to Install}</text> - <actions> - <action function="set">tw_action=installsu</action> - <action function="set">tw_action_text1={@su_installing=Installing SuperSU}</action> - <action function="set">tw_action_text2=</action> - <action function="page">singleaction_page</action> - </actions> - </slider> - </page> - <page name="slideout"> <fill color="%background_color%"> <placement x="0" y="%row2_header_y%" w="%screen_width%" h="%slideout_bg_height%"/> diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml index 152818e72..019045ac5 100644 --- a/gui/theme/common/watch.xml +++ b/gui/theme/common/watch.xml @@ -3389,7 +3389,7 @@ <button style="main_button_half_height"> <placement x="%indent%" y="%row7_y%"/> - <text>{@su_cancel=Do not Install}</text> + <text>{@install_cancel=Do not Install}</text> <action function="reboot">%tw_reboot_param%</action> </button> @@ -5403,48 +5403,6 @@ </action> </page> - <page name="installsu"> - <template name="page"/> - - <template name="statusbar"/> - - <text style="text_m"> - <placement x="%col1_x_left%" y="%row1_header_y%"/> - <text>{@reboot_hdr=Reboot} > {@su_hdr=SuperSU Check}</text> - </text> - - <text style="text_m_accent"> - <placement x="%center_x%" y="%row2_y%" placement="5"/> - <text>{@su_note1=Your device does not appear to be rooted.}</text> - </text> - - <text style="text_m"> - <placement x="%center_x%" y="%row4_y%" placement="5"/> - <text>{@su_note2=Install SuperSU now?}</text> - </text> - - <text style="text_m"> - <placement x="%center_x%" y="%row5_y%" placement="5"/> - <text>{@su_note3=This will root your device.}</text> - </text> - - <button style="main_button_full_width"> - <placement x="%indent%" y="%row6_y%"/> - <text>{@su_cancel=Do not Install}</text> - <action function="set">tw_page_done=1</action> - </button> - - <slider> - <text>{@swipe_su_install= Install}</text> - <actions> - <action function="set">tw_action=installsu</action> - <action function="set">tw_action_text1={@su_installing=Installing SuperSU}</action> - <action function="set">tw_action_text2=</action> - <action function="page">singleaction_page</action> - </actions> - </slider> - </page> - <page name="slideout"> <fill color="%background_color%"> <placement x="0" y="%row2_header_y%" w="%screen_width%" h="%slideout_bg_height%"/> diff --git a/gui/theme/extra-languages/languages/ja.xml b/gui/theme/extra-languages/languages/ja.xml index 58fe3aa1d..37d3e7c7d 100644 --- a/gui/theme/extra-languages/languages/ja.xml +++ b/gui/theme/extra-languages/languages/ja.xml @@ -457,14 +457,7 @@ <string name="fixing_contexts">コンテキストの修正中...</string> <string name="fix_contexts_complete">コンテキストを修正しました</string> <string name="reboot_hdr">再起動</string> - <string name="su_hdr">SuperSU チェック</string> - <string name="su_note1">機器がroot化されていないようです。</string> - <string name="su_note2">SuperSU をインストールしますか?</string> - <string name="su_note3">機器をroot化します。</string> - <string name="su_cancel">インストールしない</string> - <string name="swipe_su_to_install">スワイプでインストール</string> - <string name="swipe_su_install"> インストール</string> - <string name="su_installing">SuperSU のインストール中</string> + <string name="install_cancel">インストールしない</string> <string name="sel_storage_list">ストレージの選択</string> <string name="ok_btn">OK</string> <!-- Various console messages - these consist of user displayed messages, oftentimes errors --> diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml index 33de9163a..5c214a569 100644 --- a/gui/theme/extra-languages/languages/zh_CN.xml +++ b/gui/theme/extra-languages/languages/zh_CN.xml @@ -476,14 +476,7 @@ <string name="fixing_contexts">正在修复 Context…</string> <string name="fix_contexts_complete">修复 Context 完成</string> <string name="reboot_hdr">重启选项</string> - <string name="su_hdr">SuperSU 检测</string> - <string name="su_note1">系统目前没有 Root。</string> - <string name="su_note2">是否现在安装 SuperSU?</string> - <string name="su_note3">这将会 Root 您的设备。</string> - <string name="su_cancel">不,以后再说</string> - <string name="swipe_su_to_install">滑动按钮确认安装</string> - <string name="swipe_su_install"> 安装</string> - <string name="su_installing">正在安装 SuperSU</string> + <string name="install_cancel">不,以后再说</string> <string name="sel_storage_list">选择存储位置</string> <string name="ok_btn">确定</string> diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml index 2bb490297..75c717ac4 100644 --- a/gui/theme/extra-languages/languages/zh_TW.xml +++ b/gui/theme/extra-languages/languages/zh_TW.xml @@ -476,14 +476,7 @@ <string name="fixing_contexts">正在修復 Context…</string> <string name="fix_contexts_complete">修復 Context 完成</string> <string name="reboot_hdr">重啟選項</string> - <string name="su_hdr">SuperSU 檢測</string> - <string name="su_note1">系統目前沒有 Root。</string> - <string name="su_note2">是否現在安裝 SuperSU?</string> - <string name="su_note3">這將會 Root 您的設備。</string> - <string name="su_cancel">不,以後再說</string> - <string name="swipe_su_to_install">滑動按鈕確認安裝</string> - <string name="swipe_su_install"> 安裝</string> - <string name="su_installing">正在安裝 SuperSU</string> + <string name="install_cancel">不,以後再說</string> <string name="sel_storage_list">選擇存儲位置</string> <string name="ok_btn">確定</string> |