diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-09-08 14:20:43 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-09-11 08:29:41 +0000 |
| commit | b506fce0fe853464beea23f7bafe004272acca2e (patch) | |
| tree | af0b0aa6d948c96672ba7f679d7c52921590281e | |
| parent | 808f192ff842dcb2a931e6feba3b0e01bc82c921 (diff) | |
Fix string messages
Found during translating.
Change-Id: I9626b3393d7b53300f7c806acbc5e12bc58574d2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
11 files changed, 14 insertions, 16 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 255114a9ca..490d2ec701 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -141,7 +141,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) if (sdkToolsVersion >= gradleScriptRevokedSdkVersion && !version->sourcePath().appendPath("src/3rdparty/gradle").exists()) { emit addOutput(tr("The installed SDK tools version (%1) does not include Gradle scripts. The " - "minimum Qt version required for Gradle build to work is %2") + "minimum Qt version required for Gradle build to work is %2.") .arg(sdkToolsVersion.toString()).arg("5.9.0/5.6.3"), OutputFormat::Stderr); return false; } @@ -189,7 +189,7 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta bool AndroidBuildApkStep::verifyKeystorePassword() { if (!m_keystorePath.exists()) { - addOutput(tr("Cannot sign the package. Invalid keystore path(%1).") + addOutput(tr("Cannot sign the package. Invalid keystore path (%1).") .arg(m_keystorePath.toString()), OutputFormat::ErrorMessage); return false; } diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index c069b3514e..a27233f1c1 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -580,7 +580,7 @@ static void searchFinished(SearchResult *search, QFutureWatcher<Usage> *watcher) auto renameCheckBox = qobject_cast<QCheckBox *>(search->additionalReplaceWidget()); if (renameCheckBox) { - renameCheckBox->setText(CppFindReferences::tr("Re&name %1 files").arg(filesToRename.size())); + renameCheckBox->setText(CppFindReferences::tr("Re&name %n files", nullptr, filesToRename.size())); renameCheckBox->setToolTip(CppFindReferences::tr("Files:\n%1").arg(filesToRename.join('\n'))); renameCheckBox->setVisible(true); } diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 14c9938114..9c52ad0b9e 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -2511,7 +2511,7 @@ void CdbEngine::parseOutputLine(QString line) // output(32): ModLoad: 00007ffb 00007ffb C:\Windows\system32\KERNEL32.DLL QRegExp moduleRegExp("[0-9a-fA-F]+(`[0-9a-fA-F]+)? [0-9a-fA-F]+(`[0-9a-fA-F]+)? (.*)"); if (moduleRegExp.indexIn(line) > -1) - showStatusMessage(tr("Module loaded: ") + moduleRegExp.cap(3).trimmed(), 3000); + showStatusMessage(tr("Module loaded: %1").arg(moduleRegExp.cap(3).trimmed()), 3000); } else { showMessage(line, LogMisc); } diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index 94412301fc..7aeb3a7cb5 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -315,7 +315,7 @@ QWidget *LocalsAndExpressionsOptionsPage::widget() label->setText(QLatin1String("<html><head/><body>\n<p>") + tr("The debugging helpers are used to produce a nice " "display of objects of certain types like QString or " - "std::map in the "Locals and Expressions" view. ") + "std::map in the "Locals and Expressions" view.") + QLatin1String("</p></body></html>")); auto groupBoxCustomDumperCommands = new QGroupBox(debuggingHelperGroupBox); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 61babbe400..ab0ca39978 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -973,7 +973,7 @@ void GdbServerPortsGatherer::start() void GdbServerPortsGatherer::handlePortListReady() { Utils::PortList portList = device()->freePorts(); - appendMessage(tr("Found %1 free ports").arg(portList.count()), NormalMessageFormat); + appendMessage(tr("Found %n free ports.", nullptr, portList.count()), NormalMessageFormat); if (m_useGdbServer) { m_gdbServerPort = m_portsGatherer.getNextFreePort(&portList); if (!m_gdbServerPort.isValid()) { diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 79b038beb1..8a10f42ed8 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3997,7 +3997,7 @@ void GdbEngine::loadInitScript() tr("Cannot find debugger initialization script"), tr("The debugger settings point to a script file at \"%1\" " "which is not accessible. If a script file is not needed, " - "consider clearing that entry to avoid this warning. " + "consider clearing that entry to avoid this warning." ).arg(script)); } } else { diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp index 2167f9ddbb..f7c85ce0c7 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp @@ -191,7 +191,7 @@ void PortsGatherer::start() }); connect(&m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, this, [this] { m_portList = device()->freePorts(); - appendMessage(tr("Found %1 free ports").arg(m_portList.count()) + '\n', NormalMessageFormat); + appendMessage(tr("Found %n free ports.", nullptr, m_portList.count()) + '\n', NormalMessageFormat); reportStarted(); }); m_portsGatherer.start(device()); diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui index a9f7e4082c..4a51b8b274 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.ui +++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui @@ -177,7 +177,7 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>Limit application output to </string> + <string>Limit application output to</string> </property> </widget> </item> diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h index 6b0015f082..1ef51816dc 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h +++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h @@ -80,10 +80,6 @@ const char positionCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContext const char layoutCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Layout"); const char stackedContainerCategoryDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Stacked Container"); -const char selectParentDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Select Parent: %1"); -const char selectDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Select: %1"); -const char deSelectDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Deselect: "); - const char cutSelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Cut"); const char copySelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Copy"); const char pasteSelectionDisplayName[] = QT_TRANSLATE_NOOP("QmlDesignerContextMenu", "Paste"); diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp index 0065239032..c9d83b6893 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp @@ -352,7 +352,8 @@ void HighlightDefinitionHandler::keywordStarted(const QXmlAttributes &atts) // Handle broken files. makefile.xml references an invalid list. Core::MessageManager::write( QCoreApplication::translate("GenericHighlighter", - "Generic highlighter warning: ") + e.message()); + "Generic highlighter warning: %1") + .arg(e.message())); } rule->setInsensitive(atts.value(kInsensitive)); ruleElementStarted(atts, QSharedPointer<Rule>(rule)); diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp index b2a12fb02f..2902f09a63 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.cpp +++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp @@ -253,8 +253,9 @@ void Highlighter::highlightBlock(const QString &text) } catch (const HighlighterException &e) { Core::MessageManager::write( QCoreApplication::translate("GenericHighlighter", - "Generic highlighter error: ") + e.message(), - Core::MessageManager::WithFocus); + "Generic highlighter error: %1") + .arg(e.message()), + Core::MessageManager::WithFocus); m_isBroken = true; } } |