Apply advanced settings prompt: offer "no" without clear options

By request.
When prompted if previous settings should be applied, offer a
"no" button that only applies this time, and does not clear
settings.
This commit is contained in:
Floris Bos 2023-03-24 14:26:43 +01:00
parent 0378751295
commit b93fe29617
16 changed files with 1153 additions and 1188 deletions

View file

@ -33,162 +33,160 @@
<context>
<name>DownloadThread</name>
<message>
<location filename="../downloadthread.cpp" line="147"/>
<location filename="../downloadthread.cpp" line="166"/>
<source>Error running diskpart: %1</source>
<translation>Erreur lors de l&apos;exécution de diskpart : %1</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="168"/>
<location filename="../downloadthread.cpp" line="187"/>
<source>Error removing existing partitions</source>
<translation>Erreur lors de la suppression des partitions existantes</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="194"/>
<location filename="../downloadthread.cpp" line="213"/>
<source>Authentication cancelled</source>
<translation>Authentification annulée</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="197"/>
<location filename="../downloadthread.cpp" line="216"/>
<source>Error running authopen to gain access to disk device &apos;%1&apos;</source>
<translation>Erreur lors de l&apos;exécution d&apos;authopen pour accéder au périphérique du stockage &apos;%1&apos;</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="198"/>
<location filename="../downloadthread.cpp" line="217"/>
<source>Please verify if &apos;Raspberry Pi Imager&apos; is allowed access to &apos;removable volumes&apos; in privacy settings (under &apos;files and folders&apos; or alternatively give it &apos;full disk access&apos;).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="220"/>
<location filename="../downloadthread.cpp" line="239"/>
<source>Cannot open storage device &apos;%1&apos;.</source>
<translation>Impossible d&apos;ouvrir le périphérique de stockage &apos;%1&apos;.</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="262"/>
<location filename="../downloadthread.cpp" line="281"/>
<source>discarding existing data on drive</source>
<translation>suppression des données existantes sur le disque</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="282"/>
<location filename="../downloadthread.cpp" line="301"/>
<source>zeroing out first and last MB of drive</source>
<translation>mise à zéro du premier et du dernier Mo du disque</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="288"/>
<location filename="../downloadthread.cpp" line="307"/>
<source>Write error while zero&apos;ing out MBR</source>
<translation>Erreur d&apos;écriture lors du formatage du MBR</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="779"/>
<location filename="../downloadthread.cpp" line="813"/>
<source>Error reading from storage.&lt;br&gt;SD card may be broken.</source>
<translation>Erreur de lecture du stockage.&lt;br&gt;La carte SD est peut-être défectueuse.</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="855"/>
<source>Waiting for FAT partition to be mounted</source>
<translation>En attente du montage de la partition FAT</translation>
<translation type="vanished">En attente du montage de la partition FAT</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="941"/>
<source>Error mounting FAT32 partition</source>
<translation>Erreur lors du montage de la partition FAT32</translation>
<translation type="vanished">Erreur lors du montage de la partition FAT32</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="963"/>
<source>Operating system did not mount FAT32 partition</source>
<translation>Le système d&apos;exploitation n&apos;a pas monté la partition FAT32</translation>
<translation type="vanished">Le système d&apos;exploitation n&apos;a pas monté la partition FAT32</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="996"/>
<source>Unable to customize. File &apos;%1&apos; does not exist.</source>
<translation>Impossible de personnaliser. Le fichier &apos;%1&apos; n&apos;existe pas.</translation>
<translation type="vanished">Impossible de personnaliser. Le fichier &apos;%1&apos; n&apos;existe pas.</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1000"/>
<location filename="../downloadthread.cpp" line="885"/>
<source>Customizing image</source>
<translation>Personnalisation de l&apos;image</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1085"/>
<source>Error creating firstrun.sh on FAT partition</source>
<translation>Erreur lors de la création de firstrun.sh sur la partition FAT</translation>
<translation type="vanished">Erreur lors de la création de firstrun.sh sur la partition FAT</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1037"/>
<source>Error writing to config.txt on FAT partition</source>
<translation>Erreur lors de la création de config.txt sur la partition FAT</translation>
<translation type="vanished">Erreur lors de la création de config.txt sur la partition FAT</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1102"/>
<source>Error creating user-data cloudinit file on FAT partition</source>
<translation>Erreur lors de la création du fichier user-data cloudinit sur la partition FAT</translation>
<translation type="vanished">Erreur lors de la création du fichier user-data cloudinit sur la partition FAT</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1116"/>
<source>Error creating network-config cloudinit file on FAT partition</source>
<translation>Erreur lors de la création du fichier network-config cloudinit sur la partition FAT</translation>
<translation type="vanished">Erreur lors de la création du fichier network-config cloudinit sur la partition FAT</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1139"/>
<source>Error writing to cmdline.txt on FAT partition</source>
<translation>Erreur lors de l&apos;écriture de cmdline.txt sur la partition FAT</translation>
<translation type="vanished">Erreur lors de l&apos;écriture de cmdline.txt sur la partition FAT</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="432"/>
<location filename="../downloadthread.cpp" line="451"/>
<source>Access denied error while writing file to disk.</source>
<translation>Accès refusé lors de l&apos;écriture d&apos;un fichier sur le disque.</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="437"/>
<location filename="../downloadthread.cpp" line="456"/>
<source>Controlled Folder Access seems to be enabled. Please add both rpi-imager.exe and fat32format.exe to the list of allowed apps and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="444"/>
<location filename="../downloadthread.cpp" line="463"/>
<source>Error writing file to disk</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="463"/>
<location filename="../downloadthread.cpp" line="482"/>
<source>Error downloading: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="686"/>
<location filename="../downloadthread.cpp" line="705"/>
<location filename="../downloadthread.cpp" line="757"/>
<source>Error writing to storage (while flushing)</source>
<translation>Erreur d&apos;écriture dans le stockage (lors du formatage)</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="693"/>
<location filename="../downloadthread.cpp" line="712"/>
<location filename="../downloadthread.cpp" line="764"/>
<source>Error writing to storage (while fsync)</source>
<translation>Erreur d&apos;écriture dans le stockage (pendant l&apos;exécution de fsync)</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="674"/>
<location filename="../downloadthread.cpp" line="693"/>
<source>Download corrupt. Hash does not match</source>
<translation>Téléchargement corrompu. La signature ne correspond pas</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="114"/>
<location filename="../downloadthread.cpp" line="118"/>
<source>unmounting drive</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="138"/>
<source>opening drive</source>
<translation>ouverture du disque</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="300"/>
<location filename="../downloadthread.cpp" line="319"/>
<source>Write error while trying to zero out last part of card.&lt;br&gt;Card could be advertising wrong capacity (possible counterfeit).</source>
<translation>Erreur d&apos;écriture lors de la tentative de formatage de la dernière partie de la carte.&lt;br&gt;La carte annonce peut-être une capacité erronée (contrefaçon possible).</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="389"/>
<location filename="../downloadthread.cpp" line="408"/>
<source>starting download</source>
<translation>début du téléchargement</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="719"/>
<location filename="../downloadthread.cpp" line="747"/>
<source>Error writing first block (partition table)</source>
<translation>Erreur lors de l&apos;écriture du premier bloc (table de partition)</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="798"/>
<location filename="../downloadthread.cpp" line="832"/>
<source>Verifying write failed. Contents of SD card is different from what was written to it.</source>
<translation>La vérification de l&apos;écriture à échoué. Le contenu de la carte SD est différent de ce qui y a é écrit.</translation>
</message>
@ -256,27 +254,27 @@
<context>
<name>ImageWriter</name>
<message>
<location filename="../imagewriter.cpp" line="257"/>
<location filename="../imagewriter.cpp" line="248"/>
<source>Storage capacity is not large enough.&lt;br&gt;Needs to be at least %1 GB.</source>
<translation>La capacité de stockage n&apos;est pas assez grande.&lt;br&gt;Elle doit être d&apos;au moins %1 Go.</translation>
</message>
<message>
<location filename="../imagewriter.cpp" line="263"/>
<location filename="../imagewriter.cpp" line="254"/>
<source>Input file is not a valid disk image.&lt;br&gt;File size %1 bytes is not a multiple of 512 bytes.</source>
<translation>Le fichier source n&apos;est pas une image disque valide.&lt;br&gt;La taille du fichier (d&apos;%1 octets) n&apos;est pas un multiple de 512 octets.</translation>
</message>
<message>
<location filename="../imagewriter.cpp" line="445"/>
<location filename="../imagewriter.cpp" line="442"/>
<source>Downloading and writing image</source>
<translation>Téléchargement et écriture de l&apos;image</translation>
</message>
<message>
<location filename="../imagewriter.cpp" line="578"/>
<location filename="../imagewriter.cpp" line="575"/>
<source>Select image</source>
<translation>Sélectionner l&apos;image</translation>
</message>
<message>
<location filename="../imagewriter.cpp" line="979"/>
<location filename="../imagewriter.cpp" line="864"/>
<source>Would you like to prefill the wifi password from the system keychain?</source>
<translation>Voulez-vous pré-remplir le mot de passe Wi-Fi à partir du trousseau du système ?</translation>
</message>
@ -320,128 +318,128 @@
<context>
<name>OptionsPopup</name>
<message>
<location filename="../OptionsPopup.qml" line="79"/>
<location filename="../OptionsPopup.qml" line="80"/>
<source>Advanced options</source>
<translation>Réglages avancés</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="96"/>
<location filename="../OptionsPopup.qml" line="97"/>
<source>Image customization options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="104"/>
<location filename="../OptionsPopup.qml" line="105"/>
<source>for this session only</source>
<translation>pour cette session uniquement</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="105"/>
<location filename="../OptionsPopup.qml" line="106"/>
<source>to always use</source>
<translation>pour toutes les sessions</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="119"/>
<location filename="../OptionsPopup.qml" line="120"/>
<source>Set hostname:</source>
<translation>Nom d&apos;hôte</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="138"/>
<location filename="../OptionsPopup.qml" line="140"/>
<source>Enable SSH</source>
<translation>Activer SSH</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="160"/>
<location filename="../OptionsPopup.qml" line="162"/>
<source>Use password authentication</source>
<translation>Utiliser un mot de passe pour l&apos;authentification</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="170"/>
<location filename="../OptionsPopup.qml" line="172"/>
<source>Allow public-key authentication only</source>
<translation>Authentification via clef publique</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="188"/>
<location filename="../OptionsPopup.qml" line="190"/>
<source>Set authorized_keys for &apos;%1&apos;:</source>
<translation>Définir authorized_keys pour &apos;%1&apos; :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="261"/>
<location filename="../OptionsPopup.qml" line="264"/>
<source>Configure wireless LAN</source>
<translation>Configurer le Wi-Fi</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="280"/>
<location filename="../OptionsPopup.qml" line="283"/>
<source>SSID:</source>
<translation>SSID :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="234"/>
<location filename="../OptionsPopup.qml" line="300"/>
<location filename="../OptionsPopup.qml" line="237"/>
<location filename="../OptionsPopup.qml" line="303"/>
<source>Password:</source>
<translation>Mot de passe :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="200"/>
<location filename="../OptionsPopup.qml" line="203"/>
<source>Set username and password</source>
<translation>Définir nom d&apos;utilisateur et mot de passe</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="219"/>
<location filename="../OptionsPopup.qml" line="222"/>
<source>Username:</source>
<translation>Nom d&apos;utilisateur :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="295"/>
<location filename="../OptionsPopup.qml" line="298"/>
<source>Hidden SSID</source>
<translation>SSID caché</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="316"/>
<location filename="../OptionsPopup.qml" line="319"/>
<source>Show password</source>
<translation>Afficher le mot de passe</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="321"/>
<location filename="../OptionsPopup.qml" line="324"/>
<source>Wireless LAN country:</source>
<translation>Pays Wi-Fi :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="332"/>
<location filename="../OptionsPopup.qml" line="335"/>
<source>Set locale settings</source>
<translation>Définir les réglages locaux</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="342"/>
<location filename="../OptionsPopup.qml" line="345"/>
<source>Time zone:</source>
<translation>Fuseau horaire :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="352"/>
<location filename="../OptionsPopup.qml" line="355"/>
<source>Keyboard layout:</source>
<translation>Type de clavier :</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="365"/>
<location filename="../OptionsPopup.qml" line="368"/>
<source>Persistent settings</source>
<translation>Réglages permanents</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="373"/>
<location filename="../OptionsPopup.qml" line="376"/>
<source>Play sound when finished</source>
<translation>Jouer un son quand terminé</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="377"/>
<location filename="../OptionsPopup.qml" line="380"/>
<source>Eject media when finished</source>
<translation>Éjecter le média quand terminé</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="381"/>
<location filename="../OptionsPopup.qml" line="384"/>
<source>Enable telemetry</source>
<translation>Activer la télémétrie</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="394"/>
<location filename="../OptionsPopup.qml" line="397"/>
<source>SAVE</source>
<translation>ENREGISTRER</translation>
</message>
@ -457,27 +455,32 @@
<context>
<name>UseSavedSettingsPopup</name>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="72"/>
<location filename="../UseSavedSettingsPopup.qml" line="73"/>
<source>Warning: advanced settings set</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="86"/>
<location filename="../UseSavedSettingsPopup.qml" line="87"/>
<source>Would you like to apply the image customization settings saved earlier?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="95"/>
<location filename="../UseSavedSettingsPopup.qml" line="96"/>
<source>NO</source>
<translation>NON</translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="106"/>
<source>NO, CLEAR SETTINGS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="105"/>
<location filename="../UseSavedSettingsPopup.qml" line="116"/>
<source>YES</source>
<translation>OUI</translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="115"/>
<location filename="../UseSavedSettingsPopup.qml" line="126"/>
<source>EDIT SETTINGS</source>
<translation type="unfinished">MODIFIER RÉGLAGES</translation>
</message>
@ -513,7 +516,7 @@
</message>
<message>
<location filename="../main.qml" line="147"/>
<location filename="../main.qml" line="1038"/>
<location filename="../main.qml" line="1041"/>
<source>CHOOSE STORAGE</source>
<translation>CHOISIR LE STOCKAGE</translation>
</message>
@ -538,7 +541,7 @@
</message>
<message>
<location filename="../main.qml" line="221"/>
<location filename="../main.qml" line="965"/>
<location filename="../main.qml" line="968"/>
<source>Cancelling...</source>
<translation>Annulation...</translation>
</message>
@ -549,14 +552,14 @@
</message>
<message>
<location filename="../main.qml" line="232"/>
<location filename="../main.qml" line="988"/>
<location filename="../main.qml" line="1057"/>
<location filename="../main.qml" line="991"/>
<location filename="../main.qml" line="1060"/>
<source>Finalizing...</source>
<translation>Finalisation...</translation>
</message>
<message>
<location filename="../main.qml" line="505"/>
<location filename="../main.qml" line="1022"/>
<location filename="../main.qml" line="1025"/>
<source>Erase</source>
<translation>Effacer</translation>
</message>
@ -673,7 +676,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../main.qml" line="998"/>
<location filename="../main.qml" line="1001"/>
<source>Preparing to write... (%1)</source>
<translation type="unfinished"></translation>
</message>
@ -682,7 +685,7 @@
<translation type="vanished">&lt;b&gt;%1&lt;/b&gt; a bien été écrit sur &lt;b&gt;%2&lt;/b&gt;</translation>
</message>
<message>
<location filename="../main.qml" line="1287"/>
<location filename="../main.qml" line="1290"/>
<source>SD card is write protected.&lt;br&gt;Push the lock switch on the left side of the card upwards, and try again.</source>
<translation type="unfinished"></translation>
</message>
@ -692,7 +695,7 @@
<translation>Attention</translation>
</message>
<message>
<location filename="../main.qml" line="968"/>
<location filename="../main.qml" line="971"/>
<source>Writing... %1%</source>
<translation>Écriture... %1%</translation>
</message>
@ -702,42 +705,42 @@
<translation>Toutes les données sur le périphérique de stockage &apos;%1&apos; vont être supprimées.&lt;br&gt;Voulez-vous vraiment continuer ?</translation>
</message>
<message>
<location filename="../main.qml" line="947"/>
<location filename="../main.qml" line="950"/>
<source>Error downloading OS list from Internet</source>
<translation>Erreur lors du téléchargement de la liste des systèmes d&apos;exploitation à partir d&apos;Internet</translation>
</message>
<message>
<location filename="../main.qml" line="991"/>
<location filename="../main.qml" line="994"/>
<source>Verifying... %1%</source>
<translation>Vérification... %1%</translation>
</message>
<message>
<location filename="../main.qml" line="1014"/>
<location filename="../main.qml" line="1017"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../main.qml" line="1021"/>
<location filename="../main.qml" line="1024"/>
<source>Write Successful</source>
<translation>Écriture réussie</translation>
</message>
<message>
<location filename="../main.qml" line="1023"/>
<location filename="../main.qml" line="1026"/>
<source>&lt;b&gt;%1&lt;/b&gt; has been erased&lt;br&gt;&lt;br&gt;You can now remove the SD card from the reader</source>
<translation>&lt;b&gt;%1&lt;/b&gt; a bien été effacé&lt;br&gt;&lt;br&gt;Vous pouvez retirer la carte SD du lecteur</translation>
</message>
<message>
<location filename="../main.qml" line="1030"/>
<location filename="../main.qml" line="1033"/>
<source>&lt;b&gt;%1&lt;/b&gt; has been written to &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;&lt;br&gt;You can now remove the SD card from the reader</source>
<translation>&lt;b&gt;%1&lt;/b&gt; a bien été écrit sur &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vous pouvez retirer la carte SD du lecteur</translation>
</message>
<message>
<location filename="../main.qml" line="1098"/>
<location filename="../main.qml" line="1101"/>
<source>Error parsing os_list.json</source>
<translation>Erreur de lecture du fichier os_list.json</translation>
</message>
<message>
<location filename="../main.qml" line="1271"/>
<location filename="../main.qml" line="1274"/>
<source>Connect an USB stick containing images first.&lt;br&gt;The images must be located in the root folder of the USB stick.</source>
<translation>Connecter d&apos;abord une clé USB contenant les images.&lt;br&gt;Les images doivent se trouver dans le dossier racine de la clé USB.</translation>
</message>