Mercurial Repositories > eric / changeset

--- a/scripts/install-debugclients.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/scripts/install-debugclients.py	Tue Dec 06 17:35:41 2022 +0100
@@ -232,7 +232,7 @@
     global sourceDir, eric7SourceDir
 
     if sys.version_info < (3, 7, 0) or sys.version_info >= (4, 0, 0):
-        print("Sorry, the eric debugger requires Python 3.7 or better" " for running.")
+        print("Sorry, the eric debugger requires Python 3.7 or better for running.")
         exit(5)
 
     progName = os.path.basename(argv[0])

--- a/scripts/install.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/scripts/install.py	Tue Dec 06 17:35:41 2022 +0100
@@ -151,7 +151,7 @@
     print("               (default: {0})".format(platBinDir))
     print("    -d dir     where eric python files will be installed")
     print("               (default: {0})".format(modDir))
-    print("    -f file    configuration file naming the various installation" " paths")
+    print("    -f file    configuration file naming the various installation paths")
     if not sys.platform.startswith(("win", "cygwin")):
         print("    -i dir     temporary install prefix")
         print("               (default: {0})".format(distDir))
@@ -165,7 +165,7 @@
         print("               (default: {0})".format(macPythonExe))
     print("    -c         don't cleanup old installation first")
     print("    -v, --verbose print some more information")
-    print("    -x         don't perform dependency checks (use on your own" " risk)")
+    print("    -x         don't perform dependency checks (use on your own risk)")
     print("    -z         don't compile the installed python files")
     print("    --yes      answer 'yes' to all questions")
     print()
@@ -174,7 +174,7 @@
     print("    --no-info  don't create the install info file")
     print("    --with-tools don't install qt6-applications")
     print()
-    print("The file given to the -f option must be valid Python code" " defining a")
+    print("The file given to the -f option must be valid Python code defining a")
     print(
         "dictionary called 'cfg' with the keys 'ericDir', 'ericPixDir',"
         " 'ericIconDir',"

--- a/src/eric7/CondaInterface/Conda.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/CondaInterface/Conda.py	Tue Dec 06 17:35:41 2022 +0100
@@ -162,7 +162,7 @@
                     self.__ui,
                     self.tr("conda remove"),
                     self.tr(
-                        "<p>The conda executable returned an error.</p>" "<p>{0}</p>"
+                        "<p>The conda executable returned an error.</p><p>{0}</p>"
                     ).format(jsonDict["message"]),
                 )
                 return False
@@ -711,7 +711,7 @@
                 process.waitForFinished(2000)
                 process.kill()
                 process.waitForFinished(3000)
-                return False, self.tr("conda did not finish within" " 3 seconds.")
+                return False, self.tr("conda did not finish within 3 seconds.")
 
         return False, self.tr("conda could not be started.")
 

--- a/src/eric7/DebugClients/Python/DebugBase.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/DebugClients/Python/DebugBase.py	Tue Dec 06 17:35:41 2022 +0100
@@ -388,7 +388,7 @@
             return None
 
         print(  # __IGNORE_WARNING_M801__
-            "DebugBase.trace_dispatch:" " unknown debugging event: ",
+            "DebugBase.trace_dispatch: unknown debugging event: ",
             repr(event),
         )
 

--- a/src/eric7/Debugger/DebugUI.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Debugger/DebugUI.py	Tue Dec 06 17:35:41 2022 +0100
@@ -606,9 +606,7 @@
             "dbg_step_out",
         )
         act.setStatusTip(
-            self.tr(
-                """Execute Python statements until leaving the current frame"""
-            )
+            self.tr("""Execute Python statements until leaving the current frame""")
         )
         act.setWhatsThis(
             self.tr(
@@ -1568,7 +1566,7 @@
             EricMessageBox.information(
                 self.ui,
                 Program,
-                self.tr("The program being debugged has terminated" " unexpectedly."),
+                self.tr("The program being debugged has terminated unexpectedly."),
             )
 
     def __getThreadList(self, debuggerId):

--- a/src/eric7/Debugger/DebugViewer.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Debugger/DebugViewer.py	Tue Dec 06 17:35:41 2022 +0100
@@ -791,7 +791,7 @@
         if self.__debuggersList.topLevelItemCount() > 1:
             self.debugUI.showNotification(
                 self.tr(
-                    "<p>Debugger with ID <b>{0}</b> has been connected." "</p>"
+                    "<p>Debugger with ID <b>{0}</b> has been connected.</p>"
                 ).format(debuggerId)
             )
 

--- a/src/eric7/Debugger/StartHistoryEditDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Debugger/StartHistoryEditDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -80,9 +80,7 @@
         yes = EricMessageBox.yesNo(
             self,
             self.tr("Delete Selected Entries"),
-            self.tr(
-                """Do you really want to delete the selected history entries?"""
-            ),
+            self.tr("""Do you really want to delete the selected history entries?"""),
         )
         if yes:
             for itm in self.historyList.selectedItems():

--- a/src/eric7/EricNetwork/EricFtp.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/EricNetwork/EricFtp.py	Tue Dec 06 17:35:41 2022 +0100
@@ -319,7 +319,7 @@
                     )
                 if not self.__proxyPassword:
                     raise EricFtpProxyError(
-                        "992 Proxy usage requested, but no proxy password" " given"
+                        "992 Proxy usage requested, but no proxy password given"
                     )
 
             if self.__proxyType in [

--- a/src/eric7/EricNetwork/EricSslCertificatesDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslCertificatesDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -453,7 +453,7 @@
                 self.tr("Export Certificate"),
                 name,
                 self.tr(
-                    "Certificate File (PEM) (*.pem);;" "Certificate File (DER) (*.der)"
+                    "Certificate File (PEM) (*.pem);;Certificate File (DER) (*.der)"
                 ),
                 None,
                 EricFileDialog.DontConfirmOverwrite,
@@ -510,9 +510,7 @@
             self,
             self.tr("Import Certificate"),
             "",
-            self.tr(
-                "Certificate Files (*.pem *.crt *.der *.cer *.ca);;" "All Files (*)"
-            ),
+            self.tr("Certificate Files (*.pem *.crt *.der *.cer *.ca);;All Files (*)"),
         )
 
         if fname:

--- a/src/eric7/EricXML/XMLStreamReaderBase.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/EricXML/XMLStreamReaderBase.py	Tue Dec 06 17:35:41 2022 +0100
@@ -63,7 +63,7 @@
             else:
                 msg = QCoreApplication.translate(
                     "XMLStreamReaderBase",
-                    "<p>XML parse error (line {0}," " column {1})</p><p>Error: {2}</p>",
+                    "<p>XML parse error (line {0}, column {1})</p><p>Error: {2}</p>",
                 ).format(self.lineNumber(), self.columnNumber(), self.errorString())
             EricMessageBox.warning(
                 None,
@@ -210,7 +210,7 @@
                             self.raiseError(
                                 QCoreApplication.translate(
                                     "XMLStreamReaderBase",
-                                    "Pickle data encoding '{0}' is not" " supported.",
+                                    "Pickle data encoding '{0}' is not supported.",
                                 ).format(encoding)
                             )
                             continue

--- a/src/eric7/Graphics/ImportsDiagramBuilder.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Graphics/ImportsDiagramBuilder.py	Tue Dec 06 17:35:41 2022 +0100
@@ -142,7 +142,7 @@
             ct.setHtml(
                 self.buildErrorMessage(
                     self.tr(
-                        "The directory <b>'{0}'</b> is not a Python" " package."
+                        "The directory <b>'{0}'</b> is not a Python package."
                     ).format(self.package)
                 )
             )

--- a/src/eric7/Graphics/UMLClassDiagramBuilder.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Graphics/UMLClassDiagramBuilder.py	Tue Dec 06 17:35:41 2022 +0100
@@ -163,7 +163,7 @@
             ct.setHtml(
                 self.buildErrorMessage(
                     self.tr(
-                        "The module <b>'{0}'</b> does not contain any" " classes."
+                        "The module <b>'{0}'</b> does not contain any classes."
                     ).format(self.file)
                 )
             )

--- a/src/eric7/Graphics/UMLDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Graphics/UMLDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -271,7 +271,7 @@
                     self,
                     self.tr("Save Diagram"),
                     self.tr(
-                        "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                        "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                     ).format(fpath),
                     icon=EricMessageBox.Warning,
                 )

--- a/src/eric7/Graphics/UMLGraphicsView.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Graphics/UMLGraphicsView.py	Tue Dec 06 17:35:41 2022 +0100
@@ -367,7 +367,7 @@
             self.tr("Save Diagram"),
             "",
             self.tr(
-                "Portable Network Graphics (*.png);;" "Scalable Vector Graphics (*.svg)"
+                "Portable Network Graphics (*.png);;Scalable Vector Graphics (*.svg)"
             ),
             "",
             EricFileDialog.DontConfirmOverwrite,
@@ -383,7 +383,7 @@
                     self,
                     self.tr("Save Diagram"),
                     self.tr(
-                        "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                        "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                     ).format(fpath),
                     icon=EricMessageBox.Warning,
                 )

--- a/src/eric7/HelpViewer/HelpViewerImplQTB.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/HelpViewer/HelpViewerImplQTB.py	Tue Dec 06 17:35:41 2022 +0100
@@ -28,7 +28,7 @@
 
 AboutBlank = QCoreApplication.translate(
     "HelpViewer",
-    "<html>" "<head><title>about:blank</title></head>" "<body></body>" "</html>",
+    "<html><head><title>about:blank</title></head><body></body></html>",
 )
 
 PageNotFound = QCoreApplication.translate(

--- a/src/eric7/HexEdit/HexEditMainWindow.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/HexEdit/HexEditMainWindow.py	Tue Dec 06 17:35:41 2022 +0100
@@ -245,9 +245,7 @@
             "hexEditor_file_save_readable",
         )
         self.saveReadableAct.setStatusTip(
-            self.tr(
-                "Save the current binary data to a new file in a readable" " format"
-            )
+            self.tr("Save the current binary data to a new file in a readable format")
         )
         self.saveReadableAct.setWhatsThis(
             self.tr(
@@ -270,9 +268,7 @@
         )
         self.closeAct.setStatusTip(self.tr("Close the current hex editor window"))
         self.closeAct.setWhatsThis(
-            self.tr(
-                """<b>Close</b><p>Closes the current hex editor window.</p>"""
-            )
+            self.tr("""<b>Close</b><p>Closes the current hex editor window.</p>""")
         )
         self.closeAct.triggered.connect(self.close)
         self.__actions.append(self.closeAct)
@@ -320,9 +316,7 @@
             "hexEditor_file_quit",
         )
         self.exitAct.setStatusTip(self.tr("Quit the hex editor"))
-        self.exitAct.setWhatsThis(
-            self.tr("""<b>Quit</b><p>Quit the hex editor.</p>""")
-        )
+        self.exitAct.setWhatsThis(self.tr("""<b>Quit</b><p>Quit the hex editor.</p>"""))
         if not self.__fromEric:
             self.exitAct.triggered.connect(self.__closeAll)
         self.__actions.append(self.exitAct)
@@ -447,9 +441,7 @@
         )
         self.selectAllAct.setStatusTip(self.tr("Select the complete binary data"))
         self.selectAllAct.setWhatsThis(
-            self.tr(
-                """<b>Select All</b><p>Selects the complete binary data.</p>"""
-            )
+            self.tr("""<b>Select All</b><p>Selects the complete binary data.</p>""")
         )
         self.selectAllAct.triggered.connect(self.__editor.selectAll)
         self.__actions.append(self.selectAllAct)
@@ -464,9 +456,7 @@
         )
         self.deselectAllAct.setStatusTip(self.tr("Deselect all binary data"))
         self.deselectAllAct.setWhatsThis(
-            self.tr(
-                """<b>Deselect All</b><p>Deselect all all binary data.</p>"""
-            )
+            self.tr("""<b>Deselect All</b><p>Deselect all all binary data.</p>""")
         )
         self.deselectAllAct.triggered.connect(self.__editor.deselectAll)
         self.__actions.append(self.deselectAllAct)
@@ -1123,9 +1113,9 @@
             EricMessageBox.warning(
                 self,
                 self.tr("eric Hex Editor"),
-                self.tr(
-                    "<p>Cannot read file <b>{0}</b>.</p>" "<p>Reason: {1}</p>"
-                ).format(fileName, str(err)),
+                self.tr("<p>Cannot read file <b>{0}</b>.</p><p>Reason: {1}</p>").format(
+                    fileName, str(err)
+                ),
             )
             return
 
@@ -1216,7 +1206,7 @@
                 self,
                 self.tr("Save binary file"),
                 self.tr(
-                    "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fileName),
                 icon=EricMessageBox.Warning,
             )
@@ -1244,7 +1234,7 @@
                 self,
                 self.tr("eric Hex Editor"),
                 self.tr(
-                    "<p>Cannot write file <b>{0}</b>.</p>" "<p>Reason: {1}</p>"
+                    "<p>Cannot write file <b>{0}</b>.</p><p>Reason: {1}</p>"
                 ).format(fileName, str(err)),
             )
             self.__checkActions()
@@ -1293,7 +1283,7 @@
                 self,
                 self.tr("Save to readable file"),
                 self.tr(
-                    "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )
@@ -1313,7 +1303,7 @@
                 self,
                 self.tr("eric Hex Editor"),
                 self.tr(
-                    "<p>Cannot write file <b>{0}</b>.</p>" "<p>Reason: {1}</p>"
+                    "<p>Cannot write file <b>{0}</b>.</p><p>Reason: {1}</p>"
                 ).format(fpath, str(err)),
             )
             return

--- a/src/eric7/IconEditor/IconEditorWindow.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/IconEditor/IconEditorWindow.py	Tue Dec 06 17:35:41 2022 +0100
@@ -142,7 +142,7 @@
             "ppm": self.tr("Portable Pixmap File (*.ppm)"),
             "sgi": self.tr("Silicon Graphics Image File (*.sgi)"),
             "svg": self.tr("Scalable Vector Graphics File (*.svg)"),
-            "svgz": self.tr("Compressed Scalable Vector Graphics File" " (*.svgz)"),
+            "svgz": self.tr("Compressed Scalable Vector Graphics File (*.svgz)"),
             "tga": self.tr("Targa Graphic File (*.tga)"),
             "tif": self.tr("TIFF File (*.tif)"),
             "tiff": self.tr("TIFF File (*.tiff)"),
@@ -292,9 +292,7 @@
         )
         self.closeAct.setStatusTip(self.tr("Close the current icon editor window"))
         self.closeAct.setWhatsThis(
-            self.tr(
-                """<b>Close</b><p>Closes the current icon editor window.</p>"""
-            )
+            self.tr("""<b>Close</b><p>Closes the current icon editor window.</p>""")
         )
         self.closeAct.triggered.connect(self.close)
         self.__actions.append(self.closeAct)
@@ -492,9 +490,7 @@
         )
         self.selectAllAct.setStatusTip(self.tr("Select the complete icon image"))
         self.selectAllAct.setWhatsThis(
-            self.tr(
-                """<b>Select All</b><p>Selects the complete icon image.</p>"""
-            )
+            self.tr("""<b>Select All</b><p>Selects the complete icon image.</p>""")
         )
         self.selectAllAct.triggered.connect(self.__editor.editSelectAll)
         self.__actions.append(self.selectAllAct)
@@ -809,9 +805,7 @@
             self.drawingActGrp,
             "iconEditor_tools_line",
         )
-        self.drawLineAct.setWhatsThis(
-            self.tr("""<b>Line</b><p>Draw a line.</p>""")
-        )
+        self.drawLineAct.setWhatsThis(self.tr("""<b>Line</b><p>Draw a line.</p>"""))
         self.drawLineAct.setCheckable(True)
         self.esm.setMapping(self.drawLineAct, IconEditorTool.LINE)
         self.drawLineAct.triggered.connect(self.esm.map)

--- a/src/eric7/JediInterface/JediClient.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/JediInterface/JediClient.py	Tue Dec 06 17:35:41 2022 +0100
@@ -601,7 +601,7 @@
 
 if __name__ == "__main__":
     if len(sys.argv) != 5:
-        print("Host, port, id and module path parameters are missing." " Abort.")
+        print("Host, port, id and module path parameters are missing. Abort.")
         sys.exit(1)
 
     host, port, idString = sys.argv[1:-1]

--- a/src/eric7/JediInterface/JediServer.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/JediInterface/JediServer.py	Tue Dec 06 17:35:41 2022 +0100
@@ -742,7 +742,7 @@
                 None,
                 self.tr("Apply Refactoring"),
                 self.tr(
-                    "<p>The refactoring could not be applied.</p>" "<p>Reason: {0}</p>"
+                    "<p>The refactoring could not be applied.</p><p>Reason: {0}</p>"
                 ).format(result["ErrorString"]),
             )
 

--- a/src/eric7/MicroPython/EspDevices.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/EspDevices.py	Tue Dec 06 17:35:41 2022 +0100
@@ -168,9 +168,7 @@
         ok = EricMessageBox.yesNo(
             self.microPython,
             self.tr("Erase Flash"),
-            self.tr(
-                """Shall the flash of the selected device really be erased?"""
-            ),
+            self.tr("""Shall the flash of the selected device really be erased?"""),
         )
         if ok:
             flashArgs = [

--- a/src/eric7/MicroPython/MicroPythonCommandsInterface.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonCommandsInterface.py	Tue Dec 06 17:35:41 2022 +0100
@@ -832,7 +832,7 @@
             "stat_ = __os_.statvfs('/flash')",
             "res['flash_total_kb'] = stat_[2] * stat_[0] / 1024.0",
             "res['flash_free_kb'] = stat_[3] * stat_[0] / 1024.0",
-            "res['flash_used_kb'] = res['flash_total_kb'] -" " res['flash_free_kb']",
+            "res['flash_used_kb'] = res['flash_total_kb'] - res['flash_free_kb']",
             "res['flash_free_pc'] = res['flash_free_kb'] /"
             " res['flash_total_kb'] * 100.0",
             "res['flash_used_pc'] = res['flash_used_kb'] /"

--- a/src/eric7/MicroPython/MicroPythonDevices.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonDevices.py	Tue Dec 06 17:35:41 2022 +0100
@@ -534,7 +534,7 @@
             Plotter and a reason why it cannot.
         @rtype tuple of (bool, str)
         """
-        return False, self.tr("Running scripts is not supported by this" " device.")
+        return False, self.tr("Running scripts is not supported by this device.")
 
     def runScript(self, script):
         """

--- a/src/eric7/MicroPython/MicroPythonFileManagerWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonFileManagerWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -479,7 +479,7 @@
                         deviceFilename,
                         self.tr("Copy File to Device"),
                         self.tr(
-                            "The given file exists already" " (Enter file name only)."
+                            "The given file exists already (Enter file name only)."
                         ),
                         False,
                         self,

--- a/src/eric7/MicroPython/MicroPythonWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -1165,9 +1165,7 @@
             EricMessageBox.critical(
                 self,
                 self.tr("Run Script"),
-                self.tr(
-                    """The current editor does not contain a script. Abort..."""
-                ),
+                self.tr("""The current editor does not contain a script. Abort..."""),
             )
             return
 
@@ -1176,9 +1174,9 @@
             EricMessageBox.warning(
                 self,
                 self.tr("Run Script"),
-                self.tr(
-                    """<p>Cannot run script.</p><p>Reason: {0}</p>"""
-                ).format(reason),
+                self.tr("""<p>Cannot run script.</p><p>Reason: {0}</p>""").format(
+                    reason
+                ),
             )
             return
 
@@ -1586,7 +1584,7 @@
                         "</table>"
                     ).format(date, time)
                 except ValueError:
-                    return self.tr("<h3>Device Date and Time</h3>" "<p>{0}</p>").format(
+                    return self.tr("<h3>Device Date and Time</h3><p>{0}</p>").format(
                         dateTimeString.strip()
                     )
             except Exception as exc:

--- a/src/eric7/MicroPython/MicrobitDevices.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/MicrobitDevices.py	Tue Dec 06 17:35:41 2022 +0100
@@ -269,7 +269,7 @@
                 self.microPython,
                 self.tr("Flash MicroPython/Firmware"),
                 downloadsPath,
-                self.tr("MicroPython/Firmware Files (*.hex *.bin);;" "All Files (*)"),
+                self.tr("MicroPython/Firmware Files (*.hex *.bin);;All Files (*)"),
             )
             if firmware and os.path.exists(firmware):
                 shutil.copy2(firmware, deviceDirectories[0])

--- a/src/eric7/MicroPython/PyBoardDevices.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/PyBoardDevices.py	Tue Dec 06 17:35:41 2022 +0100
@@ -28,7 +28,7 @@
     DeviceVolumeName = "PYBFLASH"
 
     FlashInstructionsURL = (
-        "https://github.com/micropython/micropython/wiki/" "Pyboard-Firmware-Update"
+        "https://github.com/micropython/micropython/wiki/Pyboard-Firmware-Update"
     )
 
     def __init__(self, microPythonWidget, deviceType, parent=None):

--- a/src/eric7/MicroPython/UF2FlashDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/UF2FlashDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -672,7 +672,7 @@
 
         self.firmwarePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.firmwarePicker.setFilters(
-            self.tr("MicroPython/CircuitPython Files (*.uf2);;" "All Files (*)")
+            self.tr("MicroPython/CircuitPython Files (*.uf2);;All Files (*)")
         )
 
         self.bootPicker.setMode(EricPathPickerModes.DIRECTORY_SHOW_FILES_MODE)

--- a/src/eric7/MicroPython/UnknownDevicesDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MicroPython/UnknownDevicesDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -261,9 +261,7 @@
             ok = EricMessageBox.okToClearData(
                 self,
                 self.tr("Unsaved Data"),
-                self.tr(
-                    """The list of devices contains some with modified data."""
-                ),
+                self.tr("""The list of devices contains some with modified data."""),
                 self.__saveDeviceData,
             )
             if not ok:

--- a/src/eric7/MultiProject/MultiProject.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/MultiProject/MultiProject.py	Tue Dec 06 17:35:41 2022 +0100
@@ -239,7 +239,7 @@
                     self.ui,
                     self.tr("Read Multi Project File"),
                     self.tr(
-                        "<p>The multi project file <b>{0}</b> could not be" " read.</p>"
+                        "<p>The multi project file <b>{0}</b> could not be read.</p>"
                     ).format(fn),
                 )
                 res = False
@@ -363,7 +363,7 @@
                 self.parent(),
                 self.tr("Copy Project"),
                 self.tr(
-                    "Enter directory for the new project (must not exist" " already):"
+                    "Enter directory for the new project (must not exist already):"
                 ),
                 mode=EricPathPickerModes.DIRECTORY_MODE,
                 strPath=srcProjectDirectory,
@@ -726,9 +726,7 @@
         )
         act.setStatusTip(self.tr("Open an existing multiproject"))
         act.setWhatsThis(
-            self.tr(
-                """<b>Open...</b><p>This opens an existing multiproject.</p>"""
-            )
+            self.tr("""<b>Open...</b><p>This opens an existing multiproject.</p>""")
         )
         act.triggered.connect(self.openMultiProject)
         self.actions.append(act)
@@ -744,9 +742,7 @@
         )
         self.closeAct.setStatusTip(self.tr("Close the current multiproject"))
         self.closeAct.setWhatsThis(
-            self.tr(
-                """<b>Close</b><p>This closes the current multiproject.</p>"""
-            )
+            self.tr("""<b>Close</b><p>This closes the current multiproject.</p>""")
         )
         self.closeAct.triggered.connect(self.closeMultiProject)
         self.actions.append(self.closeAct)

--- a/src/eric7/Network/IRC/IrcChannelWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Network/IRC/IrcChannelWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -1024,7 +1024,7 @@
                         ).format(nick)
                     else:
                         message = self.tr(
-                            "{0} removes the 'anonymous' mode from the" " channel."
+                            "{0} removes the 'anonymous' mode from the channel."
                         ).format(nick)
                 elif mode == "b":
                     if isPlus:
@@ -1038,11 +1038,11 @@
                 elif mode == "c":
                     if isPlus:
                         message = self.tr(
-                            "{0} sets the channel mode to 'no colors" " allowed'."
+                            "{0} sets the channel mode to 'no colors allowed'."
                         ).format(nick)
                     else:
                         message = self.tr(
-                            "{0} sets the channel mode to 'allow color" " codes'."
+                            "{0} sets the channel mode to 'allow color codes'."
                         ).format(nick)
                 elif mode == "e":
                     if isPlus:
@@ -1060,7 +1060,7 @@
                         ).format(nick)
                     else:
                         message = self.tr(
-                            "{0} removes the 'invite only' mode from the" " channel."
+                            "{0} removes the 'invite only' mode from the channel."
                         ).format(nick)
                 elif mode == "k":
                     if isPlus:
@@ -1229,7 +1229,7 @@
                 self.__addManagementMessage(
                     self.tr("CTCP"),
                     self.tr(
-                        "Received CTCP-PING request from {0}," " sending answer."
+                        "Received CTCP-PING request from {0}, sending answer."
                     ).format(match.group(1)),
                 )
                 self.sendCtcpReply.emit(match.group(1), "PING {0}".format(ctcpArg))
@@ -1237,7 +1237,7 @@
                 self.__addManagementMessage(
                     self.tr("CTCP"),
                     self.tr(
-                        "Received CTCP-CLIENTINFO request from {0}," " sending answer."
+                        "Received CTCP-CLIENTINFO request from {0}, sending answer."
                     ).format(match.group(1)),
                 )
                 self.sendCtcpReply.emit(
@@ -1953,7 +1953,7 @@
                     self.tr("Whois"),
                     self.tr(
                         "{0} has been idle for {1} and {2}.",
-                        "{0} = name of person, {1} = (x minutes), " "{3} = (x seconds)",
+                        "{0} = name of person, {1} = (x minutes), {3} = (x seconds)",
                     ).format(match.group(1), minutesString, secondsString),
                 )
             else:

--- a/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -364,7 +364,7 @@
             )
             if inUse
             else self.tr(
-                "Do you really want to delete all information for" " this identity?"
+                "Do you really want to delete all information for this identity?"
             )
         )
         res = EricMessageBox.yesNo(

--- a/src/eric7/Network/IRC/IrcWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Network/IRC/IrcWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -686,11 +686,11 @@
                 if not self.isChannelName(name) and name == self.__nickName:
                     if sourceNick == self.__nickName:
                         msg = self.tr(
-                            "You have set your personal modes to" " <b>[{0}]</b>."
+                            "You have set your personal modes to <b>[{0}]</b>."
                         ).format(modes)
                     else:
                         msg = self.tr(
-                            "{0} has changed your personal modes to" " <b>[{1}]</b>."
+                            "{0} has changed your personal modes to <b>[{1}]</b>."
                         ).format(sourceNick, modes)
                     self.networkWidget.addServerMessage(
                         self.tr("Mode"), msg, filterMsg=False
@@ -799,7 +799,7 @@
         elif code == 4:
             parts = message.strip().split()
             message = self.tr(
-                "Server {0} (Version {1}), User-Modes: {2}," " Channel-Modes: {3}"
+                "Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}"
             ).format(parts[1], parts[2], parts[3], parts[4])
         elif code == 265:
             parts = message.strip().split()
@@ -1013,7 +1013,7 @@
                 self.networkWidget.addServerMessage(
                     self.tr("CTCP"),
                     self.tr(
-                        "Received CTCP-PING request from {0}," " sending answer."
+                        "Received CTCP-PING request from {0}, sending answer."
                     ).format(match.group(1)),
                 )
                 self.__sendCtcpReply(match.group(1), "PING {0}".format(ctcpArg))
@@ -1021,7 +1021,7 @@
                 self.networkWidget.addServerMessage(
                     self.tr("CTCP"),
                     self.tr(
-                        "Received CTCP-CLIENTINFO request from {0}," " sending answer."
+                        "Received CTCP-CLIENTINFO request from {0}, sending answer."
                     ).format(match.group(1)),
                 )
                 self.__sendCtcpReply(

--- a/src/eric7/PluginManager/PluginManager.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/PluginManager/PluginManager.py	Tue Dec 06 17:35:41 2022 +0100
@@ -247,7 +247,7 @@
             return (
                 False,
                 self.tr(
-                    "The internal plugin directory <b>{0}</b>" " does not exits."
+                    "The internal plugin directory <b>{0}</b> does not exits."
                 ).format(self.pluginDirs["eric7"]),
             )
 

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -47,7 +47,7 @@
     ),
     "D132": QCoreApplication.translate(
         "DocStyleChecker",
-        "docstring summary is not in imperative mood" " (Does instead of Do)",
+        "docstring summary is not in imperative mood (Does instead of Do)",
     ),
     "D133": QCoreApplication.translate(
         "DocStyleChecker",

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -24,18 +24,18 @@
     ),
     "I201": QCoreApplication.translate(
         "ImportsChecker",
-        "Import statements are in the wrong order. " "'{0}' should be before '{1}'",
+        "Import statements are in the wrong order. '{0}' should be before '{1}'",
     ),
     "I202": QCoreApplication.translate(
-        "ImportsChecker", "Imported names are in the wrong order. " "Should be '{0}'"
+        "ImportsChecker", "Imported names are in the wrong order. Should be '{0}'"
     ),
     "I203": QCoreApplication.translate(
         "ImportsChecker",
-        "Import statements should be combined. " "'{0}' should be combined with '{1}'",
+        "Import statements should be combined. '{0}' should be combined with '{1}'",
     ),
     "I204": QCoreApplication.translate(
         "ImportsChecker",
-        "The names in __all__ are in the wrong order. " "The order should be '{0}'",
+        "The names in __all__ are in the wrong order. The order should be '{0}'",
     ),
     "I901": QCoreApplication.translate(
         "ImportsChecker", "unnecessary import alias - rewrite as '{0}'"

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -58,7 +58,7 @@
     ),
     "M187a": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "unnecessary {0} call around {1}()" " - toggle reverse argument to sorted()",
+        "unnecessary {0} call around {1}() - toggle reverse argument to sorted()",
     ),
     "M187b": QCoreApplication.translate(
         "MiscellaneousChecker",
@@ -105,7 +105,7 @@
     ),
     "M301": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "use of 'datetime.datetime()' without 'tzinfo' argument should be" " avoided",
+        "use of 'datetime.datetime()' without 'tzinfo' argument should be avoided",
     ),
     "M302": QCoreApplication.translate(
         "MiscellaneousChecker",
@@ -124,7 +124,7 @@
     ),
     "M305": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "use of 'datetime.datetime.now()' without 'tz' argument should be" " avoided",
+        "use of 'datetime.datetime.now()' without 'tz' argument should be avoided",
     ),
     "M306": QCoreApplication.translate(
         "MiscellaneousChecker",
@@ -164,7 +164,7 @@
     ),
     "M321": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "use of 'datetime.time()' without 'tzinfo' argument should be" " avoided",
+        "use of 'datetime.time()' without 'tzinfo' argument should be avoided",
     ),
     "M401": QCoreApplication.translate(
         "MiscellaneousChecker",
@@ -176,7 +176,7 @@
     ),
     "M403": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "'sys.version' compared to string (Python 3.10), use" " 'sys.version_info'",
+        "'sys.version' compared to string (Python 3.10), use 'sys.version_info'",
     ),
     "M411": QCoreApplication.translate(
         "MiscellaneousChecker",
@@ -201,7 +201,7 @@
     ),
     "M422": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "'sys.version' compared to string (Python 10)," " use 'sys.version_info'",
+        "'sys.version' compared to string (Python 10), use 'sys.version_info'",
     ),
     "M423": QCoreApplication.translate(
         "MiscellaneousChecker",

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -29,7 +29,7 @@
     ),
     "N806": QCoreApplication.translate(
         "NamingStyleChecker",
-        "first argument of a static method should not be named" " 'self' or 'cls",
+        "first argument of a static method should not be named 'self' or 'cls",
     ),
     "N807": QCoreApplication.translate(
         "NamingStyleChecker", "module names should be lowercase"

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -21,11 +21,11 @@
     ),
     "P103": QCoreApplication.translate(
         "PathlibChecker",
-        "os.makedirs('foo/bar') should be replaced by " "bar_path.mkdir(parents=True)",
+        "os.makedirs('foo/bar') should be replaced by bar_path.mkdir(parents=True)",
     ),
     "P104": QCoreApplication.translate(
         "PathlibChecker",
-        "os.rename('foo', 'bar') should be replaced by " "foo_path.rename(Path('bar'))",
+        "os.rename('foo', 'bar') should be replaced by foo_path.rename(Path('bar'))",
     ),
     "P105": QCoreApplication.translate(
         "PathlibChecker",
@@ -58,11 +58,11 @@
     ),
     "P113": QCoreApplication.translate(
         "PathlibChecker",
-        "os.link('bar', 'foo') should be replaced by" " foo_path.hardlink_to('bar')",
+        "os.link('bar', 'foo') should be replaced by foo_path.hardlink_to('bar')",
     ),
     "P114": QCoreApplication.translate(
         "PathlibChecker",
-        "os.symlink('bar', 'foo') should be replaced by" " foo_path.symlink_to('bar')",
+        "os.symlink('bar', 'foo') should be replaced by foo_path.symlink_to('bar')",
     ),
     "P201": QCoreApplication.translate(
         "PathlibChecker",
@@ -74,7 +74,7 @@
     ),
     "P203": QCoreApplication.translate(
         "PathlibChecker",
-        "os.path.expanduser('~/foo') should be replaced by " "foo_path.expanduser()",
+        "os.path.expanduser('~/foo') should be replaced by foo_path.expanduser()",
     ),
     "P204": QCoreApplication.translate(
         "PathlibChecker", "os.path.isdir('foo') should be replaced by foo_path.is_dir()"
@@ -93,7 +93,7 @@
     ),
     "P208": QCoreApplication.translate(
         "PathlibChecker",
-        "os.path.join('foo', 'bar') should be replaced by " "foo_path / 'bar'",
+        "os.path.join('foo', 'bar') should be replaced by foo_path / 'bar'",
     ),
     "P209": QCoreApplication.translate(
         "PathlibChecker",

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -206,7 +206,7 @@
     ),
     "S332": QCoreApplication.translate(
         "Security",
-        "Use of insecure {0} hash for security. Consider" " 'usedforsecurity=False'.",
+        "Use of insecure {0} hash for security. Consider 'usedforsecurity=False'.",
     ),
     # blacklisted imports
     "S401": QCoreApplication.translate(

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -59,7 +59,7 @@
     ),
     "E123": QCoreApplication.translate(
         "pycodestyle",
-        "closing bracket does not match indentation of opening" " bracket's line",
+        "closing bracket does not match indentation of opening bracket's line",
     ),
     "E124": QCoreApplication.translate(
         "pycodestyle", "closing bracket does not match visual indentation"
@@ -149,7 +149,7 @@
     ),
     "E305": QCoreApplication.translate(
         "pycodestyle",
-        "expected {0} blank lines after class or function definition," " found {1}",
+        "expected {0} blank lines after class or function definition, found {1}",
     ),
     "E306": QCoreApplication.translate(
         "pycodestyle", "expected {0} blank lines before a nested definition, found {1}"

--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py	Tue Dec 06 17:35:41 2022 +0100
@@ -32,7 +32,7 @@
     ),
     "F07B": QCoreApplication.translate(
         "pyFlakes",
-        "Local variable {0!r} (defined as a builtin)" " referenced before assignment.",
+        "Local variable {0!r} (defined as a builtin) referenced before assignment.",
     ),
     "F08": QCoreApplication.translate(
         "pyFlakes", "Duplicate argument {0!r} in function definition."

--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py	Tue Dec 06 17:35:41 2022 +0100
@@ -223,7 +223,7 @@
         if len(text) > self.TextToSpeechLimit:
             return (
                 self.tr(
-                    "Google V1: Only texts up to {0} characters are" " allowed."
+                    "Google V1: Only texts up to {0} characters are allowed."
                 ).format(self.TextToSpeechLimit),
                 False,
             )

--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py	Tue Dec 06 17:35:41 2022 +0100
@@ -124,7 +124,7 @@
         apiKey = self.plugin.getPreferences("GoogleV2Key")
         if not apiKey:
             return (
-                self.tr("Google V2: A valid Google Translate key is" " required."),
+                self.tr("Google V2: A valid Google Translate key is required."),
                 False,
             )
 

--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py	Tue Dec 06 17:35:41 2022 +0100
@@ -115,13 +115,13 @@
         apiKey = self.plugin.getPreferences("IbmKey")
         if not apiKey:
             return (
-                self.tr("IBM Watson: A valid Language Translator key is" " required."),
+                self.tr("IBM Watson: A valid Language Translator key is required."),
                 False,
             )
         translatorUrl = self.plugin.getPreferences("IbmUrl")
         if not translatorUrl:
             return (
-                self.tr("IBM Watson: A valid Language Translator URL is" " required."),
+                self.tr("IBM Watson: A valid Language Translator URL is required."),
                 False,
             )
 
@@ -188,7 +188,7 @@
             EricMessageBox.critical(
                 self.__ui,
                 self.tr("Error Getting Available Translations"),
-                self.tr("IBM Watson: A valid Language Translator key is" " required."),
+                self.tr("IBM Watson: A valid Language Translator key is required."),
             )
             return
         translatorUrl = self.plugin.getPreferences("IbmUrl")
@@ -196,7 +196,7 @@
             EricMessageBox.critical(
                 self.__ui,
                 self.tr("Error Getting Available Translations"),
-                self.tr("IBM Watson: A valid Language Translator URL is" " required."),
+                self.tr("IBM Watson: A valid Language Translator URL is required."),
             )
             return
 

--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py	Tue Dec 06 17:35:41 2022 +0100
@@ -21,7 +21,7 @@
     """
 
     TranslatorUrl = (
-        "https://api.cognitive.microsofttranslator.com/translate" "?api-version=3.0"
+        "https://api.cognitive.microsofttranslator.com/translate?api-version=3.0"
     )
 
     def __init__(self, plugin, parent=None):

--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py	Tue Dec 06 17:35:41 2022 +0100
@@ -123,7 +123,7 @@
         if len(text) > self.TranslatorLimit:
             return (
                 self.tr(
-                    "MyMemory: Only texts up to {0} characters are" " allowed."
+                    "MyMemory: Only texts up to {0} characters are allowed."
                 ).format(self.TranslatorLimit),
                 False,
             )

--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py	Tue Dec 06 17:35:41 2022 +0100
@@ -41,12 +41,12 @@
             402: self.tr("Yandex: API key has been blocked."),
             403: self.tr("Yandex: Daily limit for requests has been reached."),
             404: self.tr(
-                "Yandex: Daily limit for the volume of translated" " text reached."
+                "Yandex: Daily limit for the volume of translated text reached."
             ),
             413: self.tr("Yandex: Text size exceeds the maximum."),
             422: self.tr("Yandex: Text could not be translated."),
             501: self.tr(
-                "Yandex: The specified translation direction is not" " supported."
+                "Yandex: The specified translation direction is not supported."
             ),
         }
 

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -84,7 +84,7 @@
             "stage2repo": self.tr("Staging Area to HEAD Commit"),
             "work2repo": self.tr("Working Tree to HEAD Commit"),
             "work2stage2repo": self.tr(
-                "Working to Staging (top)" " and Staging to HEAD (bottom)"
+                "Working to Staging (top) and Staging to HEAD (bottom)"
             ),
             "stash": self.tr("Stash Contents"),
             "stashName": self.tr("Stash Contents of {0}"),
@@ -334,7 +334,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -2413,7 +2413,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -226,9 +226,7 @@
             self.tr("Differences"), self.__diff
         )
         self.__diffAct.setToolTip(
-            self.tr(
-                "Shows the differences of the selected entry in a" " separate dialog"
-            )
+            self.tr("Shows the differences of the selected entry in a separate dialog")
         )
         self.__sbsDiffAct = self.__actionsMenu.addAction(
             self.tr("Differences Side-By-Side"), self.__sbsDiff
@@ -719,9 +717,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Add"),
-                self.tr(
-                    """There are no unversioned entries available/selected."""
-                ),
+                self.tr("""There are no unversioned entries available/selected."""),
             )
             return
 
@@ -745,9 +741,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Stage"),
-                self.tr(
-                    """There are no stageable entries available/selected."""
-                ),
+                self.tr("""There are no stageable entries available/selected."""),
             )
             return
 
@@ -771,9 +765,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Unstage"),
-                self.tr(
-                    """There are no unstageable entries available/selected."""
-                ),
+                self.tr("""There are no unstageable entries available/selected."""),
             )
             return
 
@@ -880,9 +872,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -107,7 +107,7 @@
                 else:
                     self.errors.setText(
                         self.tr(
-                            "The process {0} finished with an error.\n" "Error: {1}"
+                            "The process {0} finished with an error.\nError: {1}"
                         ).format("git", process.errorString())
                     )
                 self.errorGroup.show()

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -694,7 +694,7 @@
                 self.parent(),
                 self.tr("Remove from repository only"),
                 self.tr(
-                    "Do you really want to remove these files" " from the repository?"
+                    "Do you really want to remove these files from the repository?"
                 ),
                 names,
             )
@@ -707,7 +707,7 @@
                 self.parent(),
                 self.tr("Remove from repository only"),
                 self.tr(
-                    "Do you really want to remove these files" " from the repository?"
+                    "Do you really want to remove these files from the repository?"
                 ),
                 files,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -350,9 +350,7 @@
         )
         self.gitTagListAct.setStatusTip(self.tr("List tags of the project"))
         self.gitTagListAct.setWhatsThis(
-            self.tr(
-                """<b>List tags</b><p>This lists the tags of the project.</p>"""
-            )
+            self.tr("""<b>List tags</b><p>This lists the tags of the project.</p>""")
         )
         self.gitTagListAct.triggered.connect(self.__gitTagList)
         self.actions.append(self.gitTagListAct)
@@ -850,7 +848,7 @@
         )
         self.gitCherryPickAbortAct.setStatusTip(
             self.tr(
-                "Cancel the current copying session and return to the" " previous state"
+                "Cancel the current copying session and return to the previous state"
             )
         )
         self.gitCherryPickAbortAct.setWhatsThis(

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Tue Dec 06 17:35:41 2022 +0100
@@ -684,7 +684,7 @@
             res = self.startSynchronizedProcess(QProcess(), "git", args, repodir)
         else:
             dia = GitDialog(
-                self.tr("Removing files/directories from the Git" " repository"), self
+                self.tr("Removing files/directories from the Git repository"), self
             )
             res = dia.startProcess(args, repodir)
             if res:
@@ -2377,9 +2377,7 @@
         EricMessageBox.information(
             None,
             self.tr("Current Branch"),
-            self.tr("""<p>The current branch is <b>{0}</b>.</p>""").format(
-                branchName
-            ),
+            self.tr("""<p>The current branch is <b>{0}</b>.</p>""").format(branchName),
         )
 
     ###########################################################################
@@ -3905,9 +3903,9 @@
                 ).format(statistics["in-pack"])
             )
             info.append(
-                self.tr(
-                    """<tr><td>Number of packs: </td><td>{0}</td></tr>"""
-                ).format(statistics["packs"])
+                self.tr("""<tr><td>Number of packs: </td><td>{0}</td></tr>""").format(
+                    statistics["packs"]
+                )
             )
             info.append(
                 self.tr(
@@ -3922,9 +3920,9 @@
                 ).format(statistics["prune-packable"])
             )
             info.append(
-                self.tr(
-                    """<tr><td>Garbage files: </td><td>{0}</td></tr>"""
-                ).format(statistics["garbage"])
+                self.tr("""<tr><td>Garbage files: </td><td>{0}</td></tr>""").format(
+                    statistics["garbage"]
+                )
             )
             info.append(
                 self.tr(

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Tue Dec 06 17:35:41 2022 +0100
@@ -42,9 +42,7 @@
 
         self.hgPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         if Globals.isWindowsPlatform():
-            self.hgPicker.setFilters(
-                self.tr("Executable Files (*.exe);;" "All Files (*)")
-            )
+            self.hgPicker.setFilters(self.tr("Executable Files (*.exe);;All Files (*)"))
         else:
             self.hgPicker.setFilters(self.tr("All Files (*)"))
 

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -91,9 +91,7 @@
             EricMessageBox.critical(
                 self,
                 self.tr("Add Sub-repository"),
-                self.tr(
-                    """The sub-repository path must be inside the project."""
-                ),
+                self.tr("""The sub-repository path must be inside the project."""),
             )
             self.pathPicker.setText("")
 

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Tue Dec 06 17:35:41 2022 +0100
@@ -145,12 +145,12 @@
 
         if not msg[0].startswith("capabilities: "):
             return False, self.tr(
-                "Bad 'hello' message, expected 'capabilities: '" " but got '{0}'."
+                "Bad 'hello' message, expected 'capabilities: ' but got '{0}'."
             ).format(msg[0])
         self.__capabilities = msg[0][len("capabilities: ") :]
         if not self.__capabilities:
             return False, self.tr(
-                "'capabilities' message did not contain" " any capability."
+                "'capabilities' message did not contain any capability."
             )
 
         self.__capabilities = set(self.__capabilities.split())
@@ -159,11 +159,11 @@
 
         if not msg[1].startswith("encoding: "):
             return False, self.tr(
-                "Bad 'hello' message, expected 'encoding: '" " but got '{0}'."
+                "Bad 'hello' message, expected 'encoding: ' but got '{0}'."
             ).format(msg[1])
         encoding = msg[1][len("encoding: ") :]
         if not encoding:
-            return False, self.tr("'encoding' message did not contain" " any encoding.")
+            return False, self.tr("'encoding' message did not contain any encoding.")
         self.__encoding = encoding
 
         return True, ""

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -238,7 +238,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -2226,7 +2226,7 @@
                     self,
                     self.tr("Switch"),
                     self.tr(
-                        "Select bookmark to switch to (leave empty to" " use revision):"
+                        "Select bookmark to switch to (leave empty to use revision):"
                     ),
                     [""] + bookmarks,
                     0,
@@ -2874,7 +2874,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -161,9 +161,7 @@
             self.tr("Differences"), self.__diff
         )
         self.__diffAct.setToolTip(
-            self.tr(
-                "Shows the differences of the selected entry in a" " separate dialog"
-            )
+            self.tr("Shows the differences of the selected entry in a separate dialog")
         )
         self.__sbsDiffAct = self.__actionsMenu.addAction(
             self.tr("Differences Side-By-Side"), self.__sbsDiff
@@ -200,12 +198,12 @@
         self.__commitMergeAct = self.__actionsMenu.addAction(
             self.tr("Commit Merge"), self.__commitMerge
         )
-        self.__commitMergeAct.setToolTip(self.tr("Commit all the merged" " changes."))
+        self.__commitMergeAct.setToolTip(self.tr("Commit all the merged changes."))
         self.__abortMergeAct = self.__actionsMenu.addAction(
             self.tr("Abort Merge"), self.__abortMerge
         )
         self.__commitMergeAct.setToolTip(
-            self.tr("Abort an uncommitted merge " "and lose all changes")
+            self.tr("Abort an uncommitted merge and lose all changes")
         )
 
         self.__actionsMenu.addSeparator()
@@ -525,9 +523,7 @@
                 EricMessageBox.information(
                     self,
                     self.tr("Commit"),
-                    self.tr(
-                        """There are no entries selected to be committed."""
-                    ),
+                    self.tr("""There are no entries selected to be committed."""),
                 )
                 return
 
@@ -569,9 +565,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Add"),
-                self.tr(
-                    """There are no unversioned entries available/selected."""
-                ),
+                self.tr("""There are no unversioned entries available/selected."""),
             )
             return
 
@@ -597,9 +591,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Add"),
-                self.tr(
-                    """There are no unversioned entries available/selected."""
-                ),
+                self.tr("""There are no unversioned entries available/selected."""),
             )
             return
 
@@ -642,9 +634,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Revert"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -692,9 +682,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -715,9 +703,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences Side-By-Side"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
         elif len(names) > 1:

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -349,18 +349,16 @@
             EricMessageBox.warning(
                 self,
                 self.tr("Close Branch"),
-                self.tr(
-                    """The branch "default" cannot be closed. Aborting..."""
-                ),
+                self.tr("""The branch "default" cannot be closed. Aborting..."""),
             )
             return
 
         yes = EricMessageBox.yesNo(
             self,
             self.tr("Close Branch"),
-            self.tr(
-                """<p>Shall the branch <b>{0}</b> really be closed?</p>"""
-            ).format(branch),
+            self.tr("""<p>Shall the branch <b>{0}</b> really be closed?</p>""").format(
+                branch
+            ),
         )
         if yes:
             switched = False

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -972,7 +972,7 @@
                 self.parent(),
                 self.tr("Remove from repository only"),
                 self.tr(
-                    "Do you really want to remove these files" " from the repository?"
+                    "Do you really want to remove these files from the repository?"
                 ),
                 names,
             )
@@ -985,7 +985,7 @@
                 self.parent(),
                 self.tr("Remove from repository only"),
                 self.tr(
-                    "Do you really want to remove these files" " from the repository?"
+                    "Do you really want to remove these files from the repository?"
                 ),
                 files,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -446,9 +446,7 @@
         )
         self.hgTipAct.setStatusTip(self.tr("Show the tip of the repository"))
         self.hgTipAct.setWhatsThis(
-            self.tr(
-                """<b>Show tip</b><p>This shows the tip of the repository.</p>"""
-            )
+            self.tr("""<b>Show tip</b><p>This shows the tip of the repository.</p>""")
         )
         self.hgTipAct.triggered.connect(self.__hgTip)
         self.actions.append(self.hgTipAct)
@@ -649,9 +647,7 @@
         )
         self.hgTagListAct.setStatusTip(self.tr("List tags of the project"))
         self.hgTagListAct.setWhatsThis(
-            self.tr(
-                """<b>List tags</b><p>This lists the tags of the project.</p>"""
-            )
+            self.tr("""<b>List tags</b><p>This lists the tags of the project.</p>""")
         )
         self.hgTagListAct.triggered.connect(self.__hgTagList)
         self.actions.append(self.hgTagListAct)
@@ -707,7 +703,7 @@
         )
         self.hgPushBranchAct.setStatusTip(
             self.tr(
-                "Push the current branch of the local project as a new named" " branch"
+                "Push the current branch of the local project as a new named branch"
             )
         )
         self.hgPushBranchAct.setWhatsThis(
@@ -1338,9 +1334,7 @@
         )
         self.hgAddSubrepoAct.setStatusTip(self.tr("Add a sub-repository"))
         self.hgAddSubrepoAct.setWhatsThis(
-            self.tr(
-                """<b>Add...</b><p>Add a sub-repository to the project.</p>"""
-            )
+            self.tr("""<b>Add...</b><p>Add a sub-repository to the project.</p>""")
         )
         self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository)
         self.actions.append(self.hgAddSubrepoAct)

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -233,9 +233,7 @@
         )
         self.hgQueueDeleteAct.setStatusTip(self.tr("Delete unapplied patch"))
         self.hgQueueDeleteAct.setWhatsThis(
-            self.tr(
-                """<b>Delete Patch</b><p>This deletes an unapplied patch.</p>"""
-            )
+            self.tr("""<b>Delete Patch</b><p>This deletes an unapplied patch.</p>""")
         )
         self.hgQueueDeleteAct.triggered.connect(self.__hgQueueDeletePatch)
         self.actions.append(self.hgQueueDeleteAct)
@@ -767,9 +765,7 @@
         )
         self.hgQueueCreateQueueAct.setStatusTip(self.tr("Create a new patch queue"))
         self.hgQueueCreateQueueAct.setWhatsThis(
-            self.tr(
-                """<b>Create Queue</b><p>This creates a new patch queue.</p>"""
-            )
+            self.tr("""<b>Create Queue</b><p>This creates a new patch queue.</p>""")
         )
         self.hgQueueCreateQueueAct.triggered.connect(self.__hgQueueCreateQueue)
         self.actions.append(self.hgQueueCreateQueueAct)
@@ -848,9 +844,7 @@
         )
         self.hgQueueActivateQueueAct.setStatusTip(self.tr("Set the active queue"))
         self.hgQueueActivateQueueAct.setWhatsThis(
-            self.tr(
-                """<b>Activate Queue</b><p>This sets the active queue.</p>"""
-            )
+            self.tr("""<b>Activate Queue</b><p>This sets the active queue.</p>""")
         )
         self.hgQueueActivateQueueAct.triggered.connect(self.__hgQueueActivateQueue)
         self.actions.append(self.hgQueueActivateQueueAct)

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Tue Dec 06 17:35:41 2022 +0100
@@ -702,7 +702,7 @@
             res = err == ""
         else:
             dia = HgDialog(
-                self.tr("Removing files/directories from the Mercurial" " repository"),
+                self.tr("Removing files/directories from the Mercurial repository"),
                 self,
             )
             res = dia.startProcess(args)
@@ -2388,9 +2388,7 @@
         res = EricMessageBox.yesNo(
             None,
             self.tr("Rollback last transaction"),
-            self.tr(
-                """Are you sure you want to rollback the last transaction?"""
-            ),
+            self.tr("""Are you sure you want to rollback the last transaction?"""),
             icon=EricMessageBox.Warning,
         )
         if res:

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -441,9 +441,7 @@
         )
         self.svnTagListAct.setStatusTip(self.tr("List tags of the project"))
         self.svnTagListAct.setWhatsThis(
-            self.tr(
-                """<b>List tags</b><p>This lists the tags of the project.</p>"""
-            )
+            self.tr("""<b>List tags</b><p>This lists the tags of the project.</p>""")
         )
         self.svnTagListAct.triggered.connect(self.__svnTagList)
         self.actions.append(self.svnTagListAct)

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -442,7 +442,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -80,26 +80,26 @@
                     ).format(info["rev"].number)
                 if info["repos_root_URL"]:
                     infoStr += self.tr(
-                        "<tr><td><b>Repository root URL:</b></td>" "<td>{0}</td></tr>"
+                        "<tr><td><b>Repository root URL:</b></td><td>{0}</td></tr>"
                     ).format(info["repos_root_URL"])
                 if info["repos_UUID"]:
                     infoStr += self.tr(
-                        "<tr><td><b>Repository UUID:</b></td>" "<td>{0}</td></tr>"
+                        "<tr><td><b>Repository UUID:</b></td><td>{0}</td></tr>"
                     ).format(info["repos_UUID"])
                 if info["last_changed_author"]:
                     infoStr += self.tr(
-                        "<tr><td><b>Last changed author:</b></td>" "<td>{0}</td></tr>"
+                        "<tr><td><b>Last changed author:</b></td><td>{0}</td></tr>"
                     ).format(info["last_changed_author"])
                 if info["last_changed_date"]:
                     infoStr += self.tr(
-                        "<tr><td><b>Last Changed Date:</b></td>" "<td>{0}</td></tr>"
+                        "<tr><td><b>Last Changed Date:</b></td><td>{0}</td></tr>"
                     ).format(formatTime(info["last_changed_date"]))
                 if (
                     info["last_changed_rev"]
                     and info["last_changed_rev"].kind == pysvn.opt_revision_kind.number
                 ):
                     infoStr += self.tr(
-                        "<tr><td><b>Last changed revision:</b></td>" "<td>{0}</td></tr>"
+                        "<tr><td><b>Last changed revision:</b></td><td>{0}</td></tr>"
                     ).format(info["last_changed_rev"].number)
                 if info["kind"]:
                     if info["kind"] == pysvn.node_kind.file:
@@ -119,7 +119,7 @@
                         "<tr><td><b>Lock Owner:</b></td><td>{0}</td></tr>"
                     ).format(lockInfo["owner"])
                     infoStr += self.tr(
-                        "<tr><td><b>Lock Creation Date:</b></td>" "<td>{0}</td></tr>"
+                        "<tr><td><b>Lock Creation Date:</b></td><td>{0}</td></tr>"
                     ).format(formatTime(lockInfo["creation_date"]))
                     if lockInfo["expiration_date"] is not None:
                         infoStr += self.tr(
@@ -148,14 +148,14 @@
                         ).format(schedule)
                     if wcInfo["copyfrom_url"]:
                         infoStr += self.tr(
-                            "<tr><td><b>Copied From URL:</b></td>" "<td>{0}</td></tr>"
+                            "<tr><td><b>Copied From URL:</b></td><td>{0}</td></tr>"
                         ).format(wcInfo["copyfrom_url"])
                         infoStr += self.tr(
-                            "<tr><td><b>Copied From Rev:</b></td>" "<td>{0}</td></tr>"
+                            "<tr><td><b>Copied From Rev:</b></td><td>{0}</td></tr>"
                         ).format(wcInfo["copyfrom_rev"].number)
                     if wcInfo["text_time"]:
                         infoStr += self.tr(
-                            "<tr><td><b>Text Last Updated:</b></td>" "<td>{0}</td></tr>"
+                            "<tr><td><b>Text Last Updated:</b></td><td>{0}</td></tr>"
                         ).format(formatTime(wcInfo["text_time"]))
                     if wcInfo["prop_time"]:
                         infoStr += self.tr(

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -205,9 +205,7 @@
                 self.__showError(e.args[0])
             except AttributeError:
                 self.__showError(
-                    self.tr(
-                        "The installed version of PySvn should be " "1.4.0 or better."
-                    )
+                    self.tr("The installed version of PySvn should be 1.4.0 or better.")
                 )
 
     def __normalizeUrl(self, url):

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -693,9 +693,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Add"),
-                self.tr(
-                    """There are no unversioned entries available/selected."""
-                ),
+                self.tr("""There are no unversioned entries available/selected."""),
             )
             return
 
@@ -719,9 +717,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Revert"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -769,9 +765,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -793,9 +787,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Side-by-Side Diff"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
         elif len(names) > 1:

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -123,7 +123,7 @@
             reposPath, ok = QInputDialog.getText(
                 self,
                 self.tr("Subversion List"),
-                self.tr("Enter the repository URL containing the" " tags or branches"),
+                self.tr("Enter the repository URL containing the tags or branches"),
                 QLineEdit.EchoMode.Normal,
                 self.vcs.svnNormalizeURL(reposURL),
             )
@@ -167,7 +167,7 @@
             res = False
         except AttributeError:
             self.__showError(
-                self.tr("The installed version of PySvn should be" " 1.4.0 or better.")
+                self.tr("The installed version of PySvn should be 1.4.0 or better.")
             )
             res = False
         self.__finish()

--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Tue Dec 06 17:35:41 2022 +0100
@@ -788,7 +788,7 @@
         client = self.getClient()
         if not noDialog:
             dlg = SvnDialog(
-                self.tr("Adding files/directories to the Subversion" " repository"),
+                self.tr("Adding files/directories to the Subversion repository"),
                 "add --non-recursive{0}{1} {2}".format(
                     force and " --force" or "",
                     noignore and " --no-ignore" or "",
@@ -934,7 +934,7 @@
         client = self.getClient()
         if not noDialog:
             dlg = SvnDialog(
-                self.tr("Removing files/directories from the Subversion" " repository"),
+                self.tr("Removing files/directories from the Subversion repository"),
                 "remove{0} {1}".format(force and " --force" or "", " ".join(name)),
                 client,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Tue Dec 06 17:35:41 2022 +0100
@@ -424,9 +424,7 @@
         )
         self.svnTagListAct.setStatusTip(self.tr("List tags of the project"))
         self.svnTagListAct.setWhatsThis(
-            self.tr(
-                """<b>List tags</b><p>This lists the tags of the project.</p>"""
-            )
+            self.tr("""<b>List tags</b><p>This lists the tags of the project.</p>""")
         )
         self.svnTagListAct.triggered.connect(self.__svnTagList)
         self.actions.append(self.svnTagListAct)

--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -393,7 +393,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -836,9 +836,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Add"),
-                self.tr(
-                    """There are no unversioned entries available/selected."""
-                ),
+                self.tr("""There are no unversioned entries available/selected."""),
             )
             return
 
@@ -862,9 +860,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Revert"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -912,9 +908,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -936,9 +930,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Side-by-Side Diff"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
         elif len(names) > 1:

--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -151,7 +151,7 @@
             reposPath, ok = QInputDialog.getText(
                 self,
                 self.tr("Subversion List"),
-                self.tr("Enter the repository URL containing the tags" " or branches"),
+                self.tr("Enter the repository URL containing the tags or branches"),
                 QLineEdit.EchoMode.Normal,
                 self.vcs.svnNormalizeURL(reposURL),
             )

--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py	Tue Dec 06 17:35:41 2022 +0100
@@ -732,7 +732,7 @@
             self.startSynchronizedProcess(QProcess(), "svn", args, wdir)
         else:
             dia = SvnDialog(
-                self.tr("Adding files/directories to the Subversion" " repository")
+                self.tr("Adding files/directories to the Subversion repository")
             )
             res = dia.startProcess(args, wdir)
             if res:
@@ -856,7 +856,7 @@
             res = self.startSynchronizedProcess(QProcess(), "svn", args)
         else:
             dia = SvnDialog(
-                self.tr("Removing files/directories from the Subversion" " repository")
+                self.tr("Removing files/directories from the Subversion repository")
             )
             res = dia.startProcess(args)
             if res:

--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -414,9 +414,7 @@
             EricMessageBox.critical(
                 self,
                 self.tr(".desktop Wizard"),
-                self.tr(
-                    """Only one of 'Only Show In' or  'Not Show In' allowed."""
-                ),
+                self.tr("""Only one of 'Only Show In' or  'Not Show In' allowed."""),
             )
 
     @pyqtSlot()
@@ -445,9 +443,7 @@
             EricMessageBox.critical(
                 self,
                 self.tr(".desktop Wizard"),
-                self.tr(
-                    """Only one of 'Only Show In' or  'Not Show In' allowed."""
-                ),
+                self.tr("""Only one of 'Only Show In' or  'Not Show In' allowed."""),
             )
 
     @pyqtSlot()

--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -342,7 +342,7 @@
                     self,
                     self.tr("Save regular expression"),
                     self.tr(
-                        "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                        "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                     ).format(fpath),
                     icon=EricMessageBox.Warning,
                 )
@@ -440,9 +440,7 @@
                 EricMessageBox.critical(
                     self,
                     self.tr("Error"),
-                    self.tr(
-                        """Invalid regular expression: missing group name"""
-                    ),
+                    self.tr("""Invalid regular expression: missing group name"""),
                 )
                 return
         else:
@@ -587,9 +585,7 @@
                 EricMessageBox.critical(
                     self,
                     self.tr("Error"),
-                    self.tr(
-                        """Invalid regular expression: missing group name"""
-                    ),
+                    self.tr("""Invalid regular expression: missing group name"""),
                 )
                 return
         else:

--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -426,7 +426,7 @@
                     self,
                     self.tr("Save regular expression"),
                     self.tr(
-                        "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                        "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                     ).format(fpath),
                     icon=EricMessageBox.Warning,
                 )

--- a/src/eric7/Preferences/ConfigurationPages/CondaPage.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/CondaPage.py	Tue Dec 06 17:35:41 2022 +0100
@@ -29,9 +29,7 @@
 
         self.condaExePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.condaExePicker.setToolTip(
-            self.tr(
-                "Press to select the conda executable via a file selection" " dialog."
-            )
+            self.tr("Press to select the conda executable via a file selection dialog.")
         )
 
         # set initial values

--- a/src/eric7/Preferences/SubstyleDefinitionDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Preferences/SubstyleDefinitionDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -114,9 +114,7 @@
             EricMessageBox.yesNo(
                 self,
                 self.tr("Set Sub-Style Data to Default"),
-                self.tr(
-                    """Shall the sub-style data be set to default values?"""
-                ),
+                self.tr("""Shall the sub-style data be set to default values?"""),
             )
             if filled
             else True

--- a/src/eric7/Preferences/ToolConfigurationDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Preferences/ToolConfigurationDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -100,7 +100,7 @@
                 self,
                 self.tr("Add tool entry"),
                 self.tr(
-                    "You have to set an executable to add to the" " Tools-Menu first."
+                    "You have to set an executable to add to the Tools-Menu first."
                 ),
             )
             return
@@ -168,7 +168,7 @@
                 self,
                 self.tr("Change tool entry"),
                 self.tr(
-                    "You have to set an executable to change the" " Tools-Menu entry."
+                    "You have to set an executable to change the Tools-Menu entry."
                 ),
             )
             return

--- a/src/eric7/Project/Project.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/Project.py	Tue Dec 06 17:35:41 2022 +0100
@@ -179,7 +179,7 @@
 
         self.__dbgFilters = {
             "Python3": self.tr(
-                "Python3 Files (*.py *.py3);;" "Python3 GUI Files (*.pyw *.pyw3);;"
+                "Python3 Files (*.py *.py3);;Python3 GUI Files (*.pyw *.pyw3);;"
             ),
         }
 
@@ -1055,7 +1055,7 @@
                     self.ui,
                     self.tr("Read Project File"),
                     self.tr(
-                        "<p>The project file <b>{0}</b> could not be read." "</p>"
+                        "<p>The project file <b>{0}</b> could not be read.</p>"
                     ).format(fn),
                 )
                 res = False
@@ -1338,7 +1338,7 @@
                         self.ui,
                         self.tr("Read Tasks"),
                         self.tr(
-                            "<p>The tasks file <b>{0}</b> could not be read." "</p>"
+                            "<p>The tasks file <b>{0}</b> could not be read.</p>"
                         ).format(fn),
                     )
 
@@ -3155,7 +3155,7 @@
                                         res, vcs_ok = QInputDialog.getItem(
                                             None,
                                             self.tr("New Project"),
-                                            self.tr("Select Version Control" " System"),
+                                            self.tr("Select Version Control System"),
                                             vcsList,
                                             0,
                                             False,
@@ -6364,7 +6364,7 @@
                 EricPixmapCache.getPixmap("pluginArchive48"),
                 self.tr("Create Plugin Archive"),
                 self.tr(
-                    "<p>The eric plugin archive files were " "created successfully.</p>"
+                    "<p>The eric plugin archive files were created successfully.</p>"
                 ),
             )
 

--- a/src/eric7/Project/ProjectBaseBrowser.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/ProjectBaseBrowser.py	Tue Dec 06 17:35:41 2022 +0100
@@ -314,7 +314,7 @@
             QCoreApplication.translate("ProjectBaseBrowser", "Delete directories"),
             QCoreApplication.translate(
                 "ProjectBaseBrowser",
-                "Do you really want to delete these directories from" " the project?",
+                "Do you really want to delete these directories from the project?",
             ),
             dirs,
         )

--- a/src/eric7/Project/ProjectFormsBrowser.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/ProjectFormsBrowser.py	Tue Dec 06 17:35:41 2022 +0100
@@ -837,7 +837,7 @@
                 ui.showNotification(
                     EricPixmapCache.getPixmap("designer48"),
                     self.tr("Form Compilation"),
-                    self.tr("The compilation of the form file" " was successful."),
+                    self.tr("The compilation of the form file was successful."),
                 )
                 self.project.projectFileCompiled.emit(self.compiledFile, "FORMS")
             except OSError as msg:
@@ -949,7 +949,7 @@
                 self,
                 self.tr("Process Generation Error"),
                 self.tr(
-                    "Could not start {0}.<br>" "Ensure that it is in the search path."
+                    "Could not start {0}.<br>Ensure that it is in the search path."
                 ).format(uicompiler),
             )
             return None

--- a/src/eric7/Project/ProjectOthersBrowser.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/ProjectOthersBrowser.py	Tue Dec 06 17:35:41 2022 +0100
@@ -390,9 +390,7 @@
                 EricMessageBox.warning(
                     self,
                     self.tr("Show Mime-Type"),
-                    self.tr(
-                        """The mime type of the file could not be determined."""
-                    ),
+                    self.tr("""The mime type of the file could not be determined."""),
                 )
             elif mimetype.split("/")[0] == "text":
                 EricMessageBox.information(
@@ -508,7 +506,7 @@
         dlg = DeleteFilesConfirmationDialog(
             self.parent(),
             self.tr("Delete files/directories"),
-            self.tr("Do you really want to delete these entries from the" " project?"),
+            self.tr("Do you really want to delete these entries from the project?"),
             names,
         )
 

--- a/src/eric7/Project/ProjectResourcesBrowser.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/ProjectResourcesBrowser.py	Tue Dec 06 17:35:41 2022 +0100
@@ -617,9 +617,7 @@
         dlg = DeleteFilesConfirmationDialog(
             self.parent(),
             self.tr("Delete resources"),
-            self.tr(
-                "Do you really want to delete these resources from the" " project?"
-            ),
+            self.tr("Do you really want to delete these resources from the project?"),
             files,
         )
 
@@ -691,7 +689,7 @@
                 ui.showNotification(
                     EricPixmapCache.getPixmap("resourcesCompiler48"),
                     self.tr("Resource Compilation"),
-                    self.tr("The compilation of the resource file" " was successful."),
+                    self.tr("The compilation of the resource file was successful."),
                 )
             except OSError as msg:
                 if not self.noDialog:
@@ -796,7 +794,7 @@
                 self,
                 self.tr("Process Generation Error"),
                 self.tr(
-                    "Could not start {0}.<br>" "Ensure that it is in the search path."
+                    "Could not start {0}.<br>Ensure that it is in the search path."
                 ).format(self.rccCompiler),
             )
             return None

--- a/src/eric7/Project/ProjectTranslationsBrowser.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/ProjectTranslationsBrowser.py	Tue Dec 06 17:35:41 2022 +0100
@@ -1108,7 +1108,7 @@
                 EricPixmapCache.getPixmap("linguist48"),
                 self.tr("Translation file generation"),
                 self.tr(
-                    "The generation of the translation files (*.ts)" " was successful."
+                    "The generation of the translation files (*.ts) was successful."
                 ),
             )
         else:
@@ -1120,7 +1120,7 @@
                 EricPixmapCache.getPixmap("linguist48"),
                 self.tr("Translation file generation"),
                 self.tr(
-                    "The generation of the translation files (*.ts) has" " failed.{0}"
+                    "The generation of the translation files (*.ts) has failed.{0}"
                 ).format(info),
                 kind=NotificationTypes.CRITICAL,
                 timeout=0,
@@ -1403,9 +1403,7 @@
             ui.showNotification(
                 EricPixmapCache.getPixmap("linguist48"),
                 self.tr("Translation file release"),
-                self.tr(
-                    "The release of the translation files (*.qm)" " was successful."
-                ),
+                self.tr("The release of the translation files (*.qm) was successful."),
             )
             if self.project.getProjectData(dataKey="TRANSLATIONSBINPATH"):
                 target = os.path.join(

--- a/src/eric7/Project/UicLoadUi5.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/UicLoadUi5.py	Tue Dec 06 17:35:41 2022 +0100
@@ -22,6 +22,7 @@
     """
     print("@@eric_start@@{0}@@eric_end@@".format(dataString), file=sys.stderr)
 
+
 try:
     from PyQt5 import uic
     from PyQt5.QtCore import QByteArray, QMetaMethod

--- a/src/eric7/Project/UicLoadUi6.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Project/UicLoadUi6.py	Tue Dec 06 17:35:41 2022 +0100
@@ -23,6 +23,7 @@
     """
     print("@@eric_start@@{0}@@eric_end@@".format(dataString), file=sys.stderr)
 
+
 try:
     from PyQt6 import uic
     from PyQt6.QtCore import QByteArray, QMetaMethod

--- a/src/eric7/QScintilla/Editor.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/Editor.py	Tue Dec 06 17:35:41 2022 +0100
@@ -3401,7 +3401,7 @@
                 self,
                 self.tr("Save File"),
                 self.tr(
-                    "<p>The file <b>{0}</b> could not be saved.<br/>" "Reason: {1}</p>"
+                    "<p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p>"
                 ).format(fn, str(why)),
             )
             return False
@@ -3458,7 +3458,7 @@
                     self,
                     self.tr("Save File"),
                     self.tr(
-                        "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                        "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                     ).format(fpath),
                     icon=EricMessageBox.Warning,
                 )
@@ -6985,7 +6985,7 @@
                 self,
                 self.tr("Save macro"),
                 self.tr(
-                    "<p>The macro file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The macro file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/QScintilla/Exporters/ExporterBase.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterBase.py	Tue Dec 06 17:35:41 2022 +0100
@@ -60,7 +60,7 @@
                     QCoreApplication.translate("Exporter", "Export source"),
                     QCoreApplication.translate(
                         "Exporter",
-                        "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>",
+                        "<p>The file <b>{0}</b> already exists. Overwrite it?</p>",
                     ).format(fpath),
                     icon=EricMessageBox.Warning,
                 )

--- a/src/eric7/QScintilla/Exporters/ExporterPDF.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterPDF.py	Tue Dec 06 17:35:41 2022 +0100
@@ -284,7 +284,7 @@
 
         # end the file with the trailer (PDF1.4Ref(p67))
         buffer = (
-            "trailer\n<< /Size {0:d} /Root {1:d} 0 R\n>>\nstartxref\n{2:d}\n" "%%EOF\n"
+            "trailer\n<< /Size {0:d} /Root {1:d} 0 R\n>>\nstartxref\n{2:d}\n%%EOF\n"
         ).format(self.oT.index, catalogRef, xref)
         self.oT.write(buffer)
 

--- a/src/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -68,7 +68,7 @@
             "ppm": self.tr("Portable Pixmap File (*.ppm)"),
             "sgi": self.tr("Silicon Graphics Image File (*.sgi)"),
             "svg": self.tr("Scalable Vector Graphics File (*.svg)"),
-            "svgz": self.tr("Compressed Scalable Vector Graphics File" " (*.svgz)"),
+            "svgz": self.tr("Compressed Scalable Vector Graphics File (*.svgz)"),
             "tga": self.tr("Targa Graphic File (*.tga)"),
             "tif": self.tr("TIFF File (*.tif)"),
             "tiff": self.tr("TIFF File (*.tiff)"),

--- a/src/eric7/QScintilla/MiniEditor.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/MiniEditor.py	Tue Dec 06 17:35:41 2022 +0100
@@ -621,9 +621,7 @@
         )
         self.newAct.setStatusTip(self.tr("Open an empty editor window"))
         self.newAct.setWhatsThis(
-            self.tr(
-                """<b>New</b><p>An empty editor window will be created.</p>"""
-            )
+            self.tr("""<b>New</b><p>An empty editor window will be created.</p>""")
         )
         self.newAct.triggered.connect(self.__newFile)
         self.fileActions.append(self.newAct)
@@ -873,9 +871,7 @@
         )
         self.deleteAct.setStatusTip(self.tr("Clear all text"))
         self.deleteAct.setWhatsThis(
-            self.tr(
-                """<b>Clear</b><p>Delete all text of the current editor.</p>"""
-            )
+            self.tr("""<b>Clear</b><p>Delete all text of the current editor.</p>""")
         )
         self.deleteAct.triggered.connect(self.__textEdit.clear)
         self.editActions.append(self.deleteAct)
@@ -1405,11 +1401,11 @@
         act = EricAction(
             QCoreApplication.translate(
                 "ViewManager",
-                "Extend selection to first visible character in document" " line",
+                "Extend selection to first visible character in document line",
             ),
             QCoreApplication.translate(
                 "ViewManager",
-                "Extend selection to first visible character in document" " line",
+                "Extend selection to first visible character in document line",
             ),
             0,
             0,
@@ -2329,11 +2325,11 @@
             act = EricAction(
                 QCoreApplication.translate(
                     "ViewManager",
-                    "Move to first visible character in display" " or document line",
+                    "Move to first visible character in display or document line",
                 ),
                 QCoreApplication.translate(
                     "ViewManager",
-                    "Move to first visible character in display" " or document line",
+                    "Move to first visible character in display or document line",
                 ),
                 0,
                 0,
@@ -3319,7 +3315,7 @@
                 self,
                 self.tr("Save File"),
                 self.tr(
-                    "<p>The file <b>{0}</b> could not be saved.<br/>" "Reason: {1}</p>"
+                    "<p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p>"
                 ).format(fileName, str(why)),
             )
             return False

--- a/src/eric7/QScintilla/Shell.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/Shell.py	Tue Dec 06 17:35:41 2022 +0100
@@ -805,7 +805,7 @@
         cmd, ok = QInputDialog.getItem(
             self,
             self.tr("Select History"),
-            self.tr("Select the history entry to execute" " (most recent shown last)."),
+            self.tr("Select the history entry to execute (most recent shown last)."),
             self.__history,
             current,
             False,

--- a/src/eric7/QScintilla/ShellWindow.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/QScintilla/ShellWindow.py	Tue Dec 06 17:35:41 2022 +0100
@@ -227,9 +227,7 @@
         )
         self.exitAct.setStatusTip(self.tr("Quit the Shell"))
         self.exitAct.setWhatsThis(
-            self.tr(
-                """<b>Quit the Shell</b><p>This quits the Shell window.</p>"""
-            )
+            self.tr("""<b>Quit the Shell</b><p>This quits the Shell window.</p>""")
         )
         self.exitAct.triggered.connect(self.quit)
         self.exitAct.setMenuRole(QAction.MenuRole.QuitRole)
@@ -344,9 +342,7 @@
             QCoreApplication.translate("ViewManager", "Cut the selection")
         )
         self.cutAct.setWhatsThis(
-            self.tr(
-                """<b>Cut</b><p>Cut the selected text to the clipboard.</p>"""
-            )
+            self.tr("""<b>Cut</b><p>Cut the selected text to the clipboard.</p>""")
         )
         self.cutAct.triggered.connect(self.__shell.cut)
         self.editActions.append(self.cutAct)
@@ -368,9 +364,7 @@
             QCoreApplication.translate("ViewManager", "Copy the selection")
         )
         self.copyAct.setWhatsThis(
-            self.tr(
-                """<b>Copy</b><p>Copy the selected text to the clipboard.</p>"""
-            )
+            self.tr("""<b>Copy</b><p>Copy the selected text to the clipboard.</p>""")
         )
         self.copyAct.triggered.connect(self.__shell.copy)
         self.editActions.append(self.copyAct)
@@ -414,9 +408,7 @@
         self.clearAct.setStatusTip(
             QCoreApplication.translate("ViewManager", "Clear all text")
         )
-        self.clearAct.setWhatsThis(
-            self.tr("""<b>Clear</b><p>Delete all text.</p>""")
-        )
+        self.clearAct.setWhatsThis(self.tr("""<b>Clear</b><p>Delete all text.</p>"""))
         self.clearAct.triggered.connect(self.__shell.clear)
         self.editActions.append(self.clearAct)
 
@@ -871,11 +863,11 @@
         act = EricAction(
             QCoreApplication.translate(
                 "ViewManager",
-                "Extend selection to first visible character in document" " line",
+                "Extend selection to first visible character in document line",
             ),
             QCoreApplication.translate(
                 "ViewManager",
-                "Extend selection to first visible character in document" " line",
+                "Extend selection to first visible character in document line",
             ),
             0,
             0,

--- a/src/eric7/Snapshot/SnapWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Snapshot/SnapWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -261,7 +261,7 @@
                 self,
                 self.tr("Save Snapshot"),
                 self.tr(
-                    "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fileName),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/Templates/TemplateViewer.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Templates/TemplateViewer.py	Tue Dec 06 17:35:41 2022 +0100
@@ -578,7 +578,7 @@
             self,
             self.tr("Export Templates"),
             "",
-            self.tr("Templates Files (*.ecj);;" "All Files (*)"),
+            self.tr("Templates Files (*.ecj);;All Files (*)"),
             "",
             EricFileDialog.DontConfirmOverwrite,
         )
@@ -767,7 +767,7 @@
                     count += len(indent)
 
             if "i_n_s_e_r_t_i_o_n" in txt and "s_e_l_e_c_t" in txt:
-                txt = "'Insertion and selection can not be in" " template together'"
+                txt = "'Insertion and selection can not be in template together'"
 
             if "i_n_s_e_r_t_i_o_n" in txt:
                 lines = 1
@@ -1005,7 +1005,7 @@
                     self,
                     self.tr("Read Templates"),
                     self.tr(
-                        "<p>The templates file <b>{0}</b> could not be read." "</p>"
+                        "<p>The templates file <b>{0}</b> could not be read.</p>"
                     ).format(filename),
                 )
 

--- a/src/eric7/Testing/TestingWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Testing/TestingWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -131,9 +131,7 @@
 
         self.__startButton.setToolTip(self.tr("Start the selected testsuite"))
         self.__startButton.setWhatsThis(
-            self.tr(
-                """<b>Start Test</b><p>This button starts the test run.</p>"""
-            )
+            self.tr("""<b>Start Test</b><p>This button starts the test run.</p>""")
         )
 
         self.__startFailedButton = self.buttonBox.addButton(
@@ -155,9 +153,7 @@
         )
         self.__stopButton.setToolTip(self.tr("Stop the running test"))
         self.__stopButton.setWhatsThis(
-            self.tr(
-                """<b>Stop Test</b><p>This button stops a running test.</p>"""
-            )
+            self.tr("""<b>Stop Test</b><p>This button stops a running test.</p>""")
         )
 
         self.setWindowFlags(
@@ -801,7 +797,7 @@
         """
         venvName = self.venvComboBox.currentText()
         if venvName:
-            headerText = self.tr("<h3>Versions of Frameworks and their" " Plugins</h3>")
+            headerText = self.tr("<h3>Versions of Frameworks and their Plugins</h3>")
             versionsText = ""
             interpreter = self.__determineInterpreter(venvName)
             for framework in sorted(self.__frameworkRegistry.getFrameworks().keys()):
@@ -967,7 +963,7 @@
                     self,
                     self.tr("Collection Error"),
                     self.tr(
-                        "<p>There was an error while collecting tests." "</p><p>{0}</p>"
+                        "<p>There was an error while collecting tests.</p><p>{0}</p>"
                     ).format("<br/>".join(error.splitlines())),
                 )
 

--- a/src/eric7/Tools/UIPreviewer.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Tools/UIPreviewer.py	Tue Dec 06 17:35:41 2022 +0100
@@ -170,9 +170,7 @@
         )
         self.printPreviewAct.setStatusTip(self.tr("Print preview a screen capture"))
         self.printPreviewAct.setWhatsThis(
-            self.tr(
-                """<b>Print Preview</b><p>Print preview a screen capture.</p>"""
-            )
+            self.tr("""<b>Print Preview</b><p>Print preview a screen capture.</p>""")
         )
         self.printPreviewAct.triggered.connect(self.__printPreviewImage)
 

--- a/src/eric7/UI/Browser.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/UI/Browser.py	Tue Dec 06 17:35:41 2022 +0100
@@ -1015,7 +1015,7 @@
         try:
             from send2trash import send2trash as s2t  # __IGNORE_WARNING_I10__
 
-            trashMsg = self.tr("Do you really want to move this file to the" " trash?")
+            trashMsg = self.tr("Do you really want to move this file to the trash?")
         except ImportError:
             s2t = os.remove
             trashMsg = self.tr("Do you really want to delete this file?")
@@ -1048,7 +1048,7 @@
 
             s2tAvailable = True
             trashMsg = self.tr(
-                "Do you really want to move this directory to" " the trash?"
+                "Do you really want to move this directory to the trash?"
             )
         except ImportError:
             s2tAvailable = False
@@ -1088,9 +1088,7 @@
         try:
             from send2trash import send2trash as s2t  # __IGNORE_WARNING_I10__
 
-            trashMsg = self.tr(
-                "Do you really want to move these files to the" " trash?"
-            )
+            trashMsg = self.tr("Do you really want to move these files to the trash?")
         except ImportError:
             s2t = os.remove
             trashMsg = self.tr("Do you really want to delete these files?")

--- a/src/eric7/UI/DiffDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/UI/DiffDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -128,7 +128,7 @@
                 self,
                 self.tr("Save Diff"),
                 self.tr(
-                    "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fpath),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/UI/Info.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/UI/Info.py	Tue Dec 06 17:35:41 2022 +0100
@@ -11,7 +11,7 @@
 Program = "eric7"
 Version = "@@VERSION@@ (rev. @@REVISION@@)"
 VersionOnly = "99.0.0"
-Copyright = "Copyright (c) 2002 - 2022 Detlev Offenbach" " <detlev@die-offenbachs.de>"
+Copyright = "Copyright (c) 2002 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>"
 CopyrightShort = "(c) 2002 - 2022 Detlev Offenbach"
 BugAddress = "eric-bugs@eric-ide.python-projects.org"
 FeatureAddress = "eric-featurerequest@eric-ide.python-projects.org"

--- a/src/eric7/UI/InstallInfoDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/UI/InstallInfoDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -77,9 +77,7 @@
             self.remarksEdit.setPlainText(self.__info["remarks"])
             if self.__info["pip"]:
                 self.pipLabel.setText(
-                    self.tr(
-                        "'eric-ide' was installed from PyPI using the pip" " command."
-                    )
+                    self.tr("'eric-ide' was installed from PyPI using the pip command.")
                 )
             else:
                 self.pipLabel.hide()

--- a/src/eric7/UI/UserInterface.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/UI/UserInterface.py	Tue Dec 06 17:35:41 2022 +0100
@@ -2422,7 +2422,7 @@
             )
             self.codeDocumentationViewerActivateAct.setStatusTip(
                 self.tr(
-                    "Switch the input focus to the Code Documentation Viewer" " window."
+                    "Switch the input focus to the Code Documentation Viewer window."
                 )
             )
             self.codeDocumentationViewerActivateAct.setWhatsThis(
@@ -2541,7 +2541,7 @@
         )
         self.virtualenvManagerActivateAct.setStatusTip(
             self.tr(
-                "Switch the input focus to the Virtual Environments Manager" " window."
+                "Switch the input focus to the Virtual Environments Manager window."
             )
         )
         self.virtualenvManagerActivateAct.setWhatsThis(
@@ -2714,9 +2714,7 @@
         )
         self.versionAct.setStatusTip(self.tr("Display version information"))
         self.versionAct.setWhatsThis(
-            self.tr(
-                """<b>Show Versions</b><p>Display version information.</p>"""
-            )
+            self.tr("""<b>Show Versions</b><p>Display version information.</p>""")
         )
         self.versionAct.triggered.connect(self.__showVersions)
         self.actions.append(self.versionAct)
@@ -2763,9 +2761,7 @@
         )
         self.reportBugAct.setStatusTip(self.tr("Report a bug"))
         self.reportBugAct.setWhatsThis(
-            self.tr(
-                """<b>Report Bug...</b><p>Opens a dialog to report a bug.</p>"""
-            )
+            self.tr("""<b>Report Bug...</b><p>Opens a dialog to report a bug.</p>""")
         )
         self.reportBugAct.triggered.connect(self.__reportBug)
         self.actions.append(self.reportBugAct)
@@ -2864,9 +2860,7 @@
         )
         self.testScriptAct.setStatusTip(self.tr("Run tests of the current script"))
         self.testScriptAct.setWhatsThis(
-            self.tr(
-                """<b>Test Script</b><p>Run tests with the current script.</p>"""
-            )
+            self.tr("""<b>Test Script</b><p>Run tests with the current script.</p>""")
         )
         self.testScriptAct.triggered.connect(self.__startTestScript)
         self.testScriptAct.setEnabled(False)
@@ -2883,9 +2877,7 @@
         )
         self.testProjectAct.setStatusTip(self.tr("Run tests of the current project"))
         self.testProjectAct.setWhatsThis(
-            self.tr(
-                """<b>Test Project</b><p>Run test of the current project.</p>"""
-            )
+            self.tr("""<b>Test Project</b><p>Run test of the current project.</p>""")
         )
         self.testProjectAct.triggered.connect(self.__startTestProject)
         self.testProjectAct.setEnabled(False)
@@ -6958,9 +6950,7 @@
                     EricMessageBox.warning(
                         self,
                         self.tr("Start Web Browser"),
-                        self.tr(
-                            """The eric web browser could not be started."""
-                        ),
+                        self.tr("""The eric web browser could not be started."""),
                     )
                     return False
 
@@ -7358,7 +7348,7 @@
             self.tr("Import Keyboard Shortcuts"),
             "",
             self.tr(
-                "Keyboard Shortcuts File (*.ekj);;" "XML Keyboard shortcut file (*.e4k)"
+                "Keyboard Shortcuts File (*.ekj);;XML Keyboard shortcut file (*.e4k)"
             ),
         )
 
@@ -7542,7 +7532,7 @@
                         self,
                         self.tr("Read Tasks"),
                         self.tr(
-                            "<p>The tasks file <b>{0}</b> could not be" " read.</p>"
+                            "<p>The tasks file <b>{0}</b> could not be read.</p>"
                         ).format(fn),
                     )
 
@@ -7586,7 +7576,7 @@
                         self,
                         self.tr("Read Session"),
                         self.tr(
-                            "<p>The session file <b>{0}</b> could not" " be read.</p>"
+                            "<p>The session file <b>{0}</b> could not be read.</p>"
                         ).format(fn),
                     )
                     fn = ""
@@ -7613,7 +7603,7 @@
                         self,
                         self.tr("Read session"),
                         self.tr(
-                            "<p>The session file <b>{0}</b> could not be" " read.</p>"
+                            "<p>The session file <b>{0}</b> could not be read.</p>"
                         ).format(fn),
                     )
 
@@ -7653,7 +7643,7 @@
             self,
             self.tr("Load session"),
             Utilities.getHomeDir(),
-            self.tr("eric Session Files (*.esj);;" "eric XML Session Files (*.e5s)"),
+            self.tr("eric Session Files (*.esj);;eric XML Session Files (*.e5s)"),
         )
 
         if not sessionFile:
@@ -8507,9 +8497,7 @@
                 res = EricMessageBox.warning(
                     self,
                     self.tr("Unsaved Data Detected"),
-                    self.tr(
-                        "Some editors contain unsaved data. Shall these" " be saved?"
-                    ),
+                    self.tr("Some editors contain unsaved data. Shall these be saved?"),
                     EricMessageBox.Abort
                     | EricMessageBox.Discard
                     | EricMessageBox.Save

--- a/src/eric7/Utilities/MimeTypes.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Utilities/MimeTypes.py	Tue Dec 06 17:35:41 2022 +0100
@@ -41,14 +41,13 @@
                     "<p>Is the file <b>{0}</b> a text file to be opened in eric?</p>"
                     "<p><b>Note:</b> You may suppress this question by adding a pattern"
                     " to the list of known text files on the <b>MimeTypes</b>"
-                    " configuration page.</p>"
+                    " configuration page.</p>",
                 ).format(filename),
             )
         )
     else:
-        return (
-            mimetype.split("/")[0] == "text"
-            or mimetype in Preferences.getUI("TextMimeTypes")
+        return mimetype.split("/")[0] == "text" or mimetype in Preferences.getUI(
+            "TextMimeTypes"
         )
 
 

--- a/src/eric7/Utilities/crypto/__init__.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/Utilities/crypto/__init__.py	Tue Dec 06 17:35:41 2022 +0100
@@ -36,9 +36,7 @@
     @param pw password to encode (string)
     @return encoded password (string)
     """
-    pop = (
-        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" ".,;:-_!$?*+#"
-    )
+    pop = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,;:-_!$?*+#"
     rpw = "".join(random.sample(pop, 32)) + pw + "".join(random.sample(pop, 32))
     return EncodeMarker + base64.b64encode(rpw.encode("utf-8")).decode("ascii")
 

--- a/src/eric7/VCS/StatusWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/VCS/StatusWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -250,9 +250,7 @@
             EricPixmapCache.getIcon("vcsDiff"), self.tr("Differences"), self.__diff
         )
         self.__diffAct.setToolTip(
-            self.tr(
-                "Shows the differences of the selected entry in a" " separate dialog"
-            )
+            self.tr("Shows the differences of the selected entry in a separate dialog")
         )
         self.__sbsDiffAct = self.__actionsMenu.addAction(
             EricPixmapCache.getIcon("vcsSbsDiff"),
@@ -560,9 +558,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Add"),
-                self.tr(
-                    """There are no unversioned entries available/selected."""
-                ),
+                self.tr("""There are no unversioned entries available/selected."""),
             )
             return
 
@@ -769,9 +765,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -800,9 +794,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Differences Side-By-Side"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
         elif len(names) > 1:
@@ -834,9 +826,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Revert"),
-                self.tr(
-                    """There are no uncommitted changes available/selected."""
-                ),
+                self.tr("""There are no uncommitted changes available/selected."""),
             )
             return
 
@@ -915,9 +905,7 @@
             EricMessageBox.information(
                 self,
                 self.tr("Conflict Resolved"),
-                self.tr(
-                    """There are no conflicting entries available/selected."""
-                ),
+                self.tr("""There are no conflicting entries available/selected."""),
             )
             return
 

--- a/src/eric7/ViewManager/ViewManager.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/ViewManager/ViewManager.py	Tue Dec 06 17:35:41 2022 +0100
@@ -1308,7 +1308,7 @@
         self.toggleCommentAct.setStatusTip(
             QCoreApplication.translate(
                 "ViewManager",
-                "Toggle the comment of the current line, selection or" " comment block",
+                "Toggle the comment of the current line, selection or comment block",
             )
         )
         self.toggleCommentAct.setWhatsThis(
@@ -2226,11 +2226,11 @@
         act = EricAction(
             QCoreApplication.translate(
                 "ViewManager",
-                "Extend selection to first visible character in document" " line",
+                "Extend selection to first visible character in document line",
             ),
             QCoreApplication.translate(
                 "ViewManager",
-                "Extend selection to first visible character in document" " line",
+                "Extend selection to first visible character in document line",
             ),
             0,
             0,
@@ -3133,11 +3133,11 @@
             act = EricAction(
                 QCoreApplication.translate(
                     "ViewManager",
-                    "Move to first visible character in display or document" " line",
+                    "Move to first visible character in display or document line",
                 ),
                 QCoreApplication.translate(
                     "ViewManager",
-                    "Move to first visible character in display or document" " line",
+                    "Move to first visible character in display or document line",
                 ),
                 0,
                 0,

--- a/src/eric7/VirtualEnv/VirtualenvExecDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvExecDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -185,11 +185,11 @@
         else:
             if self.__pyvenv:
                 self.__logError(
-                    self.tr("No suitable pyvenv program could be" " started.\n")
+                    self.tr("No suitable pyvenv program could be started.\n")
                 )
             else:
                 self.__logError(
-                    self.tr("No suitable virtualenv program could be" " started.\n")
+                    self.tr("No suitable virtualenv program could be started.\n")
                 )
             self.__cmd = ""
             self.__finish(0, 0, giveUp=True)

--- a/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -156,9 +156,7 @@
         if self.__callIndex < len(self.__progs):
             self.start(self.__callArgs)
         else:
-            self.__logError(
-                self.tr("No suitable pyvenv program could be" " started.\n")
-            )
+            self.__logError(self.tr("No suitable pyvenv program could be started.\n"))
             self.__cmd = ""
             self.__finish(0, 0, giveUp=True)
 

--- a/src/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -237,7 +237,7 @@
             )
             if requiresTitles
             else self.tr(
-                "<p>Do you really want to remove subscription" " <b>{0}</b>?</p>"
+                "<p>Do you really want to remove subscription <b>{0}</b>?</p>"
             ).format(self.__currentSubscription.title())
         )
         res = EricMessageBox.yesNo(self, self.tr("Remove Subscription"), message)

--- a/src/eric7/WebBrowser/Download/DownloadItem.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/Download/DownloadItem.py	Tue Dec 06 17:35:41 2022 +0100
@@ -564,9 +564,7 @@
         self.__pageUrl = data["PageURL"]
 
         self.__state = (
-            DownloadState.Successful
-            if data["Done"]
-            else DownloadState.Cancelled
+            DownloadState.Successful if data["Done"] else DownloadState.Cancelled
         )
 
         try:

--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Tue Dec 06 17:35:41 2022 +0100
@@ -62,7 +62,7 @@
                 "{0} wants to capture video of your screen."
             ),
             QWebEnginePage.Feature.DesktopAudioVideoCapture: self.tr(
-                "{0} wants to capture audio and video of your" " screen."
+                "{0} wants to capture audio and video of your screen."
             ),
         }
         with contextlib.suppress(AttributeError):

--- a/src/eric7/WebBrowser/Network/EricSchemeHandler.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/Network/EricSchemeHandler.py	Tue Dec 06 17:35:41 2022 +0100
@@ -257,11 +257,11 @@
             page = page.replace("@TITLE-REMOVE@", self.tr("Remove"))
             page = page.replace("@TITLE-RELOAD@", self.tr("Reload"))
             page = page.replace(
-                "@TITLE-WARN@", self.tr("Are you sure to remove this" " speed dial?")
+                "@TITLE-WARN@", self.tr("Are you sure to remove this speed dial?")
             )
             page = page.replace(
                 "@TITLE-WARN-REL@",
-                self.tr("Are you sure you want to reload" " all speed dials?"),
+                self.tr("Are you sure you want to reload all speed dials?"),
             )
             page = page.replace("@TITLE-FETCHTITLE@", self.tr("Load title from page"))
             page = page.replace("@SETTINGS-TITLE@", self.tr("Speed Dial Settings"))
@@ -270,7 +270,7 @@
             page = page.replace("@TXT_SDSIZE@", self.tr("Change size of pages:"))
             page = page.replace(
                 "@JAVASCRIPT_DISABLED@",
-                self.tr("SpeedDial requires enabled" " JavaScript."),
+                self.tr("SpeedDial requires enabled JavaScript."),
             )
 
             self._speedDialPage = page

--- a/src/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -37,13 +37,13 @@
                 " keys pinned for the host name."
             ),
             QWebEngineCertificateError.Type.CertificateCommonNameInvalid: self.tr(
-                "The certificate's common name did not match the" " host name."
+                "The certificate's common name did not match the host name."
             ),
             QWebEngineCertificateError.Type.CertificateDateInvalid: self.tr(
-                "The certificate is not valid at the current date" " and time."
+                "The certificate is not valid at the current date and time."
             ),
             QWebEngineCertificateError.Type.CertificateAuthorityInvalid: self.tr(
-                "The certificate is not signed by a trusted" " authority."
+                "The certificate is not signed by a trusted authority."
             ),
             QWebEngineCertificateError.Type.CertificateContainsErrors: self.tr(
                 "The certificate contains errors."
@@ -53,7 +53,7 @@
                 " it has been revoked."
             ),
             QWebEngineCertificateError.Type.CertificateUnableToCheckRevocation: self.tr(
-                "Revocation information for the certificate is" " not available."
+                "Revocation information for the certificate is not available."
             ),
             QWebEngineCertificateError.Type.CertificateRevoked: self.tr(
                 "The certificate has been revoked."
@@ -62,10 +62,10 @@
                 "The certificate is invalid."
             ),
             QWebEngineCertificateError.Type.CertificateWeakSignatureAlgorithm: self.tr(
-                "The certificate is signed using a weak signature" " algorithm."
+                "The certificate is signed using a weak signature algorithm."
             ),
             QWebEngineCertificateError.Type.CertificateNonUniqueName: self.tr(
-                "The host name specified in the certificate is" " not unique."
+                "The host name specified in the certificate is not unique."
             ),
             QWebEngineCertificateError.Type.CertificateWeakKey: self.tr(
                 "The certificate contains a weak key."
@@ -75,7 +75,7 @@
                 " violation of name constraints."
             ),
             QWebEngineCertificateError.Type.CertificateValidityTooLong: self.tr(
-                "The certificate has a validity period that is" " too long."
+                "The certificate has a validity period that is too long."
             ),
             QWebEngineCertificateError.Type.CertificateTransparencyRequired: self.tr(
                 "Certificate Transparency was required for this"
@@ -92,7 +92,7 @@
                 "The connection uses an obsolete version of SSL/TLS."
             ),
             QWebEngineCertificateError.Type.CertificateSymantecLegacy: self.tr(
-                "The certificate is a legacy Symantec one that's no" " longer valid."
+                "The certificate is a legacy Symantec one that's no longer valid."
             ),
         }
 

--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py	Tue Dec 06 17:35:41 2022 +0100
@@ -65,7 +65,7 @@
 
             if len(engine.searchParameters()) > 0:
                 self.writeNamespace(
-                    "http://a9.com/-/spec/opensearch/extensions/" "parameters/1.0/", "p"
+                    "http://a9.com/-/spec/opensearch/extensions/parameters/1.0/", "p"
                 )
                 for parameter in engine.searchParameters():
                     self.writeStartElement("p:Parameter")
@@ -82,7 +82,7 @@
 
             if len(engine.suggestionsParameters()) > 0:
                 self.writeNamespace(
-                    "http://a9.com/-/spec/opensearch/extensions/" "parameters/1.0/", "p"
+                    "http://a9.com/-/spec/opensearch/extensions/parameters/1.0/", "p"
                 )
                 for parameter in engine.suggestionsParameters():
                     self.writeStartElement("p:Parameter")

--- a/src/eric7/WebBrowser/PageScreenDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/PageScreenDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -85,7 +85,7 @@
                 self,
                 self.tr("Save Page Screen"),
                 self.tr(
-                    "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+                    "<p>The file <b>{0}</b> already exists. Overwrite it?</p>"
                 ).format(fileName),
                 icon=EricMessageBox.Warning,
             )

--- a/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -87,9 +87,7 @@
         yes = EricMessageBox.yesNo(
             self,
             self.tr("Delete Documentation Sets"),
-            self.tr(
-                """Shall the selected documentation sets really be deleted?"""
-            ),
+            self.tr("""Shall the selected documentation sets really be deleted?"""),
         )
         if yes:
             for itm in self.documentationList.selectedItems():

--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -211,9 +211,7 @@
                 EricMessageBox.critical(
                     self,
                     self.tr("Update Safe Browsing Cache"),
-                    self.tr(
-                        """<p>Updating the Safe Browsing cache failed.</p>"""
-                    ),
+                    self.tr("""<p>Updating the Safe Browsing cache failed.</p>"""),
                 )
 
     @pyqtSlot()

--- a/src/eric7/WebBrowser/Session/SessionManager.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/Session/SessionManager.py	Tue Dec 06 17:35:41 2022 +0100
@@ -525,9 +525,7 @@
                 EricMessageBox.critical(
                     WebBrowserWindow.getWindow(),
                     title,
-                    self.tr(
-                        """An error occurred while cloning the session file."""
-                    ),
+                    self.tr("""An error occurred while cloning the session file."""),
                 )
                 return
         else:
@@ -537,9 +535,7 @@
                 EricMessageBox.critical(
                     WebBrowserWindow.getWindow(),
                     title,
-                    self.tr(
-                        """An error occurred while renaming the session file."""
-                    ),
+                    self.tr("""An error occurred while renaming the session file."""),
                 )
                 return
             if self.__isActive(sessionFilePath):

--- a/src/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py	Tue Dec 06 17:35:41 2022 +0100
@@ -68,7 +68,7 @@
         if url.scheme() in ["https"]:
             if WebBrowserWindow.networkManager().isInsecureHost(url.host()):
                 secureLabel.setText(
-                    self.tr("Your connection to this site " "<b>may not be secure</b>.")
+                    self.tr("Your connection to this site <b>may not be secure</b>.")
                 )
                 secureIcon.setPixmap(EricPixmapCache.getPixmap("securityMedium"))
             else:

--- a/src/eric7/WebBrowser/StatusBar/ImagesIcon.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/StatusBar/ImagesIcon.py	Tue Dec 06 17:35:41 2022 +0100
@@ -37,7 +37,7 @@
         super().__init__(window)
 
         self.setToolTip(
-            self.tr("Modify images loading settings temporarily" " or globally")
+            self.tr("Modify images loading settings temporarily or globally")
         )
         self.__icon = EricPixmapCache.getPixmap("filePixmap").scaled(16, 16)
         self.setPixmap(self.__icon)

--- a/src/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Tue Dec 06 17:35:41 2022 +0100
@@ -36,7 +36,7 @@
         super().__init__(window)
 
         self.setToolTip(
-            self.tr("Modify JavaScript settings temporarily for" " a site or globally")
+            self.tr("Modify JavaScript settings temporarily for a site or globally")
         )
         self.__icon = EricPixmapCache.getPixmap("fileJavascript").scaled(16, 16)
         self.setPixmap(self.__icon)

--- a/src/eric7/WebBrowser/Sync/SyncHandler.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncHandler.py	Tue Dec 06 17:35:41 2022 +0100
@@ -60,13 +60,13 @@
                     "Remote bookmarks file exists! Syncing local copy..."
                 ),
                 "RemoteMissing": self.tr(
-                    "Remote bookmarks file does NOT exist. Exporting" " local copy..."
+                    "Remote bookmarks file does NOT exist. Exporting local copy..."
                 ),
                 "LocalNewer": self.tr(
                     "Local bookmarks file is NEWER. Exporting local copy..."
                 ),
                 "LocalMissing": self.tr(
-                    "Local bookmarks file does NOT exist. Skipping" " synchronization!"
+                    "Local bookmarks file does NOT exist. Skipping synchronization!"
                 ),
                 "Uploading": self.tr("Uploading local bookmarks file..."),
             },
@@ -75,13 +75,13 @@
                     "Remote history file exists! Syncing local copy..."
                 ),
                 "RemoteMissing": self.tr(
-                    "Remote history file does NOT exist. Exporting" " local copy..."
+                    "Remote history file does NOT exist. Exporting local copy..."
                 ),
                 "LocalNewer": self.tr(
                     "Local history file is NEWER. Exporting local copy..."
                 ),
                 "LocalMissing": self.tr(
-                    "Local history file does NOT exist. Skipping" " synchronization!"
+                    "Local history file does NOT exist. Skipping synchronization!"
                 ),
                 "Uploading": self.tr("Uploading local history file..."),
             },
@@ -90,19 +90,19 @@
                     "Remote logins file exists! Syncing local copy..."
                 ),
                 "RemoteMissing": self.tr(
-                    "Remote logins file does NOT exist. Exporting" " local copy..."
+                    "Remote logins file does NOT exist. Exporting local copy..."
                 ),
                 "LocalNewer": self.tr(
                     "Local logins file is NEWER. Exporting local copy..."
                 ),
                 "LocalMissing": self.tr(
-                    "Local logins file does NOT exist. Skipping" " synchronization!"
+                    "Local logins file does NOT exist. Skipping synchronization!"
                 ),
                 "Uploading": self.tr("Uploading local logins file..."),
             },
             "useragents": {
                 "RemoteExists": self.tr(
-                    "Remote user agent settings file exists! Syncing local" " copy..."
+                    "Remote user agent settings file exists! Syncing local copy..."
                 ),
                 "RemoteMissing": self.tr(
                     "Remote user agent settings file does NOT exist."
@@ -120,7 +120,7 @@
             },
             "speeddial": {
                 "RemoteExists": self.tr(
-                    "Remote speed dial settings file exists! Syncing local" " copy..."
+                    "Remote speed dial settings file exists! Syncing local copy..."
                 ),
                 "RemoteMissing": self.tr(
                     "Remote speed dial settings file does NOT exist."

--- a/src/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Tue Dec 06 17:35:41 2022 +0100
@@ -38,7 +38,7 @@
         self.setupUi(self)
 
         self.pdfFilePicker.setMode(EricPathPickerModes.SAVE_FILE_OVERWRITE_MODE)
-        self.pdfFilePicker.setFilters(self.tr("PDF Files (*.pdf);;" "All Files (*)"))
+        self.pdfFilePicker.setFilters(self.tr("PDF Files (*.pdf);;All Files (*)"))
         if not os.path.isabs(filePath):
             documentsPath = QStandardPaths.writableLocation(
                 QStandardPaths.StandardLocation.DocumentsLocation

--- a/src/eric7/WebBrowser/WebBrowserView.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserView.py	Tue Dec 06 17:35:41 2022 +0100
@@ -1817,14 +1817,14 @@
             status
             == QWebEnginePage.RenderProcessTerminationStatus.CrashedTerminationStatus
         ):
-            msg = self.tr("The render process crashed while" " loading this page.")
+            msg = self.tr("The render process crashed while loading this page.")
         elif (
             status
             == QWebEnginePage.RenderProcessTerminationStatus.KilledTerminationStatus
         ):
             msg = self.tr("The render process was killed.")
         else:
-            msg = self.tr("The render process terminated while" " loading this page.")
+            msg = self.tr("The render process terminated while loading this page.")
         html = html.replace("@LI-1@", msg)
         html = html.replace(
             "@LI-2@",

--- a/src/eric7/WebBrowser/WebBrowserWindow.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserWindow.py	Tue Dec 06 17:35:41 2022 +0100
@@ -818,9 +818,7 @@
             )
             self.saveAsAct.setStatusTip(self.tr("Save the current page to disk"))
             self.saveAsAct.setWhatsThis(
-                self.tr(
-                    """<b>Save As...</b><p>Saves the current page to disk.</p>"""
-                )
+                self.tr("""<b>Save As...</b><p>Saves the current page to disk.</p>""")
             )
             self.saveAsAct.triggered.connect(self.__savePageAs)
             self.__actions.append(self.saveAsAct)
@@ -837,7 +835,7 @@
             "webbrowser_file_save_visible_page_screen",
         )
         self.saveVisiblePageScreenAct.setStatusTip(
-            self.tr("Save the visible part of the current page as a" " screen shot")
+            self.tr("Save the visible part of the current page as a screen shot")
         )
         self.saveVisiblePageScreenAct.setWhatsThis(
             self.tr(
@@ -978,9 +976,7 @@
         )
         self.closeAct.setStatusTip(self.tr("Close the current help window"))
         self.closeAct.setWhatsThis(
-            self.tr(
-                """<b>Close</b><p>Closes the current web browser window.</p>"""
-            )
+            self.tr("""<b>Close</b><p>Closes the current web browser window.</p>""")
         )
         self.closeAct.triggered.connect(self.__tabWidget.closeBrowser)
         self.__actions.append(self.closeAct)
@@ -1118,9 +1114,7 @@
         )
         self.copyAct.setStatusTip(self.tr("Copy the selected text"))
         self.copyAct.setWhatsThis(
-            self.tr(
-                """<b>Copy</b><p>Copy the selected text to the clipboard.</p>"""
-            )
+            self.tr("""<b>Copy</b><p>Copy the selected text to the clipboard.</p>""")
         )
         self.copyAct.triggered.connect(self.__copy)
         self.__actions.append(self.copyAct)
@@ -1136,9 +1130,7 @@
         )
         self.cutAct.setStatusTip(self.tr("Cut the selected text"))
         self.cutAct.setWhatsThis(
-            self.tr(
-                """<b>Cut</b><p>Cut the selected text to the clipboard.</p>"""
-            )
+            self.tr("""<b>Cut</b><p>Cut the selected text to the clipboard.</p>""")
         )
         self.cutAct.triggered.connect(self.__cut)
         self.__actions.append(self.cutAct)
@@ -5553,7 +5545,7 @@
             self.tr("Import Keyboard Shortcuts"),
             "",
             self.tr(
-                "Keyboard Shortcuts File (*.ekj);;" "XML Keyboard shortcut file (*.e4k)"
+                "Keyboard Shortcuts File (*.ekj);;XML Keyboard shortcut file (*.e4k)"
             ),
         )
 

--- a/src/eric7/eric7_api.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/eric7_api.py	Tue Dec 06 17:35:41 2022 +0100
@@ -33,7 +33,7 @@
     """
     print("eric7_api")
     print()
-    print("Copyright (c) 2004 - 2022 Detlev Offenbach" " <detlev@die-offenbachs.de>.")
+    print("Copyright (c) 2004 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>.")
     print()
     print("Usage:")
     print()
@@ -68,7 +68,7 @@
         "        Write the API information to the named file."
         " A '%L' placeholder"  # __IGNORE_WARNING_M601__
     )
-    print("        is replaced by the language of the API file" " (see --language).")
+    print("        is replaced by the language of the API file (see --language).")
     print("  -p or --private")
     print("        Include private methods and functions.")
     print("  -R, -r or --recursive")

--- a/src/eric7/eric7_doc.py	Tue Dec 06 16:57:54 2022 +0100
+++ b/src/eric7/eric7_doc.py	Tue Dec 06 17:35:41 2022 +0100
@@ -41,7 +41,7 @@
     """
     print("eric7_doc")
     print()
-    print("Copyright (c) 2003 - 2022 Detlev Offenbach" " <detlev@die-offenbachs.de>.")
+    print("Copyright (c) 2003 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>.")
     print()
     print("Usage:")
     print()
@@ -96,7 +96,7 @@
     print("  --cfheader-color=color")
     print("        Specify the text color of class and function headers.")
     print("  --cfheader-background-color=color")
-    print("        Specify the text background color of class and" " function headers.")
+    print("        Specify the text background color of class and function headers.")
     print("  --link-color=color")
     print("        Specify the text color of hyperlinks.")
     print()