From 18aa49e7c2296da46e6070058b600434c68211ae Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 5 Jan 2015 14:21:59 +0100 Subject: [PATCH] String improvements Change-Id: I45778c9562ba530a36ddaf201f0c61d380d701cf Reviewed-by: Leena Miettinen --- src/libs/qmljs/qmljsstaticanalysismessage.cpp | 2 +- src/libs/timeline/qml/CategoryLabel.qml | 2 +- src/plugins/android/androidbuildapkwidget.ui | 2 +- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/perforce/perforceplugin.cpp | 2 +- src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp | 4 ++-- src/plugins/projectexplorer/kit.cpp | 2 +- src/plugins/projectexplorer/kitinformationconfigwidget.cpp | 2 +- src/plugins/projectexplorer/projectexplorer.cpp | 2 +- .../qmakeandroidsupport/createandroidmanifestwizard.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakestep.ui | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp index 01a09a00b2f..3d8e3c8f3df 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp +++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp @@ -231,7 +231,7 @@ StaticAnalysisMessages::StaticAnalysisMessages() newMsg(ErrFunctionsNotSupportedInQmlUi, Error, tr("Functions are not supported in a Qt Quick UI form.")); newMsg(ErrBlocksNotSupportedInQmlUi, Error, - tr("Java Script blocks are not supported in a Qt Quick UI form.")); + tr("JavaScript blocks are not supported in a Qt Quick UI form.")); newMsg(ErrBehavioursNotSupportedInQmlUi, Error, tr("Behavior type is not supported in a Qt Quick UI form.")); newMsg(ErrStatesOnlyInRootItemInQmlUi, Error, diff --git a/src/libs/timeline/qml/CategoryLabel.qml b/src/libs/timeline/qml/CategoryLabel.qml index 528ea8a8762..4a793eb2bdc 100644 --- a/src/libs/timeline/qml/CategoryLabel.qml +++ b/src/libs/timeline/qml/CategoryLabel.qml @@ -231,7 +231,7 @@ Item { implicitHeight: txt.height - 1 enabled: expanded || (model && !model.empty) iconSource: expanded ? "arrow_down.png" : "arrow_right.png" - tooltip: expanded ? qsTr("Collapse category") : qsTr("Expand category.") + tooltip: expanded ? qsTr("Collapse category") : qsTr("Expand category") onClicked: model.expanded = !expanded } diff --git a/src/plugins/android/androidbuildapkwidget.ui b/src/plugins/android/androidbuildapkwidget.ui index 51ba40b30c8..dd084a72c3a 100644 --- a/src/plugins/android/androidbuildapkwidget.ui +++ b/src/plugins/android/androidbuildapkwidget.ui @@ -154,7 +154,7 @@ Signing an APK that uses "Deploy local Qt libraries" is not allowed. -Deploying local Qt libraries is incompatible with Android 5 +Deploying local Qt libraries is incompatible with Android 5. diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 8f0d6d512fd..38407595b70 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -361,7 +361,7 @@ void AndroidDeployQtStep::runCommand(const QString &program, const QStringList & if (!buildProc.waitForFinished(2 * 60 * 1000) || buildProc.error() != QProcess::UnknownError || buildProc.exitCode() != 0) { - QString mainMessage = tr("Packaging Error: Command \"%1 %2\" failed.") + QString mainMessage = tr("Packaging error: Command \"%1 %2\" failed.") .arg(program).arg(arguments.join(QLatin1Char(' '))); if (buildProc.error() != QProcess::UnknownError) mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc.errorString()); diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index db9675030db..b67fcb4b884 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1209,7 +1209,7 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title, const int maxSize = EditorManager::maxTextFileSize() / 2 - 1000; // ~25 MB, 600000 lines if (content.size() >= maxSize) { content = content.left(maxSize); - content += QLatin1Char('\n') + tr("[Only %1 MB of output shown]").arg(maxSize / 1024 / 1024); + content += QLatin1Char('\n') + tr("[Only %n MB of output shown]", 0, maxSize / 1024 / 1024); } IEditor *editor = EditorManager::openEditorWithContents(id, &s, content.toUtf8()); QTC_ASSERT(editor, return 0); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 1a940661982..a850f60ac28 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -153,7 +153,7 @@ static JsonWizardFactory::Page parsePage(const QVariant &value, QString *errorMe JsonWizardFactory::Page p; if (value.type() != QVariant::Map) { - *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Page is not a object."); + *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", "Page is not an object."); return p; } @@ -612,7 +612,7 @@ bool JsonWizardFactory::initialize(const QVariantMap &data, const QDir &baseDir, m_options.insert(key, value); } } else if (optionValue.isValid()) { - *errorMessage = tr("Value for \"options\" is not a list"); + *errorMessage = tr("Value for \"options\" is not a list."); return false; } diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index e2eedbdb7e9..a6005a84da8 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -106,7 +106,7 @@ public: [kit] { return kit->displayName(); }, false); m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME, - tr("The name of the currently active kit in a filesystem friendly version."), + tr("The name of the currently active kit in a filesystem-friendly version."), [kit] { return kit->fileSystemFriendlyName(); }, false); m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_ID, diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index b1ff57e3d23..f741ae1e560 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -415,7 +415,7 @@ KitEnvironmentConfigWidget::KitEnvironmentConfigWidget(Kit *workingCopy, const K m_editor(0) { refresh(); - m_manageButton->setText(tr("Change ...")); + m_manageButton->setText(tr("Change...")); connect(m_manageButton, SIGNAL(clicked()), this, SLOT(editEnvironmentChanges())); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 93aedbe6ac0..5d3a7edfedc 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1149,7 +1149,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er }); expander->registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME, - tr("The name of the currently active kit in a filesystem friendly version."), + tr("The name of the currently active kit in a filesystem-friendly version."), []() -> QString { Kit *kit = currentKit(); return kit ? kit->fileSystemFriendlyName() : QString(); diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp index a7ced8234ee..b511bcfcb19 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp @@ -164,7 +164,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard) checkBox->setChecked(true); connect(checkBox, &QCheckBox::toggled, wizard, &CreateAndroidManifestWizard::setCopyGradle); checkBox->setText(tr("Copy the Gradle files to Android directory")); - checkBox->setToolTip(tr("It is highly recommended if you are plannig to extend the Java part of your Qt application.")); + checkBox->setToolTip(tr("It is highly recommended if you are planning to extend the Java part of your Qt application.")); fl->addRow(checkBox); } } diff --git a/src/plugins/qmakeprojectmanager/qmakestep.ui b/src/plugins/qmakeprojectmanager/qmakestep.ui index 721bc2d112a..aa659aa0664 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.ui +++ b/src/plugins/qmakeprojectmanager/qmakestep.ui @@ -156,7 +156,7 @@ - Use QML compiler + Use QML compiler: