From 2394ceef6c1bf78ffc665d9a1680561679d4bf09 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 19 Oct 2012 17:07:26 +0200 Subject: [PATCH] Updated strings after target -> kit renaming Change-Id: Ia686fdb377e2267c7687d6804c02b209402d6275 Reviewed-by: Tobias Hunger Reviewed-by: Daniel Teske --- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 2 +- src/plugins/cmakeprojectmanager/makestep.cpp | 4 ++-- src/plugins/projectexplorer/buildmanager.cpp | 2 +- src/plugins/projectexplorer/miniprojecttargetselector.cpp | 2 +- src/plugins/projectexplorer/projectexplorer.cpp | 6 +++--- src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 2 +- src/plugins/qtsupport/qtoptionspage.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index ff7a870f1d..a0601d8476 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -199,7 +199,7 @@ bool CMakeRunConfiguration::fromMap(const QVariantMap &map) QString CMakeRunConfiguration::defaultDisplayName() const { if (m_title.isEmpty()) - return tr("Run CMake target"); + return tr("Run CMake kit"); return m_title + (m_enabled ? "" : tr(" (disabled)")); } diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 66fb55ba90..74070d8c37 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -343,7 +343,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) m_buildTargetsList = new QListWidget; m_buildTargetsList->setMinimumHeight(200); - fl->addRow(tr("Targets:"), m_buildTargetsList); + fl->addRow(tr("Kits:"), m_buildTargetsList); // TODO update this list also on rescans of the CMakeLists.txt CMakeProject *pro = static_cast(m_makeStep->target()->project()); @@ -403,7 +403,7 @@ void MakeStepConfigWidget::updateDetails() if (!bc) bc = static_cast(m_makeStep->target()->activeBuildConfiguration()); if (!bc) { - m_summaryText = tr("No build configuration found on this target."); + m_summaryText = tr("No build configuration found on this kit."); updateSummary(); return; } diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index b09305bfc0..e42f7d28dd 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -401,7 +401,7 @@ void BuildManager::nextBuildQueue() // Build Failure const QString projectName = d->m_currentBuildStep->project()->displayName(); const QString targetName = d->m_currentBuildStep->target()->displayName(); - addToOutputWindow(tr("Error while building/deploying project %1 (target: %2)").arg(projectName, targetName), BuildStep::ErrorOutput); + addToOutputWindow(tr("Error while building/deploying project %1 (kit: %2)").arg(projectName, targetName), BuildStep::ErrorOutput); addToOutputWindow(tr("When executing step '%1'").arg(d->m_currentBuildStep->displayName()), BuildStep::ErrorOutput); // NBS TODO fix in qtconcurrent d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, tr("Error while building/deploying project %1 (target: %2)").arg(projectName, targetName)); diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 71f38f5749..4795385283 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -1414,7 +1414,7 @@ void MiniProjectTargetSelector::updateActionAndSummary() QStringList lines; lines << tr("Project: %1").arg(projectName); if (!targetName.isEmpty()) - lines << tr("Target: %1").arg(targetName); + lines << tr("Kit: %1").arg(targetName); if (!buildConfig.isEmpty()) lines << tr("Build: %1").arg(buildConfig); if (!deployConfig.isEmpty()) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index c7dc84bbe9..c9a7aac6f4 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -876,7 +876,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er d->m_projectSelectorActionQuick = new QAction(this); d->m_projectSelectorActionQuick->setEnabled(false); - d->m_projectSelectorActionQuick->setText(tr("Quick Switch Target Selector")); + d->m_projectSelectorActionQuick->setText(tr("Quick Switch Kit Selector")); connect(d->m_projectSelectorActionQuick, SIGNAL(triggered()), d->m_targetSelector, SLOT(nextOrShow())); cmd = Core::ActionManager::registerAction(d->m_projectSelectorActionQuick, ProjectExplorer::Constants::SELECTTARGETQUICK, globalcontext); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+T"))); @@ -2343,10 +2343,10 @@ QString ProjectExplorerPlugin::cannotRunReason(Project *project, RunMode runMode return tr("The project %1 is not configured.").arg(project->displayName()); if (!project->activeTarget()) - return tr("The project '%1' has no active target.").arg(project->displayName()); + return tr("The project '%1' has no active kit.").arg(project->displayName()); if (!project->activeTarget()->activeRunConfiguration()) - return tr("The target '%1' for the project '%2' has no active run configuration.") + return tr("The kit '%1' for the project '%2' has no active run configuration.") .arg(project->activeTarget()->displayName(), project->displayName()); diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index f57ffd7961..8f89331089 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -216,7 +216,7 @@ void Qt4ProjectConfigWidget::updateProblemLabel() // Check for Qt version: QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); if (!version) { - setProblemLabel(tr("This target cannot build this project since it does not define a Qt version.")); + setProblemLabel(tr("This kit cannot build this project since it does not define a Qt version.")); return; } diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 764dc7dfce..af5d0480bc 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -703,7 +703,7 @@ void QtOptionsPageWidget::editPath() if (current->type() != version->type()) { // not the same type, error out QMessageBox::critical(this, tr("Incompatible Qt Versions"), - tr("The Qt version selected must be for the same target."), + tr("The Qt version selected must be for the same device type."), QMessageBox::Ok); delete version; return; -- GitLab