Commit 455b677f authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk

tr()-fixes for 2.6

- 'profile' -> 'target'.
- 'qt version' -> 'Qt version'. Fix occurrences in comments as
  well to make grepping easier.
- Placeholders.

Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent ed7c80d4
......@@ -925,7 +925,7 @@ void HelpPlugin::activateContext()
QUrl source = *links.begin();
const QLatin1String qtRefDoc = QLatin1String("com.trolltech.qt");
// workaround to show the latest qt version
// workaround to show the latest Qt version
foreach (const QUrl &tmp, links) {
const QString &authority = tmp.authority();
if (authority.startsWith(qtRefDoc)) {
......
......@@ -102,7 +102,7 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
m_qemuAction->setEnabled(false);
m_qemuAction->setVisible(false);
// listen to qt version changes to update the start button
// listen to Qt version changes to update the start button
connect(QtSupport::QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)),
this, SLOT(qtVersionsChanged(QList<int>,QList<int>,QList<int>)));
......@@ -195,7 +195,7 @@ void MaemoQemuManager::qtVersionsChanged(const QList<int> &added, const QList<in
}
}
} else {
// this qt version has been removed from the settings
// this Qt version has been removed from the settings
m_runtimes.remove(uniqueId);
if (uniqueId == m_runningQtId) {
terminateRuntime();
......@@ -249,7 +249,7 @@ void MaemoQemuManager::targetAdded(ProjectExplorer::Target *target)
if (!target || !MaemoGlobal::hasMaemoDevice(target->profile()))
return;
// handle the qt version changes the build configuration uses
// handle the Qt version changes the build configuration uses
connect(target, SIGNAL(environmentChanged()), this, SLOT(environmentChanged()));
connect(target, SIGNAL(profileChanged()), this, SLOT(systemChanged()));
......@@ -283,7 +283,7 @@ void MaemoQemuManager::systemChanged()
void MaemoQemuManager::environmentChanged()
{
// likely to happen when the qt version changes the build config is using
// likely to happen when the Qt version changes the build config is using
if (ProjectExplorerPlugin *explorer = ProjectExplorerPlugin::instance()) {
if (Project *project = explorer->session()->startupProject())
toggleStarterButton(project->activeTarget());
......
......@@ -83,7 +83,7 @@ private slots:
void targetChanged(ProjectExplorer::Target *target);
void systemChanged();
void environmentChanged(); // needed to check for qt version
void environmentChanged(); // needed to check for Qt version
void deviceConfigurationChanged(ProjectExplorer::Target *target);
void terminateRuntime();
......
......@@ -153,7 +153,7 @@ bool MakeStep::init()
ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile());
if (!tc) {
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a tool chain set up to build. Configure a tool chain the profile options."),
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a tool chain set up to build. Configure a tool chain the target options."),
Utils::FileName(), -1,
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return false;
......@@ -418,7 +418,7 @@ void MakeStepConfigWidget::updateDetails()
m_ui->makeLabel->setText(tr("Make:"));
if (!tc) {
setSummaryText(tr("<b>Make:</b> No tool chain set in profile."));
setSummaryText(tr("<b>Make:</b> No tool chain set in target."));
return;
}
Qt4BuildConfiguration *bc = m_makeStep->qt4BuildConfiguration();
......
......@@ -151,7 +151,7 @@ void Qt4BuildConfiguration::profileChanged()
void Qt4BuildConfiguration::emitBuildDirectoryChanged()
{
// We also emit buildDirectoryChanged if the the qt version's supportShadowBuild changed
// We also emit buildDirectoryChanged if the the Qt version's supportShadowBuild changed
if (buildDirectory() != m_lastEmmitedBuildDirectory
|| supportsShadowBuilds() != m_qtVersionSupportsShadowBuilds) {
m_lastEmmitedBuildDirectory = buildDirectory();
......@@ -442,7 +442,7 @@ Qt4BuildConfiguration::MakefileState Qt4BuildConfiguration::compareToImportFrom(
}
} else {
if (debug)
qDebug()<<"diffrent qt versions, buildconfiguration:"<<version->qmakeCommand().toString()<<" Makefile:"<<qmakePath.toString();
qDebug() << "different Qt versions, buildconfiguration:" << version->qmakeCommand().toString() << " Makefile:"<< qmakePath.toString();
return MakefileForWrongProject;
}
}
......
......@@ -123,14 +123,14 @@ public:
QString additionalArguments,
QString directory,
bool importing);
/// returns whether the qt version in the profile supports shadow building (also true for no qt version)
/// returns whether the Qt version in the profile supports shadow building (also true for no Qt version)
bool supportsShadowBuilds();
public slots:
void emitEvaluateBuildSystem();
signals:
/// emitted for setQMakeBuildConfig, not emitted for qt version changes, even
/// emitted for setQMakeBuildConfig, not emitted for Qt version changes, even
/// if those change the qmakebuildconfig
void qmakeBuildConfigurationChanged();
/// emitted when smart installer property of S60 create package step changes
......
......@@ -111,7 +111,7 @@ Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
void Qt4ProjectConfigWidget::updateDetails()
{
m_detailsContainer->setSummaryText(
tr("building in <b>%3</b>")
tr("building in <b>%1</b>")
.arg(QDir::toNativeSeparators(m_buildConfiguration->buildDirectory())));
}
......@@ -245,7 +245,7 @@ void Qt4ProjectConfigWidget::updateProblemLabel()
QString shadowBuildWarning;
if (!version->supportsShadowBuilds() && m_buildConfiguration->shadowBuild()) {
shadowBuildWarning =tr("The qt version %1 does not support shadow builds, building might fail.")
shadowBuildWarning =tr("The Qt version %1 does not support shadow builds, building might fail.")
.arg(version->displayName())
+ QLatin1String("<br>");
}
......
......@@ -245,7 +245,7 @@ private:
QString findQtBinary(Binaries binary) const;
void updateMkspec() const;
void setId(int id); // used by the qtversionmanager for legacy restore
// and by the qtoptionspage to replace qt versions
// and by the qtoptionspage to replace Qt versions
QString m_displayName;
int m_id;
bool m_isAutodetected;
......
......@@ -326,7 +326,7 @@ QStringList ExamplesListModel::exampleSources(QString *examplesFallback, QString
return sources;
// try to find a suitable Qt version
m_updateOnQtVersionsChanged = true; // this must be updated when the qt versions change
m_updateOnQtVersionsChanged = true; // this must be updated when the Qt versions change
// fallbacks are passed back if no example manifest is found
// and we fallback to Qt Creator's shipped manifest (e.g. only old Qt Versions found)
QString potentialExamplesFallback;
......
......@@ -700,7 +700,7 @@ void QtOptionsPageWidget::editPath()
if (current->type() != version->type()) {
// not the same type, error out
QMessageBox::critical(this, tr("Qt versions incompatible"),
tr("The qt version selected must be for the same target."),
tr("The Qt version selected must be for the same target."),
QMessageBox::Ok);
delete version;
return;
......@@ -911,7 +911,7 @@ void QtOptionsPageWidget::updateDebuggingHelperUi()
}
}
// To be called if a qt version was removed or added
// To be called if a Qt version was removed or added
void QtOptionsPageWidget::updateCleanUpButton()
{
bool hasInvalidVersion = false;
......@@ -1057,7 +1057,7 @@ void QtOptionsPageWidget::apply()
this, SLOT(updateQtVersions(QList<int>,QList<int>,QList<int>)));
}
/* Checks that the qt version name is unique
/* Checks that the Qt version name is unique
* and otherwise changes the name
*
*/
......@@ -1115,7 +1115,7 @@ QString QtOptionsPageWidget::searchKeywords() const
// Symbian specific, could be factored out to the factory
// checking m_configurationWidget is not enough, we want them to be a keyword
// regardless of which qt versions configuration widget is currently active
// regardless of which Qt versions configuration widget is currently active
ts << sep << tr("S60 SDK:")
<< sep << tr("SBS v2 directory:");
......
......@@ -141,7 +141,7 @@ void QtVersionManager::extensionsInitialized()
if (!success) {
// We did neither restore our settings or upgraded
// in that case figure out if there's a qt in path
// and add it to the qt versions
// and add it to the Qt versions
findSystemQt();
}
......@@ -288,7 +288,7 @@ void QtVersionManager::updateFromInstaller()
qDebug("Warning: Unable to find factory for type '%s'", qPrintable(type));
continue;
}
// First try to find a existing qt version to update
// First try to find a existing Qt version to update
bool restored = false;
foreach (BaseQtVersion *v, m_versions) {
if (v->autodetectionSource() == autoDetectionSource) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment