diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:14:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:51:15 +0100 |
| commit | c53ccceff1e1642b7704fa8b0681604c25a833a0 (patch) | |
| tree | 7258d63fba4dabd6f9e2f2f36089ce45df7fe3af /src/plugins/pythoneditor/pythoneditorplugin.cpp | |
| parent | 62cafc1782369cde0605fbd6b1182a83d5473a12 (diff) | |
| parent | 429eb73ace5909e228a58bf8b067823e2be44212 (diff) | |
| download | qt-creator-c53ccceff1e1642b7704fa8b0681604c25a833a0.tar.gz | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/debugger/debuggerkitinformation.cpp
src/plugins/languageclient/languageclientmanager.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/kit.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
| -rw-r--r-- | src/plugins/pythoneditor/pythoneditorplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 68a0431789..4d71670e7d 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -363,7 +363,7 @@ static QStringList readLinesJson(const Utils::FileName &projectFile, // This assumes te project file is formed with only one field called // 'files' that has a list associated of the files to include in the project. if (content.isEmpty()) { - *errorMessage = PythonProject::tr("Unable read \"%1\": The file is empty.") + *errorMessage = PythonProject::tr("Unable to read \"%1\": The file is empty.") .arg(projectFile.toUserOutput()); return lines; } @@ -372,7 +372,7 @@ static QStringList readLinesJson(const Utils::FileName &projectFile, const QJsonDocument doc = QJsonDocument::fromJson(content, &error); if (doc.isNull()) { const int line = content.left(error.offset).count('\n') + 1; - *errorMessage = PythonProject::tr("Unable parse %1:%2: %3") + *errorMessage = PythonProject::tr("Unable to parse \"%1\":%2: %3") .arg(projectFile.toUserOutput()).arg(line) .arg(error.errorString()); return lines; |