From b7f814372823df1d5de49207ab0346bad460bf9d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 26 May 2023 13:04:31 +0200 Subject: [PATCH] Tr: Various small fixes Change-Id: Ic86d6b6a4aae7b301557eaa4296beb9a31399e03 Reviewed-by: Leena Miettinen Reviewed-by: Qt CI Bot --- share/qtcreator/translations/qtcreator_de.ts | 16 ++++++++-------- share/qtcreator/translations/qtcreator_hr.ts | 4 ++-- .../languageserverprotocol/jsonrpcmessages.cpp | 3 +-- src/plugins/coreplugin/loggingviewer.cpp | 2 +- src/plugins/fossil/fossilplugin.cpp | 2 +- .../languageclient/languageclientinterface.cpp | 2 +- src/plugins/projectexplorer/project.cpp | 2 +- src/plugins/qtsupport/qtsupportplugin.cpp | 2 +- src/plugins/texteditor/formattexteditor.cpp | 6 ++---- 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 2d1a13ead00..28c1cfb917e 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -18989,8 +18989,8 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. Datei "%1" konnte nicht zum Schreiben der Protokolle geöffnet werden. - Save Enabled Categories As - Ausgewählte Kategorien speichern unter + Save Enabled Categories As... + Ausgewählte Kategorien speichern unter... Failed to write preset file "%1". @@ -27390,7 +27390,7 @@ Private Check-Ins werden standardmäßig nicht zum entfernten Repository gepusht ALT+I,Alt+C - Settings ... + Settings... Einstellungen... @@ -31889,8 +31889,8 @@ Beispiel: *.cpp%1*.h In die Zwischenablage kopieren - Cannot handle MIME type of message %1 - MIME type %1 der Nachricht kann nicht verarbeitet werden + Cannot handle MIME type "%1" of message. + MIME type "%1" der Nachricht kann nicht verarbeitet werden. Generic StdIO Language Server @@ -32025,7 +32025,7 @@ Beispiel: *.cpp%1*.h In "%1" ist keine ID angegeben. - Could not parse JSON message "%1". + Could not parse JSON message: "%1". Die JSON-Nachricht konnte nicht ausgewertet werden: "%1". @@ -38801,7 +38801,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw %1: Vollständiger Pfad zur Hauptdatei. - %1: The name the active kit. + %1: The name of the active kit. %1 is something like "Active project" %1: Der Name des aktiven Kits. @@ -44979,7 +44979,7 @@ wirklich löschen? Vollständiger Pfad zum Ziel-"bin"-Verzeichnis der Qt-Version des aktiven Kits des aktiven Projekts.<br>Wahrscheinlich sollten Sie stattdessen %1 nutzen. - Full path to the libexec bin directory of the Qt version in the active kit of the active project. + Full path to the libexec directory of the Qt version in the active kit of the active project. Vollständiger Pfad zum Host-"libexec"-Verzeichnis der Qt-Version des aktiven Kits des aktiven Projekts. diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 179850cef10..386c4d14929 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -10705,8 +10705,8 @@ will also disable the following plugins: Očekivana vrsta %1, ali vrijednost je sadržavala %2 - Could not parse JSON message "%1". - Nije moguće obraditi JSON poruku "%1". + Could not parse JSON message: "%1". + Nije moguće obraditi JSON poruku: "%1". Expected a JSON object, but got a JSON "%1". diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.cpp b/src/libs/languageserverprotocol/jsonrpcmessages.cpp index 31183cc0cc1..cef4c47cb09 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.cpp +++ b/src/libs/languageserverprotocol/jsonrpcmessages.cpp @@ -77,8 +77,7 @@ JsonRpcMessage::JsonRpcMessage(const BaseMessage &message) if (doc.isObject()) m_jsonObject = doc.object(); else if (doc.isNull()) - m_parseError = - Tr::tr("Could not parse JSON message \"%1\".").arg(error.errorString()); + m_parseError = Tr::tr("Could not parse JSON message: \"%1\".").arg(error.errorString()); else m_parseError = Tr::tr("Expected a JSON object, but got a JSON \"%1\" value.").arg(docType(doc)); diff --git a/src/plugins/coreplugin/loggingviewer.cpp b/src/plugins/coreplugin/loggingviewer.cpp index 4392ef63445..d35a5da20bf 100644 --- a/src/plugins/coreplugin/loggingviewer.cpp +++ b/src/plugins/coreplugin/loggingviewer.cpp @@ -622,7 +622,7 @@ void LoggingViewManagerWidget::saveLoggingsToFile() const void LoggingViewManagerWidget::saveEnabledCategoryPreset() const { Utils::FilePath fp = Utils::FileUtils::getSaveFilePath(ICore::dialogParent(), - Tr::tr("Save Enabled Categories As")); + Tr::tr("Save Enabled Categories As...")); if (fp.isEmpty()) return; const QList enabled = m_categoryModel->enabledCategories(); diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp index a316daf3aec..bdd68d06210 100644 --- a/src/plugins/fossil/fossilplugin.cpp +++ b/src/plugins/fossil/fossilplugin.cpp @@ -559,7 +559,7 @@ void FossilPluginPrivate::createRepositoryActions(const Core::Context &context) m_fossilContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(Tr::tr("Settings ..."), this); + action = new QAction(Tr::tr("Settings..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Constants::CONFIGURE_REPOSITORY, context); connect(action, &QAction::triggered, this, &FossilPluginPrivate::configureRepository); diff --git a/src/plugins/languageclient/languageclientinterface.cpp b/src/plugins/languageclient/languageclientinterface.cpp index 84f4b5ed0a1..d42e74c9b36 100644 --- a/src/plugins/languageclient/languageclientinterface.cpp +++ b/src/plugins/languageclient/languageclientinterface.cpp @@ -71,7 +71,7 @@ void BaseClientInterface::parseCurrentMessage() if (m_currentMessage.mimeType == JsonRpcMessage::jsonRpcMimeType()) { emit messageReceived(JsonRpcMessage(m_currentMessage)); } else { - emit error(Tr::tr("Cannot handle MIME type of message %1") + emit error(Tr::tr("Cannot handle MIME type \"%1\" of message.") .arg(QString::fromUtf8(m_currentMessage.mimeType))); } m_currentMessage = BaseMessage(); diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 3b32e3c2650..c021d9b1a64 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -1183,7 +1183,7 @@ void Project::addVariablesToMacroExpander(const QByteArray &prefix, }); expander->registerVariable(fullPrefix + "Kit:Name", //: %1 is something like "Active project" - Tr::tr("%1: The name the active kit.").arg(descriptor), + Tr::tr("%1: The name of the active kit.").arg(descriptor), [targetGetter]() -> QString { if (const Target *const target = targetGetter()) return target->kit()->displayName(); diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 3fc9fe8fed8..41c88d18e36 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -197,7 +197,7 @@ void QtSupportPlugin::extensionsInitialized() expander->registerVariable( "ActiveProject::QT_HOST_LIBEXECS", - Tr::tr("Full path to the libexec bin directory of the Qt version in the active kit " + Tr::tr("Full path to the libexec directory of the Qt version in the active kit " "of the active project."), []() { const QtVersion *const qt = activeQtVersion(); diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index 3e31006d617..03de5fb4152 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -69,8 +69,7 @@ static FormatTask format(FormatTask task) process.setCommand({executable, options}); process.runBlocking(); if (process.result() != ProcessResult::FinishedWithSuccess) { - task.error = Tr::tr("TextEditor", "Failed to format: %1.") - .arg(process.exitMessage()); + task.error = Tr::tr("Failed to format: %1.").arg(process.exitMessage()); return task; } const QString output = process.cleanedStdErr(); @@ -249,8 +248,7 @@ void updateEditorText(QPlainTextEdit *editor, const QString &text) static void showError(const QString &error) { - Core::MessageManager::writeFlashing(Tr::tr("TextEditor", "Error in text formatting: %1") - .arg(error.trimmed())); + Core::MessageManager::writeFlashing(Tr::tr("Error in text formatting: %1").arg(error.trimmed())); } /**