--- a/eric6/UI/UserInterface.py Tue Jan 05 18:28:31 2021 +0100
+++ b/eric6/UI/UserInterface.py Wed Jan 06 13:47:01 2021 +0100
@@ -1686,10 +1686,10 @@
QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
0, self, 'new_window')
self.newWindowAct.setStatusTip(self.tr(
- 'Open a new eric6 instance'))
+ 'Open a new eric instance'))
self.newWindowAct.setWhatsThis(self.tr(
"""<b>New Window</b>"""
- """<p>This opens a new instance of the eric6 IDE.</p>"""
+ """<p>This opens a new instance of the eric IDE.</p>"""
))
self.newWindowAct.triggered.connect(self.__newWindow)
self.actions.append(self.newWindowAct)
@@ -2132,7 +2132,7 @@
'Open the helpviewer window'))
self.helpviewerAct.setWhatsThis(self.tr(
"""<b>Helpviewer</b>"""
- """<p>Display the eric6 web browser. This window will show"""
+ """<p>Display the eric web browser. This window will show"""
""" HTML help files and help from Qt help collections. It"""
""" has the capability to navigate to links, set bookmarks,"""
""" print the displayed help and some more features. You may"""
@@ -2167,7 +2167,7 @@
self.checkUpdateAct.setStatusTip(self.tr('Check for Updates'))
self.checkUpdateAct.setWhatsThis(self.tr(
"""<b>Check for Updates...</b>"""
- """<p>Checks the internet for updates of eric6.</p>"""
+ """<p>Checks the internet for updates of eric.</p>"""
))
self.checkUpdateAct.triggered.connect(self.performVersionCheck)
self.actions.append(self.checkUpdateAct)
@@ -2180,7 +2180,7 @@
self.tr('Show the versions available for download'))
self.showVersionsAct.setWhatsThis(self.tr(
"""<b>Show downloadable versions...</b>"""
- """<p>Shows the eric6 versions available for download """
+ """<p>Shows the eric versions available for download """
"""from the internet.</p>"""
))
self.showVersionsAct.triggered.connect(
@@ -2453,25 +2453,25 @@
self.tr('&Hex Editor...'),
0, 0, self, 'hex_editor')
self.hexEditorAct.setStatusTip(self.tr(
- 'Start the eric6 Hex Editor'))
+ 'Start the eric Hex Editor'))
self.hexEditorAct.setWhatsThis(self.tr(
"""<b>Hex Editor</b>"""
- """<p>Starts the eric6 Hex Editor for viewing or editing"""
+ """<p>Starts the eric Hex Editor for viewing or editing"""
""" binary files.</p>"""
))
self.hexEditorAct.triggered.connect(self.__openHexEditor)
self.actions.append(self.hexEditorAct)
self.webBrowserAct = E5Action(
- self.tr('eric6 Web Browser'),
+ self.tr('eric Web Browser'),
UI.PixmapCache.getIcon("ericWeb"),
- self.tr('eric6 &Web Browser...'),
+ self.tr('eric &Web Browser...'),
0, 0, self, 'web_browser')
self.webBrowserAct.setStatusTip(self.tr(
- 'Start the eric6 Web Browser'))
+ 'Start the eric Web Browser'))
self.webBrowserAct.setWhatsThis(self.tr(
- """<b>eric6 Web Browser</b>"""
- """<p>Browse the Internet with the eric6 Web Browser.</p>"""
+ """<b>eric Web Browser</b>"""
+ """<p>Browse the Internet with the eric Web Browser.</p>"""
))
self.webBrowserAct.triggered.connect(self.__startWebBrowser)
self.actions.append(self.webBrowserAct)
@@ -2484,10 +2484,10 @@
self.tr('&Icon Editor...'),
0, 0, self, 'icon_editor')
self.iconEditorAct.setStatusTip(self.tr(
- 'Start the eric6 Icon Editor'))
+ 'Start the eric Icon Editor'))
self.iconEditorAct.setWhatsThis(self.tr(
"""<b>Icon Editor</b>"""
- """<p>Starts the eric6 Icon Editor for editing simple icons.</p>"""
+ """<p>Starts the eric Icon Editor for editing simple icons.</p>"""
))
self.iconEditorAct.triggered.connect(self.__editPixmap)
self.actions.append(self.iconEditorAct)
@@ -2574,7 +2574,7 @@
self.showExternalToolsAct.setWhatsThis(self.tr(
"""<b>Show external tools</b>"""
"""<p>Opens a dialog to show the path and versions of all"""
- """ extenal tools used by eric6.</p>"""
+ """ extenal tools used by eric.</p>"""
))
self.showExternalToolsAct.triggered.connect(
self.__showExternalTools)
@@ -2937,7 +2937,7 @@
def __initEricDocAction(self):
"""
- Private slot to initialize the action to show the eric6 documentation.
+ Private slot to initialize the action to show the eric documentation.
"""
self.ericDocAct = E5Action(
self.tr("Eric API Documentation"),
@@ -2949,7 +2949,7 @@
"""<b>Eric API Documentation</b>"""
"""<p>Display the Eric API documentation. The location for the"""
""" documentation is the Documentation/Source subdirectory of"""
- """ the eric6 installation directory.</p>"""
+ """ the eric installation directory.</p>"""
))
self.ericDocAct.triggered.connect(self.__showEricDoc)
self.actions.append(self.ericDocAct)
@@ -3844,7 +3844,7 @@
address = FeatureAddress
else:
address = BugAddress
- subject = "[eric6] "
+ subject = "[eric] "
if attachFile is not None:
with open(attachFile, "r", encoding="utf-8") as f:
body = f.read()
@@ -4153,10 +4153,10 @@
def __newWindow(self):
"""
- Private slot to start a new instance of eric6.
+ Private slot to start a new instance of eric.
"""
if not Preferences.getUI("SingleApplicationMode"):
- # start eric6 without any arguments
+ # start eric without any arguments
program = sys.executable
eric6 = os.path.join(getConfig("ericDir"), "eric6.py")
args = [eric6]
@@ -5203,7 +5203,7 @@
def __startWebBrowser(self):
"""
- Private slot to start the eric6 web browser.
+ Private slot to start the eric web browser.
"""
self.launchHelpViewer("")
@@ -5977,7 +5977,7 @@
E5MessageBox.warning(
self,
self.tr("Start Web Browser"),
- self.tr("""The eric6 web browser could not be"""
+ self.tr("""The eric web browser could not be"""
""" started."""))
return False
@@ -6038,7 +6038,7 @@
E5MessageBox.warning(
self,
self.tr("Start Web Browser"),
- self.tr("""<p>The eric6 web browser is not started.</p>"""
+ self.tr("""<p>The eric web browser is not started.</p>"""
"""<p>Reason: {0}</p>""").format(
webBrowserClient.errstr())
)
@@ -6072,7 +6072,7 @@
def __webBrowser(self, home=""):
"""
- Private slot to start the eric6 web browser.
+ Private slot to start the eric web browser.
@param home full pathname of a file to display (string)
"""
@@ -6238,7 +6238,7 @@
def __showExternalTools(self):
"""
Private slot to display a dialog show a list of external tools used
- by eric6.
+ by eric.
"""
if self.programsDialog is None:
from Preferences.ProgramsDialog import ProgramsDialog
@@ -6609,7 +6609,7 @@
self,
self.tr("Save session"),
Utilities.getHomeDir(),
- self.tr("eric6 Session Files (*.e5s)"),
+ self.tr("eric Session Files (*.e5s)"),
"")
if not sessionFile:
@@ -6631,7 +6631,7 @@
self,
self.tr("Load session"),
Utilities.getHomeDir(),
- self.tr("eric6 Session Files (*.e5s)"))
+ self.tr("eric Session Files (*.e5s)"))
if not sessionFile:
return
@@ -6992,7 +6992,7 @@
def showAvailableVersionsInfo(self):
"""
- Public method to show the eric6 versions available for download.
+ Public method to show the eric versions available for download.
"""
self.performVersionCheck(manual=True, showVersions=True)
@@ -7000,7 +7000,7 @@
def performVersionCheck(self, manual=True, alternative=0,
showVersions=False):
"""
- Public method to check the internet for an eric6 update.
+ Public method to check the internet for an eric update.
@param manual flag indicating an invocation via the menu (boolean)
@param alternative index of server to download from (integer)
@@ -7166,7 +7166,7 @@
self,
self.tr("Update available"),
self.tr(
- """The update to <b>{0}</b> of eric6 is"""
+ """The update to <b>{0}</b> of eric is"""
""" available at <b>{1}</b>. Would you like"""
""" to get it?""")
.format(versions[2], versions[3]),
@@ -7179,7 +7179,7 @@
self.tr("Update Check"),
self.tr(
"""You are using a snapshot release of"""
- """ eric6. A more up-to-date stable release"""
+ """ eric. A more up-to-date stable release"""
""" might be available."""))
elif VersionOnly.startswith(("rev_", "@@")):
# check installation from source
@@ -7200,7 +7200,7 @@
self,
self.tr("Update available"),
self.tr(
- """The update to <b>{0}</b> of eric6 is"""
+ """The update to <b>{0}</b> of eric is"""
""" available at <b>{1}</b>. Would you like"""
""" to get it?""")
.format(versions[0], versions[1]),
@@ -7210,10 +7210,10 @@
if self.manualUpdatesCheck:
E5MessageBox.information(
self,
- self.tr("Eric6 is up to date"),
+ self.tr("eric is up to date"),
self.tr(
"""You are using the latest version of"""
- """ eric6"""))
+ """ eric"""))
except (IndexError, TypeError):
E5MessageBox.warning(
self,
@@ -7285,7 +7285,7 @@
def checkConfigurationStatus(self):
"""
- Public method to check, if eric6 has been configured. If it is not,
+ Public method to check, if eric has been configured. If it is not,
the configuration dialog is shown.
"""
if not Preferences.isConfigured():
@@ -7294,7 +7294,7 @@
E5MessageBox.information(
self,
self.tr("First time usage"),
- self.tr("""eric6 has not been configured yet. """
+ self.tr("""eric has not been configured yet. """
"""The configuration dialog will be started."""))
self.showPreferences()
@@ -7319,7 +7319,7 @@
def versionIsNewer(self, required, snapshot=None):
"""
- Public method to check, if the eric6 version is good compared to
+ Public method to check, if the eric version is good compared to
the required version.
@param required required version (string)
@@ -7392,7 +7392,7 @@
def getOriginalPathString(self):
"""
Public method to get the original PATH environment variable
- (i.e. before modifications by eric6 and PyQt5).
+ (i.e. before modifications by eric and PyQt5).
@return original PATH environment variable
@rtype str
