summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@nokia.com>2011-06-21 17:07:45 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-22 10:05:33 +0200
commitf1889864db05a7944d0c62db8c8477fcc2bc7d33 (patch)
tree3bf81138049f9971735d773e0818c263e59d39e7 /src/plugins/qt4projectmanager
parentefeefef10a288a4f1878b68e931987f562353530 (diff)
downloadqt-creator-f1889864db05a7944d0c62db8c8477fcc2bc7d33.tar.gz
UI text: check capitalization and tooltips
Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4 Reviewed-on: http://codereview.qt.nokia.com/569 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager')
-rw-r--r--src/plugins/qt4projectmanager/makestep.cpp6
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp10
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp4
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.cpp4
-rw-r--r--src/plugins/qt4projectmanager/qt4target.cpp6
5 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 44b195471b..5da804a96a 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -133,7 +133,7 @@ bool MakeStep::init()
m_tasks.clear();
if (!bc->toolChain()) {
m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error,
- tr("Qt Creator needs a tool chain set up to build. Please configure a tool chain in Project mode."),
+ tr("Qt Creator needs a tool chain set up to build. Configure a tool chain in Project mode."),
QString(), -1,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
}
@@ -229,7 +229,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
if (!QFileInfo(m_makeFileToCheck).exists()) {
if (!m_clean)
- emit addOutput(tr("Makefile not found. Please check your build settings"), BuildStep::MessageOutput);
+ emit addOutput(tr("Cannot find Makefile. Check your build settings."), BuildStep::MessageOutput);
fi.reportResult(m_clean);
return;
}
@@ -242,7 +242,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
canContinue = false;
}
if (!canContinue) {
- emit addOutput(tr("Configuration is faulty, please check the Build Issues view for details."), BuildStep::MessageOutput);
+ emit addOutput(tr("Configuration is faulty. Check the Build Issues view for details."), BuildStep::MessageOutput);
fi.reportResult(false);
return;
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index a2151e3154..6c443b55ed 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -163,7 +163,7 @@ bool S60DeployStep::init()
m_channel = deployConfiguration->communicationChannel();
if (m_signedPackages.isEmpty()) {
- appendMessage(tr("No package has been found. Please specify at least one installation package."), true);
+ appendMessage(tr("No package has been found. Specify at least one installation package."), true);
return false;
}
@@ -238,13 +238,13 @@ void S60DeployStep::start()
bool serialConnection = m_channel == S60DeployConfiguration::CommunicationCodaSerialConnection;
if (serialConnection && m_serialPortName.isEmpty()) {
- errorMessage = tr("No device is connected. Please connect a device and try again.");
+ errorMessage = tr("No device is connected. Connect a device and try again.");
reportError(errorMessage);
return;
}
QTC_ASSERT(!m_codaDevice.data(), return);
if (m_address.isEmpty() && !serialConnection) {
- errorMessage = tr("No address for a device has been defined. Please define an address and try again.");
+ errorMessage = tr("No address for a device has been defined. Define an address and try again.");
reportError(errorMessage);
return;
}
@@ -444,7 +444,7 @@ void S60DeployStep::initFileInstallation()
} else {
m_codaDevice->sendSymbianInstallUIInstallCommand(Coda::CodaCallback(this, &S60DeployStep::handleSymbianInstall),
remoteFileLocation.toAscii());
- appendMessage(tr("Please continue the installation on your device."), false);
+ appendMessage(tr("Continue the installation on your device."), false);
emit manualInstallation();
}
}
@@ -586,7 +586,7 @@ void S60DeployStep::checkForTimeout()
void S60DeployStep::showManualInstallationInfo()
{
const QString title = tr("Installation");
- const QString text = tr("Please continue the installation on your device.");
+ const QString text = tr("Continue the installation on your device.");
QMessageBox *mb = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Ok, Core::ICore::instance()->mainWindow());
connect(this, SIGNAL(allFilesInstalled()), mb, SLOT(close()));
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
index 86ed6fdb67..fb7b986f52 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
@@ -88,9 +88,9 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe
m_ui->buildConfigInfoLabel->setVisible(list.isEmpty());
m_ui->buildConfigInfoLabel->setToolTip(tr("No valid build configuration has been detected.<br>"
- "Please define a correct build configuration in \"Options > Qt4\""));
+ "Define a correct build configuration in \"Options > Qt4\""));
m_ui->toolchainInfoIconLabel->setToolTip(tr("No valid tool chain has been detected.<br>"
- "Please define a correct tool chain in \"Options > Tool Chains\""));
+ "Define a correct tool chain in \"Options > Tool Chains\""));
populateToolchainList(m_bc);
//change the build configuration if the user changes it
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index a1640debb8..2d51465872 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -975,14 +975,14 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) {
case Core::FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(path)) {
- QMessageBox::warning(core->mainWindow(), tr("Failed!"), tr("Could not open the file for edit with VCS."));
+ QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for edit with VCS."));
return false;
}
break;
case Core::FileManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(path, QFile::permissions(path) | QFile::WriteUser);
if (!permsOk) {
- QMessageBox::warning(core->mainWindow(), tr("Failed!"), tr("Could not set permissions to writable."));
+ QMessageBox::warning(core->mainWindow(), tr("Cannot Set Permissions"), tr("Cannot set permissions to writable."));
return false;
}
break;
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 5b2e1e445d..5cd90d4613 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -199,7 +199,7 @@ QString Qt4BaseTargetFactory::msgBuildConfigurationName(const BuildConfiguration
return (info.buildConfig & QtSupport::BaseQtVersion::DebugBuild) ?
//: Name of a debug build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.
tr("%1 Debug").arg(qtVersionName) :
- //: Name of a release build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.
+ //: Name of a release build configuration to be created by a project wizard, %1 being the Qt version name. We recommend not translating it.
tr("%1 Release").arg(qtVersionName);
}
@@ -709,14 +709,14 @@ void Qt4DefaultTargetSetupWidget::addImportClicked()
if (!info.isValid()) {
QMessageBox::critical(this,
tr("No build found"),
- tr("No Build found in %1 matching project %2.").arg(m_importLinePath->path()).arg(m_proFilePath));
+ tr("No build found in %1 matching project %2.").arg(m_importLinePath->path()).arg(m_proFilePath));
return;
}
if (!info.version->supportsTargetId(m_id)) {
QMessageBox::critical(this,
tr("Incompatible build found"),
- tr("The Build found in %1 is incompatible with this target").arg(m_importLinePath->path()));
+ tr("The build found in %1 is incompatible with this target").arg(m_importLinePath->path()));
return;
}