diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 888786eba13..94bbf49d0b3 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -24897,8 +24897,8 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné '%1' se nepodařilo spustit: %2 - A timeout occurred running '%1' - Překročení času při spuštění '%1' + A timeout occurred running "%1". + Překročení času při spuštění "%1". '%1' crashed. diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 2d6ee616342..8421c0a6242 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -7806,8 +7806,8 @@ Vil du dræbe den? Kunne ikke starte "%1": %2 - A timeout occurred running "%1" - Timeout under kørsel af "%1" + A timeout occurred running "%1". + Timeout under kørsel af "%1". "%1" crashed. diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 695b64e9774..3fc1a98bfe2 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -6385,8 +6385,8 @@ Exporting assets: %2 - A timeout occurred running "%1" - Zeitüberschreitung bei Ausführung von "%1" + A timeout occurred running "%1". + Zeitüberschreitung bei Ausführung von "%1". "%1" crashed. @@ -9410,7 +9410,7 @@ Locked components cannot be modified or selected. Kommandozeilen-Werkzeug für Android-SDK ist installiert. - Android SDK Command-line Tools run. + Android SDK Command-line Tools runs. Kommandozeilen-Werkzeug für Android-SDK startet erfolgreich. @@ -12470,8 +12470,8 @@ Siehe auch die Einstellungen für Google Test. Zieltreiber: - Starting %1 ... - Starte %1 ... + Starting %1... + Starte %1... Choose the desired startup mode of the GDB server provider. @@ -17014,7 +17014,7 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a Fordert Vorschläge für die Cursorposition des aktuellen Editors von Copilot an. - Show next Copilot Suggestion + Show Next Copilot Suggestion Nächsten Copilot-Vorschlag zeigen @@ -17022,7 +17022,7 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a Iteriert über die Vorschläge von Copilot und zeigt den nächsten verfügbaren Vorschlag. - Show previos Copilot Suggestion + Show Previous Copilot Suggestion Vorangehenden Copilot-Vorschlag zeigen @@ -17991,8 +17991,8 @@ Trotzdem fortfahren? "%1" konnte nicht gestartet werden: %2 - A timeout occurred running "%1" - Zeitüberschreitung bei Ausführung von "%1" + A timeout occurred running "%1". + Zeitüberschreitung bei Ausführung von "%1". "%1" crashed. @@ -27673,8 +27673,8 @@ Versuchen Sie, das Projekt neu zu erstellen. Die Liste der Quellverzeichnisse sollte nicht leer sein. - Host directories to mount into the container - Host-Verzeichnisse die in den Container eingehängt werden sollen + Host directories to mount into the container. + Host-Verzeichnisse die in den Container eingehängt werden sollen. Maps paths in this list one-to-one to the docker container. @@ -49406,9 +49406,9 @@ Zieldatei "%1" existiert bereits. Could not merge results into single results.xml. -Failed to open file "%1" +Failed to open file "%1". Die Ergebnisse konnten nicht in einer einzelnen 'results.xml'-Datei zusammengeführt werden. -Die Datei "%1" konnte nicht geöffnet werden +Die Datei "%1" konnte nicht geöffnet werden. Error while parsing first test result. @@ -49805,7 +49805,7 @@ Die Datei "%1" konnte nicht geöffnet werden Escape-Taste zum Terminal senden - Sends the escape key to the terminal when pressedinstead of closing the terminal. + Sends the escape key to the terminal when pressed instead of closing the terminal. Sendet die Escape-Taste zum Terminal, anstatt das Terminal zu schliessen. @@ -52963,8 +52963,8 @@ Die Trace-Daten sind verloren. Ausschl&ussmuster: - List of comma separated wildcard filters. - Kommaseparierte Liste von Platzhalter-Filtern. + List of comma separated wildcard filters. + Kommaseparierte Liste von Platzhalter-Filtern. Files with file name or full file path matching any filter are included. @@ -58306,7 +58306,7 @@ Are you sure you want to remove the material? Vcpkg Manifest-Editor - Name: + Name: Name: diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 6865214290b..ab8e488103b 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -6336,8 +6336,8 @@ Export des ressources : %2 Impossible de générer le fichier de ressource : %1 - A timeout occurred running "%1" - Un dépassement de délai s’est produit lors de l’exécution de « %1 » + A timeout occurred running "%1". + Un dépassement de délai s’est produit lors de l’exécution de « %1 ». "%1" crashed. @@ -12731,8 +12731,8 @@ Avertissement : fonctionnalité expérimentale pouvant entraîner un échec Pilote cible : - Starting %1 ... - Démarrage de %1 … + Starting %1... + Démarrage de %1… Version @@ -16725,7 +16725,7 @@ Le code a été copié dans votre presse-papiers. Requête de suggestion Copilot à la position actuelle du curseur de l'éditeur. - Show next Copilot Suggestion + Show Next Copilot Suggestion Afficher la suggestion Copilot suivante @@ -16733,7 +16733,7 @@ Le code a été copié dans votre presse-papiers. Alterner parmi les suggestions Copilot reçues pour afficher la suggestion suivante disponible. - Show previos Copilot Suggestion + Show Previous Copilot Suggestion Afficher la suggestion Copilot précédente @@ -20030,8 +20030,8 @@ Double-cliquez pour modifier l’élément. Impossible de lancer « %1 » : %2 - A timeout occurred running "%1" - Un dépassement de délai s’est produit lors de l’exécution de « %1 » + A timeout occurred running "%1". + Un dépassement de délai s’est produit lors de l’exécution de « %1 ». "%1" crashed. @@ -27418,8 +27418,8 @@ La recompilation du projet peut aider. La liste des répertoires sources ne doit pas être vide. - Host directories to mount into the container - Répertoires hôtes à monter dans le conteneur + Host directories to mount into the container. + Répertoires hôtes à monter dans le conteneur. Maps paths in this list one-to-one to the docker container. @@ -49074,9 +49074,9 @@ Le fichier de destination « %1 » existe déjà. Could not merge results into single results.xml. -Failed to open file "%1" +Failed to open file "%1". Impossible de fusionner les résultats dans un unique fichier results.xml. -Impossible d'ouvrir le fichier « %1 » +Impossible d'ouvrir le fichier « %1 ». Error while parsing first test result. @@ -49473,7 +49473,7 @@ Impossible d'ouvrir le fichier « %1 » Envoyer la touche d'échappement au terminal - Sends the escape key to the terminal when pressedinstead of closing the terminal. + Sends the escape key to the terminal when pressed instead of closing the terminal. Envoi la touche d'échappement au terminal lorsque appuyé au lieu de fermer le terminal. @@ -52695,8 +52695,8 @@ Les données de la trace sont perdues. Motif d’excl&usion : - List of comma separated wildcard filters. - Liste de filtres joker séparés par des virgules. + List of comma separated wildcard filters. + Liste de filtres joker séparés par des virgules. Files with file name or full file path matching any filter are included. @@ -54704,8 +54704,8 @@ Vérifiez les paramètres pour vous assurer que Valgrind est installé et dispon Éditeur de Manifest Vcpkg - Name: - Nom: + Name: + Nom : Version: diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index c408f28563a..5cb6489b7ed 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -18568,8 +18568,8 @@ Do you want to kill it? Nije moguće pokrenuti „%1”: %2 - A timeout occurred running "%1" - Došlo je do prekoračenja vremena prilikom pokretanja „%1” + A timeout occurred running "%1". + Došlo je do prekoračenja vremena prilikom pokretanja „%1”. "%1" crashed. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 6bfd303b72d..71665c23d51 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -32559,8 +32559,8 @@ API バージョンが %1 以上の SDK をインストールしてください "%1" を起動できません: %2 - A timeout occurred running "%1" - "%1" を実行中にタイムアウトが発生しました + A timeout occurred running "%1". + "%1" を実行中にタイムアウトが発生しました。 "%1" crashed. @@ -46500,8 +46500,8 @@ Stepping into the module or setting breakpoints by file and line is expected to QmlDesigner::GenerateResource - A timeout occurred running "%1" - "%1" を実行中にタイムアウトが発生しました + A timeout occurred running "%1". + "%1" を実行中にタイムアウトが発生しました。 "%1" crashed. diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index f207ab64d56..fb3b9a36e3f 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -28623,8 +28623,8 @@ Do you want to check them out now? Nie można uruchomić "%1": %2 - A timeout occurred running "%1" - Przekroczono limit czasu oczekiwania na odpowiedź od uruchomionego "%1" + A timeout occurred running "%1". + Przekroczono limit czasu oczekiwania na odpowiedź od uruchomionego "%1". "%1" crashed. diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 23561e76c50..ed5d78ba7a2 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -10560,8 +10560,8 @@ Double-click to edit item. Не удалось запустить «%1»: %2 - A timeout occurred running "%1" - Истекло время работы «%1» + A timeout occurred running "%1". + Истекло время работы «%1». "%1" crashed. @@ -34843,8 +34843,8 @@ Neither the path to the library nor the path to its includes is added to the .pr Не удалось создать файл ресурсов: %1 - A timeout occurred running "%1" - Истекло время работы «%1» + A timeout occurred running "%1". + Истекло время работы «%1». "%1" crashed. diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 97b4fe1b6cc..e5b3b87b02b 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -15893,8 +15893,8 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.Ni moč zagnati »%1«: %2 - A timeout occurred running '%1' - Med poganjanjem »%1« je potekel čas + A timeout occurred running "%1". + Med poganjanjem »%1« je potekel čas. '%1' crashed. diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 5e90d729015..432f5ab3a24 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -35645,8 +35645,8 @@ Install an SDK of at least API version %1. Неможливо запустити "%1": %2 - A timeout occurred running "%1" - Час очікування вичерпано для "%1" + A timeout occurred running "%1". + Час очікування вичерпано для "%1". "%1" crashed. diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 0cae4a5a7a2..3ae81e4f3ea 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -1308,8 +1308,8 @@ This cannot be undone. 无法为 %1 创建文件 “%2” - A timeout occurred running "%1" - 运行 “%1” 时超时 + A timeout occurred running "%1". + 运行 “%1” 时超时。 Crash while creating file for %1 "%2" @@ -4114,7 +4114,7 @@ Warning: this is an experimental feature and might lead to failing to execute th 目标驱动器: - Starting %1 ... + Starting %1... 启动 %1... @@ -8538,7 +8538,7 @@ Set a valid executable first. - A timeout occurred running "%1" + A timeout occurred running "%1". @@ -18145,7 +18145,7 @@ Rebuilding the project might help. - Host directories to mount into the container + Host directories to mount into the container. @@ -33329,7 +33329,7 @@ The following files or directories are missing: - A timeout occurred running "%1" + A timeout occurred running "%1". @@ -41375,7 +41375,7 @@ Destination file "%1" already exists. Could not merge results into single results.xml. -Failed to open file "%1" +Failed to open file "%1". diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 500e7548e81..d21d4d9bca2 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -13569,8 +13569,8 @@ Requires <b>Qt 4.7.4</b> or newer. 無法啟動 '%1':%2 - A timeout occurred running '%1' - 執行 '%1' 發生逾時 + A timeout occurred running "%1". + 執行 '%1' 發生逾時。 '%1' crashed. diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 6340d5e1191..f97934cde40 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -495,7 +495,7 @@ QString msgExclusionPatternLabel() QString msgFilePatternToolTip(InclusionType inclusionType) { - return Tr::tr("List of comma separated wildcard filters. ") + return Tr::tr("List of comma separated wildcard filters.") + " " + (inclusionType == InclusionType::Included ? Tr::tr("Files with file name or full file path matching any filter are included.") : Tr::tr("Files with file name or full file path matching any filter are excluded.")); diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index c48ad217ec0..ce8fbcf8614 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -281,7 +281,7 @@ AndroidSettingsWidget::AndroidSettingsWidget() { JavaPathExistsAndWritableRow, Tr::tr("JDK path exists and is writable.") }, { SdkPathExistsAndWritableRow, Tr::tr("Android SDK path exists and is writable.") }, { SdkToolsInstalledRow, Tr::tr("Android SDK Command-line Tools installed.") }, - { SdkManagerSuccessfulRow, Tr::tr("Android SDK Command-line Tools run.") }, + { SdkManagerSuccessfulRow, Tr::tr("Android SDK Command-line Tools runs.") }, { PlatformToolsInstalledRow, Tr::tr("Android SDK Platform-Tools installed.") }, { AllEssentialsInstalledRow, Tr::tr( "All essential packages installed for all installed Qt versions.") }, diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp index 49eccb1187c..f77a0ce0cfd 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp @@ -368,8 +368,7 @@ UvscServerProviderRunner::UvscServerProviderRunner(ProjectExplorer::RunControl * void UvscServerProviderRunner::start() { - const QString msg = Tr::tr("Starting %1 ...") - .arg(m_process.commandLine().displayName()); + const QString msg = Tr::tr("Starting %1...").arg(m_process.commandLine().displayName()); appendMessage(msg, NormalMessageFormat); m_process.start(); diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp index 8af42ae0c07..47364c60d7d 100644 --- a/src/plugins/copilot/copilotplugin.cpp +++ b/src/plugins/copilot/copilotplugin.cpp @@ -72,7 +72,7 @@ void CopilotPlugin::initialize() ActionManager::registerAction(requestAction, Constants::COPILOT_REQUEST_SUGGESTION); QAction *nextSuggestionAction = new QAction(this); - nextSuggestionAction->setText(Tr::tr("Show next Copilot Suggestion")); + nextSuggestionAction->setText(Tr::tr("Show Next Copilot Suggestion")); nextSuggestionAction->setToolTip(Tr::tr( "Cycles through the received Copilot Suggestions showing the next available Suggestion.")); @@ -84,7 +84,7 @@ void CopilotPlugin::initialize() ActionManager::registerAction(nextSuggestionAction, Constants::COPILOT_NEXT_SUGGESTION); QAction *previousSuggestionAction = new QAction(this); - previousSuggestionAction->setText(Tr::tr("Show previos Copilot Suggestion")); + previousSuggestionAction->setText(Tr::tr("Show Previous Copilot Suggestion")); previousSuggestionAction->setToolTip(Tr::tr("Cycles through the received Copilot Suggestions " "showing the previous available Suggestion.")); diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index 89144f7a27d..c17db9ba927 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -97,8 +97,8 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec if (!patchProcess.readDataFromProcess(&stdOut, &stdErr)) { patchProcess.stop(); patchProcess.waitForFinished(); - MessageManager::writeFlashing(Tr::tr("A timeout occurred running \"%1\"") - .arg(patch.toUserOutput())); + MessageManager::writeFlashing( + Tr::tr("A timeout occurred running \"%1\".").arg(patch.toUserOutput())); return false; } diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index ec6403dd79f..c47de707914 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -187,7 +187,7 @@ DockerDeviceSettings::DockerDeviceSettings() mounts.setLabelText(Tr::tr("Paths to mount:")); mounts.setDefaultValue({Core::DocumentManager::projectsDirectory().toString()}); mounts.setToolTip(Tr::tr("Maps paths in this list one-to-one to the docker container.")); - mounts.setPlaceHolderText(Tr::tr("Host directories to mount into the container")); + mounts.setPlaceHolderText(Tr::tr("Host directories to mount into the container.")); extraArgs.setSettingsKey(DockerDeviceExtraArgs); extraArgs.setLabelText(Tr::tr("Extra arguments:")); diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index e2d6dad9a95..de8cd5a80b4 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -190,9 +190,10 @@ static bool runRcc(const CommandLine &command, const FilePath &workingDir, QByteArray stdOut; QByteArray stdErr; if (!rccProcess.readDataFromProcess(&stdOut, &stdErr)) { - Core::MessageManager::writeDisrupting(QCoreApplication::translate( - "QmlDesigner::GenerateResource", "A timeout occurred running \"%1\"") - .arg(rccProcess.commandLine().toUserOutput())); + Core::MessageManager::writeDisrupting( + QCoreApplication::translate("QmlDesigner::GenerateResource", + "A timeout occurred running \"%1\".") + .arg(rccProcess.commandLine().toUserOutput())); return false; } if (!stdOut.trimmed().isEmpty()) diff --git a/src/plugins/squish/squishxmloutputhandler.cpp b/src/plugins/squish/squishxmloutputhandler.cpp index a9f59af44a3..d41e4bccc8d 100644 --- a/src/plugins/squish/squishxmloutputhandler.cpp +++ b/src/plugins/squish/squishxmloutputhandler.cpp @@ -50,7 +50,7 @@ void SquishXmlOutputHandler::mergeResultFiles(const Utils::FilePaths &reportFile if (!resultsXML.open(QFile::WriteOnly)) { if (error) *error = Tr::tr("Could not merge results into single results.xml.\n" - "Failed to open file \"%1\"") + "Failed to open file \"%1\".") .arg(resultsXML.fileName()); return; } diff --git a/src/plugins/terminal/terminalsettings.cpp b/src/plugins/terminal/terminalsettings.cpp index 63fcdac3bb1..57093d20a6e 100644 --- a/src/plugins/terminal/terminalsettings.cpp +++ b/src/plugins/terminal/terminalsettings.cpp @@ -482,9 +482,8 @@ TerminalSettings::TerminalSettings() sendEscapeToTerminal.setSettingsKey("SendEscapeToTerminal"); sendEscapeToTerminal.setLabelText(Tr::tr("Send escape key to terminal")); - sendEscapeToTerminal.setToolTip( - Tr::tr("Sends the escape key to the terminal when pressed" - "instead of closing the terminal.")); + sendEscapeToTerminal.setToolTip(Tr::tr("Sends the escape key to the terminal when pressed " + "instead of closing the terminal.")); sendEscapeToTerminal.setDefaultValue(false); lockKeyboard.setSettingsKey("LockKeyboard"); diff --git a/src/plugins/vcpkg/vcpkgsearch.cpp b/src/plugins/vcpkg/vcpkgsearch.cpp index ddf42bd8a61..dd0f4e93d7d 100644 --- a/src/plugins/vcpkg/vcpkgsearch.cpp +++ b/src/plugins/vcpkg/vcpkgsearch.cpp @@ -88,6 +88,7 @@ VcpkgPackageSearchDialog::VcpkgPackageSearchDialog(const VcpkgManifest &preexist m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + // clang-format off using namespace Layouting; Column { Row { @@ -99,7 +100,7 @@ VcpkgPackageSearchDialog::VcpkgPackageSearchDialog(const VcpkgManifest &preexist Group { title(Tr::tr("Package details")), Form { - Tr::tr("Name:"), m_vcpkgName, br, + Tr::tr("Name:"), m_vcpkgName, br, Tr::tr("Version:"), m_vcpkgVersion, br, Tr::tr("License:"), m_vcpkgLicense, br, Tr::tr("Description:"), m_vcpkgDescription, br, @@ -109,6 +110,7 @@ VcpkgPackageSearchDialog::VcpkgPackageSearchDialog(const VcpkgManifest &preexist }, Row { m_infoLabel, m_buttonBox }, }.attachTo(this); + // clang-format on m_allPackages = vcpkgManifests(settings().vcpkgRoot());