Change messages about partition added, not always persistent

Format message in interface, translation wasn't displayed

3 files changed, 69 insertions, 68 deletions

diff --git a/lib/isodumper.py b/lib/isodumper.py
index cc624b5..94f0484 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -674,12 +674,12 @@ class IsoDumper(basedialog.BaseDialog):
                             progress = self.iface.progress
                         nowarning, message = self.iface.end()
                         self.progress.setEnabled()
-                        # Add persistent partition if asked
+                        # Add persistent partition if asked, persistent or not
                         if (
                             self.partition_cbox.isChecked()
                             and self.partition_cb.value() == "ext4"
                         ):
-                            self.progress.setLabel(_("Adding persistent partition"))
+                            self.progress.setLabel(_("Adding partition"))
                             self.progress.setValue(0)
                             if self.cryptcb.isChecked():
                                 if self.cryptkey.value() == "":
@@ -701,13 +701,13 @@ class IsoDumper(basedialog.BaseDialog):
                                         time.sleep(0.5)
                                     if self.iface.state:
                                         message = _(
-                                            "Added encrypted persistent partition"
+                                            "Added encrypted partition"
                                         )
                                         self.logger.info(message)
                                     else:
                                         self.logger.error(
                                             _(
-                                                "Adding encrypted persistent partition failed"
+                                                "Adding encrypted partition failed"
                                             )
                                         )
                                         self.logger.error(self.iface.message)
@@ -722,9 +722,9 @@ class IsoDumper(basedialog.BaseDialog):
                                     self.dialog.pollEvent()
                                     time.sleep(0.5)
                                 if self.iface.state:
-                                    message = _("Added persistent partition")
+                                    message = _("Added partition")
                                 else:
-                                    message = _("Adding persistent partition failed")
+                                    message = _("Adding partition failed")
                                     self.logger.warning(self.iface.message)
                                     nowarning = False
                                 self.logger.warning(message)
@@ -1009,9 +1009,10 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         self.labelbox.setStretchable(0, True)
         self.factory.createLabel(
             self.labelbox,
-            _(
-                "The selected operations will be executed in order from top to bottom.\nIf both write image and create partition are selected, the partition\nwill be created in the free space after the image."
-            ),
+           "\n".join( [
+               _("The selected operations will be executed in order from top to bottom."),
+               _("If both write image and create partition are selected, the partition will be created in the free space after the image."),
+               ]),
         ).setStretchable(0, True)
         self.backupbox = self.factory.createHBox(self.operationbox)
         self.backup_cbox = self.factory.createCheckBox(
@@ -1056,8 +1057,6 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         )
         self.partition_label.setStretchable(0, True)
         self.persistencebox = self.factory.createHBox(self.operationbox)
-        # self.persistencecb = self.factory.createCheckBox(self.persistencecol1,
-        #                                                _("Add a persistent partition in the remaining space"))
         self.cryptcb = self.factory.createCheckBox(
             self.persistencebox, _("Encrypt partition using LUKS, with key:")
         )
@@ -1066,7 +1065,6 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
             self.persistencebox, _("Key:"), passwordMode=True
         )
         self.cryptkey.setStretchable(0, True)
-        # self.formatbt = self.factory.createPushButton(self.formatbox, _("Format the device"))
         self.execute_frame = self.factory.createFrame(self.box, _("Execution"))
         self.execute_framevb = self.factory.createVBox(self.execute_frame)
         self.execute_label = self.factory.createLabel(
diff --git a/po/isodumper.pot b/po/isodumper.pot
index e251f43..e7b3448 100644
--- a/po/isodumper.pot
+++ b/po/isodumper.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: isodumper 1.27\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-04 18:50+0200\n"
+"POT-Creation-Date: 2023-07-11 17:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -187,7 +187,7 @@ msgstr ""
 msgid "An error {} occurred."
 msgstr ""
 
-#: lib/isodumper.py:499 lib/isodumper.py:1081
+#: lib/isodumper.py:499 lib/isodumper.py:1079
 msgid "Progress"
 msgstr ""
 
@@ -252,7 +252,7 @@ msgid "Checking "
 msgstr ""
 
 #: lib/isodumper.py:682
-msgid "Adding persistent partition"
+msgid "Adding partition"
 msgstr ""
 
 #: lib/isodumper.py:687
@@ -260,19 +260,19 @@ msgid "No key for encrypted partition provided. Adding the partition aborted."
 msgstr ""
 
 #: lib/isodumper.py:704
-msgid "Added encrypted persistent partition"
+msgid "Added encrypted partition"
 msgstr ""
 
 #: lib/isodumper.py:710
-msgid "Adding encrypted persistent partition failed"
+msgid "Adding encrypted partition failed"
 msgstr ""
 
 #: lib/isodumper.py:725
-msgid "Added persistent partition"
+msgid "Added partition"
 msgstr ""
 
 #: lib/isodumper.py:727
-msgid "Adding persistent partition failed"
+msgid "Adding partition failed"
 msgstr ""
 
 #: lib/isodumper.py:758
@@ -289,8 +289,8 @@ msgid ""
 "/var/log/magiback.log has been saved."
 msgstr ""
 
-#: lib/isodumper.py:774 lib/isodumper.py:794 lib/isodumper.py:1149
-#: lib/isodumper.py:1166 lib/isodumper.py:1274
+#: lib/isodumper.py:774 lib/isodumper.py:794 lib/isodumper.py:1147
+#: lib/isodumper.py:1164 lib/isodumper.py:1272
 msgid "Warning"
 msgstr ""
 
@@ -307,8 +307,8 @@ msgid ""
 "            Are you sure you want to quit during writing?"
 msgstr ""
 
-#: lib/isodumper.py:811 lib/isodumper.py:935 lib/isodumper.py:1264
-#: lib/isodumper.py:1283
+#: lib/isodumper.py:811 lib/isodumper.py:935 lib/isodumper.py:1262
+#: lib/isodumper.py:1281
 msgid "Error"
 msgstr ""
 
@@ -438,182 +438,185 @@ msgid "Select operations"
 msgstr ""
 
 #: lib/isodumper.py:1013
+msgid "The selected operations will be executed in order from top to bottom."
+msgstr ""
+
+#: lib/isodumper.py:1014
 msgid ""
-"The selected operations will be executed in order from top to bottom.\n"
-"If both write image and create partition are selected, the partition\n"
-"will be created in the free space after the image."
+"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:1018
+#: lib/isodumper.py:1019
 msgid "Backup the device to:"
 msgstr ""
 
-#: lib/isodumper.py:1029
+#: lib/isodumper.py:1030
 msgid "Write Image from:"
 msgstr ""
 
-#: lib/isodumper.py:1039
+#: lib/isodumper.py:1040
 msgid "Create partition of type:"
 msgstr ""
 
-#: lib/isodumper.py:1042
+#: lib/isodumper.py:1043
 msgid "Type:"
 msgstr ""
 
-#: lib/isodumper.py:1045
+#: lib/isodumper.py:1046
 msgid "FAT32"
 msgstr ""
 
-#: lib/isodumper.py:1046 lib/isodumper.py:1242
+#: lib/isodumper.py:1047 lib/isodumper.py:1240
 msgid "ext4"
 msgstr ""
 
-#: lib/isodumper.py:1047
+#: lib/isodumper.py:1048
 msgid "NTFS"
 msgstr ""
 
-#: lib/isodumper.py:1048
+#: lib/isodumper.py:1049
 msgid "exFAT"
 msgstr ""
 
-#: lib/isodumper.py:1049 lib/isodumper.py:1242 lib/isodumper.py:1244
+#: lib/isodumper.py:1050 lib/isodumper.py:1240 lib/isodumper.py:1242
 msgid "Persistent partition"
 msgstr ""
 
-#: lib/isodumper.py:1055
+#: lib/isodumper.py:1056
 msgid "Label:"
 msgstr ""
 
-#: lib/isodumper.py:1062
+#: lib/isodumper.py:1061
 msgid "Encrypt partition using LUKS, with key:"
 msgstr ""
 
-#: lib/isodumper.py:1066
+#: lib/isodumper.py:1065
 msgid "Key:"
 msgstr ""
 
-#: lib/isodumper.py:1070
+#: lib/isodumper.py:1068
 msgid "Execution"
 msgstr ""
 
-#: lib/isodumper.py:1073
+#: lib/isodumper.py:1071
 msgid "When you are sure all options are correct, start:"
 msgstr ""
 
-#: lib/isodumper.py:1076 lib/isodumper.py:1338
+#: lib/isodumper.py:1074 lib/isodumper.py:1336
 msgid "Execute"
 msgstr ""
 
-#: lib/isodumper.py:1086
+#: lib/isodumper.py:1084
 msgid "Report"
 msgstr ""
 
-#: lib/isodumper.py:1089
+#: lib/isodumper.py:1087
 msgid "About"
 msgstr ""
 
-#: lib/isodumper.py:1091
+#: lib/isodumper.py:1089
 msgid "Help"
 msgstr ""
 
-#: lib/isodumper.py:1093
+#: lib/isodumper.py:1091
 msgid "Quit"
 msgstr ""
 
-#: lib/isodumper.py:1152
+#: lib/isodumper.py:1150
 msgid "The validation of the GPG signature of the checksum file failed !"
 msgstr ""
 
-#: lib/isodumper.py:1155
+#: lib/isodumper.py:1153
 msgid "Do you want to continue?"
 msgstr ""
 
-#: lib/isodumper.py:1163
+#: lib/isodumper.py:1161
 msgid "The checksum file is signed"
 msgstr ""
 
-#: lib/isodumper.py:1169
+#: lib/isodumper.py:1167
 msgid ""
 "No GPG signature has been found or the key is expired. Are you sure you want "
 "to use this image?"
 msgstr ""
 
-#: lib/isodumper.py:1264
+#: lib/isodumper.py:1262
 msgid "No image for backup is selected."
 msgstr ""
 
-#: lib/isodumper.py:1270
+#: lib/isodumper.py:1268
 msgid "Writing confirmation"
 msgstr ""
 
-#: lib/isodumper.py:1277
+#: lib/isodumper.py:1275
 msgid "The device is bigger than 32 Gbytes. Are you sure you want use it?"
 msgstr ""
 
-#: lib/isodumper.py:1283
+#: lib/isodumper.py:1281
 msgid "No image to write is selected."
 msgstr ""
 
-#: lib/isodumper.py:1318
+#: lib/isodumper.py:1316
 msgid "Label for the device:"
 msgstr ""
 
-#: lib/isodumper.py:1323
+#: lib/isodumper.py:1321
 msgid "FAT32 (Windows)"
 msgstr ""
 
-#: lib/isodumper.py:1327
+#: lib/isodumper.py:1325
 msgid "exFAT (Windows)"
 msgstr ""
 
-#: lib/isodumper.py:1331
+#: lib/isodumper.py:1329
 msgid "NTFS (Windows)"
 msgstr ""
 
-#: lib/isodumper.py:1335
+#: lib/isodumper.py:1333
 msgid "ext4 (Linux)"
 msgstr ""
 
-#: lib/isodumper.py:1339 lib/isodumper.py:1427
+#: lib/isodumper.py:1337 lib/isodumper.py:1425
 msgid "Cancel"
 msgstr ""
 
-#: lib/isodumper.py:1381
+#: lib/isodumper.py:1379
 msgid "OK"
 msgstr ""
 
-#: lib/isodumper.py:1393
+#: lib/isodumper.py:1391
 msgid "Yes"
 msgstr ""
 
-#: lib/isodumper.py:1394
+#: lib/isodumper.py:1392
 msgid "No"
 msgstr ""
 
-#: lib/isodumper.py:1407
+#: lib/isodumper.py:1405
 msgid "Oliver Grawert<BR />Papoteur<BR />Pictures : Timothée Giet"
 msgstr ""
 
-#: lib/isodumper.py:1408
+#: lib/isodumper.py:1406
 msgid "A tool for writing ISO images to  a device"
 msgstr ""
 
-#: lib/isodumper.py:1423
+#: lib/isodumper.py:1421
 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:1426
+#: lib/isodumper.py:1424
 msgid "Refresh"
 msgstr ""
 
-#: lib/isodumper.py:1452
+#: lib/isodumper.py:1450
 msgid "UDisks2 is not available on your system"
 msgstr ""
 
-#: lib/isodumper.py:1490
+#: lib/isodumper.py:1488
 msgid "allow debug information"
 msgstr ""
 
diff --git a/tools/po-compile.sh b/tools/po-compile.sh
index a29d8cb..a29d8cb 100644..100755
--- a/tools/po-compile.sh
+++ b/tools/po-compile.sh