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

Fix tr()-messages in QNX.

Browse Source 
Do not concatenate translated parts, this will result in incorrect
grammar.

Change-Id: Ieba7c948c09b927213ddd127be80651333f911ee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Friedemann Kleint
2013-10-30 17:23:15 +01:00
parent e176013140
commit 428b2b9519
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qnx/blackberryinstallwizardpages.cpp
View File

@@ -490,18 +490,18 @@ void BlackBerryInstallWizardFinalPage::initializePage()
} }
} }
QString actionMsg; QString message;
if (m_data.mode == BlackBerryInstallerDataHandler::UninstallMode)
actionMsg = tr("uninstalling");
else
actionMsg = tr("installing");
if (m_data.exitCode == 0 && m_data.exitStatus == QProcess::NormalExit) { if (m_data.exitCode == 0 && m_data.exitStatus == QProcess::NormalExit) {
label->setText(tr("Finished %1 target:\n %2").arg(actionMsg, m_data.target)); message = m_data.mode == BlackBerryInstallerDataHandler::UninstallMode ?
tr("Finished uninstalling target:\n %1").arg(m_data.target) :
tr("Finished installing target:\n %1").arg(m_data.target);
emit done(); emit done();
} else { } else {
label->setText(tr("An error has occurred while %1 target:\n %2").arg(actionMsg, m_data.target)); message = m_data.mode == BlackBerryInstallerDataHandler::UninstallMode ?
tr("An error has occurred while uninstalling target:\n %1").arg(m_data.target) :
tr("An error has occurred while installing target:\n %1").arg(m_data.target);
} }
label->setText(message);
} }
} // namespace Internal } // namespace Internal