MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'john/master' into development

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-05-09 18:23:05 +02:00
commit 4f9e8d2e8a
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/values-es/strings.xml
View File

@ -99,14 +99,16 @@
<string name="dtbo_patched_title">DTBO fue parchado!</string> <string name="dtbo_patched_title">DTBO fue parchado!</string>
<string name="dtbo_patched_reboot">Magisk Manager ha parcheado dtbo.img, por favor reinicia</string> <string name="dtbo_patched_reboot">Magisk Manager ha parcheado dtbo.img, por favor reinicia</string>
<string name="flashing">Flasheando</string> <string name="flashing">Flasheando…</string>
<string name="done">¡Hecho!</string>
<string name="failure">Ha fallado</string>
<string name="hide_manager_title">Ocultando Magisk Manager…</string> <string name="hide_manager_title">Ocultando Magisk Manager…</string>
<string name="hide_manager_fail_toast">La Ocultación de Magisk Manager ha fallado…</string> <string name="hide_manager_fail_toast">La Ocultación de Magisk Manager ha fallado…</string>
<string name="open_link_failed_toast">No se encontró ninguna aplicación para abrir el enlace…</string> <string name="open_link_failed_toast">No se encontró ninguna aplicación para abrir el enlace…</string>
<string name="warning">Advertencia</string> <string name="warning">Advertencia</string>
<string name="complete_uninstall">Desinstalación completa</string> <string name="complete_uninstall">Desinstalación completa</string>
<string name="restore_img">Restaurar imágenes</string> <string name="restore_img">Restaurar imágenes</string>
<string name="restore_img_msg">Restaurando …</string> <string name="restore_img_msg">Restaurando …</string>
<string name="restore_done">¡Restauración Terminada!</string> <string name="restore_done">¡Restauración Terminada!</string>
<string name="restore_fail">¡El respaldo de la imagen boot Stock no existe!</string> <string name="restore_fail">¡El respaldo de la imagen boot Stock no existe!</string>
<string name="proprietary_title">Descargar Código Propietario</string> <string name="proprietary_title">Descargar Código Propietario</string>

6
app/src/main/res/values-it/strings.xml
View File

@ -16,7 +16,7 @@
<string name="invalid_update_channel">Canale di aggiornamento non valido</string> <string name="invalid_update_channel">Canale di aggiornamento non valido</string>
<string name="safetyNet_check_text">Tocca per controllare SafetyNet</string> <string name="safetyNet_check_text">Tocca per controllare SafetyNet</string>
<string name="checking_safetyNet_status">Controllo stato SafetyNet…</string> <string name="checking_safetyNet_status">Controllo stato SafetyNet…</string>
<string name="safetyNet_check_success">Controllo SafetyNet OK</string> <string name="safetyNet_check_success">Controllo SafetyNet Superato</string>
<string name="safetyNet_api_error">Errore API SafetyNet</string> <string name="safetyNet_api_error">Errore API SafetyNet</string>
<string name="safetyNet_res_invalid">La risposta non è valida.</string> <string name="safetyNet_res_invalid">La risposta non è valida.</string>
<string name="magisk_up_to_date">Magisk è aggiornato</string> <string name="magisk_up_to_date">Magisk è aggiornato</string>
@ -28,9 +28,9 @@
<string name="latest_version">Ultima: %1$s</string> <string name="latest_version">Ultima: %1$s</string>
<string name="uninstall">Disinstalla</string> <string name="uninstall">Disinstalla</string>
<string name="uninstall_magisk_title">Disinstalla Magisk</string> <string name="uninstall_magisk_title">Disinstalla Magisk</string>
<string name="uninstall_magisk_msg">Tutti i moduli verranno disabilitati/rimossi. Il root verrà rimosso e i tuoi dati potrebbero venire criptati, nel caso non lo siano già.</string> <string name="uninstall_magisk_msg">Tutti i moduli verranno disabilitati/rimossi. Il root verrà rimosso e i tuoi dati potrebbero essere criptati, nel caso non lo siano già.</string>
<string name="update">Aggiorna</string> <string name="update">Aggiorna</string>
<string name="core_only_enabled">(Modalità solo Core abilitata)</string> <string name="core_only_enabled">(Modalità solo-core abilitata)</string>
<!--Module Fragment--> <!--Module Fragment-->
<string name="no_info_provided">(Nessuna informazione)</string> <string name="no_info_provided">(Nessuna informazione)</string>

2
native/jni/core/init.cpp
View File

@ -268,7 +268,7 @@ void MagiskInit::load_kernel_info() {
} else if (key == "enter_recovery") { } else if (key == "enter_recovery") {
enter_recovery = value[0] == '1'; enter_recovery = value[0] == '1';
} else if (key == "androidboot.hardware") { } else if (key == "androidboot.hardware") {
kirin = strstr(value, "kirin") || strstr(value, "hi3660"); kirin = strstr(value, "kirin") || strstr(value, "hi3660") || strstr(value, "hi6250");
} }
}); });