forked from qt-creator/qt-creator
Fix original string messages
Change-Id: I60c459de44b72dd2bea23672bee41892dcbc507b Reviewed-on: http://codereview.qt.nokia.com/1168 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
committed by
Leena Miettinen
parent
b36cdab396
commit
81e65bc1e6
@@ -389,7 +389,7 @@ QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const Ba
|
|||||||
} else {
|
} else {
|
||||||
// Yes, some ABIs are unsupported
|
// Yes, some ABIs are unsupported
|
||||||
info.message = tr("Not all possible target environments can be supported due to missing tool chains.");
|
info.message = tr("Not all possible target environments can be supported due to missing tool chains.");
|
||||||
info.toolTip = tr("The following ABIs are currently not supported:<ul><li>%1</ul>")
|
info.toolTip = tr("The following ABIs are currently not supported:<ul><li>%1</li></ul>")
|
||||||
.arg(missingToolChains.join(QLatin1String("</li><li>")));
|
.arg(missingToolChains.join(QLatin1String("</li><li>")));
|
||||||
info.icon = m_warningVersionIcon;
|
info.icon = m_warningVersionIcon;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const LinuxDeviceConfigurat
|
|||||||
const QString &dir = QFileInfo(sshParams.privateKeyFile).path();
|
const QString &dir = QFileInfo(sshParams.privateKeyFile).path();
|
||||||
QString publicKeyFileName = QFileDialog::getOpenFileName(this,
|
QString publicKeyFileName = QFileDialog::getOpenFileName(this,
|
||||||
tr("Choose Public Key File"), dir,
|
tr("Choose Public Key File"), dir,
|
||||||
tr("Public Key Files(*.pub);;All Files (*)"));
|
tr("Public Key Files (*.pub);;All Files (*)"));
|
||||||
if (publicKeyFileName.isEmpty()) {
|
if (publicKeyFileName.isEmpty()) {
|
||||||
reject();
|
reject();
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user