Commit 89ca18e4 authored by Robert Loehning's avatar Robert Loehning
Browse files

Further string fixes



Change-Id: Iab93aea9e7ec17dd8196a957f90beb1ee3179605
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>
parent 0eeb590f
/**************************************************************************
**
** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com>
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Copyright (c) 2015 BogDan Vatra <bog_dan_ro@yahoo.com>
** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
......@@ -395,7 +395,7 @@ bool AndroidDeployQtStep::processSucceeded(int exitCode, QProcess::ExitStatus st
if (!m_installOk && !m_uninstallPreviousPackageRun &&
QMessageBox::critical(0, tr("Install failed"),
tr("Another application with the same package id but signed with "
"different ceritificate already exists.\n"
"different certificate already exists.\n"
"Do you want to uninstall the existing package next time?"),
QMessageBox::Yes, QMessageBox::No)
== QMessageBox::Yes) {
......
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
......@@ -690,13 +690,13 @@ bool JsonFieldPage::ComboBoxField::parseData(const QVariant &data, QString *erro
m_index = tmp.value(QLatin1String("index"), 0).toInt(&ok);
if (!ok) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage",
"ComboBox 'index' is not a integer value.");
"ComboBox 'index' is not an integer value.");
return false;
}
m_disabledIndex = tmp.value(QLatin1String("disabledIndex"), -1).toInt(&ok);
if (!ok) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage",
"ComboBox 'disabledIndex' is not a integer value.");
"ComboBox 'disabledIndex' is not an integer value.");
return false;
}
......
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