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, 166 insertions, 138 deletions

diff --git a/po/sl.po b/po/sl.po
index 59b2c0e..ca46d25 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,7 +12,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: 2013-11-11 18:58+0000\n"
 "Last-Translator: Filip Komar <filip.komar@guest.arnes.si>, "
 "2013,2018-2021,2023,2025\n"
@@ -61,53 +61,56 @@ msgstr "/!\\Izračunana in shranjena vsota se ne ujemata"
 msgid "Timeout reached when {}"
 msgstr "Časovna omejitev dosežena ob {}"
 
-#: 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: {}"
-msgstr "Napaka {} med ustvarjanjem razdelka za obdržanje sprememb: {}"
+#: 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 "Poskusi ponovno naložiti tabelo razdelkov"
 
-#: backend/raw_write.py:244
+#: backend/raw_write.py:249
 msgid "Unable to reload the partition table: {}"
 msgstr "Ponovno nalaganje tabele razdelkov ni uspela: {}"
 
-#: backend/raw_write.py:268
+#: backend/raw_write.py:273
 msgid "Additional partition added. Formatting..."
 msgstr "Ustvarjen je bil dodatni razdelek. Formatiranje ..."
 
-#: backend/raw_write.py:303 backend/raw_write.py:440
-msgid "Persistent partition done"
-msgstr "Dodan razdelek za obdržanje sprememb"
+#: 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 "formatiranje razdelka"
 
-#: backend/raw_write.py:316
-msgid "Persistent partition added. Encrypting..."
-msgstr "Dodan razdelek za obdržanje sprememb. Šifriranje ..."
+#: backend/raw_write.py:321
+msgid "Partition added. Encrypting..."
+msgstr ""
 
 #: backend/raw_write.py:343
-msgid "Persistent partition encrypted. Opening..."
-msgstr "Razdelek za obdržanje sprememb je šifriran. Odpiranje ..."
+msgid "Error {} while encrypting partition: {}"
+msgstr ""
+
+#: backend/raw_write.py:349
+msgid "Partition encrypted. Opening..."
+msgstr ""
 
-#: backend/raw_write.py:380
+#: backend/raw_write.py:386
 msgid "opening encrypted partition"
 msgstr "odpiranje šifriranega razdelka"
 
-#: backend/raw_write.py:383
-msgid "Persistent partition opened. Formatting..."
-msgstr "Odprt razdelek za obdržanje sprememb. Formatiranje ..."
+#: 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 "formatiranje šifriranega razdelka"
 
-#: backend/raw_write.py:442
+#: backend/raw_write.py:448
 msgid "closing encrypted partition"
 msgstr "zapiranje šifriranega razdelka"
 
@@ -175,130 +178,122 @@ msgstr "Podpis ne ustreza"
 msgid "Signature file {} not found\n"
 msgstr "Datoteka s podpisom {} ni bila najdena\n"
 
-#: lib/isodumper.py:468
+#: lib/isodumper.py:469
 msgid "Persistence partition is to use when writing a Live ISO image."
 msgstr ""
 "Razdelek za obdržanje sprememb je uporaben ob zapisu živih odtisov diskov."
 
-#: lib/isodumper.py:473
+#: lib/isodumper.py:474
 msgid "Formatting confirmation in {}"
 msgstr "Potrditev formatiranja v {}"
 
-#: lib/isodumper.py:486
+#: lib/isodumper.py:497
 msgid "The device was formatted successfully."
 msgstr "Naprava je bila uspešno formatirana."
 
-#: lib/isodumper.py:488
+#: lib/isodumper.py:500
 msgid "An error occurred while creating a partition."
 msgstr "Med ustvarjanjem razdelka je prišlo do napake."
 
-#: lib/isodumper.py:490
-msgid "Authentication error."
-msgstr "Napaka overjanja."
-
-#: lib/isodumper.py:492
-msgid "An error {} occurred."
-msgstr "Prišlo je do napake {}."
-
-#: lib/isodumper.py:508 lib/isodumper.py:1086
+#: lib/isodumper.py:521 lib/isodumper.py:1104
 msgid "Progress"
 msgstr "v delu ..."
 
-#: 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 "odklapljanje"
 
-#: lib/isodumper.py:584
+#: lib/isodumper.py:597
 msgid "Backup"
 msgstr "Varnostna kopija"
 
-#: lib/isodumper.py:588
+#: lib/isodumper.py:601
 msgid "Backup confirmation"
 msgstr "Potrditev varnostnega kopiranja"
 
-#: lib/isodumper.py:588
+#: lib/isodumper.py:601
 msgid "Do you want to overwrite the file?"
 msgstr "Ali želite prepisati datoteko?"
 
-#: 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 ""
 "Ciljna mapa nima dovolj prostora za varnostno kopiranje (potrebno je %s MB)"
 
-#: lib/isodumper.py:608
+#: lib/isodumper.py:621
 msgid "Backup to: {}"
 msgstr "Varnostno kopiranje na: {}"
 
 #. 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 "{source} je bil uspešno zapisan na/v {target}"
 
-#: lib/isodumper.py:639
+#: lib/isodumper.py:652
 msgid "The device is too small to contain the ISO file."
 msgstr "Izbrana naprava nima dovolj prostora za datoteko odtisa diska."
 
-#: lib/isodumper.py:645
+#: lib/isodumper.py:658
 #, python-brace-format
 msgid "Writing {source} to {target}"
 msgstr "Pisanje {source} v/na {target}"
 
-#: lib/isodumper.py:649
+#: lib/isodumper.py:662
 #, python-brace-format
 msgid "Executing copy from {source} to {target}"
 msgstr "Izvajanje kopiranja {source} v/na {target}"
 
 #. 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 "Odtis diska {source} je bil zapisan na/v {target}"
 
-#: lib/isodumper.py:671
+#: lib/isodumper.py:684
 msgid "Bytes written: {}"
 msgstr "Zapisano zlogov: {}"
 
-#: lib/isodumper.py:673
+#: lib/isodumper.py:686
 msgid "Checking "
 msgstr "Preverjanje "
 
-#: lib/isodumper.py:688
+#: lib/isodumper.py:701
 msgid "Adding partition"
 msgstr "Dodajanje razdelka"
 
-#: lib/isodumper.py:693
+#: lib/isodumper.py:706
 msgid "No key for encrypted partition provided. Adding the partition aborted."
 msgstr ""
 "Ključ za šifriran razdelek ni bil dodan. Dodajanje razdelka je preklicano."
 
-#: lib/isodumper.py:711
+#: lib/isodumper.py:725
 msgid "Added encrypted partition"
 msgstr "Dodan šifriran razdelek"
 
-#: lib/isodumper.py:717
+#: lib/isodumper.py:731
 msgid "Adding encrypted partition failed"
 msgstr "Dodajanje šifriranega razdelka je spodletelo"
 
-#: lib/isodumper.py:732
+#: lib/isodumper.py:750
 msgid "Added partition"
 msgstr "Dodan razdelek"
 
-#: lib/isodumper.py:734
+#: lib/isodumper.py:752
 msgid "Adding partition failed"
 msgstr "Dodajanje razdelka je spodletelo"
 
-#: lib/isodumper.py:765
+#: lib/isodumper.py:783
 msgid "Success"
 msgstr "Uspeh"
 
-#: lib/isodumper.py:767
+#: lib/isodumper.py:785
 msgid "The operation completed successfully."
 msgstr "Postopek je uspešno zaključen."
 
-#: 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."
@@ -306,12 +301,12 @@ msgstr ""
 "Napravo lahko sedaj odklopite, shranjen je bil dnevnik \n"
 "/var/log/magiback.log."
 
-#: 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 "Opozorilo"
 
-#: lib/isodumper.py:784
+#: lib/isodumper.py:802
 msgid ""
 "The operation completed, but with anomalies.\n"
 " Check carefully the messages in log view"
@@ -319,7 +314,7 @@ msgstr ""
 "Postopek je zaključen, a z nepravilnostmi.\n"
 "Pazljivo preverite sporočila v dnevniškem pogledu"
 
-#: 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"
@@ -329,24 +324,24 @@ msgstr ""
 "napravo ali varnostno kopijo pustil v neuporabnem\n"
 "stanju. Ali res želite takoj prekiniti pisanje?"
 
-#: 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 "Napaka"
 
-#: lib/isodumper.py:853
+#: lib/isodumper.py:871
 msgid "ISO Image to copy: "
 msgstr "Odtis diska za kopiranje:"
 
-#: lib/isodumper.py:860
+#: lib/isodumper.py:878
 msgid "IsoDumper"
 msgstr "IsoDumper"
 
-#: lib/isodumper.py:862
+#: lib/isodumper.py:880
 msgid "Mageia IsoDumper"
 msgstr "Mageia IsoDumper"
 
-#: 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 "
@@ -359,11 +354,11 @@ msgstr ""
 "negotovo ali lahko celo nevarno. Dodatno lahko shrani arhiv celotne prejšnje "
 "vsebine na trdi disk in ga po potrebi povrne nazaj na napravo."
 
-#: lib/isodumper.py:872
+#: lib/isodumper.py:890
 msgid "It gives also a feature for formatting the USB device."
 msgstr "Ponuja tudi možnost formatiranja naprave USB."
 
-#: 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'."
@@ -371,7 +366,7 @@ msgstr ""
 "Program IsoDumper je možno zagnati tako iz menija kot iz ukazne vrstice z "
 "ukazom »isodumper«."
 
-#: lib/isodumper.py:879
+#: lib/isodumper.py:897
 msgid ""
 "The root password is solicited when this is necessary for the program's "
 "operation."
@@ -379,7 +374,7 @@ msgstr ""
 "Poziv za korensko geslo se pojavi samo takrat, kadar ga kako programsko "
 "opravilo potrebuje."
 
-#: 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 "
@@ -391,7 +386,7 @@ msgstr ""
 "pomnilniška naprava ni bila zaznana ter možnost ponovne detekcije. <BR /"
 ">(Mogoče bo treba zapreti kako samodejno odprto okno upravitelja datotek)"
 
-#: 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 "
@@ -405,7 +400,7 @@ msgstr ""
 "bliskovne pomnilniške naprave *.img) za zapis.<BR />- Pisanje na napravo: Ta "
 "gumb sproži proces - s predhodnim opozorilnim oknom."
 
-#: 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 "
@@ -415,7 +410,7 @@ msgstr ""
 "uporabljen v novem razdelku, kjer se bodo podatki iz živega sistema lahko "
 "zapisali in se ohranili med sejami."
 
-#: 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."
@@ -423,11 +418,11 @@ msgstr ""
 "- Šifriranje: razdelek za obdržanje sprememb bo šifriran s ključem iz polja "
 "<i>Ključ</i>."
 
-#: lib/isodumper.py:903
+#: lib/isodumper.py:921
 msgid "The operation is shown in the progress bar beneath."
 msgstr "Vrstica napredka in opravilo sta vidna spodaj."
 
-#: 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 "
@@ -444,11 +439,11 @@ msgstr ""
 "v prejšnje stanje bliskovne pomnilniške naprave z izbiro izvorne datoteke *."
 "img file za zapis."
 
-#: lib/isodumper.py:912
+#: lib/isodumper.py:930
 msgid "- Backup the device: launch the backup operation."
 msgstr "- Arhiviranje vsebine naprave: zagon opravila arhiviranja"
 
-#: 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 "
@@ -458,15 +453,15 @@ msgstr ""
 "izbranem tipu FAT, exFAT, NTFS ali ext. Ime in tip razdelka je možno "
 "določiti v novem pogovornem oknu."
 
-#: lib/isodumper.py:944
+#: lib/isodumper.py:962
 msgid "There is another instance of Isodumper already running."
 msgstr "Okno programa Isodumper je že aktivno."
 
-#: lib/isodumper.py:957
+#: lib/isodumper.py:975
 msgid "Choose an image"
 msgstr "Izbor odtisa diska"
 
-#: lib/isodumper.py:959
+#: lib/isodumper.py:977
 msgid ""
 "Warning\n"
 "This will destroy all data on the target device,\n"
@@ -480,27 +475,27 @@ msgstr ""
 "Če boste potrdili, <b>ne odstranjujte</b>\n"
 "naprave med naslednjim opravilom."
 
-#: lib/isodumper.py:970
+#: lib/isodumper.py:988
 msgid "Isodumper {}"
 msgstr "IsoDumper {}"
 
-#: lib/isodumper.py:1005
+#: lib/isodumper.py:1023
 msgid "Select the device to work on:"
 msgstr "Izberite ciljno napravo:"
 
-#: lib/isodumper.py:1009
+#: lib/isodumper.py:1027
 msgid "Update list"
 msgstr "Posodobi seznam"
 
-#: lib/isodumper.py:1012
+#: lib/isodumper.py:1030
 msgid "Select operations"
 msgstr "Izberite postopek"
 
-#: lib/isodumper.py:1020
+#: lib/isodumper.py:1038
 msgid "The selected operations will be executed in order from top to bottom."
 msgstr "Izbrana opravila bodo izvedena po vrsti z vrha navzdol."
 
-#: 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."
@@ -508,102 +503,95 @@ msgstr ""
 "Če sta hkrati izbrani operaciji zapisa slike odtisa diska in ustvarjanje "
 "razdelka se slednji ustvari v preostalem prostem prostoru po zapisu slike."
 
-#: lib/isodumper.py:1026
+#: lib/isodumper.py:1044
 msgid "Backup the device to:"
 msgstr "Arhiviranje vsebine naprave na:"
 
-#: lib/isodumper.py:1037
+#: lib/isodumper.py:1055
 msgid "Write Image from:"
 msgstr "Zapis odtisa diska iz:"
 
-#: lib/isodumper.py:1047
+#: lib/isodumper.py:1065
 msgid "Create partition of type:"
 msgstr "Ustvari vrsto razdelka:"
 
-#: lib/isodumper.py:1050
+#: lib/isodumper.py:1068
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: lib/isodumper.py:1053
+#: lib/isodumper.py:1071
 msgid "FAT32"
 msgstr "FAT32"
 
-#: lib/isodumper.py:1054 lib/isodumper.py:1249
+#: lib/isodumper.py:1072 lib/isodumper.py:1267
 msgid "ext4"
 msgstr "ext4"
 
-#: lib/isodumper.py:1055
+#: lib/isodumper.py:1073
 msgid "NTFS"
 msgstr "NTFS"
 
-#: lib/isodumper.py:1056
+#: lib/isodumper.py:1074
 msgid "exFAT"
 msgstr "exFAT"
 
-#: 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 "Razdelek za obdržanje sprememb"
 
-#: lib/isodumper.py:1063
+#: lib/isodumper.py:1081
 msgid "Label:"
 msgstr "Oznaka:"
 
-#: lib/isodumper.py:1068
+#: lib/isodumper.py:1086
 msgid "Encrypt partition using LUKS, with key:"
 msgstr "Šifriranje razdelka z uporabo LUKS s ključem:"
 
-#: lib/isodumper.py:1072
+#: lib/isodumper.py:1090
 msgid "Key:"
 msgstr "Ključ:"
 
-#: lib/isodumper.py:1075
+#: lib/isodumper.py:1093
 msgid "Execution"
 msgstr "Izvajanje"
 
-#: lib/isodumper.py:1078
+#: lib/isodumper.py:1096
 msgid "When you are sure all options are correct, start:"
 msgstr "Ko boste prepričani, da so vse nastavljene možnosti pravilne, začnite:"
 
-#: lib/isodumper.py:1081 lib/isodumper.py:1359
+#: lib/isodumper.py:1099 lib/isodumper.py:1377
 msgid "Execute"
 msgstr "Izvajanje"
 
-#: lib/isodumper.py:1091
+#: lib/isodumper.py:1109
 msgid "Report"
 msgstr "Poročilo"
 
-#: lib/isodumper.py:1094
+#: lib/isodumper.py:1112
 msgid "About"
 msgstr "O programu"
 
-#: lib/isodumper.py:1096
+#: lib/isodumper.py:1114
 msgid "Help"
 msgstr "Pomoč"
 
-#: lib/isodumper.py:1098
+#: lib/isodumper.py:1116
 msgid "Quit"
 msgstr "Končaj"
 
-#: lib/isodumper.py:1157
+#: lib/isodumper.py:1175
 msgid "The validation of the GPG signature of the checksum file failed !"
 msgstr ""
 "Potrjevanje veljavnosti podpisa GPG datoteke kontrolne vsote ni uspelo!"
 
-#: lib/isodumper.py:1160
+#: lib/isodumper.py:1178
 msgid "Do you want to continue?"
 msgstr "Ali želite nadaljevati?"
 
-#: lib/isodumper.py:1168
+#: lib/isodumper.py:1186
 msgid "The checksum file is signed"
 msgstr "Datoteka kontrolne vsote je podpisana"
 
-#: lib/isodumper.py:1174
-msgid ""
-"No GPG signature has been found. Are you sure you want to use this image?"
-msgstr ""
-"Podpis GPG ni bil najden. Ali še zmeraj želiš uporabiti ta odtis diska?"
-
-#: lib/isodumper.py:1183
 msgid ""
 "Info: Key used for the signature has expired. Updated version may be "
 "available."
@@ -611,73 +599,79 @@ msgstr ""
 "Informacija: ključ za podpis je pretekel. Mogoče je na voljo posodobljena "
 "verzija."
 
-#: lib/isodumper.py:1271
+#: lib/isodumper.py:1194
+msgid ""
+"No GPG signature has been found. Are you sure you want to use this image?"
+msgstr ""
+"Podpis GPG ni bil najden. Ali še zmeraj želiš uporabiti ta odtis diska?"
+
+#: lib/isodumper.py:1289
 msgid "No image for backup is selected."
 msgstr "Odtis diska za arhiv ni izbran."
 
-#: lib/isodumper.py:1277
+#: lib/isodumper.py:1295
 msgid "Writing confirmation"
 msgstr "Potrditev pisanja"
 
-#: lib/isodumper.py:1284
+#: lib/isodumper.py:1302
 msgid "The device is bigger than 32 Gbytes. Are you sure you want use it?"
 msgstr ""
 "Izbrana naprava ima kapaciteto večjo od 32 gigabajtov. Ali jo res želite "
 "uporabiti?"
 
-#: lib/isodumper.py:1290
+#: lib/isodumper.py:1308
 msgid "No image to write is selected."
 msgstr "Odtis diska za zapis ni izbran."
 
-#: lib/isodumper.py:1302
+#: lib/isodumper.py:1320
 msgid "Label length will be shorten to {} characters. Do you want to continue?"
 msgstr "Dolžina oznake bo skrajšana na {} znakov. Ali želite nadaljevati?"
 
-#: lib/isodumper.py:1339
+#: lib/isodumper.py:1357
 msgid "Label for the device:"
 msgstr "Oznaka naprave:"
 
-#: lib/isodumper.py:1344
+#: lib/isodumper.py:1362
 msgid "FAT32 (Windows)"
 msgstr "FAT32 (Windows)"
 
-#: lib/isodumper.py:1348
+#: lib/isodumper.py:1366
 msgid "exFAT (Windows)"
 msgstr "exFAT (Windows)"
 
-#: lib/isodumper.py:1352
+#: lib/isodumper.py:1370
 msgid "NTFS (Windows)"
 msgstr "NTFS (Windows)"
 
-#: lib/isodumper.py:1356
+#: lib/isodumper.py:1374
 msgid "ext4 (Linux)"
 msgstr "ext4 (Linux)"
 
-#: lib/isodumper.py:1360 lib/isodumper.py:1448
+#: lib/isodumper.py:1378 lib/isodumper.py:1466
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: lib/isodumper.py:1402
+#: lib/isodumper.py:1420
 msgid "OK"
 msgstr "V redu"
 
-#: lib/isodumper.py:1414
+#: lib/isodumper.py:1432
 msgid "Yes"
 msgstr "Da"
 
-#: lib/isodumper.py:1415
+#: lib/isodumper.py:1433
 msgid "No"
 msgstr "Ne"
 
-#: lib/isodumper.py:1428
+#: lib/isodumper.py:1446
 msgid "Oliver Grawert<BR />Papoteur<BR />Pictures : Timothée Giet"
 msgstr "Oliver Grawert<BR />Papoteur<BR />Slike : Timothée Giet"
 
-#: lib/isodumper.py:1429
+#: lib/isodumper.py:1447
 msgid "A tool for writing ISO images to  a device"
 msgstr "Orodje za zapis odtisov diskov na napravo"
 
-#: lib/isodumper.py:1444
+#: lib/isodumper.py:1462
 msgid ""
 "Warning\n"
 "No target devices were found.\n"
@@ -687,15 +681,15 @@ msgstr ""
 "Nobene ciljne naprave ni bilo mogoče najti.\n"
 "Vstavite ključ USB, na katerega lahko zapišete odtis diska."
 
-#: lib/isodumper.py:1447
+#: lib/isodumper.py:1465
 msgid "Refresh"
 msgstr "Osveževanje"
 
-#: lib/isodumper.py:1473
+#: lib/isodumper.py:1491
 msgid "UDisks2 is not available on your system"
 msgstr "Storitev UDisks2 ni na voljo na vašem sistemu"
 
-#: lib/isodumper.py:1511
+#: lib/isodumper.py:1529
 msgid "allow debug information"
 msgstr "omogoči informacije za razhroščevanje"
 
@@ -708,3 +702,37 @@ msgid "A GUI tool to write .img and .iso files to USB sticks"
 msgstr ""
 "Orodje z grafičnim uporabniškim vmesnikom za zapis datotek odtisa diska "
 "npr.: .img in .iso na ključek USB"
+<<<<<<< HEAD
+=======
+
+#~ msgid "An error {} occurred."
+#~ msgstr "Prišlo je do napake {}."
+
+#~ msgid "Authentication error."
+#~ msgstr "Napaka overjanja."
+
+#~ msgid "Error {} while doing persistent partition: {}"
+#~ msgstr "Napaka {} med ustvarjanjem razdelka za obdržanje sprememb: {}"
+
+#~ msgid ""
+#~ "No GPG signature has been found or the key is expired. Are you sure you "
+#~ "want to use this image?"
+#~ msgstr ""
+#~ "Podpis GPG ni bil najden ali pa je ključ pretekel. Ali ste prepričani, da "
+#~ "hočete uporabiti ta odtis diska?"
+
+#~ msgid "Persistent partition added. Encrypting..."
+#~ msgstr "Dodan razdelek za obdržanje sprememb. Šifriranje ..."
+
+#~ msgid "Persistent partition done"
+#~ msgstr "Dodan razdelek za obdržanje sprememb"
+
+#~ msgid "Persistent partition encrypted. Opening..."
+#~ msgstr "Razdelek za obdržanje sprememb je šifriran. Odpiranje ..."
+
+#~ msgid "Persistent partition opened. Formatting..."
+#~ msgstr "Odprt razdelek za obdržanje sprememb. Formatiranje ..."
+
+#~ msgid "or key expired"
+#~ msgstr "ali pa je ključ pretečen"
+>>>>>>> d9b219d (Fix running do_format in magiback)