Tue, 06 Dec 2022 16:04:58 +0100
Corrected some 'wrong' string quotes caused by the Black line merging.
--- a/src/eric7/CondaInterface/CondaPackagesWidget.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/CondaInterface/CondaPackagesWidget.py Tue Dec 06 16:04:58 2022 +0100 @@ -693,7 +693,7 @@ self, self.tr("Delete Environment"), self.tr( - """<p>Shall the environment <b>{0}</b> really be""" """ deleted?</p>""" + """<p>Shall the environment <b>{0}</b> really be deleted?</p>""" ).format(envName), ) if ok:
--- a/src/eric7/Debugger/DebugUI.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Debugger/DebugUI.py Tue Dec 06 16:04:58 2022 +0100 @@ -607,7 +607,7 @@ ) act.setStatusTip( self.tr( - """Execute Python statements until leaving""" """ the current frame""" + """Execute Python statements until leaving the current frame""" ) ) act.setWhatsThis( @@ -634,7 +634,7 @@ ) act.setStatusTip(self.tr("Stop debugging")) act.setWhatsThis( - self.tr("""<b>Stop</b>""" """<p>Stop the running debugging session.</p>""") + self.tr("""<b>Stop</b><p>Stop the running debugging session.</p>""") ) act.triggered.connect(self.__stepQuit) self.actions.append(act)
--- a/src/eric7/Debugger/StartHistoryEditDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Debugger/StartHistoryEditDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -81,7 +81,7 @@ self, self.tr("Delete Selected Entries"), self.tr( - """Do you really want to delete the selected""" """ history entries?""" + """Do you really want to delete the selected history entries?""" ), ) if yes:
--- a/src/eric7/Debugger/WatchPointViewer.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Debugger/WatchPointViewer.py Tue Dec 06 16:04:58 2022 +0100 @@ -235,7 +235,7 @@ if showMessage and duplicate: if not special: msg = self.tr( - """<p>A watch expression '<b>{0}</b>'""" """ already exists.</p>""" + """<p>A watch expression '<b>{0}</b>' already exists.</p>""" ).format(Utilities.html_encode(cond)) else: msg = self.tr(
--- a/src/eric7/EricWidgets/EricToolBarDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/EricWidgets/EricToolBarDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -160,7 +160,7 @@ self, self.tr("New Toolbar"), self.tr( - """A toolbar with the name <b>{0}</b> already""" """ exists.""" + """A toolbar with the name <b>{0}</b> already exists.""" ).format(name), ) return @@ -228,7 +228,7 @@ self, self.tr("Rename Toolbar"), self.tr( - """A toolbar with the name <b>{0}</b> already""" """ exists.""" + """A toolbar with the name <b>{0}</b> already exists.""" ).format(newName), ) return
--- a/src/eric7/Graphics/UMLDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Graphics/UMLDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -428,7 +428,7 @@ """ msg = ( self.tr( - """<p>The file <b>{0}</b> does not contain""" """ valid data.</p>""" + """<p>The file <b>{0}</b> does not contain valid data.</p>""" ).format(filename) if linenum < 0 else self.tr(
--- a/src/eric7/HexEdit/HexEditMainWindow.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/HexEdit/HexEditMainWindow.py Tue Dec 06 16:04:58 2022 +0100 @@ -271,7 +271,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>""" + """<b>Close</b><p>Closes the current hex editor window.</p>""" ) ) self.closeAct.triggered.connect(self.close) @@ -287,7 +287,7 @@ ) self.closeAllAct.setStatusTip(self.tr("Close all hex editor windows")) self.closeAllAct.setWhatsThis( - self.tr("""<b>Close All</b>""" """<p>Closes all hex editor windows.</p>""") + self.tr("""<b>Close All</b><p>Closes all hex editor windows.</p>""") ) self.closeAllAct.triggered.connect(self.__closeAll) self.__actions.append(self.closeAllAct) @@ -321,7 +321,7 @@ ) self.exitAct.setStatusTip(self.tr("Quit the hex editor")) self.exitAct.setWhatsThis( - self.tr("""<b>Quit</b>""" """<p>Quit the hex editor.</p>""") + self.tr("""<b>Quit</b><p>Quit the hex editor.</p>""") ) if not self.__fromEric: self.exitAct.triggered.connect(self.__closeAll) @@ -342,7 +342,7 @@ ) self.undoAct.setStatusTip(self.tr("Undo the last change")) self.undoAct.setWhatsThis( - self.tr("""<b>Undo</b>""" """<p>Undo the last change done.</p>""") + self.tr("""<b>Undo</b><p>Undo the last change done.</p>""") ) self.undoAct.triggered.connect(self.__editor.undo) self.__actions.append(self.undoAct) @@ -358,7 +358,7 @@ ) self.redoAct.setStatusTip(self.tr("Redo the last change")) self.redoAct.setWhatsThis( - self.tr("""<b>Redo</b>""" """<p>Redo the last change done.</p>""") + self.tr("""<b>Redo</b><p>Redo the last change done.</p>""") ) self.redoAct.triggered.connect(self.__editor.redo) self.__actions.append(self.redoAct) @@ -431,7 +431,7 @@ ) self.pasteAct.setStatusTip(self.tr("Paste the clipboard contents")) self.pasteAct.setWhatsThis( - self.tr("""<b>Paste</b>""" """<p>Paste the clipboard contents.</p>""") + self.tr("""<b>Paste</b><p>Paste the clipboard contents.</p>""") ) self.pasteAct.triggered.connect(self.__editor.paste) self.__actions.append(self.pasteAct) @@ -448,7 +448,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>""" + """<b>Select All</b><p>Selects the complete binary data.</p>""" ) ) self.selectAllAct.triggered.connect(self.__editor.selectAll) @@ -465,7 +465,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>""" + """<b>Deselect All</b><p>Deselect all all binary data.</p>""" ) ) self.deselectAllAct.triggered.connect(self.__editor.deselectAll)
--- a/src/eric7/IconEditor/IconEditorWindow.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/IconEditor/IconEditorWindow.py Tue Dec 06 16:04:58 2022 +0100 @@ -199,7 +199,7 @@ ) self.newAct.setStatusTip(self.tr("Create a new icon")) self.newAct.setWhatsThis( - self.tr("""<b>New</b>""" """<p>This creates a new icon.</p>""") + self.tr("""<b>New</b><p>This creates a new icon.</p>""") ) self.newAct.triggered.connect(self.__newIcon) self.__actions.append(self.newAct) @@ -293,7 +293,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>""" + """<b>Close</b><p>Closes the current icon editor window.</p>""" ) ) self.closeAct.triggered.connect(self.close) @@ -346,7 +346,7 @@ ) self.exitAct.setStatusTip(self.tr("Quit the icon editor")) self.exitAct.setWhatsThis( - self.tr("""<b>Quit</b>""" """<p>Quit the icon editor.</p>""") + self.tr("""<b>Quit</b><p>Quit the icon editor.</p>""") ) if not self.fromEric: self.exitAct.triggered.connect(self.__closeAll) @@ -367,7 +367,7 @@ ) self.undoAct.setStatusTip(self.tr("Undo the last change")) self.undoAct.setWhatsThis( - self.tr("""<b>Undo</b>""" """<p>Undo the last change done.</p>""") + self.tr("""<b>Undo</b><p>Undo the last change done.</p>""") ) self.undoAct.triggered.connect(self.__editor.editUndo) self.__actions.append(self.undoAct) @@ -383,7 +383,7 @@ ) self.redoAct.setStatusTip(self.tr("Redo the last change")) self.redoAct.setWhatsThis( - self.tr("""<b>Redo</b>""" """<p>Redo the last change done.</p>""") + self.tr("""<b>Redo</b><p>Redo the last change done.</p>""") ) self.redoAct.triggered.connect(self.__editor.editRedo) self.__actions.append(self.redoAct) @@ -437,7 +437,7 @@ ) self.pasteAct.setStatusTip(self.tr("Paste the clipboard image")) self.pasteAct.setWhatsThis( - self.tr("""<b>Paste</b>""" """<p>Paste the clipboard image.</p>""") + self.tr("""<b>Paste</b><p>Paste the clipboard image.</p>""") ) self.pasteAct.triggered.connect(self.__editor.editPaste) self.__actions.append(self.pasteAct) @@ -493,7 +493,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>""" + """<b>Select All</b><p>Selects the complete icon image.</p>""" ) ) self.selectAllAct.triggered.connect(self.__editor.editSelectAll) @@ -510,7 +510,7 @@ ) self.resizeAct.setStatusTip(self.tr("Change the icon size")) self.resizeAct.setWhatsThis( - self.tr("""<b>Change Size...</b>""" """<p>Changes the icon size.</p>""") + self.tr("""<b>Change Size...</b><p>Changes the icon size.</p>""") ) self.resizeAct.triggered.connect(self.__editor.editResize) self.__actions.append(self.resizeAct) @@ -526,7 +526,7 @@ ) self.grayscaleAct.setStatusTip(self.tr("Change the icon to grayscale")) self.grayscaleAct.setWhatsThis( - self.tr("""<b>Grayscale</b>""" """<p>Changes the icon to grayscale.</p>""") + self.tr("""<b>Grayscale</b><p>Changes the icon to grayscale.</p>""") ) self.grayscaleAct.triggered.connect(self.__editor.grayScale) self.__actions.append(self.grayscaleAct) @@ -620,7 +620,7 @@ ) self.showGridAct.setStatusTip(self.tr("Toggle the display of the grid")) self.showGridAct.setWhatsThis( - self.tr("""<b>Show Grid</b>""" """<p>Toggle the display of the grid.</p>""") + self.tr("""<b>Show Grid</b><p>Toggle the display of the grid.</p>""") ) self.showGridAct.triggered[bool].connect(self.__editor.setGridEnabled) self.__actions.append(self.showGridAct) @@ -647,7 +647,7 @@ "iconEditor_tools_pencil", ) self.drawPencilAct.setWhatsThis( - self.tr("""<b>Free hand</b>""" """<p>Draws non linear lines.</p>""") + self.tr("""<b>Free hand</b><p>Draws non linear lines.</p>""") ) self.drawPencilAct.setCheckable(True) self.esm.setMapping(self.drawPencilAct, IconEditorTool.PENCIL) @@ -685,7 +685,7 @@ "iconEditor_tools_rectangle", ) self.drawRectangleAct.setWhatsThis( - self.tr("""<b>Rectangle</b>""" """<p>Draw a rectangle.</p>""") + self.tr("""<b>Rectangle</b><p>Draw a rectangle.</p>""") ) self.drawRectangleAct.setCheckable(True) self.esm.setMapping(self.drawRectangleAct, IconEditorTool.RECTANGLE) @@ -702,7 +702,7 @@ "iconEditor_tools_filled_rectangle", ) self.drawFilledRectangleAct.setWhatsThis( - self.tr("""<b>Filled Rectangle</b>""" """<p>Draw a filled rectangle.</p>""") + self.tr("""<b>Filled Rectangle</b><p>Draw a filled rectangle.</p>""") ) self.drawFilledRectangleAct.setCheckable(True) self.esm.setMapping( @@ -721,7 +721,7 @@ "iconEditor_tools_circle", ) self.drawCircleAct.setWhatsThis( - self.tr("""<b>Circle</b>""" """<p>Draw a circle.</p>""") + self.tr("""<b>Circle</b><p>Draw a circle.</p>""") ) self.drawCircleAct.setCheckable(True) self.esm.setMapping(self.drawCircleAct, IconEditorTool.CIRCLE) @@ -738,7 +738,7 @@ "iconEditor_tools_filled_circle", ) self.drawFilledCircleAct.setWhatsThis( - self.tr("""<b>Filled Circle</b>""" """<p>Draw a filled circle.</p>""") + self.tr("""<b>Filled Circle</b><p>Draw a filled circle.</p>""") ) self.drawFilledCircleAct.setCheckable(True) self.esm.setMapping(self.drawFilledCircleAct, IconEditorTool.FILLED_CIRCLE) @@ -755,7 +755,7 @@ "iconEditor_tools_ellipse", ) self.drawEllipseAct.setWhatsThis( - self.tr("""<b>Ellipse</b>""" """<p>Draw an ellipse.</p>""") + self.tr("""<b>Ellipse</b><p>Draw an ellipse.</p>""") ) self.drawEllipseAct.setCheckable(True) self.esm.setMapping(self.drawEllipseAct, IconEditorTool.ELLIPSE) @@ -772,7 +772,7 @@ "iconEditor_tools_filled_ellipse", ) self.drawFilledEllipseAct.setWhatsThis( - self.tr("""<b>Filled Ellipse</b>""" """<p>Draw a filled ellipse.</p>""") + self.tr("""<b>Filled Ellipse</b><p>Draw a filled ellipse.</p>""") ) self.drawFilledEllipseAct.setCheckable(True) self.esm.setMapping(self.drawFilledEllipseAct, IconEditorTool.FILLED_ELLIPSE) @@ -810,7 +810,7 @@ "iconEditor_tools_line", ) self.drawLineAct.setWhatsThis( - self.tr("""<b>Line</b>""" """<p>Draw a line.</p>""") + self.tr("""<b>Line</b><p>Draw a line.</p>""") ) self.drawLineAct.setCheckable(True) self.esm.setMapping(self.drawLineAct, IconEditorTool.LINE)
--- a/src/eric7/MicroPython/EspDevices.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/MicroPython/EspDevices.py Tue Dec 06 16:04:58 2022 +0100 @@ -169,7 +169,7 @@ self.microPython, self.tr("Erase Flash"), self.tr( - """Shall the flash of the selected device really be""" """ erased?""" + """Shall the flash of the selected device really be erased?""" ), ) if ok:
--- a/src/eric7/MicroPython/MicroPythonWidget.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/MicroPython/MicroPythonWidget.py Tue Dec 06 16:04:58 2022 +0100 @@ -1166,7 +1166,7 @@ self, self.tr("Run Script"), self.tr( - """The current editor does not contain a script.""" """ Abort...""" + """The current editor does not contain a script. Abort...""" ), ) return @@ -1177,7 +1177,7 @@ self, self.tr("Run Script"), self.tr( - """<p>Cannot run script.</p><p>Reason:""" """ {0}</p>""" + """<p>Cannot run script.</p><p>Reason: {0}</p>""" ).format(reason), ) return @@ -1761,7 +1761,7 @@ self, title, self.tr( - """The Python file <b>{0}</b> does not exist.""" """ Aborting...""" + """The Python file <b>{0}</b> does not exist. Aborting...""" ).format(pythonFile), ) return
--- a/src/eric7/MicroPython/UnknownDevicesDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/MicroPython/UnknownDevicesDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -262,7 +262,7 @@ self, self.tr("Unsaved Data"), self.tr( - """The list of devices contains some with modified""" """ data.""" + """The list of devices contains some with modified data.""" ), self.__saveDeviceData, )
--- a/src/eric7/MultiProject/MultiProject.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/MultiProject/MultiProject.py Tue Dec 06 16:04:58 2022 +0100 @@ -727,7 +727,7 @@ act.setStatusTip(self.tr("Open an existing multiproject")) act.setWhatsThis( self.tr( - """<b>Open...</b>""" """<p>This opens an existing multiproject.</p>""" + """<b>Open...</b><p>This opens an existing multiproject.</p>""" ) ) act.triggered.connect(self.openMultiProject) @@ -745,7 +745,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>""" + """<b>Close</b><p>This closes the current multiproject.</p>""" ) ) self.closeAct.triggered.connect(self.closeMultiProject) @@ -762,7 +762,7 @@ ) self.saveAct.setStatusTip(self.tr("Save the current multiproject")) self.saveAct.setWhatsThis( - self.tr("""<b>Save</b>""" """<p>This saves the current multiproject.</p>""") + self.tr("""<b>Save</b><p>This saves the current multiproject.</p>""") ) self.saveAct.triggered.connect(self.saveMultiProject) self.actions.append(self.saveAct)
--- a/src/eric7/Network/IRC/IrcChannelWidget.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Network/IRC/IrcChannelWidget.py Tue Dec 06 16:04:58 2022 +0100 @@ -554,7 +554,7 @@ self, self.tr("Leave IRC channel"), self.tr( - """Do you really want to leave the IRC channel""" """ <b>{0}</b>?""" + """Do you really want to leave the IRC channel <b>{0}</b>?""" ).format(self.__name), ) if ok:
--- a/src/eric7/PipInterface/PipPackagesWidget.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/PipInterface/PipPackagesWidget.py Tue Dec 06 16:04:58 2022 +0100 @@ -968,7 +968,7 @@ self, self.tr("Search PyPI"), self.tr( - """<p>There were no more results for""" """ <b>{0}</b>.</p>""" + """<p>There were no more results for <b>{0}</b>.</p>""" ).format(searchTerm), ) lastItem = None @@ -1456,7 +1456,7 @@ EricMessageBox.critical( None, self.tr("Edit Configuration"), - self.tr("""No valid configuration path determined.""" """ Aborting"""), + self.tr("""No valid configuration path determined. Aborting"""), ) return @@ -1467,7 +1467,7 @@ EricMessageBox.critical( None, self.tr("Edit Configuration"), - self.tr("""No valid configuration path determined.""" """ Aborting"""), + self.tr("""No valid configuration path determined. Aborting"""), ) return @@ -1480,7 +1480,7 @@ EricMessageBox.critical( None, self.tr("Edit Configuration"), - self.tr("""No valid configuration path determined.""" """ Aborting"""), + self.tr("""No valid configuration path determined. Aborting"""), ) return
--- a/src/eric7/PluginManager/PluginInstallDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/PluginManager/PluginInstallDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -408,7 +408,7 @@ return ( False, self.tr( - """<p>The plugin module <b>{0}</b> exists. """ """Aborting...</p>""" + """<p>The plugin module <b>{0}</b> exists. Aborting...</p>""" ).format(os.path.join(destination, pluginFileName)), False, )
--- a/src/eric7/Plugins/PluginWizardDotDesktop.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/PluginWizardDotDesktop.py Tue Dec 06 16:04:58 2022 +0100 @@ -25,7 +25,7 @@ packageName = "__core__" shortDescription = "Wizard for the creation of a .desktop file." longDescription = ( - """This plug-in implements a wizard to generate code for""" """ a .desktop file.""" + """This plug-in implements a wizard to generate code for a .desktop file.""" ) needsRestart = False pyqtApi = 2
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -676,7 +676,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 @@ -720,7 +720,7 @@ self, self.tr("Add"), self.tr( - """There are no unversioned entries""" """ available/selected.""" + """There are no unversioned entries available/selected.""" ), ) return @@ -746,7 +746,7 @@ self, self.tr("Stage"), self.tr( - """There are no stageable entries""" """ available/selected.""" + """There are no stageable entries available/selected.""" ), ) return @@ -772,7 +772,7 @@ self, self.tr("Unstage"), self.tr( - """There are no unstageable entries""" """ available/selected.""" + """There are no unstageable entries available/selected.""" ), ) return @@ -797,7 +797,7 @@ EricMessageBox.information( self, self.tr("Forget Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -845,7 +845,7 @@ EricMessageBox.information( self, self.tr("Restore Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -881,7 +881,7 @@ self, self.tr("Differences"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -1255,7 +1255,7 @@ res = EricMessageBox.yesNo( self, title, - self.tr("""Are you sure you want to revert the selected""" """ changes?"""), + self.tr("""Are you sure you want to revert the selected changes?"""), ) if res: if cursor.hasSelection():
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Tue Dec 06 16:04:58 2022 +0100 @@ -351,7 +351,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>""" + """<b>List tags</b><p>This lists the tags of the project.</p>""" ) ) self.gitTagListAct.triggered.connect(self.__gitTagList) @@ -696,7 +696,7 @@ ) self.gitRemoteAddAct.setStatusTip(self.tr("Add a remote repository")) self.gitRemoteAddAct.setWhatsThis( - self.tr("""<b>Add</b>""" """<p>This adds a remote repository.</p>""") + self.tr("""<b>Add</b><p>This adds a remote repository.</p>""") ) self.gitRemoteAddAct.triggered.connect(self.__gitAddRemote) self.actions.append(self.gitRemoteAddAct) @@ -706,7 +706,7 @@ ) self.gitRemoteRemoveAct.setStatusTip(self.tr("Remove a remote repository")) self.gitRemoteRemoveAct.setWhatsThis( - self.tr("""<b>Remove</b>""" """<p>This removes a remote repository.</p>""") + self.tr("""<b>Remove</b><p>This removes a remote repository.</p>""") ) self.gitRemoteRemoveAct.triggered.connect(self.__gitRemoveRemote) self.actions.append(self.gitRemoteRemoveAct) @@ -732,7 +732,7 @@ ) self.gitRemoteRenameAct.setStatusTip(self.tr("Rename a remote repository")) self.gitRemoteRenameAct.setWhatsThis( - self.tr("""<b>Rename</b>""" """<p>This renames a remote repository.</p>""") + self.tr("""<b>Rename</b><p>This renames a remote repository.</p>""") ) self.gitRemoteRenameAct.triggered.connect(self.__gitRenameRemote) self.actions.append(self.gitRemoteRenameAct) @@ -986,7 +986,7 @@ ) self.gitStashDropAct.setStatusTip(self.tr("Delete a stash")) self.gitStashDropAct.setWhatsThis( - self.tr("""<b>Delete</b>""" """<p>This deletes a stash.</p>""") + self.tr("""<b>Delete</b><p>This deletes a stash.</p>""") ) self.gitStashDropAct.triggered.connect(self.__gitStashDrop) self.actions.append(self.gitStashDropAct) @@ -1001,7 +1001,7 @@ ) self.gitStashClearAct.setStatusTip(self.tr("Delete all stashes")) self.gitStashClearAct.setWhatsThis( - self.tr("""<b>Delete All</b>""" """<p>This deletes all stashes.</p>""") + self.tr("""<b>Delete All</b><p>This deletes all stashes.</p>""") ) self.gitStashClearAct.triggered.connect(self.__gitStashClear) self.actions.append(self.gitStashClearAct) @@ -1279,7 +1279,7 @@ ) self.gitBisectStartAct.setStatusTip(self.tr("Start a bisect session")) self.gitBisectStartAct.setWhatsThis( - self.tr("""<b>Start</b>""" """<p>This starts a bisect session.</p>""") + self.tr("""<b>Start</b><p>This starts a bisect session.</p>""") ) self.gitBisectStartAct.triggered.connect(self.__gitBisectStart) self.actions.append(self.gitBisectStartAct) @@ -1348,7 +1348,7 @@ ) self.gitBisectSkipAct.setStatusTip(self.tr("Skip a selectable revision")) self.gitBisectSkipAct.setWhatsThis( - self.tr("""<b>Skip</b>""" """<p>This skips a selectable revision.</p>""") + self.tr("""<b>Skip</b><p>This skips a selectable revision.</p>""") ) self.gitBisectSkipAct.triggered.connect(self.__gitBisectSkip) self.actions.append(self.gitBisectSkipAct) @@ -1358,7 +1358,7 @@ ) self.gitBisectResetAct.setStatusTip(self.tr("Reset the bisect session")) self.gitBisectResetAct.setWhatsThis( - self.tr("""<b>Reset</b>""" """<p>This resets the bisect session.</p>""") + self.tr("""<b>Reset</b><p>This resets the bisect session.</p>""") ) self.gitBisectResetAct.triggered.connect(self.__gitBisectReset) self.actions.append(self.gitBisectResetAct)
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Tue Dec 06 16:04:58 2022 +0100 @@ -537,7 +537,7 @@ None, self.tr("Switch"), self.tr( - """<p>Do you really want to switch to <b>{0}</b>?""" """</p>""" + """<p>Do you really want to switch to <b>{0}</b>?</p>""" ).format(revision), yesDefault=True, ) @@ -2377,7 +2377,7 @@ EricMessageBox.information( None, self.tr("Current Branch"), - self.tr("""<p>The current branch is <b>{0}</b>.""" """</p>""").format( + self.tr("""<p>The current branch is <b>{0}</b>.</p>""").format( branchName ), ) @@ -3889,7 +3889,7 @@ info.append(self.tr("""<tr><td><b>Statistics</b></td></tr>""")) info.append( self.tr( - """<tr><td>Number of loose objects: </td>""" """<td>{0}</td></tr>""" + """<tr><td>Number of loose objects: </td><td>{0}</td></tr>""" ).format(statistics["count"]) ) info.append( @@ -3906,7 +3906,7 @@ ) info.append( self.tr( - """<tr><td>Number of packs: </td>""" """<td>{0}</td></tr>""" + """<tr><td>Number of packs: </td><td>{0}</td></tr>""" ).format(statistics["packs"]) ) info.append( @@ -3923,7 +3923,7 @@ ) info.append( self.tr( - """<tr><td>Garbage files: </td>""" """<td>{0}</td></tr>""" + """<tr><td>Garbage files: </td><td>{0}</td></tr>""" ).format(statistics["garbage"]) ) info.append(
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -92,7 +92,7 @@ self, self.tr("Add Sub-repository"), self.tr( - """The sub-repository path must be inside""" """ the project.""" + """The sub-repository path must be inside the project.""" ), ) self.pathPicker.setText("")
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -329,7 +329,7 @@ self, self.tr("Delete Bookmark"), self.tr( - """<p>Shall the bookmark <b>{0}</b> really be""" """ deleted?</p>""" + """<p>Shall the bookmark <b>{0}</b> really be deleted?</p>""" ).format(bookmark), ) if yes:
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -526,7 +526,7 @@ self, self.tr("Commit"), self.tr( - """There are no entries selected to be""" """ committed.""" + """There are no entries selected to be committed.""" ), ) return @@ -570,7 +570,7 @@ self, self.tr("Add"), self.tr( - """There are no unversioned entries""" """ available/selected.""" + """There are no unversioned entries available/selected.""" ), ) return @@ -598,7 +598,7 @@ self, self.tr("Add"), self.tr( - """There are no unversioned entries""" """ available/selected.""" + """There are no unversioned entries available/selected.""" ), ) return @@ -623,7 +623,7 @@ EricMessageBox.information( self, self.tr("Forget Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -643,7 +643,7 @@ self, self.tr("Revert"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -670,7 +670,7 @@ EricMessageBox.information( self, self.tr("Restore Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -693,7 +693,7 @@ self, self.tr("Differences"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -716,7 +716,7 @@ self, self.tr("Differences Side-By-Side"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -350,7 +350,7 @@ self, self.tr("Close Branch"), self.tr( - """The branch "default" cannot be closed.""" """ Aborting...""" + """The branch "default" cannot be closed. Aborting...""" ), ) return @@ -359,7 +359,7 @@ self, self.tr("Close Branch"), self.tr( - """<p>Shall the branch <b>{0}</b> really be closed?""" """</p>""" + """<p>Shall the branch <b>{0}</b> really be closed?</p>""" ).format(branch), ) if yes:
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Dec 06 16:04:58 2022 +0100 @@ -447,7 +447,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>""" + """<b>Show tip</b><p>This shows the tip of the repository.</p>""" ) ) self.hgTipAct.triggered.connect(self.__hgTip) @@ -650,7 +650,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>""" + """<b>List tags</b><p>This lists the tags of the project.</p>""" ) ) self.hgTagListAct.triggered.connect(self.__hgTagList) @@ -1103,7 +1103,7 @@ ) self.hgBisectSkipAct.setStatusTip(self.tr("Skip a selectable changeset")) self.hgBisectSkipAct.setWhatsThis( - self.tr("""<b>Skip</b>""" """<p>This skips a selectable changeset.</p>""") + self.tr("""<b>Skip</b><p>This skips a selectable changeset.</p>""") ) self.hgBisectSkipAct.triggered.connect(self.__hgBisectSkip) self.actions.append(self.hgBisectSkipAct) @@ -1113,7 +1113,7 @@ ) self.hgBisectResetAct.setStatusTip(self.tr("Reset the bisect search data")) self.hgBisectResetAct.setWhatsThis( - self.tr("""<b>Reset</b>""" """<p>This resets the bisect search data.</p>""") + self.tr("""<b>Reset</b><p>This resets the bisect search data.</p>""") ) self.hgBisectResetAct.triggered.connect(self.__hgBisectReset) self.actions.append(self.hgBisectResetAct) @@ -1339,7 +1339,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>""" + """<b>Add...</b><p>Add a sub-repository to the project.</p>""" ) ) self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository)
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Dec 06 16:04:58 2022 +0100 @@ -82,7 +82,7 @@ ) self.hgQueueNewAct.setStatusTip(self.tr("Create a new patch")) self.hgQueueNewAct.setWhatsThis( - self.tr("""<b>New Patch</b>""" """<p>This creates a new named patch.</p>""") + self.tr("""<b>New Patch</b><p>This creates a new named patch.</p>""") ) self.hgQueueNewAct.triggered.connect(self.__hgQueueNewPatch) self.actions.append(self.hgQueueNewAct) @@ -234,7 +234,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>""" + """<b>Delete Patch</b><p>This deletes an unapplied patch.</p>""" ) ) self.hgQueueDeleteAct.triggered.connect(self.__hgQueueDeletePatch) @@ -768,7 +768,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>""" + """<b>Create Queue</b><p>This creates a new patch queue.</p>""" ) ) self.hgQueueCreateQueueAct.triggered.connect(self.__hgQueueCreateQueue) @@ -849,7 +849,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>""" + """<b>Activate Queue</b><p>This sets the active queue.</p>""" ) ) self.hgQueueActivateQueueAct.triggered.connect(self.__hgQueueActivateQueue)
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Dec 06 16:04:58 2022 +0100 @@ -2389,7 +2389,7 @@ None, self.tr("Rollback last transaction"), self.tr( - """Are you sure you want to rollback the last""" """ transaction?""" + """Are you sure you want to rollback the last transaction?""" ), icon=EricMessageBox.Warning, )
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Dec 06 16:04:58 2022 +0100 @@ -442,7 +442,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>""" + """<b>List tags</b><p>This lists the tags of the project.</p>""" ) ) self.svnTagListAct.triggered.connect(self.__svnTagList)
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -651,7 +651,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 @@ -694,7 +694,7 @@ self, self.tr("Add"), self.tr( - """There are no unversioned entries""" """ available/selected.""" + """There are no unversioned entries available/selected.""" ), ) return @@ -720,7 +720,7 @@ self, self.tr("Revert"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -747,7 +747,7 @@ EricMessageBox.information( self, self.tr("Restore Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -770,7 +770,7 @@ self, self.tr("Differences"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -794,7 +794,7 @@ self, self.tr("Side-by-Side Diff"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -823,7 +823,7 @@ EricMessageBox.information( self, self.tr("Lock"), - self.tr("""There are no unlocked files""" """ available/selected."""), + self.tr("""There are no unlocked files available/selected."""), ) return @@ -842,7 +842,7 @@ EricMessageBox.information( self, self.tr("Unlock"), - self.tr("""There are no locked files""" """ available/selected."""), + self.tr("""There are no locked files available/selected."""), ) return @@ -861,7 +861,7 @@ EricMessageBox.information( self, self.tr("Break Lock"), - self.tr("""There are no locked files""" """ available/selected."""), + self.tr("""There are no locked files available/selected."""), ) return @@ -880,7 +880,7 @@ EricMessageBox.information( self, self.tr("Steal Lock"), - self.tr("""There are no locked files""" """ available/selected."""), + self.tr("""There are no locked files available/selected."""), ) return
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue Dec 06 16:04:58 2022 +0100 @@ -425,7 +425,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>""" + """<b>List tags</b><p>This lists the tags of the project.</p>""" ) ) self.svnTagListAct.triggered.connect(self.__svnTagList)
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -794,7 +794,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 @@ -837,7 +837,7 @@ self, self.tr("Add"), self.tr( - """There are no unversioned entries""" """ available/selected.""" + """There are no unversioned entries available/selected.""" ), ) return @@ -863,7 +863,7 @@ self, self.tr("Revert"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -890,7 +890,7 @@ EricMessageBox.information( self, self.tr("Revert"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -913,7 +913,7 @@ self, self.tr("Differences"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -937,7 +937,7 @@ self, self.tr("Side-by-Side Diff"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -966,7 +966,7 @@ EricMessageBox.information( self, self.tr("Lock"), - self.tr("""There are no unlocked files""" """ available/selected."""), + self.tr("""There are no unlocked files available/selected."""), ) return @@ -985,7 +985,7 @@ EricMessageBox.information( self, self.tr("Unlock"), - self.tr("""There are no locked files""" """ available/selected."""), + self.tr("""There are no locked files available/selected."""), ) return @@ -1004,7 +1004,7 @@ EricMessageBox.information( self, self.tr("Break Lock"), - self.tr("""There are no locked files""" """ available/selected."""), + self.tr("""There are no locked files available/selected."""), ) return @@ -1023,7 +1023,7 @@ EricMessageBox.information( self, self.tr("Steal Lock"), - self.tr("""There are no locked files""" """ available/selected."""), + self.tr("""There are no locked files available/selected."""), ) return
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -162,7 +162,7 @@ EricMessageBox.critical( self, self.tr("Subversion List"), - self.tr("""The repository URL is empty.""" """ Aborting..."""), + self.tr("""The repository URL is empty. Aborting..."""), ) self.close() return
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Dec 06 16:04:58 2022 +0100 @@ -1821,7 +1821,7 @@ EricMessageBox.critical( self.__ui, self.tr("Subversion Set Property"), - self.tr("""You have to supply a property name.""" """ Aborting."""), + self.tr("""You have to supply a property name. Aborting."""), ) return @@ -1867,7 +1867,7 @@ EricMessageBox.critical( self.__ui, self.tr("Subversion Delete Property"), - self.tr("""You have to supply a property name.""" """ Aborting."""), + self.tr("""You have to supply a property name. Aborting."""), ) return
--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -415,7 +415,7 @@ self, self.tr(".desktop Wizard"), self.tr( - """Only one of 'Only Show In' or """ """ 'Not Show In' allowed.""" + """Only one of 'Only Show In' or 'Not Show In' allowed.""" ), ) @@ -446,7 +446,7 @@ self, self.tr(".desktop Wizard"), self.tr( - """Only one of 'Only Show In' or """ """ 'Not Show In' allowed.""" + """Only one of 'Only Show In' or 'Not Show In' allowed.""" ), )
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -441,7 +441,7 @@ self, self.tr("Error"), self.tr( - """Invalid regular expression: missing""" """ group name""" + """Invalid regular expression: missing group name""" ), ) return @@ -588,7 +588,7 @@ self, self.tr("Error"), self.tr( - """Invalid regular expression: missing""" """ group name""" + """Invalid regular expression: missing group name""" ), ) return @@ -596,7 +596,7 @@ EricMessageBox.critical( self, self.tr("Error"), - self.tr("""A regular expression and a text must be""" """ given."""), + self.tr("""A regular expression and a text must be given."""), ) @pyqtSlot()
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -172,7 +172,7 @@ self, self.tr("Communication Error"), self.tr( - """<p>The backend reported an error.</p>""" """<p>{0}</p>""" + """<p>The backend reported an error.</p><p>{0}</p>""" ).format(responseDict["error"]), ) responseDict = {} @@ -733,7 +733,7 @@ EricMessageBox.critical( self, self.tr("Error"), - self.tr("""A regular expression and a text must""" """ be given."""), + self.tr("""A regular expression and a text must be given."""), ) @pyqtSlot()
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Tue Dec 06 16:04:58 2022 +0100 @@ -785,7 +785,7 @@ self, self.tr("Delete Sub-Style"), self.tr( - """<p>Shall the sub-style <b>{0}</b> really be""" """ deleted?</p>""" + """<p>Shall the sub-style <b>{0}</b> really be deleted?</p>""" ).format(self.lexer.description(style, substyle)), ) if ok:
--- a/src/eric7/Preferences/SubstyleDefinitionDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Preferences/SubstyleDefinitionDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -115,7 +115,7 @@ self, self.tr("Set Sub-Style Data to Default"), self.tr( - """Shall the sub-style data be set to default""" """ values?""" + """Shall the sub-style data be set to default values?""" ), ) if filled
--- a/src/eric7/Project/ProjectOthersBrowser.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Project/ProjectOthersBrowser.py Tue Dec 06 16:04:58 2022 +0100 @@ -391,7 +391,7 @@ self, self.tr("Show Mime-Type"), self.tr( - """The mime type of the file could not be""" """ determined.""" + """The mime type of the file could not be determined.""" ), ) elif mimetype.split("/")[0] == "text":
--- a/src/eric7/QScintilla/Exporters/ExporterHTML.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterHTML.py Tue Dec 06 16:04:58 2022 +0100 @@ -673,7 +673,7 @@ """<html xmlns="http://www.w3.org/1999/xhtml">\n""" ) elif htmlFormat == "html5": - head = """<!DOCTYPE html>\n""" """<html lang="EN">\n""" + head = """<!DOCTYPE html>\n<html lang="EN">\n""" else: head = '<html lang="EN">\n' head += """<head>\n"""
--- a/src/eric7/QScintilla/Exporters/ExporterODT.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterODT.py Tue Dec 06 16:04:58 2022 +0100 @@ -69,7 +69,7 @@ self.editor, self.tr("Export source"), self.tr( - """<p>The source could not be exported to""" """ <b>{0}</b>.</p>""" + """<p>The source could not be exported to <b>{0}</b>.</p>""" ).format(filename), )
--- a/src/eric7/QScintilla/MiniEditor.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/QScintilla/MiniEditor.py Tue Dec 06 16:04:58 2022 +0100 @@ -622,7 +622,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>""" + """<b>New</b><p>An empty editor window will be created.</p>""" ) ) self.newAct.triggered.connect(self.__newFile) @@ -717,7 +717,7 @@ ) self.closeAct.setStatusTip(self.tr("Close the editor window")) self.closeAct.setWhatsThis( - self.tr("""<b>Close Window</b>""" """<p>Close the current window.</p>""") + self.tr("""<b>Close Window</b><p>Close the current window.</p>""") ) self.closeAct.triggered.connect(self.close) self.fileActions.append(self.closeAct) @@ -874,7 +874,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>""" + """<b>Clear</b><p>Delete all text of the current editor.</p>""" ) ) self.deleteAct.triggered.connect(self.__textEdit.clear)
--- a/src/eric7/QScintilla/ShellWindow.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/QScintilla/ShellWindow.py Tue Dec 06 16:04:58 2022 +0100 @@ -228,7 +228,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>""" + """<b>Quit the Shell</b><p>This quits the Shell window.</p>""" ) ) self.exitAct.triggered.connect(self.quit) @@ -345,7 +345,7 @@ ) self.cutAct.setWhatsThis( self.tr( - """<b>Cut</b>""" """<p>Cut the selected text to the clipboard.</p>""" + """<b>Cut</b><p>Cut the selected text to the clipboard.</p>""" ) ) self.cutAct.triggered.connect(self.__shell.cut) @@ -369,7 +369,7 @@ ) self.copyAct.setWhatsThis( self.tr( - """<b>Copy</b>""" """<p>Copy the selected text to the clipboard.</p>""" + """<b>Copy</b><p>Copy the selected text to the clipboard.</p>""" ) ) self.copyAct.triggered.connect(self.__shell.copy) @@ -415,7 +415,7 @@ QCoreApplication.translate("ViewManager", "Clear all text") ) self.clearAct.setWhatsThis( - self.tr("""<b>Clear</b>""" """<p>Delete all text.</p>""") + self.tr("""<b>Clear</b><p>Delete all text.</p>""") ) self.clearAct.triggered.connect(self.__shell.clear) self.editActions.append(self.clearAct)
--- a/src/eric7/SqlBrowser/SqlBrowser.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/SqlBrowser/SqlBrowser.py Tue Dec 06 16:04:58 2022 +0100 @@ -133,7 +133,7 @@ ) self.exitAct.setStatusTip(self.tr("Quit the SQL browser")) self.exitAct.setWhatsThis( - self.tr("""<b>Quit</b>""" """<p>Quit the SQL browser.</p>""") + self.tr("""<b>Quit</b><p>Quit the SQL browser.</p>""") ) self.exitAct.triggered.connect(ericApp().closeAllWindows)
--- a/src/eric7/Testing/TestingWidget.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Testing/TestingWidget.py Tue Dec 06 16:04:58 2022 +0100 @@ -132,7 +132,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>""" + """<b>Start Test</b><p>This button starts the test run.</p>""" ) ) @@ -156,7 +156,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>""" + """<b>Stop Test</b><p>This button stops a running test.</p>""" ) )
--- a/src/eric7/Tools/TRPreviewer.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Tools/TRPreviewer.py Tue Dec 06 16:04:58 2022 +0100 @@ -217,7 +217,7 @@ self.exitAct.setShortcut(QKeySequence(self.tr("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.tr("Quit the application")) self.exitAct.setWhatsThis( - self.tr("""<b>Quit</b>""" """<p>Quit the application.</p>""") + self.tr("""<b>Quit</b><p>Quit the application.</p>""") ) self.exitAct.triggered.connect(ericApp().closeAllWindows) @@ -288,14 +288,14 @@ self.closeAct.setShortcut(QKeySequence(self.tr("Ctrl+W", "File|Close"))) self.closeAct.setStatusTip(self.tr("Close the current window")) self.closeAct.setWhatsThis( - self.tr("""<b>Close Window</b>""" """<p>Close the current window.</p>""") + self.tr("""<b>Close Window</b><p>Close the current window.</p>""") ) self.closeAct.triggered.connect(self.preview.closeWidget) self.closeAllAct = QAction(self.tr("Clos&e All"), self) self.closeAllAct.setStatusTip(self.tr("Close all windows")) self.closeAllAct.setWhatsThis( - self.tr("""<b>Close All Windows</b>""" """<p>Close all windows.</p>""") + self.tr("""<b>Close All Windows</b><p>Close all windows.</p>""") ) self.closeAllAct.triggered.connect(self.preview.closeAllWidgets) @@ -687,7 +687,7 @@ self.parent(), self.tr("Load Translator"), self.tr( - """<p>The translation file <b>{0}</b> could""" """ not be loaded.</p>""" + """<p>The translation file <b>{0}</b> could not be loaded.</p>""" ).format(transFileName), ) return None
--- a/src/eric7/Tools/TrayStarter.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Tools/TrayStarter.py Tue Dec 06 16:04:58 2022 +0100 @@ -580,7 +580,7 @@ except AttributeError: sip_version_str = "sip version not available" - versionText = self.tr("""<h3>Version Numbers</h3>""" """<table>""") + versionText = self.tr("""<h3>Version Numbers</h3><table>""") # Python version versionText += """<tr><td><b>Python</b></td><td>{0}</td></tr>""".format(
--- a/src/eric7/Tools/UIPreviewer.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/Tools/UIPreviewer.py Tue Dec 06 16:04:58 2022 +0100 @@ -161,7 +161,7 @@ self.printAct.setShortcut(QKeySequence(self.tr("Ctrl+P", "File|Print"))) self.printAct.setStatusTip(self.tr("Print a screen capture")) self.printAct.setWhatsThis( - self.tr("""<b>Print</b>""" """<p>Print a screen capture.</p>""") + self.tr("""<b>Print</b><p>Print a screen capture.</p>""") ) self.printAct.triggered.connect(self.__printImage) @@ -171,7 +171,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>""" + """<b>Print Preview</b><p>Print preview a screen capture.</p>""" ) ) self.printPreviewAct.triggered.connect(self.__printPreviewImage) @@ -195,7 +195,7 @@ self.exitAct.setShortcut(QKeySequence(self.tr("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.tr("Quit the application")) self.exitAct.setWhatsThis( - self.tr("""<b>Quit</b>""" """<p>Quit the application.</p>""") + self.tr("""<b>Quit</b><p>Quit the application.</p>""") ) self.exitAct.triggered.connect(ericApp().closeAllWindows) @@ -205,7 +205,7 @@ self.copyAct.setShortcut(QKeySequence(self.tr("Ctrl+C", "Edit|Copy"))) self.copyAct.setStatusTip(self.tr("Copy screen capture to clipboard")) self.copyAct.setWhatsThis( - self.tr("""<b>Copy</b>""" """<p>Copy screen capture to clipboard.</p>""") + self.tr("""<b>Copy</b><p>Copy screen capture to clipboard.</p>""") ) self.copyAct.triggered.connect(self.__copyImageToClipboard)
--- a/src/eric7/UI/Browser.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/UI/Browser.py Tue Dec 06 16:04:58 2022 +0100 @@ -587,7 +587,7 @@ QCoreApplication.translate("Browser", "Show Mime-Type"), QCoreApplication.translate( "Browser", - """The mime type of the file could not be""" """ determined.""", + """The mime type of the file could not be determined.""", ), ) elif mimetype.split("/")[0] == "text":
--- a/src/eric7/UI/Previewers/PreviewerHTML.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/UI/Previewers/PreviewerHTML.py Tue Dec 06 16:04:58 2022 +0100 @@ -868,7 +868,7 @@ """<html xmlns="http://www.w3.org/1999/xhtml">\n""" ) elif htmlFormat == "html5": - head = """<!DOCTYPE html>\n""" """<html lang="EN">\n""" + head = """<!DOCTYPE html>\n<html lang="EN">\n""" else: head = '<html lang="EN">\n' head += """<head>\n"""
--- a/src/eric7/UI/UserInterface.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/UI/UserInterface.py Tue Dec 06 16:04:58 2022 +0100 @@ -2715,7 +2715,7 @@ self.versionAct.setStatusTip(self.tr("Display version information")) self.versionAct.setWhatsThis( self.tr( - """<b>Show Versions</b>""" """<p>Display version information.</p>""" + """<b>Show Versions</b><p>Display version information.</p>""" ) ) self.versionAct.triggered.connect(self.__showVersions) @@ -2764,7 +2764,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>""" + """<b>Report Bug...</b><p>Opens a dialog to report a bug.</p>""" ) ) self.reportBugAct.triggered.connect(self.__reportBug) @@ -2865,7 +2865,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>""" + """<b>Test Script</b><p>Run tests with the current script.</p>""" ) ) self.testScriptAct.triggered.connect(self.__startTestScript) @@ -2884,7 +2884,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>""" + """<b>Test Project</b><p>Run test of the current project.</p>""" ) ) self.testProjectAct.triggered.connect(self.__startTestProject) @@ -2915,7 +2915,7 @@ ) self.designer4Act.setStatusTip(self.tr("Start Qt-Designer")) self.designer4Act.setWhatsThis( - self.tr("""<b>Qt-Designer</b>""" """<p>Start Qt-Designer.</p>""") + self.tr("""<b>Qt-Designer</b><p>Start Qt-Designer.</p>""") ) self.designer4Act.triggered.connect(self.__designer) self.actions.append(self.designer4Act) @@ -2945,7 +2945,7 @@ ) self.linguist4Act.setStatusTip(self.tr("Start Qt-Linguist")) self.linguist4Act.setWhatsThis( - self.tr("""<b>Qt-Linguist</b>""" """<p>Start Qt-Linguist.</p>""") + self.tr("""<b>Qt-Linguist</b><p>Start Qt-Linguist.</p>""") ) self.linguist4Act.triggered.connect(self.__linguist) self.actions.append(self.linguist4Act) @@ -2963,7 +2963,7 @@ ) self.uipreviewerAct.setStatusTip(self.tr("Start the UI Previewer")) self.uipreviewerAct.setWhatsThis( - self.tr("""<b>UI Previewer</b>""" """<p>Start the UI Previewer.</p>""") + self.tr("""<b>UI Previewer</b><p>Start the UI Previewer.</p>""") ) self.uipreviewerAct.triggered.connect(self.__UIPreviewer) self.actions.append(self.uipreviewerAct) @@ -3037,7 +3037,7 @@ ) self.sqlBrowserAct.setStatusTip(self.tr("Browse a SQL database")) self.sqlBrowserAct.setWhatsThis( - self.tr("""<b>SQL Browser</b>""" """<p>Browse a SQL database.</p>""") + self.tr("""<b>SQL Browser</b><p>Browse a SQL database.</p>""") ) self.sqlBrowserAct.triggered.connect(self.__sqlBrowser) self.actions.append(self.sqlBrowserAct) @@ -3243,7 +3243,7 @@ ) self.reloadAPIsAct.setStatusTip(self.tr("Reload the API information")) self.reloadAPIsAct.setWhatsThis( - self.tr("""<b>Reload APIs</b>""" """<p>Reload the API information.</p>""") + self.tr("""<b>Reload APIs</b><p>Reload the API information.</p>""") ) self.reloadAPIsAct.triggered.connect(self.__reloadAPIs) self.actions.append(self.reloadAPIsAct) @@ -4524,7 +4524,7 @@ sizeStr = "64-Bit" if sys.maxsize > 2**32 else "32-Bit" - versionText = self.tr("""<h2>Version Numbers</h2>""" """<table>""") + versionText = self.tr("""<h2>Version Numbers</h2><table>""") # Python version versionText += ("""<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>""").format( @@ -6959,7 +6959,7 @@ self, self.tr("Start Web Browser"), self.tr( - """The eric web browser could not be""" """ started.""" + """The eric web browser could not be started.""" ), ) return False
--- a/src/eric7/VCS/StatusWidget.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/VCS/StatusWidget.py Tue Dec 06 16:04:58 2022 +0100 @@ -501,7 +501,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 @@ -561,7 +561,7 @@ self, self.tr("Add"), self.tr( - """There are no unversioned entries""" """ available/selected.""" + """There are no unversioned entries available/selected.""" ), ) return @@ -770,7 +770,7 @@ self, self.tr("Differences"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -801,7 +801,7 @@ self, self.tr("Differences Side-By-Side"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -835,7 +835,7 @@ self, self.tr("Revert"), self.tr( - """There are no uncommitted changes""" """ available/selected.""" + """There are no uncommitted changes available/selected.""" ), ) return @@ -858,7 +858,7 @@ EricMessageBox.information( self, self.tr("Forget Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -880,7 +880,7 @@ EricMessageBox.information( self, self.tr("Restore Missing"), - self.tr("""There are no missing entries""" """ available/selected."""), + self.tr("""There are no missing entries available/selected."""), ) return @@ -916,7 +916,7 @@ self, self.tr("Conflict Resolved"), self.tr( - """There are no conflicting entries""" """ available/selected.""" + """There are no conflicting entries available/selected.""" ), ) return @@ -977,7 +977,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
--- a/src/eric7/ViewManager/ViewManager.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/ViewManager/ViewManager.py Tue Dec 06 16:04:58 2022 +0100 @@ -602,7 +602,7 @@ self.newAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>New</b>""" """<p>An empty editor window will be created.</p>""", + """<b>New</b><p>An empty editor window will be created.</p>""", ) ) self.newAct.triggered.connect(self.newEditor) @@ -652,7 +652,7 @@ self.closeAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Close Window</b>""" """<p>Close the current window.</p>""", + """<b>Close Window</b><p>Close the current window.</p>""", ) ) self.closeAct.triggered.connect(self.closeCurrentWindow) @@ -672,7 +672,7 @@ self.closeAllAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Close All Windows</b>""" """<p>Close all editor windows.</p>""", + """<b>Close All Windows</b><p>Close all editor windows.</p>""", ) ) self.closeAllAct.triggered.connect(self.closeAllWindows) @@ -1136,7 +1136,7 @@ self.deleteAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Clear</b>""" """<p>Delete all text of the current editor.</p>""", + """<b>Clear</b><p>Delete all text of the current editor.</p>""", ) ) self.deleteAct.triggered.connect(self.__editDelete) @@ -4357,7 +4357,7 @@ self.splitViewAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Split view</b>""" """<p>Add a split to the view.</p>""", + """<b>Split view</b><p>Add a split to the view.</p>""", ) ) self.splitViewAct.triggered.connect(self.__splitView) @@ -4403,7 +4403,7 @@ self.splitRemoveAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Remove split</b>""" """<p>Remove the current split.</p>""", + """<b>Remove split</b><p>Remove the current split.</p>""", ) ) self.splitRemoveAct.triggered.connect(self.removeSplit) @@ -4427,7 +4427,7 @@ self.nextSplitAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Next split</b>""" """<p>Move to the next split.</p>""", + """<b>Next split</b><p>Move to the next split.</p>""", ) ) self.nextSplitAct.triggered.connect(self.nextSplit) @@ -4451,7 +4451,7 @@ self.prevSplitAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Previous split</b>""" """<p>Move to the previous split.</p>""", + """<b>Previous split</b><p>Move to the previous split.</p>""", ) ) self.prevSplitAct.triggered.connect(self.prevSplit) @@ -4725,7 +4725,7 @@ self.macroLoadAct.setWhatsThis( QCoreApplication.translate( "ViewManager", - """<b>Load Macro</b>""" """<p>Load an editor macro from a file.</p>""", + """<b>Load Macro</b><p>Load an editor macro from a file.</p>""", ) ) self.macroLoadAct.triggered.connect(self.__macroLoad)
--- a/src/eric7/VirtualEnv/VirtualenvExecDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvExecDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -271,7 +271,7 @@ except OSError as err: self.__logError( self.tr( - """The logfile '{0}' could not be written.\n""" """Reason: {1}\n""" + """The logfile '{0}' could not be written.\nReason: {1}\n""" ).format(logFile, str(err)) ) self.__logOutput(self.tr("Done.\n"))
--- a/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -235,7 +235,7 @@ except OSError as err: self.__logError( self.tr( - """The logfile '{0}' could not be written.\n""" """Reason: {1}\n""" + """The logfile '{0}' could not be written.\nReason: {1}\n""" ).format(logFile, str(err)) ) self.__logOutput(self.tr("Done.\n"))
--- a/src/eric7/WebBrowser/AdBlock/AdBlockManager.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockManager.py Tue Dec 06 16:04:58 2022 +0100 @@ -338,7 +338,7 @@ None, self.tr("Subscribe?"), self.tr( - """<p>Subscribe to this AdBlock subscription?</p>""" """<p>{0}</p>""" + """<p>Subscribe to this AdBlock subscription?</p><p>{0}</p>""" ).format(title), ) if res:
--- a/src/eric7/WebBrowser/Passwords/PasswordManager.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/Passwords/PasswordManager.py Tue Dec 06 16:04:58 2022 +0100 @@ -165,7 +165,7 @@ None, self.tr("Saving login data"), self.tr( - """<p>Login data could not be saved to""" """ <b>{0}</b></p>""" + """<p>Login data could not be saved to <b>{0}</b></p>""" ).format(loginFile), ) else:
--- a/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -88,7 +88,7 @@ self, self.tr("Delete Documentation Sets"), self.tr( - """Shall the selected documentation sets really be""" """ deleted?""" + """Shall the selected documentation sets really be deleted?""" ), ) if yes:
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py Tue Dec 06 16:04:58 2022 +0100 @@ -212,7 +212,7 @@ self, self.tr("Update Safe Browsing Cache"), self.tr( - """<p>Updating the Safe Browsing cache failed.""" """</p>""" + """<p>Updating the Safe Browsing cache failed.</p>""" ), )
--- a/src/eric7/WebBrowser/Session/SessionManager.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/Session/SessionManager.py Tue Dec 06 16:04:58 2022 +0100 @@ -526,7 +526,7 @@ WebBrowserWindow.getWindow(), title, self.tr( - """An error occurred while cloning the session""" """ file.""" + """An error occurred while cloning the session file.""" ), ) return @@ -538,7 +538,7 @@ WebBrowserWindow.getWindow(), title, self.tr( - """An error occurred while renaming the session""" """ file.""" + """An error occurred while renaming the session file.""" ), ) return @@ -597,7 +597,7 @@ res = EricMessageBox.yesNo( WebBrowserWindow.getWindow(), self.tr("Restore Backup"), - self.tr("""Are you sure you want to replace the current""" """ session?"""), + self.tr("""Are you sure you want to replace the current session?"""), ) if res: self.openSession(sessionFilePath, SessionManager.ReplaceSession)
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDial.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/SpeedDial.py Tue Dec 06 16:04:58 2022 +0100 @@ -219,7 +219,7 @@ None, self.tr("Saving Speed Dial data"), self.tr( - """<p>Speed Dial data could not be saved to""" """ <b>{0}</b></p>""" + """<p>Speed Dial data could not be saved to <b>{0}</b></p>""" ).format(speedDialFile), ) else:
--- a/src/eric7/WebBrowser/UserAgent/UserAgentManager.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentManager.py Tue Dec 06 16:04:58 2022 +0100 @@ -69,7 +69,7 @@ None, self.tr("Saving user agent data"), self.tr( - """<p>User agent data could not be saved to""" """ <b>{0}</b></p>""" + """<p>User agent data could not be saved to <b>{0}</b></p>""" ).format(agentFile), ) else:
--- a/src/eric7/WebBrowser/WebBrowserWindow.py Tue Dec 06 16:00:06 2022 +0100 +++ b/src/eric7/WebBrowser/WebBrowserWindow.py Tue Dec 06 16:04:58 2022 +0100 @@ -719,7 +719,7 @@ ) self.newTabAct.setStatusTip(self.tr("Open a new web browser tab")) self.newTabAct.setWhatsThis( - self.tr("""<b>New Tab</b>""" """<p>This opens a new web browser tab.</p>""") + self.tr("""<b>New Tab</b><p>This opens a new web browser tab.</p>""") ) self.newTabAct.triggered.connect(self.newTab) self.__actions.append(self.newTabAct) @@ -819,7 +819,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>""" + """<b>Save As...</b><p>Saves the current page to disk.</p>""" ) ) self.saveAsAct.triggered.connect(self.__savePageAs) @@ -901,7 +901,7 @@ ) self.printAct.setStatusTip(self.tr("Print the displayed help")) self.printAct.setWhatsThis( - self.tr("""<b>Print</b>""" """<p>Print the displayed help text.</p>""") + self.tr("""<b>Print</b><p>Print the displayed help text.</p>""") ) self.printAct.triggered.connect(self.__tabWidget.printBrowser) self.__actions.append(self.printAct) @@ -979,7 +979,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>""" + """<b>Close</b><p>Closes the current web browser window.</p>""" ) ) self.closeAct.triggered.connect(self.__tabWidget.closeBrowser) @@ -1014,7 +1014,7 @@ ) self.exitAct.setStatusTip(self.tr("Quit the eric Web Browser")) self.exitAct.setWhatsThis( - self.tr("""<b>Quit</b>""" """<p>Quit the eric Web Browser.</p>""") + self.tr("""<b>Quit</b><p>Quit the eric Web Browser.</p>""") ) self.exitAct.triggered.connect(self.shutdown) self.__actions.append(self.exitAct) @@ -1070,7 +1070,7 @@ ) self.homeAct.setStatusTip(self.tr("Move to the initial screen")) self.homeAct.setWhatsThis( - self.tr("""<b>Home</b>""" """<p>Moves to the initial screen.</p>""") + self.tr("""<b>Home</b><p>Moves to the initial screen.</p>""") ) self.homeAct.triggered.connect(self.__home) self.__actions.append(self.homeAct) @@ -1086,7 +1086,7 @@ ) self.reloadAct.setStatusTip(self.tr("Reload the current screen")) self.reloadAct.setWhatsThis( - self.tr("""<b>Reload</b>""" """<p>Reloads the current screen.</p>""") + self.tr("""<b>Reload</b><p>Reloads the current screen.</p>""") ) self.reloadAct.triggered.connect(self.__reload) self.__actions.append(self.reloadAct) @@ -1102,7 +1102,7 @@ ) self.stopAct.setStatusTip(self.tr("Stop loading")) self.stopAct.setWhatsThis( - self.tr("""<b>Stop</b>""" """<p>Stops loading of the current tab.</p>""") + self.tr("""<b>Stop</b><p>Stops loading of the current tab.</p>""") ) self.stopAct.triggered.connect(self.__stopLoading) self.__actions.append(self.stopAct) @@ -1119,7 +1119,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>""" + """<b>Copy</b><p>Copy the selected text to the clipboard.</p>""" ) ) self.copyAct.triggered.connect(self.__copy) @@ -1137,7 +1137,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>""" + """<b>Cut</b><p>Cut the selected text to the clipboard.</p>""" ) ) self.cutAct.triggered.connect(self.__cut) @@ -1154,7 +1154,7 @@ ) self.pasteAct.setStatusTip(self.tr("Paste text from the clipboard")) self.pasteAct.setWhatsThis( - self.tr("""<b>Paste</b>""" """<p>Paste some text from the clipboard.</p>""") + self.tr("""<b>Paste</b><p>Paste some text from the clipboard.</p>""") ) self.pasteAct.triggered.connect(self.__paste) self.__actions.append(self.pasteAct) @@ -1170,7 +1170,7 @@ ) self.undoAct.setStatusTip(self.tr("Undo the last edit action")) self.undoAct.setWhatsThis( - self.tr("""<b>Undo</b>""" """<p>Undo the last edit action.</p>""") + self.tr("""<b>Undo</b><p>Undo the last edit action.</p>""") ) self.undoAct.triggered.connect(self.__undo) self.__actions.append(self.undoAct) @@ -1186,7 +1186,7 @@ ) self.redoAct.setStatusTip(self.tr("Redo the last edit action")) self.redoAct.setWhatsThis( - self.tr("""<b>Redo</b>""" """<p>Redo the last edit action.</p>""") + self.tr("""<b>Redo</b><p>Redo the last edit action.</p>""") ) self.redoAct.triggered.connect(self.__redo) self.__actions.append(self.redoAct) @@ -1239,7 +1239,7 @@ ) self.findAct.setStatusTip(self.tr("Find text in page")) self.findAct.setWhatsThis( - self.tr("""<b>Find</b>""" """<p>Find text in the current page.</p>""") + self.tr("""<b>Find</b><p>Find text in the current page.</p>""") ) self.findAct.triggered.connect(self.__find) self.__actions.append(self.findAct) @@ -1604,7 +1604,7 @@ ) self.cookiesAct.setStatusTip(self.tr("Configure cookies handling")) self.cookiesAct.setWhatsThis( - self.tr("""<b>Cookies</b>""" """<p>Configure cookies handling.</p>""") + self.tr("""<b>Cookies</b><p>Configure cookies handling.</p>""") ) self.cookiesAct.triggered.connect(self.__showCookiesConfiguration) self.__actions.append(self.cookiesAct) @@ -1742,7 +1742,7 @@ ) self.showIndexAct.setStatusTip(self.tr("Shows the index window")) self.showIndexAct.setWhatsThis( - self.tr("""<b>Index</b>""" """<p>Shows the index window.</p>""") + self.tr("""<b>Index</b><p>Shows the index window.</p>""") ) self.showIndexAct.triggered.connect(self.__showIndexWindow) self.__actions.append(self.showIndexAct) @@ -1757,7 +1757,7 @@ ) self.showSearchAct.setStatusTip(self.tr("Shows the search window")) self.showSearchAct.setWhatsThis( - self.tr("""<b>Search</b>""" """<p>Shows the search window.</p>""") + self.tr("""<b>Search</b><p>Shows the search window.</p>""") ) self.showSearchAct.triggered.connect(self.__showSearchWindow) self.__actions.append(self.showSearchAct) @@ -1982,7 +1982,7 @@ ) self.showDownloadManagerAct.setStatusTip(self.tr("Shows the downloads window")) self.showDownloadManagerAct.setWhatsThis( - self.tr("""<b>Downloads</b>""" """<p>Shows the downloads window.</p>""") + self.tr("""<b>Downloads</b><p>Shows the downloads window.</p>""") ) self.showDownloadManagerAct.triggered.connect(self.__showDownloadsWindow) self.__actions.append(self.showDownloadManagerAct) @@ -2123,7 +2123,7 @@ ) self.showTabManagerAct.setStatusTip(self.tr("Shows the tab manager window")) self.showTabManagerAct.setWhatsThis( - self.tr("""<b>Tab Manager</b>""" """<p>Shows the tab manager window.</p>""") + self.tr("""<b>Tab Manager</b><p>Shows the tab manager window.</p>""") ) self.showTabManagerAct.triggered.connect( lambda: self.__showTabManager(self.showTabManagerAct)