diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-03-10 14:26:06 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-03-10 14:36:48 +0100 |
commit | 2a27ed5c8f923fbee0a1404e2c805508e6de811b (patch) | |
tree | e6f111651f175f5c8d5f71c82843cf6e534a4857 /src | |
parent | b8046e603d5bae78c301a9bdb22e2d55a1743b17 (diff) | |
download | qt-creator-2a27ed5c8f923fbee0a1404e2c805508e6de811b.tar.gz |
Fix messages in QNX.
Change-Id: Id9199607e787a04a3c90596e30e5ca5f249e7f07
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qnx/blackberrycheckdevicestatusstep.cpp | 6 | ||||
-rw-r--r-- | src/plugins/qnx/blackberrydeployconfiguration.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/qnx/blackberrycheckdevicestatusstep.cpp b/src/plugins/qnx/blackberrycheckdevicestatusstep.cpp index bd7683c850..955299bd14 100644 --- a/src/plugins/qnx/blackberrycheckdevicestatusstep.cpp +++ b/src/plugins/qnx/blackberrycheckdevicestatusstep.cpp @@ -121,8 +121,10 @@ void BlackBerryCheckDeviceStatusStep::checkDeviceInfo(int status) } if (m_debugTokenCheckEnabled && !m_deviceInfo->debugTokenValid()) { - QString errorMsg = m_deviceInfo->debugTokenValidationError() - + tr(". Upload a valid debug token into the device."); + //: %1: Error message from BlackBerryDeviceInformation + const QString errorMsg = + tr("%1. Upload a valid debug token into the device.") + .arg(m_deviceInfo->debugTokenValidationError()); raiseError(errorMsg); m_eventLoop->exit(false); return; diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp index 05a6d28c96..8c4ab54aa4 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.cpp +++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp @@ -114,7 +114,7 @@ void BlackBerryDeployConfiguration::setupBarDescriptor() tr("You need to set up a BAR descriptor file to enable " "packaging.\nDo you want Qt Creator to generate it for your project (%1)?") .arg(target()->project()->projectFilePath()), - tr("Don not ask again for this project"), &m_appBarDesciptorSetup); + tr("Do not ask again for this project"), &m_appBarDesciptorSetup); if (button == QDialogButtonBox::No) return; |