From cee8309998cd63dcb8c6512e9777cdf22b012387 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 16 Oct 2023 10:58:23 +0200 Subject: [PATCH] Tr: Parametrize some application names Change-Id: I5222455d895aecb94c9a96d0a0f4fd7c279a7388 Reviewed-by: Jarek Kobus Reviewed-by: Leena Miettinen Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 12 ++++++------ share/qtcreator/translations/qtcreator_fr.ts | 12 ++++++------ share/qtcreator/translations/qtcreator_zh_CN.ts | 2 +- src/plugins/cppeditor/cppcodemodelsettingspage.cpp | 13 ++++++++----- src/plugins/docker/dockerdevice.cpp | 4 +++- src/plugins/terminal/terminalpane.cpp | 13 ++++++++++--- 6 files changed, 34 insertions(+), 22 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 77be1e4ada2..695b64e9774 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -21872,9 +21872,9 @@ z.B. name = "m_test_foo_": Bestimmt, ob Clangd beim Vervollständigen von Symbolen Header-Dateien einfügen darf. - Defines the amount of time Qt Creator waits before sending document changes to the server. + Defines the amount of time %1 waits before sending document changes to the server. If the document changes again while waiting, this timeout resets. - Bestimmt die Zeit, die Qt Creator vor dem Senden von Dokumentänderungen an den Server wartet. + Bestimmt die Zeit, die %1 vor dem Senden von Dokumentänderungen an den Server wartet. Falls sich das Dokument innerhalb dieser Zeit wieder ändert, wird erneut die volle Zeit gewartet. @@ -27577,8 +27577,8 @@ Versuchen Sie, das Projekt neu zu erstellen. Shell in Container öffnen - Docker daemon appears to be not running. Verify daemon is up and running and reset the Docker daemon in Docker device preferences or restart Qt Creator. - Der Docker-Daemon scheint nicht zu laufen. Stellen Sie sicher, dass der Daemon ausgeführt wird, und setzen Sie den Docker-Daemon in den Einstellungen des Docker-Geräts zurück oder starten Sie Qt Creator neu. + Docker daemon appears to be not running. Verify daemon is up and running and reset the Docker daemon in Docker device preferences or restart %1. + Der Docker-Daemon scheint nicht zu laufen. Stellen Sie sicher, dass der Daemon ausgeführt wird, und setzen Sie den Docker-Daemon in den Einstellungen des Docker-Geräts zurück oder starten Sie %1 neu. Docker Image Selection @@ -49685,8 +49685,8 @@ Die Datei "%1" konnte nicht geöffnet werden Einstellungen... - Sends Esc to terminal instead of Qt Creator. - Sendet Escape zum Terminal statt zu Qt Creator. + Sends Esc to terminal instead of %1. + Sendet Escape zum Terminal statt zu %1. Press %1 to send Esc to terminal. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index f587f274099..6865214290b 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -20297,9 +20297,9 @@ Double-cliquez pour modifier l’élément. Contrôle si clangd peut insérer des fichiers d’en-tête dans le cadre de la complétion de symboles. - Defines the amount of time Qt Creator waits before sending document changes to the server. + Defines the amount of time %1 waits before sending document changes to the server. If the document changes again while waiting, this timeout resets. - Définit le temps d’attente de Qt Creator avant d’envoyer les modifications du document au serveur. + Définit le temps d’attente de %1 avant d’envoyer les modifications du document au serveur. Si le document est à nouveau modifié pendant l’attente, ce délai est réinitialisé. @@ -27322,8 +27322,8 @@ La recompilation du projet peut aider. Ouvrir un shell dans le conteneur - Docker daemon appears to be not running. Verify daemon is up and running and reset the Docker daemon in Docker device preferences or restart Qt Creator. - Le démon Docker ne semble pas fonctionner. Vérifiez que le démon est présent et en cours d'exécution et réinitialisez le démon docker dans les paramètres du périphérique docker ou redémarrez Qt Creator. + Docker daemon appears to be not running. Verify daemon is up and running and reset the Docker daemon in Docker device preferences or restart %1. + Le démon Docker ne semble pas fonctionner. Vérifiez que le démon est présent et en cours d'exécution et réinitialisez le démon docker dans les paramètres du périphérique docker ou redémarrez %1. Docker Image Selection @@ -49353,8 +49353,8 @@ Impossible d'ouvrir le fichier « %1 » Configurer… - Sends Esc to terminal instead of Qt Creator. - Envoie Échap au terminal au lieu d'à Qt Creator. + Sends Esc to terminal instead of %1. + Envoie Échap au terminal au lieu d'à %1. Press %1 to send Esc to terminal. diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 335d2bbc377..0cae4a5a7a2 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -11554,7 +11554,7 @@ to version control (%2) - Defines the amount of time Qt Creator waits before sending document changes to the server. + Defines the amount of time %1 waits before sending document changes to the server. If the document changes again while waiting, this timeout resets. diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp index a2639f380b3..1c8ff05fee8 100644 --- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp @@ -24,14 +24,15 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include -#include #include @@ -244,10 +245,12 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD "worker threads."); const QString autoIncludeToolTip = Tr::tr( "Controls whether clangd may insert header files as part of symbol completion."); - const QString documentUpdateToolTip = Tr::tr( - "Defines the amount of time Qt Creator waits before sending document changes to the " - "server.\n" - "If the document changes again while waiting, this timeout resets."); + const QString documentUpdateToolTip + //: %1 is the application name (Qt Creator) + = Tr::tr("Defines the amount of time %1 waits before sending document changes to the " + "server.\n" + "If the document changes again while waiting, this timeout resets.") + .arg(QGuiApplication::applicationDisplayName()); const QString sizeThresholdToolTip = Tr::tr( "Files greater than this will not be opened as documents in clangd.\n" "The built-in code model will handle highlighting, completion and so on."); diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index a13e2f19513..ec6403dd79f 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -913,10 +913,12 @@ expected_str DockerDevicePrivate::startContainer() qCWarning(dockerDeviceLog) << "Container shell encountered error:" << resultData.m_error; DockerApi::recheckDockerDaemon(); + //: %1 is the application name (Qt Creator) MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. " "Verify daemon is up and running and reset the " "Docker daemon in Docker device preferences " - "or restart Qt Creator.")); + "or restart %1.") + .arg(QGuiApplication::applicationDisplayName())); }); QTC_ASSERT(m_shell, diff --git a/src/plugins/terminal/terminalpane.cpp b/src/plugins/terminal/terminalpane.cpp index df059d03b3b..a11284ef1bd 100644 --- a/src/plugins/terminal/terminalpane.cpp +++ b/src/plugins/terminal/terminalpane.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -81,7 +82,9 @@ TerminalPane::TerminalPane(QObject *parent) .toString(QKeySequence::NativeText); if (settings().sendEscapeToTerminal()) { m_escSettingButton->setText(escKey); - m_escSettingButton->setToolTip(Tr::tr("Sends Esc to terminal instead of Qt Creator.")); + //: %1 is the application name (Qt Creator) + m_escSettingButton->setToolTip(Tr::tr("Sends Esc to terminal instead of %1.") + .arg(QGuiApplication::applicationDisplayName())); } else { m_escSettingButton->setText(shiftEsc); m_escSettingButton->setToolTip( @@ -106,10 +109,14 @@ TerminalPane::TerminalPane(QObject *parent) if (settings().lockKeyboard()) { m_lockKeyboardButton->setIcon(LOCK_KEYBOARD_ICON.icon()); m_lockKeyboardButton->setToolTip( - Tr::tr("Qt Creator shortcuts are blocked when focus is inside the terminal.")); + //: %1 is the application name (Qt Creator) + Tr::tr("%1 shortcuts are blocked when focus is inside the terminal.") + .arg(QGuiApplication::applicationDisplayName())); } else { m_lockKeyboardButton->setIcon(UNLOCK_KEYBOARD_ICON.icon()); - m_lockKeyboardButton->setToolTip(Tr::tr("Qt Creator shortcuts take precedence.")); + //: %1 is the application name (Qt Creator) + m_lockKeyboardButton->setToolTip(Tr::tr("%1 shortcuts take precedence.") + .arg(QGuiApplication::applicationDisplayName())); } };