feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Updated strings after target -> kit renaming

Browse Source 
Change-Id: Ia686fdb377e2267c7687d6804c02b209402d6275
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Robert Loehning
2012-10-19 17:07:26 +02:00
committed by Eike Ziller
parent bc5cda03e4
commit 2394ceef6c
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -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)"));
}

4
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -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<CMakeProject *>(m_makeStep->target()->project());
@@ -403,7 +403,7 @@ void MakeStepConfigWidget::updateDetails()
if (!bc)
bc = static_cast<CMakeBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
if (!bc) {
m_summaryText = tr("<b>No build configuration found on this target.</b>");
m_summaryText = tr("<b>No build configuration found on this kit.</b>");
updateSummary();
return;
}

2
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -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));

2
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -1414,7 +1414,7 @@ void MiniProjectTargetSelector::updateActionAndSummary()
QStringList lines;
lines << tr("<b>Project:</b> %1").arg(projectName);
if (!targetName.isEmpty())
lines << tr("<b>Target:</b> %1").arg(targetName);
lines << tr("<b>Kit:</b> %1").arg(targetName);
if (!buildConfig.isEmpty())
lines << tr("<b>Build:</b> %1").arg(buildConfig);
if (!deployConfig.isEmpty())

6
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -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());

2
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -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;
}

2
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -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;