Fix running do_format in magiback (mga#34877 mga#34867)

Restore erasing MBR when formatting in one partition
Fix messages about partition, not only persistent partition.

1 files changed, 126 insertions, 131 deletions

diff --git a/po/tg.po b/po/tg.po
index 0a91658..0f7a0c8 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-01 09:02+0200\n"
+"POT-Creation-Date: 2026-01-01 15:25+0100\n"
 "PO-Revision-Date: 2020-06-29 10:00+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -55,53 +55,56 @@ msgstr ""
 msgid "Timeout reached when {}"
 msgstr ""
 
-#: backend/raw_write.py:226 backend/raw_write.py:252 backend/raw_write.py:307
-#: backend/raw_write.py:337 backend/raw_write.py:374 backend/raw_write.py:410
-#: backend/raw_write.py:435
-msgid "Error {} while doing persistent partition: {}"
+#: backend/raw_write.py:231 backend/raw_write.py:257 backend/raw_write.py:312
+#: backend/raw_write.py:380 backend/raw_write.py:416 backend/raw_write.py:441
+msgid "Error {} while doing partition: {}"
 msgstr ""
 
-#: backend/raw_write.py:230
+#: backend/raw_write.py:235
 msgid "Try reloading partition table"
 msgstr ""
 
-#: backend/raw_write.py:244
+#: backend/raw_write.py:249
 msgid "Unable to reload the partition table: {}"
 msgstr ""
 
-#: backend/raw_write.py:268
+#: backend/raw_write.py:273
 msgid "Additional partition added. Formatting..."
 msgstr ""
 
-#: backend/raw_write.py:303 backend/raw_write.py:440
-msgid "Persistent partition done"
+#: backend/raw_write.py:308 backend/raw_write.py:446
+msgid "Partition done"
 msgstr ""
 
-#: backend/raw_write.py:312
+#: backend/raw_write.py:317
 msgid "formatting partition"
 msgstr ""
 
-#: backend/raw_write.py:316
-msgid "Persistent partition added. Encrypting..."
+#: backend/raw_write.py:321
+msgid "Partition added. Encrypting..."
 msgstr ""
 
 #: backend/raw_write.py:343
-msgid "Persistent partition encrypted. Opening..."
+msgid "Error {} while encrypting partition: {}"
 msgstr ""
 
-#: backend/raw_write.py:380
+#: backend/raw_write.py:349
+msgid "Partition encrypted. Opening..."
+msgstr ""
+
+#: backend/raw_write.py:386
 msgid "opening encrypted partition"
 msgstr ""
 
-#: backend/raw_write.py:383
-msgid "Persistent partition opened. Formatting..."
+#: backend/raw_write.py:389
+msgid "Partition opened. Formatting..."
 msgstr ""
 
-#: backend/raw_write.py:418
+#: backend/raw_write.py:424
 msgid "formatting encrypted partition"
 msgstr ""
 
-#: backend/raw_write.py:442
+#: backend/raw_write.py:448
 msgid "closing encrypted partition"
 msgstr ""
 
@@ -169,168 +172,160 @@ msgstr ""
 msgid "Signature file {} not found\n"
 msgstr ""
 
-#: lib/isodumper.py:468
+#: lib/isodumper.py:469
 msgid "Persistence partition is to use when writing a Live ISO image."
 msgstr ""
 
-#: lib/isodumper.py:473
+#: lib/isodumper.py:474
 msgid "Formatting confirmation in {}"
 msgstr ""
 
-#: lib/isodumper.py:486
+#: lib/isodumper.py:497
 msgid "The device was formatted successfully."
 msgstr ""
 
-#: lib/isodumper.py:488
+#: lib/isodumper.py:500
 msgid "An error occurred while creating a partition."
 msgstr ""
 
-#: lib/isodumper.py:490
-msgid "Authentication error."
-msgstr ""
-
-#: lib/isodumper.py:492
-msgid "An error {} occurred."
-msgstr ""
-
-#: lib/isodumper.py:508 lib/isodumper.py:1086
+#: lib/isodumper.py:521 lib/isodumper.py:1104
 msgid "Progress"
 msgstr ""
 
-#: lib/isodumper.py:522 lib/isodumper.py:655 lib/isodumper.py:742
+#: lib/isodumper.py:535 lib/isodumper.py:668 lib/isodumper.py:760
 msgid "unmounting"
 msgstr ""
 
-#: lib/isodumper.py:584
+#: lib/isodumper.py:597
 msgid "Backup"
 msgstr ""
 
-#: lib/isodumper.py:588
+#: lib/isodumper.py:601
 msgid "Backup confirmation"
 msgstr ""
 
-#: lib/isodumper.py:588
+#: lib/isodumper.py:601
 msgid "Do you want to overwrite the file?"
 msgstr ""
 
-#: lib/isodumper.py:598
+#: lib/isodumper.py:611
 #, python-format
 msgid ""
 "The destination directory is too small to receive the backup (%s Mb needed)"
 msgstr ""
 
-#: lib/isodumper.py:608
+#: lib/isodumper.py:621
 msgid "Backup to: {}"
 msgstr ""
 
 #. I18N: don't translate source nor target
-#: lib/isodumper.py:626
+#: lib/isodumper.py:639
 #, python-brace-format
 msgid "{source} successfully written to {target}"
 msgstr ""
 
-#: lib/isodumper.py:639
+#: lib/isodumper.py:652
 msgid "The device is too small to contain the ISO file."
 msgstr ""
 
-#: lib/isodumper.py:645
+#: lib/isodumper.py:658
 #, python-brace-format
 msgid "Writing {source} to {target}"
 msgstr ""
 
-#: lib/isodumper.py:649
+#: lib/isodumper.py:662
 #, python-brace-format
 msgid "Executing copy from {source} to {target}"
 msgstr ""
 
 #. I18N: don't translate source nor target
-#: lib/isodumper.py:668
+#: lib/isodumper.py:681
 #, python-brace-format
 msgid "Image {source} written to {target}"
 msgstr ""
 
-#: lib/isodumper.py:671
+#: lib/isodumper.py:684
 msgid "Bytes written: {}"
 msgstr ""
 
-#: lib/isodumper.py:673
+#: lib/isodumper.py:686
 msgid "Checking "
 msgstr ""
 
-#: lib/isodumper.py:688
+#: lib/isodumper.py:701
 msgid "Adding partition"
 msgstr ""
 
-#: lib/isodumper.py:693
+#: lib/isodumper.py:706
 msgid "No key for encrypted partition provided. Adding the partition aborted."
 msgstr ""
 
-#: lib/isodumper.py:711
+#: lib/isodumper.py:725
 msgid "Added encrypted partition"
 msgstr ""
 
-#: lib/isodumper.py:717
+#: lib/isodumper.py:731
 msgid "Adding encrypted partition failed"
 msgstr ""
 
-#: lib/isodumper.py:732
+#: lib/isodumper.py:750
 msgid "Added partition"
 msgstr ""
 
-#: lib/isodumper.py:734
+#: lib/isodumper.py:752
 msgid "Adding partition failed"
 msgstr ""
 
-#: lib/isodumper.py:765
+#: lib/isodumper.py:783
 msgid "Success"
 msgstr ""
 
-#: lib/isodumper.py:767
+#: lib/isodumper.py:785
 msgid "The operation completed successfully."
 msgstr ""
 
-#: lib/isodumper.py:770 lib/isodumper.py:789
+#: lib/isodumper.py:788 lib/isodumper.py:807
 msgid ""
 "You are free to unplug it now, a logfile \n"
 "/var/log/magiback.log has been saved."
 msgstr ""
 
-#: lib/isodumper.py:781 lib/isodumper.py:801 lib/isodumper.py:1154
-#: lib/isodumper.py:1171 lib/isodumper.py:1281 lib/isodumper.py:1299
+#: lib/isodumper.py:799 lib/isodumper.py:819 lib/isodumper.py:1172
+#: lib/isodumper.py:1191 lib/isodumper.py:1299 lib/isodumper.py:1317
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: lib/isodumper.py:784
+#: lib/isodumper.py:802
 msgid ""
 "The operation completed, but with anomalies.\n"
 " Check carefully the messages in log view"
 msgstr ""
 
-#: lib/isodumper.py:804
+#: lib/isodumper.py:822
 msgid ""
 "Writing is in progress. Exiting during writing \n"
 "            will make the device or the backup unusable.\n"
 "            Are you sure you want to quit during writing?"
 msgstr ""
 
-#: lib/isodumper.py:818 lib/isodumper.py:942 lib/isodumper.py:1271
-#: lib/isodumper.py:1290
+#: lib/isodumper.py:836 lib/isodumper.py:960 lib/isodumper.py:1289
+#: lib/isodumper.py:1308
 msgid "Error"
 msgstr "Хато"
 
-#: lib/isodumper.py:853
+#: lib/isodumper.py:871
 msgid "ISO Image to copy: "
 msgstr ""
 
-#: lib/isodumper.py:860
+#: lib/isodumper.py:878
 msgid "IsoDumper"
 msgstr ""
 
-#: lib/isodumper.py:862
+#: lib/isodumper.py:880
 msgid "Mageia IsoDumper"
 msgstr ""
 
-#: lib/isodumper.py:866
+#: lib/isodumper.py:884
 msgid ""
 "This GUI program is primarily for safely writing a bootable ISO image to a "
 "USB flash drive, an operation devious & potentially hazardous when done by "
@@ -339,23 +334,23 @@ msgid ""
 "state subsequently."
 msgstr ""
 
-#: lib/isodumper.py:872
+#: lib/isodumper.py:890
 msgid "It gives also a feature for formatting the USB device."
 msgstr ""
 
-#: lib/isodumper.py:875
+#: lib/isodumper.py:893
 msgid ""
 "IsoDumper can be launched either from the menus, or a user console with the "
 "command 'isodumper'."
 msgstr ""
 
-#: lib/isodumper.py:879
+#: lib/isodumper.py:897
 msgid ""
 "The root password is solicited when this is necessary for the program's "
 "operation."
 msgstr ""
 
-#: lib/isodumper.py:883
+#: lib/isodumper.py:901
 msgid ""
 "The flash drive can be inserted beforehand or once the program is started. "
 "In the latter case, a dialogue will say that there is no flash drive "
@@ -363,7 +358,7 @@ msgid ""
 "close any automatically opened File Manager window)."
 msgstr ""
 
-#: lib/isodumper.py:889
+#: lib/isodumper.py:907
 msgid ""
 "The fields of the main window are as follows:<BR />- Device to work on: the "
 "device of the USB flash drive, a drop-down list to choose from.<BR />- Write "
@@ -372,24 +367,24 @@ msgid ""
 "operation - with a prior warning dialogue."
 msgstr ""
 
-#: lib/isodumper.py:896
+#: lib/isodumper.py:914
 msgid ""
 "- Add a persistent partition: the remaining space will be used in a new "
 "partition where data from the Live system can be written and recovered "
 "between sessions."
 msgstr ""
 
-#: lib/isodumper.py:900
+#: lib/isodumper.py:918
 msgid ""
 "- Encrypt: the persistent partition will be encrypted with the key provided "
 "in <i>Key</i> field."
 msgstr ""
 
-#: lib/isodumper.py:903
+#: lib/isodumper.py:921
 msgid "The operation is shown in the progress bar beneath."
 msgstr ""
 
-#: lib/isodumper.py:906
+#: lib/isodumper.py:924
 msgid ""
 "- Backup to: define the name and placement of the backup image file. The "
 "current flash drive will be backed up to a disc file. Note that the entire "
@@ -399,26 +394,26 @@ msgid ""
 "the source *.img file to write out."
 msgstr ""
 
-#: lib/isodumper.py:912
+#: lib/isodumper.py:930
 msgid "- Backup the device: launch the backup operation."
 msgstr ""
 
-#: lib/isodumper.py:915
+#: lib/isodumper.py:933
 msgid ""
 "- Format the device: create an unique partition on the entire volume in the "
 "specified format in FAT, exFAT, NTFS or ext. You can specify a volume name "
 "and the format in a new dialog box."
 msgstr ""
 
-#: lib/isodumper.py:944
+#: lib/isodumper.py:962
 msgid "There is another instance of Isodumper already running."
 msgstr ""
 
-#: lib/isodumper.py:957
+#: lib/isodumper.py:975
 msgid "Choose an image"
 msgstr ""
 
-#: lib/isodumper.py:959
+#: lib/isodumper.py:977
 msgid ""
 "Warning\n"
 "This will destroy all data on the target device,\n"
@@ -427,213 +422,213 @@ msgid ""
 "during the following operation."
 msgstr ""
 
-#: lib/isodumper.py:970
+#: lib/isodumper.py:988
 msgid "Isodumper {}"
 msgstr ""
 
-#: lib/isodumper.py:1005
+#: lib/isodumper.py:1023
 msgid "Select the device to work on:"
 msgstr ""
 
-#: lib/isodumper.py:1009
+#: lib/isodumper.py:1027
 msgid "Update list"
 msgstr ""
 
-#: lib/isodumper.py:1012
+#: lib/isodumper.py:1030
 msgid "Select operations"
 msgstr ""
 
-#: lib/isodumper.py:1020
+#: lib/isodumper.py:1038
 msgid "The selected operations will be executed in order from top to bottom."
 msgstr ""
 
-#: lib/isodumper.py:1021
+#: lib/isodumper.py:1039
 msgid ""
 "If both write image and create partition are selected, the partition will be "
 "created in the free space after the image."
 msgstr ""
 
-#: lib/isodumper.py:1026
+#: lib/isodumper.py:1044
 msgid "Backup the device to:"
 msgstr ""
 
-#: lib/isodumper.py:1037
+#: lib/isodumper.py:1055
 msgid "Write Image from:"
 msgstr ""
 
-#: lib/isodumper.py:1047
+#: lib/isodumper.py:1065
 msgid "Create partition of type:"
 msgstr ""
 
-#: lib/isodumper.py:1050
+#: lib/isodumper.py:1068
 msgid "Type:"
 msgstr ""
 
-#: lib/isodumper.py:1053
+#: lib/isodumper.py:1071
 msgid "FAT32"
 msgstr ""
 
-#: lib/isodumper.py:1054 lib/isodumper.py:1249
+#: lib/isodumper.py:1072 lib/isodumper.py:1267
 msgid "ext4"
 msgstr ""
 
-#: lib/isodumper.py:1055
+#: lib/isodumper.py:1073
 msgid "NTFS"
 msgstr ""
 
-#: lib/isodumper.py:1056
+#: lib/isodumper.py:1074
 msgid "exFAT"
 msgstr ""
 
-#: lib/isodumper.py:1057 lib/isodumper.py:1249 lib/isodumper.py:1251
+#: lib/isodumper.py:1075 lib/isodumper.py:1267 lib/isodumper.py:1269
 msgid "Persistent partition"
 msgstr ""
 
-#: lib/isodumper.py:1063
+#: lib/isodumper.py:1081
 msgid "Label:"
 msgstr ""
 
-#: lib/isodumper.py:1068
+#: lib/isodumper.py:1086
 msgid "Encrypt partition using LUKS, with key:"
 msgstr ""
 
-#: lib/isodumper.py:1072
+#: lib/isodumper.py:1090
 msgid "Key:"
 msgstr ""
 
-#: lib/isodumper.py:1075
+#: lib/isodumper.py:1093
 msgid "Execution"
 msgstr ""
 
-#: lib/isodumper.py:1078
+#: lib/isodumper.py:1096
 msgid "When you are sure all options are correct, start:"
 msgstr ""
 
-#: lib/isodumper.py:1081 lib/isodumper.py:1359
+#: lib/isodumper.py:1099 lib/isodumper.py:1377
 msgid "Execute"
 msgstr "Иҷро кардан"
 
-#: lib/isodumper.py:1091
+#: lib/isodumper.py:1109
 msgid "Report"
 msgstr "Маърӯза"
 
-#: lib/isodumper.py:1094
+#: lib/isodumper.py:1112
 msgid "About"
 msgstr ""
 
-#: lib/isodumper.py:1096
+#: lib/isodumper.py:1114
 msgid "Help"
 msgstr ""
 
-#: lib/isodumper.py:1098
+#: lib/isodumper.py:1116
 msgid "Quit"
 msgstr ""
 
-#: lib/isodumper.py:1157
+#: lib/isodumper.py:1175
 msgid "The validation of the GPG signature of the checksum file failed !"
 msgstr ""
 
-#: lib/isodumper.py:1160
+#: lib/isodumper.py:1178
 msgid "Do you want to continue?"
 msgstr ""
 
-#: lib/isodumper.py:1168
+#: lib/isodumper.py:1186
 msgid "The checksum file is signed"
 msgstr ""
 
-#: lib/isodumper.py:1174
+#: lib/isodumper.py:1188
 msgid ""
-"No GPG signature has been found. Are you sure you want to use this image?"
+"Info: Key used for the signature has expired. Updated version may be "
+"available."
 msgstr ""
 
-#: lib/isodumper.py:1183
+#: lib/isodumper.py:1194
 msgid ""
-"Info: Key used for the signature has expired. Updated version may be "
-"available."
+"No GPG signature has been found. Are you sure you want to use this image?"
 msgstr ""
 
-#: lib/isodumper.py:1271
+#: lib/isodumper.py:1289
 msgid "No image for backup is selected."
 msgstr ""
 
-#: lib/isodumper.py:1277
+#: lib/isodumper.py:1295
 msgid "Writing confirmation"
 msgstr ""
 
-#: lib/isodumper.py:1284
+#: lib/isodumper.py:1302
 msgid "The device is bigger than 32 Gbytes. Are you sure you want use it?"
 msgstr ""
 "Ин дастгоҳ зиёда за 32 Гигабайт аст. Шумо мутмаин ҳастед, ки мехоҳед онро "
 "истифода баред?"
 
-#: lib/isodumper.py:1290
+#: lib/isodumper.py:1308
 msgid "No image to write is selected."
 msgstr ""
 
-#: lib/isodumper.py:1302
+#: lib/isodumper.py:1320
 msgid "Label length will be shorten to {} characters. Do you want to continue?"
 msgstr ""
 
-#: lib/isodumper.py:1339
+#: lib/isodumper.py:1357
 msgid "Label for the device:"
 msgstr ""
 
-#: lib/isodumper.py:1344
+#: lib/isodumper.py:1362
 msgid "FAT32 (Windows)"
 msgstr ""
 
-#: lib/isodumper.py:1348
+#: lib/isodumper.py:1366
 msgid "exFAT (Windows)"
 msgstr ""
 
-#: lib/isodumper.py:1352
+#: lib/isodumper.py:1370
 msgid "NTFS (Windows)"
 msgstr ""
 
-#: lib/isodumper.py:1356
+#: lib/isodumper.py:1374
 msgid "ext4 (Linux)"
 msgstr ""
 
-#: lib/isodumper.py:1360 lib/isodumper.py:1448
+#: lib/isodumper.py:1378 lib/isodumper.py:1466
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: lib/isodumper.py:1402
+#: lib/isodumper.py:1420
 msgid "OK"
 msgstr "OK"
 
-#: lib/isodumper.py:1414
+#: lib/isodumper.py:1432
 msgid "Yes"
 msgstr "Ҳа"
 
-#: lib/isodumper.py:1415
+#: lib/isodumper.py:1433
 msgid "No"
 msgstr "Не"
 
-#: lib/isodumper.py:1428
+#: lib/isodumper.py:1446
 msgid "Oliver Grawert<BR />Papoteur<BR />Pictures : Timothée Giet"
 msgstr ""
 
-#: lib/isodumper.py:1429
+#: lib/isodumper.py:1447
 msgid "A tool for writing ISO images to  a device"
 msgstr ""
 
-#: lib/isodumper.py:1444
+#: lib/isodumper.py:1462
 msgid ""
 "Warning\n"
 "No target devices were found.\n"
 "You need to plug in a USB Key to which the image can be written."
 msgstr ""
 
-#: lib/isodumper.py:1447
+#: lib/isodumper.py:1465
 msgid "Refresh"
 msgstr ""
 
-#: lib/isodumper.py:1473
+#: lib/isodumper.py:1491
 msgid "UDisks2 is not available on your system"
 msgstr ""
 
-#: lib/isodumper.py:1511
+#: lib/isodumper.py:1529
 msgid "allow debug information"
 msgstr ""