Merge remote-tracking branch 'origin/8.0'

Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
This commit is contained in:
Eike Ziller
2022-06-29 15:29:49 +02:00
99 changed files with 1318 additions and 327 deletions

View File

@@ -218,7 +218,7 @@ InterpreterOptionsWidget::InterpreterOptionsWidget(const QList<Interpreter> &int
m_cleanButton = new QPushButton(PythonSettings::tr("&Clean Up"));
connect(m_cleanButton, &QPushButton::pressed, this, &InterpreterOptionsWidget::cleanUp);
m_cleanButton->setToolTip(
PythonSettings::tr("Remove all python interpreters without a valid executable."));
PythonSettings::tr("Remove all Python interpreters without a valid executable."));
updateCleanButton();
@@ -423,7 +423,7 @@ public:
mainGroupLayout->addWidget(m_pluginsGroup);
const QString labelText = PythonSettings::tr(
"For a complete list of avilable options, consult the <a "
"For a complete list of available options, consult the <a "
"href=\"https://github.com/python-lsp/python-lsp-server/blob/develop/"
"CONFIGURATION.md\">Python LSP Server configuration documentation</a>.");