Skip to content

Commit bb0da94

Browse files
bigbiffGerrit Code Review
authored andcommitted
Merge "MD5 verification sanity" into android-7.0
2 parents e9a3ee2 + 5c39507 commit bb0da94

File tree

22 files changed

+74
-56
lines changed

22 files changed

+74
-56
lines changed

gui/theme/common/languages/cz.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@
542542
<string name="unable_resize">Nelze natáhnout {1}.</string>
543543
<string name="no_md5_found">Soubor MD5 se nenašel pro \'{1}\'. Prosím zvolte Vypnout kontrolu MD5 během obnovy.</string>
544544
<string name="md5_fail_match">MD5 neodpovídá souboru \'{1}\'.</string>
545+
<string name="md5_matched">MD5 matched for '{1}'.</string>
545546
<string name="fail_decrypt_tar">Nelze dešifrovat soubor tar \'{1}\'</string>
546547
<string name="format_data_msg">Měli by jste restartovat recovery aby jste mohli znova používat /data.</string>
547548
<string name="format_data_err">Nelze formátovat pro zrušení šifrování.</string>

gui/theme/common/languages/de.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@
572572
<string name="unable_resize">Größe von {1} kann nicht geändert werden.</string>
573573
<string name="no_md5_found">Keine MD5-Datei für '{1}' gefunden. Bitte MD5-Prüfung für Wiederherstellung deaktivieren.</string>
574574
<string name="md5_fail_match">MD5-Prüfung für '{1}' fehlgeschlagen.</string>
575+
<string name="md5_matched">MD5 matched for '{1}'.</string>
575576
<string name="fail_decrypt_tar">TAR-Datei '{1}' konnte nicht entschlüsselt werden.</string>
576577
<string name="format_data_msg">Ein Neustart von TWRP kann notwendig sein, damit /data wieder verwendet werden kann.</string>
577578
<string name="format_data_err">Formatierung zum Entfernen der Verschlüsselung kann nicht durchgeführt werden.</string>

gui/theme/common/languages/el.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@
552552
<string name="unable_resize">Δεν είναι δυνατή η αλλαγή μεγέθους {1}.</string>
553553
<string name="no_md5_found">Δεν βρέθηκε MD5 αρχείο για το '{1}'. Παρακαλώ απεπηλέξτε την επαλήθευση MD5 για επαναφορά.</string>
554554
<string name="md5_fail_match">Το MD5 απέτυχε να ταυτίσει με το '{1}'.</string>
555+
<string name="md5_matched">MD5 matched for '{1}'.</string>
555556
<string name="fail_decrypt_tar">Αποτυχία αποκρυπτογράφησης του αρχείου tar '{1}'</string>
556557
<string name="format_data_msg">Ίσως χρειαστεί να επανεκκινήσετε στο recovery για να ξαναχρησιμοποιήσετε το /data.</string>
557558
<string name="format_data_err">Αδύνατη η διαμόρφωση για να καταργήσετε την κρυπτογράφηση.</string>

gui/theme/common/languages/en.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@
572572
<string name="unable_resize">Unable to resize {1}.</string>
573573
<string name="no_md5_found">No md5 file found for '{1}'. Please unselect Enable MD5 verification to restore.</string>
574574
<string name="md5_fail_match">MD5 failed to match on '{1}'.</string>
575+
<string name="md5_matched">MD5 matched for '{1}'.</string>
575576
<string name="fail_decrypt_tar">Failed to decrypt tar file '{1}'</string>
576577
<string name="format_data_msg">You may need to reboot recovery to be able to use /data again.</string>
577578
<string name="format_data_err">Unable to format to remove encryption.</string>

gui/theme/common/languages/es.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@
555555
<string name="unable_resize">Incapaz de cambiar el tamaño de archivo de {1}.</string>
556556
<string name="no_md5_found">No se encuentra archivo md5 para \'{1}\'. Por favor, deselecciona Activar verificación de MD5 para restaurar.</string>
557557
<string name="md5_fail_match">MD5 no coincide en \'{1}\'.</string>
558+
<string name="md5_matched">MD5 matched for '{1}'.</string>
558559
<string name="fail_decrypt_tar">Fallo al desencriptar el archivo tar '{1}'</string>
559560
<string name="format_data_msg">Quizás necesites reiniciar el recovery para ser capaz de usar /data de nuevo.</string>
560561
<string name="format_data_err">Incapaz de formatear para remover encriptación.</string>

gui/theme/common/languages/fr.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,8 @@
553553
<string name="repair_resize">Réparation de {1} avant de redimensionner.</string>
554554
<string name="unable_resize">Incapable de redimensionner {1}.</string>
555555
<string name="no_md5_found">Pas de fichier md5 trouvé pour '{1}'. Veuillez désactiver la vérification MD5 pour effectuer la restauration.</string>
556-
<string name="md5_fail_match">Le MD5 ne corresponds pas pour '{1}'.</string>
556+
<string name="md5_fail_match">Le MD5 ne correspond pas pour '{1}'.</string>
557+
<string name="md5_matched">Le MD5 correspond pour '{1}'.</string>
557558
<string name="restoring">Restauration en cours</string>
558559
<string name="format_data_msg">Vous aurez peut-être à redémarrer pour pouvoir utiliser /data à nouveau.</string>
559560
<string name="format_data_err">Incapable de formater pour enlever l'encryption.</string>

gui/theme/common/languages/hu.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@
572572
<string name="unable_resize">Nem lehet átméretezni: {1}.</string>
573573
<string name="no_md5_found">Nem található MD5 fájl ehhez: \'{1}\'. Kérjük, a visszaállításhoz szüntesse meg a kijelölést: \"MD5 ellenőrzés engedélyezése\".</string>
574574
<string name="md5_fail_match">MD5 nem egyezik ezzel: \'{1}\'.</string>
575+
<string name="md5_matched">MD5 matched for '{1}'.</string>
575576
<string name="fail_decrypt_tar">Nem sikerült visszafejteni a(z) \'{1}\' tar fájlt</string>
576577
<string name="format_data_msg">Lehet, hogy a recovery-be kell újraindítania ahhoz, hogy képes legyen használni az /adat partíciót.</string>
577578
<string name="format_data_err">Nem sikerült formázni a titkosítás eltávolításához.</string>

gui/theme/common/languages/it.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@
572572
<string name="unable_resize">Impossibile ridimensionare {1}.</string>
573573
<string name="no_md5_found">Nessun MD5 trovato per '{1}'. Deseleziona "Abilita verifica MD5" per procedere con il ripristino.</string>
574574
<string name="md5_fail_match">Il valore MD5 non corrisponde per '{1}'.</string>
575+
<string name="md5_matched">MD5 matched for '{1}'.</string>
575576
<string name="fail_decrypt_tar">Decriptazione fallita per il file Tar '{1}'</string>
576577
<string name="format_data_msg">Potresti dover riavviare la Recovery per accedere nuovamente a Data.</string>
577578
<string name="format_data_err">Impossibile formattare al fine di rimuovere la crittografia.</string>

gui/theme/common/languages/nl.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@
572572
<string name="unable_resize">Kan de grootte van {1} niet wijzigen.</string>
573573
<string name="no_md5_found">Geen md5 bestand gevonden voor \'{1}\'. Gelieve MD5 controle inschakelen uitzetten om te herstellen.</string>
574574
<string name="md5_fail_match">MD5 vergelijken mislukt op \'{1}\'.</string>
575+
<string name="md5_matched">MD5 matched for '{1}'.</string>
575576
<string name="fail_decrypt_tar">Het decoderen van tar bestand \'{1}\' is mislukt</string>
576577
<string name="format_data_msg">U zou in recovery moeten herstarten om /data opnieuw te kunnen gebruiken.</string>
577578
<string name="format_data_err">Kan niet formatteren om encryptie te verwijderen.</string>

gui/theme/common/languages/pl.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@
572572
<string name="unable_resize">Nie można zmienić rozmiaru {1}.</string>
573573
<string name="no_md5_found">Nie znaleziono pliku MD5 '{1}'. Proszę wyłączyć weryfikację MD5, aby przywrócić.</string>
574574
<string name="md5_fail_match">MD5 nie pasuje do '{1}'.</string>
575+
<string name="md5_matched">MD5 matched for '{1}'.</string>
575576
<string name="fail_decrypt_tar">Nie udało się odszyfrować pliku tar '{1}'</string>
576577
<string name="format_data_msg">Może być konieczne ponowne uruchomienie recovery, aby móc ponownie użyć /date.</string>
577578
<string name="format_data_err">Nie można sformatować, aby usunąć szyfrowanie.</string>

0 commit comments

Comments
 (0)