Improve translated strings and make them consistent

Change-Id: I88a6e6ceaa44b22539449037faa788caa9f349fc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Robert Loehning
2017-12-27 13:56:54 +01:00
parent 034f0209b0
commit 63e47f903f
12 changed files with 13 additions and 12 deletions

View File

@@ -93,7 +93,7 @@
}, },
{ {
"name": "UseVirtualKeyboard", "name": "UseVirtualKeyboard",
"trDisplayName": "Use Qt Virtual Keyboard.", "trDisplayName": "Use Qt Virtual Keyboard",
"type": "CheckBox", "type": "CheckBox",
"data": "data":
{ {

View File

@@ -132,7 +132,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
return false; return false;
} }
} else if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) { } 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.") "It is recommended to install the latest Qt version.")
.arg("5.4.0"), OutputFormat::Stderr); .arg("5.4.0"), OutputFormat::Stderr);
return false; return false;

View File

@@ -813,7 +813,7 @@ void ServerModeReader::addTargets(const QHash<Utils::FileName, ProjectExplorer::
if (cr->type != CrossReference::TARGET) { if (cr->type != CrossReference::TARGET) {
if (path == targetPath) { if (path == targetPath) {
if (bt->line >= 0) 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 else
dn = tr("%1").arg(btName); dn = tr("%1").arg(btName);
} else { } else {

View File

@@ -4620,7 +4620,7 @@ void GdbEngine::handleFileExecAndSymbols(const DebuggerResponse &response)
+ ' ' + tr("This can be caused by a path length limitation " + ' ' + tr("This can be caused by a path length limitation "
"in the core file.") "in the core file.")
+ ' ' + tr("Try to specify the binary in " + ' ' + tr("Try to specify the binary in "
"Debug > Start Debugging > Attach to Core."); "Debug > Start Debugging > Load Core File.");
notifyInferiorSetupFailedHelper(msg); notifyInferiorSetupFailedHelper(msg);
} }

View File

@@ -270,7 +270,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
if (prerequisiteOk) if (prerequisiteOk)
reportStarted(); reportStarted();
else 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) void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)

View File

@@ -122,7 +122,7 @@
<item> <item>
<widget class="QLabel" name="limitBuildOutputLabel"> <widget class="QLabel" name="limitBuildOutputLabel">
<property name="text"> <property name="text">
<string>Limit build output to </string> <string>Limit build output to</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -432,7 +432,7 @@ public:
QPushButton *closeAnyway = box.addButton(tr("Cancel Build and Disable Kit in This Project"), QMessageBox::AcceptRole); 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); QPushButton *cancelClose = box.addButton(tr("Do Not Remove"), QMessageBox::RejectRole);
box.setDefaultButton(cancelClose); 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.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.setInformativeText(tr("Do you want to cancel the build process and remove the kit anyway?"));
box.exec(); box.exec();

View File

@@ -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 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 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 anchorsResetToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Reset anchors for selected item.");
const char layoutColumnLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected items in column layout."); const char layoutColumnLayoutToolTip[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout selected items in column layout.");

View File

@@ -227,7 +227,7 @@ QProcess *PuppetCreator::puppetProcess(const QString &puppetPath,
#endif #endif
if (debugPuppet == puppetMode || debugPuppet == "all") { if (debugPuppet == puppetMode || debugPuppet == "all") {
QMessageBox::information(Core::ICore::dialogParent(), 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.") QCoreApplication::translate("PuppetCreator", "You can now attach your debugger to the %1 puppet with process id: %2.")
.arg(puppetMode, QString::number(puppetProcess->processId()))); .arg(puppetMode, QString::number(puppetProcess->processId())));
} }

View File

@@ -63,7 +63,8 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
m_messageLabel->setForegroundRole(QPalette::ToolTipText); m_messageLabel->setForegroundRole(QPalette::ToolTipText);
m_messageLabel->setWordWrap(true); 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) { connect(m_navigateLabel, &QLabel::linkActivated, this, [=](const QString &link) {
if (link == QLatin1String("goToCode")) { if (link == QLatin1String("goToCode")) {

View File

@@ -34,7 +34,7 @@ IdWarningItem::IdWarningItem(QGraphicsItem *parent)
setSeverity(OutputPane::Warning::ErrorType); setSeverity(OutputPane::Warning::ErrorType);
setTypeName(tr("State")); setTypeName(tr("State"));
setDescription(tr("Each state must have a unique ID.")); setDescription(tr("Each state must have a unique ID."));
setReason(tr("Missing ID")); setReason(tr("Missing ID."));
setX(-boundingRect().width()); setX(-boundingRect().width());
} }

View File

@@ -350,7 +350,7 @@ void StateItem::selectedMenuAction(const QAction *action)
break; break;
} }
case TagUtils::Relayout: { case TagUtils::Relayout: {
document->undoStack()->beginMacro(tr("Relayout")); document->undoStack()->beginMacro(tr("Re-Layout"));
doLayout(depth()); doLayout(depth());
document->undoStack()->endMacro(); document->undoStack()->endMacro();
break; break;