Tr: Various small fixes

Change-Id: Ic86d6b6a4aae7b301557eaa4296beb9a31399e03
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

share/qtcreator/translations/qtcreator_de.ts

@@ -18989,8 +18989,8 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
         <translation>Datei &quot;%1&quot; konnte nicht zum Schreiben der Protokolle geöffnet werden.</translation>
     </message>
     <message>
-        <source>Save Enabled Categories As</source>
+        <source>Save Enabled Categories As...</source>
-        <translation>Ausgewählte Kategorien speichern unter</translation>
+        <translation>Ausgewählte Kategorien speichern unter...</translation>
     </message>
     <message>
         <source>Failed to write preset file &quot;%1&quot;.</source>
@@ -27390,7 +27390,7 @@ Private Check-Ins werden standardmäßig nicht zum entfernten Repository gepusht
         <translation>ALT+I,Alt+C</translation>
     </message>
     <message>
-        <source>Settings ...</source>
+        <source>Settings...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
@@ -31889,8 +31889,8 @@ Beispiel: *.cpp%1*.h</translation>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <source>Cannot handle MIME type of message %1</source>
+        <source>Cannot handle MIME type &quot;%1&quot; of message.</source>
-        <translation>MIME type %1 der Nachricht kann nicht verarbeitet werden</translation>
+        <translation>MIME type &quot;%1&quot; der Nachricht kann nicht verarbeitet werden.</translation>
     </message>
     <message>
         <source>Generic StdIO Language Server</source>
@@ -32025,7 +32025,7 @@ Beispiel: *.cpp%1*.h</translation>
         <translation>In &quot;%1&quot; ist keine ID angegeben.</translation>
     </message>
     <message>
-        <source>Could not parse JSON message &quot;%1&quot;.</source>
+        <source>Could not parse JSON message: &quot;%1&quot;.</source>
         <translation>Die JSON-Nachricht konnte nicht ausgewertet werden: &quot;%1&quot;.</translation>
     </message>
     <message>
@@ -38801,7 +38801,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw
         <translation>%1: Vollständiger Pfad zur Hauptdatei.</translation>
     </message>
     <message>
-        <source>%1: The name the active kit.</source>
+        <source>%1: The name of the active kit.</source>
         <extracomment>%1 is something like &quot;Active project&quot;</extracomment>
         <translation>%1: Der Name des aktiven Kits.</translation>
     </message>
@@ -44979,7 +44979,7 @@ wirklich löschen?</translation>
         <translation>Vollständiger Pfad zum Ziel-&quot;bin&quot;-Verzeichnis der Qt-Version des aktiven Kits des aktiven Projekts.&lt;br&gt;Wahrscheinlich sollten Sie stattdessen %1 nutzen.</translation>
     </message>
     <message>
-        <source>Full path to the libexec bin directory of the Qt version in the active kit of the active project.</source>
+        <source>Full path to the libexec directory of the Qt version in the active kit of the active project.</source>
         <translation>Vollständiger Pfad zum Host-&quot;libexec&quot;-Verzeichnis der Qt-Version des aktiven Kits des aktiven Projekts.</translation>
     </message>
     <message>

share/qtcreator/translations/qtcreator_hr.ts

@@ -10705,8 +10705,8 @@ will also disable the following plugins:
         <translation>Očekivana vrsta %1, ali vrijednost je sadržavala %2</translation>
     </message>
     <message>
-        <source>Could not parse JSON message &quot;%1&quot;.</source>
+        <source>Could not parse JSON message: &quot;%1&quot;.</source>
-        <translation>Nije moguće obraditi JSON poruku &quot;%1&quot;.</translation>
+        <translation>Nije moguće obraditi JSON poruku: &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>Expected a JSON object, but got a JSON &quot;%1&quot;.</source>

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 =
+        m_parseError = Tr::tr("Could not parse JSON message: \"%1\".").arg(error.errorString());
-            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));

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<LoggingCategoryItem> enabled = m_categoryModel->enabledCategories();

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);

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();

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();

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();

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.")
+            task.error = Tr::tr("Failed to format: %1.").arg(process.exitMessage());
-                             .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")
+    Core::MessageManager::writeFlashing(Tr::tr("Error in text formatting: %1").arg(error.trimmed()));
-                .arg(error.trimmed()));
 }
 
 /**