feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tr: Parametrize some application names

Browse Source 
Change-Id: I5222455d895aecb94c9a96d0a0f4fd7c279a7388
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2023-10-16 10:58:23 +02:00
parent 74cf082ee9
commit cee8309998
6 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/translations/qtcreator_de.ts
View File

@@ -21872,9 +21872,9 @@ z.B. name = &quot;m_test_foo_&quot;:
<translation>Bestimmt, ob Clangd beim Vervollständigen von Symbolen Header-Dateien einfügen darf.</translation> <translation>Bestimmt, ob Clangd beim Vervollständigen von Symbolen Header-Dateien einfügen darf.</translation>
</message> </message>
<message> <message>
<source>Defines the amount of time Qt Creator waits before sending document changes to the server. <source>Defines the amount of time %1 waits before sending document changes to the server.
If the document changes again while waiting, this timeout resets.</source> If the document changes again while waiting, this timeout resets.</source>
<translation>Bestimmt die Zeit, die Qt Creator vor dem Senden von Dokumentänderungen an den Server wartet. <translation>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.</translation> Falls sich das Dokument innerhalb dieser Zeit wieder ändert, wird erneut die volle Zeit gewartet.</translation>
</message> </message>
<message> <message>
@@ -27577,8 +27577,8 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<translation>Shell in Container öffnen</translation> <translation>Shell in Container öffnen</translation>
</message> </message>
<message> <message>
<source>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.</source> <source>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.</source>
<translation>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.</translation> <translation>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.</translation>
</message> </message>
<message> <message>
<source>Docker Image Selection</source> <source>Docker Image Selection</source>
@@ -49685,8 +49685,8 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden</translation>
<translation>Einstellungen...</translation> <translation>Einstellungen...</translation>
</message> </message>
<message> <message>
<source>Sends Esc to terminal instead of Qt Creator.</source> <source>Sends Esc to terminal instead of %1.</source>
<translation>Sendet Escape zum Terminal statt zu Qt Creator.</translation> <translation>Sendet Escape zum Terminal statt zu %1.</translation>
</message> </message>
<message> <message>
<source>Press %1 to send Esc to terminal.</source> <source>Press %1 to send Esc to terminal.</source>

12
share/qtcreator/translations/qtcreator_fr.ts
View File

@@ -20297,9 +20297,9 @@ Double-cliquez pour modifier l’élément.</translation>
<translation>Contrôle si clangd peut insérer des fichiers d’en-tête dans le cadre de la complétion de symboles.</translation> <translation>Contrôle si clangd peut insérer des fichiers d’en-tête dans le cadre de la complétion de symboles.</translation>
</message> </message>
<message> <message>
<source>Defines the amount of time Qt Creator waits before sending document changes to the server. <source>Defines the amount of time %1 waits before sending document changes to the server.
If the document changes again while waiting, this timeout resets.</source> If the document changes again while waiting, this timeout resets.</source>
<translation>Définit le temps d’attente de Qt Creator avant d’envoyer les modifications du document au serveur. <translation>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é.</translation> Si le document est à nouveau modifié pendant l’attente, ce délai est réinitialisé.</translation>
</message> </message>
<message> <message>
@@ -27322,8 +27322,8 @@ La recompilation du projet peut aider.</translation>
<translation>Ouvrir un shell dans le conteneur</translation> <translation>Ouvrir un shell dans le conteneur</translation>
</message> </message>
<message> <message>
<source>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.</source> <source>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.</source>
<translation>Le démon Docker ne semble pas fonctionner. Vérifiez que le démon est présent et en cours d&apos;exécution et réinitialisez le démon docker dans les paramètres du périphérique docker ou redémarrez Qt Creator.</translation> <translation>Le démon Docker ne semble pas fonctionner. Vérifiez que le démon est présent et en cours d&apos;exécution et réinitialisez le démon docker dans les paramètres du périphérique docker ou redémarrez %1.</translation>
</message> </message>
<message> <message>
<source>Docker Image Selection</source> <source>Docker Image Selection</source>
@@ -49353,8 +49353,8 @@ Impossible d&apos;ouvrir le fichier «&#xa0;%1&#xa0;»</translation>
<translation>Configurer…</translation> <translation>Configurer…</translation>
</message> </message>
<message> <message>
<source>Sends Esc to terminal instead of Qt Creator.</source> <source>Sends Esc to terminal instead of %1.</source>
<translation>Envoie Échap au terminal au lieu d&apos;à Qt Creator.</translation> <translation>Envoie Échap au terminal au lieu d&apos;à %1.</translation>
</message> </message>
<message> <message>
<source>Press %1 to send Esc to terminal.</source> <source>Press %1 to send Esc to terminal.</source>

2
share/qtcreator/translations/qtcreator_zh_CN.ts
View File

@@ -11554,7 +11554,7 @@ to version control (%2)
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Defines the amount of time Qt Creator waits before sending document changes to the server. <source>Defines the amount of time %1 waits before sending document changes to the server.
If the document changes again while waiting, this timeout resets.</source> If the document changes again while waiting, this timeout resets.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

11
src/plugins/cppeditor/cppcodemodelsettingspage.cpp
View File

@@ -24,14 +24,15 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QFormLayout> #include <QFormLayout>
#include <QGroupBox> #include <QGroupBox>
#include <QGuiApplication>
#include <QInputDialog> #include <QInputDialog>
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
#include <QStringListModel> #include <QStringListModel>
#include <QTextBlock>
#include <QTextStream> #include <QTextStream>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QVersionNumber> #include <QVersionNumber>
#include <QTextBlock>
#include <limits> #include <limits>
@@ -244,10 +245,12 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
"worker threads."); "worker threads.");
const QString autoIncludeToolTip = Tr::tr( const QString autoIncludeToolTip = Tr::tr(
"Controls whether clangd may insert header files as part of symbol completion."); "Controls whether clangd may insert header files as part of symbol completion.");
const QString documentUpdateToolTip = Tr::tr( const QString documentUpdateToolTip
"Defines the amount of time Qt Creator waits before sending document changes to the " //: %1 is the application name (Qt Creator)
= Tr::tr("Defines the amount of time %1 waits before sending document changes to the "
"server.\n" "server.\n"
"If the document changes again while waiting, this timeout resets."); "If the document changes again while waiting, this timeout resets.")
.arg(QGuiApplication::applicationDisplayName());
const QString sizeThresholdToolTip = Tr::tr( const QString sizeThresholdToolTip = Tr::tr(
"Files greater than this will not be opened as documents in clangd.\n" "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."); "The built-in code model will handle highlighting, completion and so on.");

4
src/plugins/docker/dockerdevice.cpp
View File

@@ -913,10 +913,12 @@ expected_str<void> DockerDevicePrivate::startContainer()
qCWarning(dockerDeviceLog) << "Container shell encountered error:" << resultData.m_error; qCWarning(dockerDeviceLog) << "Container shell encountered error:" << resultData.m_error;
DockerApi::recheckDockerDaemon(); DockerApi::recheckDockerDaemon();
//: %1 is the application name (Qt Creator)
MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. " MessageManager::writeFlashing(Tr::tr("Docker daemon appears to be not running. "
"Verify daemon is up and running and reset the " "Verify daemon is up and running and reset the "
"Docker daemon in Docker device preferences " "Docker daemon in Docker device preferences "
"or restart Qt Creator.")); "or restart %1.")
.arg(QGuiApplication::applicationDisplayName()));
}); });
QTC_ASSERT(m_shell, QTC_ASSERT(m_shell,

13
src/plugins/terminal/terminalpane.cpp
View File

@@ -26,6 +26,7 @@
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <QFileIconProvider> #include <QFileIconProvider>
#include <QGuiApplication>
#include <QMenu> #include <QMenu>
#include <QStandardPaths> #include <QStandardPaths>
#include <QToolButton> #include <QToolButton>
@@ -81,7 +82,9 @@ TerminalPane::TerminalPane(QObject *parent)
.toString(QKeySequence::NativeText); .toString(QKeySequence::NativeText);
if (settings().sendEscapeToTerminal()) { if (settings().sendEscapeToTerminal()) {
m_escSettingButton->setText(escKey); 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 { } else {
m_escSettingButton->setText(shiftEsc); m_escSettingButton->setText(shiftEsc);
m_escSettingButton->setToolTip( m_escSettingButton->setToolTip(
@@ -106,10 +109,14 @@ TerminalPane::TerminalPane(QObject *parent)
if (settings().lockKeyboard()) { if (settings().lockKeyboard()) {
m_lockKeyboardButton->setIcon(LOCK_KEYBOARD_ICON.icon()); m_lockKeyboardButton->setIcon(LOCK_KEYBOARD_ICON.icon());
m_lockKeyboardButton->setToolTip( 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 { } else {
m_lockKeyboardButton->setIcon(UNLOCK_KEYBOARD_ICON.icon()); 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()));
} }
}; };