diff --git a/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp b/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp index 323028cec52..a8394802662 100644 --- a/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp +++ b/src/libs/qmljsdebugclient/qmlprofilereventlist.cpp @@ -1572,7 +1572,7 @@ void QmlProfilerEventList::load() clear(); emit countChanged(); emit dataReady(); - emit error(tr("Invalid version of QmlProfiler trace file.")); + emit error(tr("Invalid version of QML Trace file.")); return; } diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp index 4ef1dff02b0..99e80093aba 100644 --- a/src/libs/utils/checkablemessagebox.cpp +++ b/src/libs/utils/checkablemessagebox.cpp @@ -91,7 +91,7 @@ public: new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::Minimum); checkBox = new QCheckBox(q); - checkBox->setText(q->tr("Do not ask again")); + checkBox->setText(CheckableMessageBox::tr("Do not ask again")); buttonBox = new QDialogButtonBox(q); buttonBox->setOrientation(Qt::Horizontal); diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 74404b18b48..267d2b3251f 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -329,7 +329,7 @@ bool CMakeRunConfiguration::isEnabled() const QString CMakeRunConfiguration::disabledReason() const { if (!m_enabled) - return tr("The executable is not built by the current buildconfiguration"); + return tr("The executable is not built by the current build configuration"); return QString(); } diff --git a/src/plugins/debugger/qml/qmljsscriptconsole.cpp b/src/plugins/debugger/qml/qmljsscriptconsole.cpp index 9d4ae835f9d..6107fd06bcb 100644 --- a/src/plugins/debugger/qml/qmljsscriptconsole.cpp +++ b/src/plugins/debugger/qml/qmljsscriptconsole.cpp @@ -363,13 +363,10 @@ void QmlJSScriptConsole::onStateChanged(QmlJsDebugClient::QDeclarativeDebugQuery void QmlJSScriptConsole::onSelectionChanged() { if (d->adapter) { - QString status(tr("Context: ")); - if (!d->inferiorStopped) { - status.append(d->adapter->currentSelectedDisplayName()); - } else { - status.append(engine()->stackHandler()->currentFrame().function); - } - emit updateStatusMessage(status, 0); + const QString context = d->inferiorStopped ? + engine()->stackHandler()->currentFrame().function : + d->adapter->currentSelectedDisplayName(); + emit updateStatusMessage(tr("Context: %1").arg(context), 0); } } diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index f54da29d91b..c47799f4df9 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -136,7 +136,7 @@ bool MakeStep::init() m_tasks.clear(); if (!bc) { m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error, - tr("Qt Creator needs a buildconfiguration set up to build. Configure a tool chain in Project mode."), + tr("Qt Creator needs a build configuration set up to build. Configure a tool chain in Project mode."), Utils::FileName(), -1, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); return false; @@ -409,7 +409,7 @@ void MakeStepConfigWidget::updateDetails() if (!bc) bc = qobject_cast(m_makeStep->target()->activeBuildConfiguration()); if (!bc) - m_summaryText = tr("No qt4 buildconfiguration."); // Can't happen + m_summaryText = tr("No Qt4 build configuration."); // Can't happen ProjectExplorer::ProcessParameters param; param.setMacroExpander(bc->macroExpander());