diff --git a/history.md b/history.md
index 240dad439..847001222 100644
--- a/history.md
+++ b/history.md
@@ -5,6 +5,12 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
## Change History
+### V3.8.6
+
+- **Updates** - Improved the update process to prevent overwriting of config files etc.
+- **WifiDialog** - Resized the wifi dialog to fit on 800x480 sized displays.
+- **Hyperpixel4** - Updated Hyperpixel4 drivers and config files for Pi4
+
### V3.8.5.3
- **Backups** - Fix ACL permissions when restoring backups
diff --git a/recovery/config.h b/recovery/config.h
index 8c90e7c5f..eeb518fb5 100644
--- a/recovery/config.h
+++ b/recovery/config.h
@@ -1,8 +1,9 @@
#ifndef CONFIG_H
#define CONFIG_H
+
/* Version number displayed in the title bar */
-#define VERSION_NUMBER "3.8.5.3"
+#define VERSION_NUMBER "3.8.6"
/* Color of the background */
// #define BACKGROUND_COLOR Qt::white
@@ -26,10 +27,12 @@
* Multiple lists can be specified by space separating the URLs */
#define DEFAULT_REPO_SERVER "http://downloads.raspberrypi.org/os_list_v3.json"
+
/* Location of data for self-updating */
#define BUILD_URL "http://downloads.sourceforge.net/project/pinn/BUILD-DATA"
#define UPDATE_URL "http://downloads.sourceforge.net/project/pinn/pinn-lite.zip"
#define README_URL "http://downloads.sourceforge.net/project/pinn/README.md"
+
#define GROUP_URL "http://raw.githubusercontent.com/procount/pinn-os/master/os/overrides.json"
#define BUILD_CURRENT "/mnt/BUILD-DATA"
#define BUILD_NEW "/tmp/BUILD-DATA"
diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
index ec9db6bc1..1c6eb4216 100644
--- a/recovery/mainwindow.cpp
+++ b/recovery/mainwindow.cpp
@@ -4483,9 +4483,9 @@ void MainWindow::downloadUpdateComplete()
if (type=="UPDATE") //upgrade
{
qDebug() << "Time to update PINN!";
- QProcess::execute("mount -o remount,rw /mnt");
- QProcess::execute("unzip /tmp/pinn-lite.zip -o -x recovery.cmdline -d /mnt");
- QProcess::execute("mount -o remount,ro /mnt");
+
+ updatePinn();
+
QProcess::execute(QString("rm ")+BUILD_IGNORE);
QProcess::execute("sync");
@@ -4554,6 +4554,43 @@ void MainWindow::downloadUpdateComplete()
}
}
+void MainWindow::updatePinn()
+{
+ //When PINN is updated, We don't need these files to be extracted
+ QString exclusions = " -x recovery.cmdline -x updatepinn -x exclude.txt";
+
+ QProcess::execute("mount -o remount,rw /mnt");
+
+ //First we'll extract these 2 files to /tmp to automate hte update process
+ QProcess::execute("unzip /tmp/pinn-lite.zip -o exclude.txt updatepinn -d /tmp");
+
+ if (QFile::exists("/tmp/exclude.txt"))
+ {
+ //exclude.txt can avoid extracting addtional files to RECOVERY that we don't want updating
+ QString contents = getFileContents("/tmp/exclude.txt");
+ QStringList fileList = contents.split("\n");
+ foreach (QString file, fileList)
+ {
+ //Add each filename to the list of file extraction exclusios
+ file=file.trimmed();
+ if (file.length()>0)
+ exclusions += " -x "+file;
+ }
+ }
+ //Extract all the files to Recovery, except our excluded set
+ QString cmd = "unzip /tmp/pinn-lite.zip -o" + exclusions + " -d /mnt";
+ QProcess::execute(cmd);
+
+ //In case we need to do some additional upgrade processing
+ if (QFile::exists("/tmp/updatepinn"))
+ {
+ QProcess::execute("chmod +x /tmp/updatepinn");
+ QProcess::execute("/tmp/updatepinn");
+ }
+
+ QProcess::execute("mount -o remount,ro /mnt");
+}
+
void MainWindow::on_newVersion()
{
diff --git a/recovery/mainwindow.h b/recovery/mainwindow.h
index 1dea529b5..6936f2455 100644
--- a/recovery/mainwindow.h
+++ b/recovery/mainwindow.h
@@ -145,6 +145,7 @@ class MainWindow : public QMainWindow
void copyConf(const QString &fconf);
void copyWpa();
void copyDhcp();
+ void updatePinn();
void on_newVersion();
QString menutext(int index);
void fullFAT();
diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
index b7cc028bd..3ad5ddb31 100644
--- a/recovery/translation_ae.ts
+++ b/recovery/translation_ae.ts
@@ -716,9 +716,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ تاكيد
@@ -873,7 +873,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -881,7 +881,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -933,7 +933,7 @@ See debug log for details
-
+
@@ -1040,8 +1040,8 @@ Would you like to make this setting permanent?
-
-
+
+
@@ -1154,49 +1154,49 @@ Do you want to continue?
-
+ PINN تحديث
-
+ يتوفر إصدار جديد من الشبكة PINN
-
+ هل تريد تحميل هذا الإصدار ؟
-
+ تنزيل التحديث
-
+ اضغط هروب لالغاء الامر
-
+
-
+
-
+
-
+
@@ -1207,7 +1207,7 @@ Do you want to continue?
-
+
@@ -3222,17 +3222,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
index 42e6b290a..530463dd5 100644
--- a/recovery/translation_ast.ts
+++ b/recovery/translation_ast.ts
@@ -808,9 +808,9 @@ AVISU: Esto desaniciará tolos datos na to tarxeta SD
-
-
-
+
+
+ Confirmar
@@ -827,7 +827,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -835,7 +835,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -895,7 +895,7 @@ See debug log for details
-
+
@@ -965,8 +965,8 @@ See debug log for details
-
-
+
+
@@ -1079,49 +1079,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1138,7 +1138,7 @@ Do you want to continue?
-
+
@@ -3177,17 +3177,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
index 9394864ac..9631c0ca2 100644
--- a/recovery/translation_ca.ts
+++ b/recovery/translation_ca.ts
@@ -807,9 +807,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ Confirma
@@ -826,7 +826,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -834,7 +834,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -894,7 +894,7 @@ See debug log for details
-
+
@@ -964,8 +964,8 @@ See debug log for details
-
-
+
+
@@ -1078,49 +1078,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1137,7 +1137,7 @@ Do you want to continue?
-
+
@@ -3175,17 +3175,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
index 775b2fd5e..4fda64864 100644
--- a/recovery/translation_de.ts
+++ b/recovery/translation_de.ts
@@ -712,9 +712,9 @@ Achtung: Dies löscht alle Daten auf dieser SD-Karte.
-
-
-
+
+
+ Bestätigen
@@ -750,7 +750,7 @@ Achtung: Dies löscht alle Daten auf dieser SD-Karte.
-
+ ist nicht verfügbar.
@@ -848,7 +848,7 @@ Sicher, dass das Laufwerk initialisiert werden soll?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -856,7 +856,7 @@ Sicher, dass das Laufwerk initialisiert werden soll?
-
+
@@ -912,7 +912,7 @@ Siehe Fehlerprotokoll für weitere Einzelheiten.
-
+ Betriebssysteme sichern
@@ -1020,8 +1020,8 @@ Soll diese Einstellung dauerhaft gespeichert werden?
-
-
+
+ Betriebssystem(e) ersetzen
@@ -1136,50 +1136,50 @@ Soll fortgesetzt werden?
Kein Update verfügbar
-
+ PINN UPDATE
-
+ Eine neue Version von PINN ist verfügbar
-
+ Soll diese Version heruntergeladen werden?
-
+ Update wird heruntergeladen
-
+ Zum Abbrechen die ESC-Taste drücken
-
+ Fehler: Kein Betriebssystem ausgewählt
(Bitte nicht RISC oder PINN auswählen)
-
+ Warnung: Kein Betriebssystem ausgewählt
-
+ Warnung: Damit werden die gewählten Betriebssysteme gesichert (Backup).
-
+ Warnung: Nicht unterstützte(s) Betriebssystem(e) erkannt. PINN kann gegenwärtig folgende Betriebssysteme nicht korrekt sichern (Backup):
@@ -3256,17 +3256,17 @@ Untbr
&Passwort
-
+ Passwort an&zeigen
-
+ Bildschirm&tastatur
-
+ &Löschen
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
index 1e7bbacf6..b7dbc5214 100644
--- a/recovery/translation_en.ts
+++ b/recovery/translation_en.ts
@@ -817,9 +817,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+
@@ -836,7 +836,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -844,7 +844,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -902,7 +902,7 @@ See debug log for details
-
+
@@ -1102,24 +1102,24 @@ Do you want to continue?
-
+
-
+
-
+
-
+
@@ -1130,7 +1130,7 @@ Do you want to continue?
-
+
@@ -1176,8 +1176,8 @@ Booting this drive again will re-instate PINN's partition structure.
-
-
+
+
@@ -1253,27 +1253,27 @@ Booting this drive again will re-instate PINN's partition structure.
-
+
-
+
-
+
-
+
-
+
@@ -3175,17 +3175,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
index fdc1886b0..42e03cc5d 100644
--- a/recovery/translation_es.ts
+++ b/recovery/translation_es.ts
@@ -785,9 +785,9 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD
-
-
-
+
+
+ Confirmar
@@ -831,7 +831,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -839,7 +839,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -847,7 +847,7 @@ Do you want to continue?
-
+
@@ -898,7 +898,7 @@ See debug log for details
-
+
@@ -986,8 +986,8 @@ Booting this drive again will re-instate PINN's partition structure.
-
-
+
+
@@ -1101,49 +1101,49 @@ Do you want to continue?
-
+ ACTUALIZACIÓN PINN
-
+ Una nueva versión de PINN está disponible
-
+ ¿Quiere descargar esta versión?
-
+ Descargando actualización
-
+ Pulsar Esc para cancelar
-
+
-
+
-
+
-
+
@@ -3191,17 +3191,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
index 5529161bb..a90652f93 100644
--- a/recovery/translation_eu.ts
+++ b/recovery/translation_eu.ts
@@ -812,9 +812,9 @@ KONTUZ: Honek zure SD txarteleko datu guztiak ezabatuko ditu
-
-
-
+
+
+ Berretsi
@@ -831,7 +831,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -839,7 +839,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -899,7 +899,7 @@ See debug log for details
-
+
@@ -969,8 +969,8 @@ See debug log for details
-
-
+
+
@@ -1083,49 +1083,49 @@ Do you want to continue?
-
+ PINN EGUNERAKETA
-
+ PINNen bertsio berri bat eskuragarri dago
-
+ Bertsio hau deskargatu nahi duzu?
-
+ Eguneraketa deskargatzen
-
+ Sakatu ESC ezeztatzeko
-
+
-
+
-
+
-
+
@@ -1142,7 +1142,7 @@ Do you want to continue?
-
+
@@ -3184,17 +3184,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
index caab042a1..784a49e6d 100644
--- a/recovery/translation_fi.ts
+++ b/recovery/translation_fi.ts
@@ -716,9 +716,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ Vahvista
@@ -873,7 +873,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -881,7 +881,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -933,7 +933,7 @@ See debug log for details
-
+
@@ -1039,8 +1039,8 @@ Would you like to make this setting permanent?
-
-
+
+
@@ -1153,49 +1153,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1206,7 +1206,7 @@ Do you want to continue?
-
+
@@ -3232,17 +3232,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
index daf0b0cb6..337667dde 100644
--- a/recovery/translation_fr.ts
+++ b/recovery/translation_fr.ts
@@ -717,9 +717,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ Confirmer
@@ -874,7 +874,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -882,7 +882,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -934,7 +934,7 @@ See debug log for details
-
+
@@ -1042,8 +1042,8 @@ Would you like to make this setting permanent?
-
-
+
+
@@ -1156,49 +1156,49 @@ Do you want to continue?
Pas de mise à jour disponible
-
+ MISE à JOUR DE PINN
-
+ Une nouvelle version de PINN est disponible
-
+ Voulez-vous télécharger cette version?
-
+ Téléchargement de la mise à jour
-
+ Appuyez sur Echap pour annuler
-
+
-
+
-
+
-
+
@@ -1209,7 +1209,7 @@ Do you want to continue?
-
+
@@ -3235,17 +3235,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
index 9b0e8a4bd..6b8a5b21b 100644
--- a/recovery/translation_hu.ts
+++ b/recovery/translation_hu.ts
@@ -712,9 +712,9 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot
-
-
-
+
+
+ Megerősítés
@@ -750,7 +750,7 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1012,8 +1012,8 @@ El szeretnéd menteni ezt a beállítást?
-
-
+
+
@@ -1126,49 +1126,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3234,17 +3234,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
index 3718e3c45..1fa1a3042 100644
--- a/recovery/translation_it.ts
+++ b/recovery/translation_it.ts
@@ -703,87 +703,87 @@ Riformattala usando il programma della SD Association e riprova.
W
-
+ Impostazione scheda SD
-
-
+
+ RACCOMANDATO
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Conferma
-
+ Errore montaggio partizione di sistema
-
+ La partizione delle impostazioni permanenti sembra corrotta. Vuoi riformattarla?
-
+ Riformattazione fallita
-
+ La scheda SD potrebbe essere danneggiata
-
+ Attendi l'inizializzazione di PINN
-
+ installa
-
+ reinstalla
-
+ sostituisci
-
+ Unità USB
-
+ Attenzione: questo %1 i sistemi operativi selezionati in %2.
Tutti i dati esistenti in %3 verranno eliminati.
-
+ Il processo '%1' partirà a breve.
-
+ OS(es) Downloaded with errors.
@@ -792,7 +792,7 @@ See debug log for details
Vedi registro debug per i dettagli.
-
+ OS(es) Installed with errors.
@@ -801,89 +801,89 @@ See debug log for details
Vedi registro debug per i dettagli.
-
-
-
-
-
-
+
+
+
+
+
+ Errore
-
+ Modo visualizzazione modificato
-
+ Modo HDMI preferenziale
-
+ Attesa scheda SD (partizione impostazioni)
-
+ Montaggio partizione impostazioni
-
+ Menu principale
-
+ Archivio
-
+ Manutenzione
-
+ ERRORE
-
+ Errore. Alcuni SO non sono disponibili:
-
+ Scheda SD
-
-
+
+ Attenzione: rilevati sistema operativi non compatibili.
I seguenti SO non sono supportati in questa revisione di Raspberry Pi e potrebbero fallire l'avvio o non funzionare correttamente:
-
+ >RUNINSTALLER-Inizializza unità
-
+ Ci sono sistemi operativi esistenti installati.
Vuoi inizializzare veramente l'unità?
-
-
+
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -892,8 +892,8 @@ I seguenti sistemi operativi possono essere eseguiti da USB solo quando è /dev/
-
-
+
+
@@ -902,40 +902,40 @@ Do you want to continue?
Vuoi continuare?
-
+ Reinstalla SO
-
+ Attenzione: nessun S.O. selezionato o disponibile
-
+ Attenzione: questo selezionerà %1 sistemi operativi in %2.
Le partizioni dei sistemi operativi selezionati verranno prima cancellate.
-
+ Attenzione: verranno scaricati i sistemi operativi selezionati.
-
+ Il download inizierà a breve.
-
+ SO scaricati
-
+ OS(es) Backed up with errors.
@@ -944,148 +944,148 @@ See debug log for details
Per i dettagli vedi registro debug.
-
+ Backup SO completato.
-
-
+
+ Backup SO
-
+ OS Installed SuccessfullyInstallazione SO completata
-
+ Installazione completata
-
+ Interrompi
-
+ Scarta
-
+ Riprova
-
+ Mantieni
-
+ Riavvio tra %1 secondi
-
+ Modo HDMI sicuro
-
+ Modo PAL composito
-
+ Modo NTSC composito
-
+ Modo visualizzazione modificato in %1.
Vuoi rendere questa impostazione permanente?
-
+ Azzeramento scheda SD
-
+ Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.Attenzione: questo ripristinerà l'unità PINN al suo stato iniziale.
Tutti i dati esistenti nell'unità, eccetto PINN, verranno sovrascritti incluso qualsiasi sistema operativo installato.
-
+ Unità azzerata!
-
-
+
+ Errore download da internet elenco distribuzione:
-
-
-
-
-
-
+
+
+
+
+
+ Errore download
-
+ Errore analisi repolist.json scaricato dal server
-
+ Errore download file meta:
-
-
-
+
+
+ Sostiuisci SO
-
+ Vuoi riprendere i download parziali?
-
+ Normalmente seleziona NO, a meno che l'ultimo download non è stato completato, in questo caso seleziona SI
-
+ Questo backup richiede
-
+ MB come spazio backup, ma solo
-
+
@@ -1095,165 +1095,165 @@ Se continui, il backup potrebbe non essere completato correttamente.
Vuoi continuare?
-
+ ATTENZIONE: spazio backup
-
+ Info backup
-
+ Prova semrpe i backup prima di usarli
-
+ Per usare PINN senza immagini locali è richiesto l'accesso alla rete.
Seleziona nella finestra successiva la rete Wi-Fi.
-
+ Per usare PINN senza immagini locali è richiesto l'accesso alla rete cablata.
Inserisci un cavo di rete nella porta ethernet.
-
+ Sei sicuro di voler riformattare l'unità '%1' per l'uso con PINN?
Tutti i dati esistenti nell'unità verranno eliminati!
-
+ Questo cancellerà tutto il contenuto del dispositivo '%s'.
Sei sicuro di voler continuare?
-
+ Clona scheda SD
-
+ Sì
-
+ No
-
+ Clonazione completata
-
+ Clonazione completata correttamente
-
+ Errore download file aggiornamento
-
-
+
+ Verifica aggiornamenti PINN
-
+ Errore di connessione al server aggiornamenti
-
+ Il software PINN è aggiornato
-
+ AGGIORNAMENTO PINN
-
+ È disponibile una nuova versione di PINN
-
+ Vuoi scaricare questa versione?
-
+ Download aggiornamento
-
+ Premi ESC per annullare
-
+ Errore: nessun S.O. selezionato
(non scegliere SO RISC o PINN)
-
+ Attenzione: nessun S.O. selezionato
-
+ Attenzione: verrà effettuato il backup dei sistemi operativi selezionati.
-
+ Attenzione: rilevati sistemi operativi non supportati.
PINN attualmente non può efefttuare il backup dei seguenti SO:
-
+ Errore analisi file list.json scaricato dal server
-
-
+
+ non è disponibile.
Copialo localmente o collegati ad internet.
-
+ Download SO completato.
-
+ PINN v%1 - Build: %2 (%3) %4
-
+
@@ -1262,53 +1262,53 @@ Installazione e download non saranno più disponibili fino a che l'unità n
Riavviando l'unità verrà re-installata la struttura di PINN.
-
+ Necessario
-
+ Disponibile
-
+ Errore download file meta
-
-
+
+ Errore scrittura su SD del file scaricato.
La scheda SD o il file system potrebbero essere danneggiati.
-
+ Errore verifica dimensione file
-
+ ha un numero incompatibile di partizioni con
-
+ Vuoi riformattare l'unità?
-
-
-
+
+
+ Nessun accesso alla rete
-
+ Per questa funzione è richiesto l'accesso alla rete cablata.
Inserisci un cavo di rete nella porta ethernet.
@@ -1572,46 +1572,46 @@ Partizione non abbastanza grande per la nuova immagine.
%1: errore smontaggio
-
+ Errore creazione file system
-
-
-
+
+
+ Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zipEstensione file tipo compressione sconosciuta.
Attesi: .lzo, .gz, .xz, .bz2,o .zip.
-
-
-
+
+
+ È stato rilevata una checksum file errata in %1
-
-
-
+
+
+ Errore checksum
-
+ Checksum Ok
-
+ Download completato
-
-
+
+ Errore download o scrittura su SD del SO
@@ -3291,19 +3291,19 @@ Verifica la password
&Password
-
+ Vi&sualizza password
-
+ Tastiera &virtuale
-
+
- &Elimina<
+ &Elimina
diff --git a/recovery/translation_ja.ts b/recovery/translation_ja.ts
index c14a3e1d9..6647329de 100644
--- a/recovery/translation_ja.ts
+++ b/recovery/translation_ja.ts
@@ -712,9 +712,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ 確認
@@ -750,7 +750,7 @@ WARNING: This will erase all data on your SD card
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1012,8 +1012,8 @@ Would you like to make this setting permanent?
-
-
+
+
@@ -1126,49 +1126,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3234,17 +3234,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
index 62fa81bed..9684c5d78 100644
--- a/recovery/translation_ko.ts
+++ b/recovery/translation_ko.ts
@@ -805,9 +805,9 @@ See debug log for details
-
-
-
+
+
+ 확인
@@ -824,7 +824,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -832,7 +832,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -846,7 +846,7 @@ Do you want to continue?
-
+ 은(는) 사용할 수 없습니다.
@@ -939,7 +939,7 @@ See debug log for details
-
+ 백업 대상 OS
@@ -1119,8 +1119,8 @@ Booting this drive again will re-instate PINN's partition structure.
-
-
+
+ OS 교체
@@ -1240,51 +1240,51 @@ Do you want to continue?
새로운 업데이트가 없습니다.
-
+ PINN 업데이트
-
+ 새 버전의 PINN 을 사용할 수 있습니다.
-
+ 이 버전을 다운로드 하시겠습니까?
-
+ 업데이트 다운로드
-
+ 취소하려면 ESC 를 누르십시요.
-
+ 경고: 선택한 OS가 없습니다
(RISC OS 또는 PINN을 선택하지 마십시요)
-
+ 경고: 선택한 OS가 없습니다
-
+ 경고: 이 동작은 선택한 운영체제를 백업합니다.
-
+ 경고: 지원하지 않는 운영체제를 발견하였습니다. PINN은 이 운영체제에 대한 백업을 제대로 생성하지 못할 수 있습니다. 대상 운영체제:
@@ -3190,17 +3190,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
index 31f78760f..31a280027 100644
--- a/recovery/translation_nl.ts
+++ b/recovery/translation_nl.ts
@@ -712,9 +712,9 @@ WAARSCHUWING: Dit verwijdert alle bestaande bestanden op de SD kaart
-
-
-
+
+
+ Bevestigen
@@ -750,7 +750,7 @@ WAARSCHUWING: Dit verwijdert alle bestaande bestanden op de SD kaart
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1012,8 +1012,8 @@ De instelling opslaan?
-
-
+
+
@@ -1126,49 +1126,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3234,17 +3234,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
index 51ef86d2a..9b0d4b0a6 100644
--- a/recovery/translation_no.ts
+++ b/recovery/translation_no.ts
@@ -716,9 +716,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ Bekreft
@@ -873,7 +873,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -881,7 +881,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -933,7 +933,7 @@ See debug log for details
-
+
@@ -1039,8 +1039,8 @@ Would you like to make this setting permanent?
-
-
+
+
@@ -1153,49 +1153,49 @@ Do you want to continue?
-
+ PINN OPPDATERING
-
+ En ny versjon av PINN er tilgjengelig
-
+ Vil du laste ned denne versjonen?
-
+ Laster ned oppdatering
-
+ Trykk ESC for å avbryte
-
+
-
+
-
+
-
+
@@ -1206,7 +1206,7 @@ Do you want to continue?
-
+
@@ -3221,17 +3221,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
index 43d46b14b..fe3b42b48 100644
--- a/recovery/translation_pl.ts
+++ b/recovery/translation_pl.ts
@@ -712,9 +712,9 @@ UWAGA: To usunie wszystkie dane zapisane na karcie SD
-
-
-
+
+
+ Potwierdź
@@ -750,7 +750,7 @@ UWAGA: To usunie wszystkie dane zapisane na karcie SD
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1012,8 +1012,8 @@ Czy chcesz zachować te ustawienia?
-
-
+
+
@@ -1126,49 +1126,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3189,17 +3189,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
index 78b734cbe..763773e59 100644
--- a/recovery/translation_pt.ts
+++ b/recovery/translation_pt.ts
@@ -712,9 +712,9 @@ AVISO: Isto irá apagar todos os dados do seu cartão SD
-
-
-
+
+
+ Confirmar
@@ -750,7 +750,7 @@ AVISO: Isto irá apagar todos os dados do seu cartão SD
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1013,8 +1013,8 @@ Deseja tornar esta configuração permanente?
-
-
+
+
@@ -1127,49 +1127,49 @@ Do you want to continue?
-
+ ATUALIZAÇÃO DO PINN
-
+ Uma nova versão do PINN está disponível
-
+ Deseja baixar esta versão?
-
+ Baixando Atualização
-
+ Pressione ESC para cancelar
-
+
-
+
-
+
-
+
@@ -3235,17 +3235,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
index b453475f3..2bccf198a 100644
--- a/recovery/translation_ru.ts
+++ b/recovery/translation_ru.ts
@@ -712,9 +712,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ Подтвердить
@@ -750,7 +750,7 @@ WARNING: This will erase all data on your SD card
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1012,8 +1012,8 @@ Would you like to make this setting permanent?
-
-
+
+
@@ -1126,49 +1126,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3189,17 +3189,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
index 58831d3a8..52eb51712 100644
--- a/recovery/translation_sv.ts
+++ b/recovery/translation_sv.ts
@@ -808,9 +808,9 @@ VARNING: Detta kommer radera all data på ditt SD-kort
-
-
-
+
+
+ Bekräfta
@@ -827,7 +827,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -835,7 +835,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -895,7 +895,7 @@ See debug log for details
-
+
@@ -965,8 +965,8 @@ See debug log for details
-
-
+
+
@@ -1079,49 +1079,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1138,7 +1138,7 @@ Do you want to continue?
-
+
@@ -3188,17 +3188,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts
index 9cd047d82..38d12cd9a 100644
--- a/recovery/translation_tr.ts
+++ b/recovery/translation_tr.ts
@@ -712,9 +712,9 @@ UYARI: Bu işlem SD kartınızdaki tüm verileri silecektir
-
-
-
+
+
+ Onayla
@@ -750,7 +750,7 @@ UYARI: Bu işlem SD kartınızdaki tüm verileri silecektir
-
+
@@ -845,7 +845,7 @@ Are you sure you want to initialise the drive?
-
+ Warning: Partial USB support. The following OSes can only be installed to USB when it is /dev/sda and may fail to boot or function correctly if that is not the case:
@@ -853,7 +853,7 @@ Are you sure you want to initialise the drive?
-
+
@@ -905,7 +905,7 @@ See debug log for details
-
+
@@ -1005,8 +1005,8 @@ See debug log for details
-
-
+
+
@@ -1119,49 +1119,49 @@ Do you want to continue?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3233,17 +3233,17 @@ Break
-
+
-
+
-
+
diff --git a/recovery/translation_zh_TW.ts b/recovery/translation_zh_TW.ts
index b212f91f6..7524306d9 100644
--- a/recovery/translation_zh_TW.ts
+++ b/recovery/translation_zh_TW.ts
@@ -777,9 +777,9 @@ WARNING: This will erase all data on your SD card
-
-
-
+
+
+ 確認
@@ -828,7 +828,7 @@ WARNING: This will erase all data on your SD card
-
+
@@ -836,7 +836,7 @@ Do you want to continue?
-
+
@@ -889,7 +889,7 @@ See debug log for details
-
+ 備份作業系統
@@ -966,8 +966,8 @@ See debug log for details
-
-
+
+ 取代作業系統
@@ -1082,51 +1082,51 @@ Do you want to continue?
無可用更新
-
+ PINN 更新
-
+ 已有新版的 PINN 可用
-
+ 您想要下載此版本嗎?
-
+ 正在下載更新
-
+ 按 ESC 取消
-
+ 錯誤:沒有已選取的作業系統
(不要選取 RISC OS 或 PINN)
-
+ 警告:沒有選擇作業系統
-
+ 警告:這將會備份選定的作業系統。
-
+ 警告:偵測到不支援的作業系統。PINN 目前無法正確備份下列的作業系統:
@@ -1148,7 +1148,7 @@ Are you sure you want to initialise the drive?
-
+ 不可用。
@@ -3194,17 +3194,17 @@ Break密碼(&P)
-
+ 顯示密碼(&S)
-
+ 虛擬鍵盤(&V)
-
+
diff --git a/recovery/wifisettingsdialog.ui b/recovery/wifisettingsdialog.ui
index 561137c74..28ebb08d5 100644
--- a/recovery/wifisettingsdialog.ui
+++ b/recovery/wifisettingsdialog.ui
@@ -10,7 +10,7 @@
00400
- 480
+ 444
@@ -125,11 +125,22 @@
-
-
- &Show Password
-
-
+
+
+
+
+ &Show Password
+
+
+
+
+
+
+ &Virtual Keyboard
+
+
+
+
@@ -140,13 +151,6 @@
-
-
-
- &Virtual Keyboard
-
-
-
diff --git a/sdcontent/config.dsi b/sdcontent/config.dsi
new file mode 100755
index 000000000..7a3744447
--- /dev/null
+++ b/sdcontent/config.dsi
@@ -0,0 +1,16 @@
+#select dsi
+#(rpf 7" touchsreen)
+
+dtoverlay=pimhyp3:checkonly
+dtoverlay=pimhyp44:checkonly
+
+display_default_lcd=1
+
+gpu_mem=16
+start_file=recovery.elf
+fixup_file=fixup_rc.dat
+
+[pi4]
+start_file=recover4.elf
+fixup_file=fixup4rc.dat
+max_framebuffers=2
diff --git a/sdcontent/config.hdmi b/sdcontent/config.hdmi
new file mode 100755
index 000000000..17bad6f8c
--- /dev/null
+++ b/sdcontent/config.hdmi
@@ -0,0 +1,15 @@
+#select hdmi
+dtoverlay=pimhyp3:checkonly
+dtoverlay=pimhyp44:checkonly
+ignore_lcd=0
+display_default_lcd=0
+#Add any additional config options for HDMI hee
+
+gpu_mem=16
+start_file=recovery.elf
+fixup_file=fixup_rc.dat
+
+[pi4]
+start_file=recover4.elf
+fixup_file=fixup4rc.dat
+max_framebuffers=2
diff --git a/sdcontent/config.hyp3 b/sdcontent/config.hyp3
new file mode 100755
index 000000000..be26e6cc1
--- /dev/null
+++ b/sdcontent/config.hyp3
@@ -0,0 +1,52 @@
+#select hyp3
+dtoverlay=pimhyp44:checkonly
+
+# HyperPixel LCD Settings
+
+#Normal view
+dtoverlay=pimhyp3
+framebuffer_width=800
+framebuffer_height=480
+
+#Rotated 90 degrees
+#dtoverlay=pimhyp3:rotate_1
+#framebuffer_width=480
+#framebuffer_height=800
+#display_lcd_rotate=1
+
+#Rotated 180 degrees
+#dtoverlay=pimhyp3:rotate_2
+#framebuffer_width=800
+#framebuffer_height=480
+#display_lcd_rotate=2
+
+#Rotated 270 degrees
+#dtoverlay=pimhyp3:rotate_3
+#framebuffer_width=480
+#framebuffer_height=800
+#display_lcd_rotate=3
+
+
+disable_overscan=1
+overscan_left=0
+overscan_right=0
+overscan_top=0
+overscan_bottom=0
+enable_dpi_lcd=1
+display_default_lcd=1
+dpi_group=2
+dpi_mode=87
+dpi_output_format=0x6f016
+dpi_timings=800 0 50 20 50 480 1 3 2 3 0 0 0 60 0 32000000 6
+
+# Use a basic GPIO backlight driver with on/off support
+dtoverlay=hyperpixel-gpio-backlight
+
+gpu_mem=16
+start_file=recovery.elf
+fixup_file=fixup_rc.dat
+
+[pi4]
+start_file=recover4.elf
+fixup_file=fixup4rc.dat
+max_framebuffers=2
diff --git a/sdcontent/config.hyp4 b/sdcontent/config.hyp4
new file mode 100755
index 000000000..1e6d04f9e
--- /dev/null
+++ b/sdcontent/config.hyp4
@@ -0,0 +1,52 @@
+#select hyp4
+dtoverlay=pimhyp3:checkonly
+
+# HyperPixel4 LCD Settings
+
+#hormal display
+#dtoverlay=pimhyp44
+#framebuffer_width=480
+#framebuffer_height=800
+
+#rotated 90 degrees
+dtoverlay=pimhyp44:rotate_1
+display_lcd_rotate=1
+framebuffer_width=800
+framebuffer_height=480
+
+#rotated 180 degrees
+#dtoverlay=pimhyp44:rotate_2
+#display_lcd_rotate=2
+#framebuffer_width=480
+#framebuffer_height=800
+
+#rotated 270 degrees
+#dtoverlay=pimhyp44:rotate_3
+#display_lcd_rotate=3
+#framebuffer_width=800
+#framebuffer_height=480
+
+
+disable_overscan=1
+overscan_left=0
+overscan_right=0
+overscan_top=0
+overscan_bottom=0
+enable_dpi_lcd=1
+display_default_lcd=1
+dpi_group=2
+dpi_mode=87
+dpi_output_format=0x7f216
+dpi_timings=480 0 10 16 59 800 0 15 113 15 0 0 0 60 0 32000000 6
+
+# Use a basic GPIO backlight driver with on/off support
+dtoverlay=hyperpixel-gpio-backlight
+
+gpu_mem=16
+start_file=recovery.elf
+fixup_file=fixup_rc.dat
+
+[pi4]
+start_file=recover4.elf
+fixup_file=fixup4rc.dat
+max_framebuffers=2