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,148 @@
<context>
<name>DownloadThread</name>
<message>
<location filename="../downloadthread.cpp" line="147"/>
<location filename="../downloadthread.cpp" line="166"/>
<source>Error running diskpart: %1</source>
<translation> diskpart %1</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="168"/>
<location filename="../downloadthread.cpp" line="187"/>
<source>Error removing existing partitions</source>
<translation></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="194"/>
<location filename="../downloadthread.cpp" line="213"/>
<source>Authentication cancelled</source>
<translation></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>authopen以获得对磁盘设备&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> Raspberry Pi Imager访访</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>&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></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>使</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>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>&lt;br&gt;SD卡可能已损坏</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="855"/>
<source>Waiting for FAT partition to be mounted</source>
<translation>FAT分区挂载</translation>
<translation type="vanished">FAT分区挂载</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="941"/>
<source>Error mounting FAT32 partition</source>
<translation>FAT32分区错误</translation>
<translation type="vanished">FAT32分区错误</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="963"/>
<source>Operating system did not mount FAT32 partition</source>
<translation>FAT32分区</translation>
<translation type="vanished">FAT32分区</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="996"/>
<source>Unable to customize. File &apos;%1&apos; does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1000"/>
<location filename="../downloadthread.cpp" line="885"/>
<source>Customizing image</source>
<translation>使</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1085"/>
<source>Error creating firstrun.sh on FAT partition</source>
<translation>FAT分区上创建firstrun.sh脚本文件时出错</translation>
<translation type="vanished">FAT分区上创建firstrun.sh脚本文件时出错</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1037"/>
<source>Error writing to config.txt on FAT partition</source>
<translation>FAT分区上写入config.txt时出错</translation>
<translation type="vanished">FAT分区上写入config.txt时出错</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1102"/>
<source>Error creating user-data cloudinit file on FAT partition</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1116"/>
<source>Error creating network-config cloudinit file on FAT partition</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="1139"/>
<source>Error writing to cmdline.txt on FAT partition</source>
<translation>FAT分区上写入cmdline.txt时出错</translation>
<translation type="vanished">FAT分区上写入cmdline.txt时出错</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>访</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>访 rpi-imager.exe和fat32format.exe都添加到允许的应用程序列表中</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="444"/>
<location filename="../downloadthread.cpp" line="463"/>
<source>Error writing file to disk</source>
<translation></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="463"/>
<location filename="../downloadthread.cpp" line="482"/>
<source>Error downloading: %1</source>
<translation>%1</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></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>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> </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></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>&lt;br&gt;SD卡可能损坏</translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="389"/>
<location filename="../downloadthread.cpp" line="408"/>
<source>starting download</source>
<translation></translation>
</message>
<message>
<location filename="../downloadthread.cpp" line="719"/>
<location filename="../downloadthread.cpp" line="747"/>
<source>Error writing first block (partition table)</source>
<translation></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> SD卡的内容与写入的内容不同</translation>
</message>
@ -256,27 +242,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>&lt;br&gt;%1 GB的空白空间.</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>&lt;br&gt;%1512</translation>
</message>
<message>
<location filename="../imagewriter.cpp" line="445"/>
<location filename="../imagewriter.cpp" line="442"/>
<source>Downloading and writing image</source>
<translation></translation>
</message>
<message>
<location filename="../imagewriter.cpp" line="578"/>
<location filename="../imagewriter.cpp" line="575"/>
<source>Select image</source>
<translation></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 type="unfinished"></translation>
</message>
@ -320,22 +306,22 @@
<context>
<name>OptionsPopup</name>
<message>
<location filename="../OptionsPopup.qml" line="79"/>
<location filename="../OptionsPopup.qml" line="80"/>
<source>Advanced options</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="96"/>
<location filename="../OptionsPopup.qml" line="97"/>
<source>Image customization options</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="104"/>
<location filename="../OptionsPopup.qml" line="105"/>
<source>for this session only</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="105"/>
<location filename="../OptionsPopup.qml" line="106"/>
<source>to always use</source>
<translation></translation>
</message>
@ -344,22 +330,22 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="119"/>
<location filename="../OptionsPopup.qml" line="120"/>
<source>Set hostname:</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="138"/>
<location filename="../OptionsPopup.qml" line="140"/>
<source>Enable SSH</source>
<translation>SSH服务</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="160"/>
<location filename="../OptionsPopup.qml" line="162"/>
<source>Use password authentication</source>
<translation>使</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="170"/>
<location filename="../OptionsPopup.qml" line="172"/>
<source>Allow public-key authentication only</source>
<translation>使</translation>
</message>
@ -368,63 +354,63 @@
<translation type="vanished">&apos;%1&apos;</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>%1</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="261"/>
<location filename="../OptionsPopup.qml" line="264"/>
<source>Configure wireless LAN</source>
<translation>WiFi</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="280"/>
<location filename="../OptionsPopup.qml" line="283"/>
<source>SSID:</source>
<translation></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></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="200"/>
<location filename="../OptionsPopup.qml" line="203"/>
<source>Set username and password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="219"/>
<location filename="../OptionsPopup.qml" line="222"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="295"/>
<location filename="../OptionsPopup.qml" line="298"/>
<source>Hidden SSID</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="316"/>
<location filename="../OptionsPopup.qml" line="319"/>
<source>Show password</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="321"/>
<location filename="../OptionsPopup.qml" line="324"/>
<source>Wireless LAN country:</source>
<translation>WIFI国家</translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="332"/>
<location filename="../OptionsPopup.qml" line="335"/>
<source>Set locale settings</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="342"/>
<location filename="../OptionsPopup.qml" line="345"/>
<source>Time zone:</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="352"/>
<location filename="../OptionsPopup.qml" line="355"/>
<source>Keyboard layout:</source>
<translation></translation>
</message>
@ -433,27 +419,27 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="365"/>
<location filename="../OptionsPopup.qml" line="368"/>
<source>Persistent settings</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="373"/>
<location filename="../OptionsPopup.qml" line="376"/>
<source>Play sound when finished</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="377"/>
<location filename="../OptionsPopup.qml" line="380"/>
<source>Eject media when finished</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="381"/>
<location filename="../OptionsPopup.qml" line="384"/>
<source>Enable telemetry</source>
<translation></translation>
</message>
<message>
<location filename="../OptionsPopup.qml" line="394"/>
<location filename="../OptionsPopup.qml" line="397"/>
<source>SAVE</source>
<translation></translation>
</message>
@ -469,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></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></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="95"/>
<location filename="../UseSavedSettingsPopup.qml" line="96"/>
<source>NO</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="106"/>
<source>NO, CLEAR SETTINGS</source>
<translation></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="105"/>
<location filename="../UseSavedSettingsPopup.qml" line="116"/>
<source>YES</source>
<translation></translation>
</message>
<message>
<location filename="../UseSavedSettingsPopup.qml" line="115"/>
<location filename="../UseSavedSettingsPopup.qml" line="126"/>
<source>EDIT SETTINGS</source>
<translation></translation>
</message>
@ -530,7 +521,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>SD卡</translation>
</message>
@ -545,7 +536,7 @@
<translation></translation>
</message>
<message>
<location filename="../main.qml" line="968"/>
<location filename="../main.qml" line="971"/>
<source>Writing... %1%</source>
<translation>...%1%</translation>
</message>
@ -570,7 +561,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>...</translation>
</message>
@ -581,8 +572,8 @@
</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>...</translation>
</message>
@ -613,7 +604,7 @@
</message>
<message>
<location filename="../main.qml" line="505"/>
<location filename="../main.qml" line="1022"/>
<location filename="../main.qml" line="1025"/>
<source>Erase</source>
<translation></translation>
</message>
@ -668,12 +659,12 @@
<translation>rpi-imager&lt;br&gt;</translation>
</message>
<message>
<location filename="../main.qml" line="998"/>
<location filename="../main.qml" line="1001"/>
<source>Preparing to write... (%1)</source>
<translation> (%1)</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;&lt;br&gt; &lt;br&gt;SD</translation>
</message>
@ -682,17 +673,17 @@
<translation type="vanished">&lt;b&gt;%1&lt;/b&gt; &lt;b&gt;%2&lt;/b&gt;</translation>
</message>
<message>
<location filename="../main.qml" line="1098"/>
<location filename="../main.qml" line="1101"/>
<source>Error parsing os_list.json</source>
<translation> 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>U盘&lt;br&gt;U盘的根文件夹中</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>SD卡具有写保护&lt;br&gt;SD卡的左侧的锁定开关</translation>
</message>
@ -737,27 +728,27 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../main.qml" line="947"/>
<location filename="../main.qml" line="950"/>
<source>Error downloading OS list from Internet</source>
<translation></translation>
</message>
<message>
<location filename="../main.qml" line="991"/>
<location filename="../main.qml" line="994"/>
<source>Verifying... %1%</source>
<translation>...%1%</translation>
</message>
<message>
<location filename="../main.qml" line="1014"/>
<location filename="../main.qml" line="1017"/>
<source>Error</source>
<translation></translation>
</message>
<message>
<location filename="../main.qml" line="1021"/>
<location filename="../main.qml" line="1024"/>
<source>Write Successful</source>
<translation></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; &lt;b&gt;%2&lt;/b&gt;&lt;br&gt;&lt;br&gt;SD</translation>
</message>