Change messages about partition added, not always persistent

Format message in interface, translation wasn't displayed

1 files changed, 10 insertions, 12 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(