summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json2
-rw-r--r--src/plugins/android/androidbuildapkstep.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/servermodereader.cpp2
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp2
-rw-r--r--src/plugins/ios/iosrunner.cpp2
-rw-r--r--src/plugins/projectexplorer/projectexplorersettingspage.ui2
-rw-r--r--src/plugins/projectexplorer/targetsettingspanel.cpp2
-rw-r--r--src/plugins/qmldesigner/components/componentcore/componentcore_constants.h2
-rw-r--r--src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp2
-rw-r--r--src/plugins/qmldesigner/documentwarningwidget.cpp3
-rw-r--r--src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp2
-rw-r--r--src/plugins/scxmleditor/plugin_interface/stateitem.cpp2
12 files changed, 13 insertions, 12 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
index 285631c96e..62305835df 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -93,7 +93,7 @@
},
{
"name": "UseVirtualKeyboard",
- "trDisplayName": "Use Qt Virtual Keyboard.",
+ "trDisplayName": "Use Qt Virtual Keyboard",
"type": "CheckBox",
"data":
{
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 9cf5aa76e0..d9c4e50f0e 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -132,7 +132,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
return false;
}
} else if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
- emit addOutput(tr("The minimum Qt version required for Gradle build to work is %2. "
+ emit addOutput(tr("The minimum Qt version required for Gradle build to work is %1. "
"It is recommended to install the latest Qt version.")
.arg("5.4.0"), OutputFormat::Stderr);
return false;
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index 3e656d44c7..f4a6235e76 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -813,7 +813,7 @@ void ServerModeReader::addTargets(const QHash<Utils::FileName, ProjectExplorer::
if (cr->type != CrossReference::TARGET) {
if (path == targetPath) {
if (bt->line >= 0)
- dn = tr("%1 in line %3").arg(btName).arg(bt->line);
+ dn = tr("%1 in line %2").arg(btName).arg(bt->line);
else
dn = tr("%1").arg(btName);
} else {
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 42a3d1e461..62837bbf42 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4620,7 +4620,7 @@ void GdbEngine::handleFileExecAndSymbols(const DebuggerResponse &response)
+ ' ' + tr("This can be caused by a path length limitation "
"in the core file.")
+ ' ' + tr("Try to specify the binary in "
- "Debug > Start Debugging > Attach to Core.");
+ "Debug > Start Debugging > Load Core File.");
notifyInferiorSetupFailedHelper(msg);
}
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 6681a27354..6a923be786 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -270,7 +270,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
if (prerequisiteOk)
reportStarted();
else
- reportFailure(tr("Could not get necessary ports the debugger connection."));
+ reportFailure(tr("Could not get necessary ports for the debugger connection."));
}
void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index 4a51b8b274..328a8c2caf 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -122,7 +122,7 @@
<item>
<widget class="QLabel" name="limitBuildOutputLabel">
<property name="text">
- <string>Limit build output to </string>
+ <string>Limit build output to</string>
</property>
</widget>
</item>
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index 955cedc956..c98e670eae 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -432,7 +432,7 @@ public:
QPushButton *closeAnyway = box.addButton(tr("Cancel Build and Disable Kit in This Project"), QMessageBox::AcceptRole);
QPushButton *cancelClose = box.addButton(tr("Do Not Remove"), QMessageBox::RejectRole);
box.setDefaultButton(cancelClose);
- box.setWindowTitle(tr("Disable Kit %1 in This Project?").arg(kitName));
+ box.setWindowTitle(tr("Disable Kit \"%1\" in This Project?").arg(kitName));
box.setText(tr("The kit <b>%1</b> is currently being built.").arg(kitName));
box.setInformativeText(tr("Do you want to cancel the build process and remove the kit anyway?"));
box.exec();
diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
index ce7952609a..0035b90fad 100644
--- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
+++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h
@@ -137,7 +137,7 @@ const char lowerToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Lower s
const char resetSizeToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset size and use implicit size.");
const char resetPositionTooltip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset position and use implicit position.");
-const char anchorsFillToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Fill selected item to parent. ");
+const char anchorsFillToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Fill selected item to parent.");
const char anchorsResetToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset anchors for selected item.");
const char layoutColumnLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected items in column layout.");
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index 2b9092e286..6efc88a7b8 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -227,7 +227,7 @@ QProcess *PuppetCreator::puppetProcess(const QString &puppetPath,
#endif
if (debugPuppet == puppetMode || debugPuppet == "all") {
QMessageBox::information(Core::ICore::dialogParent(),
- QCoreApplication::translate("PuppetCreator", "Puppet is starting ..."),
+ QCoreApplication::translate("PuppetCreator", "Puppet is starting..."),
QCoreApplication::translate("PuppetCreator", "You can now attach your debugger to the %1 puppet with process id: %2.")
.arg(puppetMode, QString::number(puppetProcess->processId())));
}
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index a6c0303464..6afe9b2714 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -63,7 +63,8 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
m_messageLabel->setForegroundRole(QPalette::ToolTipText);
m_messageLabel->setWordWrap(true);
- m_ignoreWarningsCheckBox->setText(tr("Ignore always these unsupported Qt Quick Designer warnings."));
+ m_ignoreWarningsCheckBox->setText(tr("Always ignore these warnings about features "
+ "not supported by Qt Quick Designer."));
connect(m_navigateLabel, &QLabel::linkActivated, this, [=](const QString &link) {
if (link == QLatin1String("goToCode")) {
diff --git a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
index 7376192581..6422c22292 100644
--- a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
@@ -34,7 +34,7 @@ IdWarningItem::IdWarningItem(QGraphicsItem *parent)
setSeverity(OutputPane::Warning::ErrorType);
setTypeName(tr("State"));
setDescription(tr("Each state must have a unique ID."));
- setReason(tr("Missing ID"));
+ setReason(tr("Missing ID."));
setX(-boundingRect().width());
}
diff --git a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
index edc2562ccf..01fd5a994b 100644
--- a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
@@ -350,7 +350,7 @@ void StateItem::selectedMenuAction(const QAction *action)
break;
}
case TagUtils::Relayout: {
- document->undoStack()->beginMacro(tr("Relayout"));
+ document->undoStack()->beginMacro(tr("Re-Layout"));
doLayout(depth());
document->undoStack()->endMacro();
break;