diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-02-29 12:44:58 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-02-29 12:44:58 +0100 |
| commit | 6c2df76737b49019d51eda0fd757f0721d3e7d82 (patch) | |
| tree | b3d5fbebcc28f57c7f57c041a634590e6b152582 /src/plugins/python | |
| parent | 5af531cd39067366cea627e3db1a0b83d7172873 (diff) | |
| parent | 49ab0c41097cb9165274cc4daad651133547794e (diff) | |
Merge remote-tracking branch 'origin/13.0'
Conflicts:
src/plugins/android/androidsettingswidget.cpp
Change-Id: Ifcb16aa16c7bc2792de25d0ee7a22cf0e39a05f8
Diffstat (limited to 'src/plugins/python')
| -rw-r--r-- | src/plugins/python/pythonkitaspect.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/python/pythonproject.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/python/pythonkitaspect.cpp b/src/plugins/python/pythonkitaspect.cpp index b3c17977f8..0be12cead0 100644 --- a/src/plugins/python/pythonkitaspect.cpp +++ b/src/plugins/python/pythonkitaspect.cpp @@ -117,11 +117,11 @@ public: if (!pipIsUsable(path)) { result << BuildSystemTask( Task::Warning, - Tr::tr("Python \"%1\" does not contain a usable pip. Pip is used to install " - "python " - "packages from the Python Package Index, like PySide and the python " - "language server. If you want to use any of that functionality " - "ensure pip is installed for that python.") + Tr::tr("Python \"%1\" does not contain a usable pip. pip is needed to install " + "Python " + "packages from the Python Package Index, like PySide and the Python " + "language server. To use any of that functionality " + "ensure that pip is installed for that Python.") .arg(path.toUserOutput())); } if (!venvIsUsable(path)) { @@ -130,7 +130,7 @@ public: Tr::tr( "Python \"%1\" does not contain a usable venv. venv is the recommended way " "to isolate a development environment for a project from the globally " - "installed python.") + "installed Python.") .arg(path.toUserOutput())); } } diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp index 129782773d..db0831005f 100644 --- a/src/plugins/python/pythonproject.cpp +++ b/src/plugins/python/pythonproject.cpp @@ -35,7 +35,7 @@ Tasks PythonProject::projectIssues(const Kit *k) const return {}; return { BuildSystemTask{Task::Error, - Tr::tr("No python interpreter set for kit \"%1\"").arg(k->displayName())}}; + Tr::tr("No Python interpreter set for kit \"%1\"").arg(k->displayName())}}; } PythonProjectNode::PythonProjectNode(const FilePath &path) |