diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 33d5cc67e5e..726414dafc3 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -491,9 +491,9 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
project()->addIssue(
CMakeProject::IssueType::Warning,
Tr::tr("CMake configuration failed"
- "The backup of the previous configuration has been restored.
"
- "Issues and \"Projects > Build\" settings "
- "show more information about the failure.The backup of the previous configuration has been restored.
"
+ "Issues and \"Projects > Build\" settings "
+ "show more information about the failure.
"));
m_reader.resetData();
@@ -506,11 +506,10 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
} else {
updateFallbackProjectData();
- project()->addIssue(
- CMakeProject::IssueType::Warning,
- Tr::tr("Failed to load project"
- "Issues and \"Projects > Build\" settings "
- "show more information about the failure.addIssue(CMakeProject::IssueType::Warning,
+ Tr::tr("Failed to load project"
+ "
Issues and \"Projects > Build\" settings "
+ "show more information about the failure.
"));
}
}
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index 36016aa0c94..9c0d687ca6f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -190,7 +190,7 @@ void CMakeTargetNode::build()
void CMakeTargetNode::setTargetInformation(const QList &artifacts, const QString &type)
{
- m_tooltip = Tr::tr("Target type: ") + type + "
";
+ m_tooltip = Tr::tr("Target type:") + " " + type + "
";
if (artifacts.isEmpty()) {
m_tooltip += Tr::tr("No build artifacts");
} else {
diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp
index 7bbe0aa5f7b..c6ee73d6abb 100644
--- a/src/plugins/cmakeprojectmanager/fileapireader.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp
@@ -285,8 +285,8 @@ void FileApiReader::makeBackupConfiguration(bool store)
replyPrev.removeRecursively();
QTC_CHECK(!replyPrev.exists());
if (!reply.renameFile(replyPrev))
- Core::MessageManager::writeFlashing(Tr::tr("Failed to rename %1 to %2.")
- .arg(reply.toString(), replyPrev.toString()));
+ Core::MessageManager::writeFlashing(Tr::tr("Failed to rename \"%1\" to \"%2\".")
+ .arg(reply.toString(), replyPrev.toString()));
}
FilePath cmakeCacheTxt = m_parameters.buildDirectory.pathAppended("CMakeCache.txt");
@@ -296,9 +296,9 @@ void FileApiReader::makeBackupConfiguration(bool store)
if (cmakeCacheTxt.exists())
if (!FileUtils::copyIfDifferent(cmakeCacheTxt, cmakeCacheTxtPrev))
- Core::MessageManager::writeFlashing(Tr::tr("Failed to copy %1 to %2.")
- .arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString()));
-
+ Core::MessageManager::writeFlashing(
+ Tr::tr("Failed to copy \"%1\" to \"%2\".")
+ .arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString()));
}
void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &configurationArguments)
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp
index c803d8db990..8d1cc1610df 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp
@@ -394,7 +394,7 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
{
const Utils::expected_str jsonContents = jsonFile.fileContents();
if (!jsonContents) {
- errorMessage = Tr::tr("Failed to read %1 file").arg(jsonFile.fileName());
+ errorMessage = Tr::tr("Failed to read file \"%1\".").arg(jsonFile.fileName());
return false;
}
@@ -410,14 +410,14 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
}
if (!jsonDoc.isObject()) {
- errorMessage = Tr::tr( "Invalid %1 file").arg(jsonFile.fileName());
+ errorMessage = Tr::tr("Invalid file \"%1\".").arg(jsonFile.fileName());
return false;
}
QJsonObject root = jsonDoc.object();
if (!parseVersion(root.value("version"), m_presetsData.version)) {
- errorMessage = Tr::tr("Invalid \"version\" in %1 file").arg(jsonFile.fileName());
+ errorMessage = Tr::tr("Invalid \"version\" in file \"%1\".").arg(jsonFile.fileName());
return false;
}
diff --git a/src/plugins/cppeditor/clangdiagnosticconfigswidget.cpp b/src/plugins/cppeditor/clangdiagnosticconfigswidget.cpp
index 6ef459f1b69..f5fc8cfe425 100644
--- a/src/plugins/cppeditor/clangdiagnosticconfigswidget.cpp
+++ b/src/plugins/cppeditor/clangdiagnosticconfigswidget.cpp
@@ -370,7 +370,7 @@ void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMes
m_infoLabel->setFilled(false);
} else {
m_infoLabel->setType(InfoLabel::Error);
- m_infoLabel->setText(Tr::tr("%1").arg(errorMessage));
+ m_infoLabel->setText(errorMessage);
m_infoLabel->setFilled(true);
}
}
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index 9c7500a6c45..8fc44622ab2 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -354,8 +354,8 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit)
.arg(reason));
};
static const auto showFallbackWarning = [](const QString &reason) {
- Core::MessageManager::writeSilently(Tr::tr("%1, falling back to built-in preprocessor.")
- .arg(reason));
+ Core::MessageManager::writeSilently(
+ Tr::tr("Falling back to built-in preprocessor: %1").arg(reason));
};
static const auto saveAndOpen = [](const FilePath &filePath, const QByteArray &contents,
bool inNextSplit) {
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 395ce703eca..e419449fe02 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2862,7 +2862,7 @@ bool GitClient::addAndCommit(const FilePath &repositoryDirectory,
GitPlugin::updateCurrentBranch();
return true;
}
- VcsOutputWindow::appendError(Tr::tr("Cannot commit %n files\n", nullptr, commitCount));
+ VcsOutputWindow::appendError(Tr::tr("Cannot commit %n files", nullptr, commitCount) + "\n");
return false;
}
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index a19d6e8758a..65bc5beab41 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -40,7 +40,7 @@ public:
repositoryLabel = new QLabel(Tr::tr("repository"));
branchLabel = new QLabel(Tr::tr("branch")); // FIXME: Isn't this overwritten soon?
- showHeadLabel = new QLabel(Tr::tr("Show HEAD")); // FIXME: Simplify string in tr()
+ showHeadLabel = new QLabel("" + Tr::tr("Show HEAD") + "");
authorLineEdit = new QLineEdit;
authorLineEdit->setObjectName("authorLineEdit");
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 3b02d93a80c..c6a94d44980 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -41,7 +41,7 @@ MacroOptionsWidget::MacroOptionsWidget()
m_treeWidget->header()->setSortIndicatorShown(true);
m_treeWidget->header()->setStretchLastSection(true);
m_treeWidget->header()->setSortIndicator(0, Qt::AscendingOrder);
- m_treeWidget->setHeaderLabels({Tr::tr("Name"), Tr::tr("Description)"), Tr::tr("Shortcut")});
+ m_treeWidget->setHeaderLabels({Tr::tr("Name"), Tr::tr("Description"), Tr::tr("Shortcut")});
m_description = new QLineEdit;
diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index 6e53b07cd37..56b8ca4c055 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -209,7 +209,7 @@ void CodeStyleSelectorWidget::slotImportClicked()
else
QMessageBox::warning(this,
Tr::tr("Import Code Style"),
- Tr::tr("Cannot import code style from %1")
+ Tr::tr("Cannot import code style from \"%1\".")
.arg(fileName.toUserOutput()));
}
}