diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 3f302c56f40..f1e33527c9f 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1548,7 +1548,7 @@ void ClearCasePluginPrivate::vcsDescribe(const FilePath &source, const QString & QString description; const QString relPath = QDir::toNativeSeparators(QDir(topLevel.toString()) .relativeFilePath(source.toString())); - const QString id = QString::fromLatin1("%1@@%2").arg(relPath).arg(changeNr); + const QString id = QString::fromLatin1("%1@@%2").arg(relPath, changeNr); QTextCodec *codec = VcsBaseEditor::getCodec(source.toString()); const CommandResult result = runCleartool(topLevel, {"describe", id}, RunFlags::None, codec); diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 9a7143fc8b3..b9372459bfc 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -588,8 +588,7 @@ void SideDiffEditorWidget::paintEvent(QPaintEvent *e) if (!fileInfo.fileName.isEmpty()) { const QString fileNameText = fileInfo.typeInfo.isEmpty() ? fileInfo.fileName - : tr("[%1] %2").arg(fileInfo.typeInfo) - .arg(fileInfo.fileName); + : tr("[%1] %2").arg(fileInfo.typeInfo, fileInfo.fileName); paintSeparator(painter, m_fileLineForeground, fileNameText, currentBlock, top); } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index aea32c17c10..2e023d6d5e0 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1200,7 +1200,7 @@ void GitClient::archive(const FilePath &workingDirectory, QString commit) FilePath archiveName = FileUtils::getSaveFilePath( nullptr, Tr::tr("Generate %1 archive").arg(repoName), - repoDirectory.pathAppended(QString("../%1-%2").arg(repoName).arg(commit.left(8))), + repoDirectory.pathAppended(QString("../%1-%2").arg(repoName, commit.left(8))), filters.keys().join(";;"), &selectedFilter); if (archiveName.isEmpty()) @@ -3671,7 +3671,7 @@ void GitClient::addChangeActions(QMenu *menu, const QString &source, const QStri } else { const FilePath filePath = FilePath::fromString(source); if (!filePath.isDir()) { - menu->addAction(Tr::tr("Sh&ow file \"%1\" on revision %2").arg(filePath.fileName()).arg(change), + menu->addAction(Tr::tr("Sh&ow file \"%1\" on revision %2").arg(filePath.fileName(), change), [workingDir, change, source] { m_instance->openShowEditor(workingDir, change, source); }); @@ -3756,7 +3756,7 @@ IEditor *GitClient::openShowEditor(const FilePath &workingDirectory, const QStri const QString documentId = QLatin1String(Git::Constants::GIT_PLUGIN) + QLatin1String(".GitShow.") + topLevelString + QLatin1String(".") + relativePath; - QString title = Tr::tr("Git Show %1:%2").arg(ref).arg(relativePath); + QString title = Tr::tr("Git Show %1:%2").arg(ref, relativePath); IEditor *editor = EditorManager::openEditorWithContents(Id(), &title, content, documentId, EditorManager::DoNotSwitchToDesignMode); editor->document()->setTemporary(true); diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp index 8203b57d771..e3bb3b3a0fd 100644 --- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp +++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp @@ -133,14 +133,11 @@ void VcsConfigurationPage::initializePage() d->m_versionControl = VcsManager::versionControl(Id::fromString(vcsId)); if (!d->m_versionControl) { - emit reportError( - //: Do not translate "VcsConfiguration", because it is the id of a page. - tr("\"vcsId\" (\"%1\") is invalid for \"VcsConfiguration\" page. " - "Possible values are: %2.") - .arg(vcsId) - .arg(QStringList(Utils::transform(VcsManager::versionControls(), [](const IVersionControl *vc) { - return vc->id().toString(); - })).join(QLatin1String(", ")))); + const QString values = Utils::transform(VcsManager::versionControls(), + [](const IVersionControl *vc) { return vc->id().toString(); }).join(", "); + //: Do not translate "VcsConfiguration", because it is the id of a page. + emit reportError(tr("\"vcsId\" (\"%1\") is invalid for \"VcsConfiguration\" page. " + "Possible values are: %2.").arg(vcsId, values)); } }