diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index c650b5e1364..549458323cc 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -309,10 +309,12 @@ static ExecutableItem removeForwardPortRecipe(RunnerStorage *storage, const QStr process.setCommand(storage->adbCommand({"forward", port, adbArg})); }; const auto onForwardPortDone = [storage, port, portType](DoneWith result) { - if (result == DoneWith::Success) + if (result == DoneWith::Success) { storage->m_afterFinishAdbCommands.push_back("forward --remove " + port); - else + } else { + //: %1 = QML/JDB/C++ storage->m_glue->setFinished(Tr::tr("Failed to forward %1 debugging ports.").arg(portType)); + } }; return Group { diff --git a/src/plugins/axivion/axivionperspective.cpp b/src/plugins/axivion/axivionperspective.cpp index d4714231dc2..ff5f3e11e9c 100644 --- a/src/plugins/axivion/axivionperspective.cpp +++ b/src/plugins/axivion/axivionperspective.cpp @@ -359,7 +359,7 @@ IssuesWidget::IssuesWidget(QWidget *parent) QPalette palette = Utils::creatorTheme()->palette(); palette.setColor(QPalette::Text, Utils::creatorColor(Theme::TextColorError)); m_errorEdit->setPalette(palette); - QPushButton *openPref = new QPushButton(Tr::tr("Open Preferences"), errorWidget); + QPushButton *openPref = new QPushButton(Tr::tr("Open Preferences..."), errorWidget); connect(openPref, &QPushButton::clicked, this, []{ ICore::showOptionsDialog("Axivion.Settings.General"); }); using namespace Layouting; diff --git a/src/plugins/axivion/axivionsettings.cpp b/src/plugins/axivion/axivionsettings.cpp index eb6369410e3..dc6214e6633 100644 --- a/src/plugins/axivion/axivionsettings.cpp +++ b/src/plugins/axivion/axivionsettings.cpp @@ -272,8 +272,9 @@ bool AxivionSettings::updateDashboardServers(const QList &other, const LoopList iterator(keysToRemove); const auto onDeleteKeySetup = [iterator](CredentialQuery &query) { - MessageManager::writeSilently(Tr::tr("Axivion: Deleting Api token for %1 as respective " - "dashboard server was removed.").arg(*iterator)); + MessageManager::writeSilently(Tr::tr("Axivion: Deleting API token for %1 as respective " + "dashboard server was removed.") + .arg(*iterator)); query.setOperation(CredentialOperation::Delete); query.setService(s_axivionKeychainService); query.setKey(*iterator); diff --git a/src/plugins/clangtools/clangtoolscompilationdb.cpp b/src/plugins/clangtools/clangtoolscompilationdb.cpp index 42512af680e..2504bed7749 100644 --- a/src/plugins/clangtools/clangtoolscompilationdb.cpp +++ b/src/plugins/clangtools/clangtoolscompilationdb.cpp @@ -56,7 +56,7 @@ ClangToolsCompilationDb::ClangToolsCompilationDb(ClangToolType toolType) d->readyAndUpToDate = success; if (success) { Core::MessageManager::writeSilently( - Tr::tr("Compilation database for %1 successfully generated at %2.") + Tr::tr("Compilation database for %1 successfully generated at \"%2\".") .arg(d->toolName(), d->dir.path().toUserOutput())); } else { Core::MessageManager::writeDisrupting( @@ -106,7 +106,7 @@ void ClangToolsCompilationDb::Private::generate() generatorWatcher.cancel(); Core::MessageManager::writeSilently( - Tr::tr("Generating compilation database for %1 at %2 ...") + Tr::tr("Generating compilation database for %1 at \"%2\" ...") .arg(clangToolName(toolType), dir.path().toUserOutput())); const auto getCompilerOptionsBuilder = [this](const ProjectPart &pp) { diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp index c27db8307bf..43086b9061b 100644 --- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp +++ b/src/plugins/compilerexplorer/compilerexplorereditor.cpp @@ -1139,7 +1139,7 @@ QWidget *Editor::toolBar() QAction *setUrlAction = new QAction(); setUrlAction->setIcon(Utils::Icons::SETTINGS_TOOLBAR.icon()); - setUrlAction->setToolTip(Tr::tr("Change backend URL")); + setUrlAction->setToolTip(Tr::tr("Change backend URL.")); connect(setUrlAction, &QAction::triggered, this, [this] { bool ok; QString text = QInputDialog::getText( diff --git a/src/plugins/coreplugin/iversioncontrol.cpp b/src/plugins/coreplugin/iversioncontrol.cpp index 11219d18e7d..ce77c42b5f6 100644 --- a/src/plugins/coreplugin/iversioncontrol.cpp +++ b/src/plugins/coreplugin/iversioncontrol.cpp @@ -251,15 +251,15 @@ QString IVersionControl::modificationToText(const IVersionControl::FileState &st using CIVF = Core::IVersionControl::FileState; switch (state) { case CIVF::AddedState: - return Tr::tr("Version control state: added"); + return Tr::tr("Version control state: added."); case CIVF::ModifiedState: - return Tr::tr("Version control state: modified"); + return Tr::tr("Version control state: modified."); case CIVF::DeletedState: - return Tr::tr("Version control state: deleted"); + return Tr::tr("Version control state: deleted."); case CIVF::RenamedState: - return Tr::tr("Version control state: renamed"); + return Tr::tr("Version control state: renamed."); case CIVF::UnmanagedState: - return Tr::tr("Version control state: untracked"); + return Tr::tr("Version control state: untracked."); default: return {}; } diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index bb7509ddebc..2e523d63c84 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1655,8 +1655,9 @@ void DebuggerPluginPrivate::attachToLastCore() LastCore lastCore = getLastCore(); QGuiApplication::restoreOverrideCursor(); if (!lastCore) { - AsynchronousMessageBox::warning(Tr::tr("Warning"), - Tr::tr("coredumpctl did not find any cores created by systemd-coredump")); + AsynchronousMessageBox::warning( + Tr::tr("Warning"), + Tr::tr("coredumpctl did not find any cores created by systemd-coredump.")); return; } diff --git a/src/plugins/lua/luaplugin.cpp b/src/plugins/lua/luaplugin.cpp index 5e3fd921640..07661245121 100644 --- a/src/plugins/lua/luaplugin.cpp +++ b/src/plugins/lua/luaplugin.cpp @@ -379,7 +379,7 @@ public: &LuaPlugin::onEditorOpened); ActionBuilder(this, Id(ACTION_SCRIPTS_BASE).withSuffix("current")) - .setText(Tr::tr("Run current Script")) + .setText(Tr::tr("Run Current Script")) .addOnTriggered([]() { if (auto textEditor = TextEditor::BaseTextEditor::currentTextEditor()) { const FilePath path = textEditor->document()->filePath(); @@ -449,8 +449,8 @@ public: auto menu = container->menu(); menu->setTitle(script.baseName()); ActionBuilder(this, base) - .setText(Tr::tr("%1").arg(script.baseName())) - .setToolTip(Tr::tr("Run script '%1'").arg(script.toUserOutput())) + .setText(script.baseName()) + .setToolTip(Tr::tr("Run script \"%1\"").arg(script.toUserOutput())) .addOnTriggered([script]() { runScript(script); }); connect(menu->addAction(Tr::tr("Run")), &QAction::triggered, this, [script]() { runScript(script); @@ -481,7 +481,7 @@ public: if (content) { Lua::runScript(QString::fromUtf8(*content), script.fileName()); } else { - MessageManager::writeFlashing(Tr::tr("Failed to read script %1: %2") + MessageManager::writeFlashing(Tr::tr("Failed to read script \"%1\": %2") .arg(script.toUserOutput()) .arg(content.error())); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 6dc4424a8f0..249c9ac603a 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2546,10 +2546,11 @@ FilePairs ProjectExplorerPlugin::renameFiles( } QString renamedOnlyString; if (!renamedOnly.isEmpty()) { - renamedOnlyString = Tr::tr( - "
The following files were renamed, but their project files could not " - "be updated accordingly: %1") - .arg(pathsAsHtmlList(renamedOnly)); + renamedOnlyString + = "
" + + Tr::tr("The following files were renamed, but their project files could not " + "be updated accordingly: %1") + .arg(pathsAsHtmlList(renamedOnly)); } QTimer::singleShot( 0, m_instance, [message = QString(failedRenamingsString + renamedOnlyString)] { diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 5f6c48fea56..50d81a8ff07 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -998,7 +998,8 @@ QString ToolchainBundle::displayName() const name.append(' ').append(Abi::toString(abi.wordWidth())); if (!cmd.exists()) return name; - return Tr::tr("%1 at %2").arg(name, cmd.toUserOutput()); + //: toolchain 'name' at 'path' + return Tr::tr("%1 at \"%2\"").arg(name, cmd.toUserOutput()); } ToolchainBundle::Valid ToolchainBundle::validity() const diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp index 6ae4cbd5770..db6dc8ded72 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp +++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp @@ -151,6 +151,7 @@ void ToolchainConfigWidget::setupCompilerPathChoosers() bundle().forEach([&](const Toolchain &tc) { const QString name = !nameLabelString.isEmpty() ? nameLabelString + //: %1 = programming language : Tr::tr("%1 compiler path").arg( ToolchainManager::displayNameOfLanguageId(tc.language())); const auto commandChooser = new PathChooser(this); diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index 6240499f2dc..fa978b17857 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -1174,7 +1174,7 @@ Utils::ListModel *createInterpreterModel(QObject * model->setDataAccessor([](const Interpreter &interpreter, int column, int role) -> QVariant { if (interpreter.id == "none") { if (role == Qt::DisplayRole) - return Tr::tr("none"); + return Tr::tr("None"); if (role == KitAspect::IsNoneRole) return true; return {};