diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-01-07 11:55:43 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-01-07 14:34:29 +0100 |
| commit | 89ca18e4d71b87551e3bb9572d49aa098bde1f55 (patch) | |
| tree | 6807b8a8eeca19ff6e65161a25fb9a32f7b07500 /src | |
| parent | 0eeb590fdfbbdc9f94f456444d65aa3c73b14c8b (diff) | |
| download | qt-creator-89ca18e4d71b87551e3bb9572d49aa098bde1f55.tar.gz | |
Further string fixes
Change-Id: Iab93aea9e7ec17dd8196a957f90beb1ee3179605
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 38407595b7..275e776a7f 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -1,7 +1,7 @@ /************************************************************************** ** -** 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) { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index baa03b0d51..8363cdd657 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** 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; } |