From a663473f8f5d15caf5f1542b713fa6fefa1be339 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Jul 2022 16:37:33 +0200 Subject: [PATCH] QtSupport: Convert to Tr::tr Change-Id: Id0f7a2e55f329fe37b9c23e890c314e145e36d79 Reviewed-by: Eike Ziller --- share/qtcreator/translations/qtcreator_cs.ts | 100 ++----- share/qtcreator/translations/qtcreator_da.ts | 33 +-- share/qtcreator/translations/qtcreator_de.ts | 40 +-- share/qtcreator/translations/qtcreator_fr.ts | 105 ++----- share/qtcreator/translations/qtcreator_hr.ts | 277 +----------------- share/qtcreator/translations/qtcreator_ja.ts | 146 ++------- share/qtcreator/translations/qtcreator_pl.ts | 35 ++- share/qtcreator/translations/qtcreator_ru.ts | 54 +--- share/qtcreator/translations/qtcreator_sl.ts | 19 +- share/qtcreator/translations/qtcreator_uk.ts | 79 ++--- .../qtcreator/translations/qtcreator_zh_CN.ts | 96 +----- .../qtcreator/translations/qtcreator_zh_TW.ts | 74 +---- src/plugins/qtsupport/baseqtversion.cpp | 160 +++++----- src/plugins/qtsupport/baseqtversion.h | 2 - src/plugins/qtsupport/codegensettings.cpp | 25 +- src/plugins/qtsupport/codegensettingspage.cpp | 22 +- src/plugins/qtsupport/exampleslistmodel.cpp | 1 - .../qtsupport/gettingstartedwelcomepage.cpp | 37 +-- src/plugins/qtsupport/qtbuildaspects.cpp | 11 +- src/plugins/qtsupport/qtkitinformation.cpp | 26 +- src/plugins/qtsupport/qtoptionspage.cpp | 107 ++++--- src/plugins/qtsupport/qtoptionspage.h | 6 +- src/plugins/qtsupport/qtsupportplugin.cpp | 30 +- src/plugins/qtsupport/qtversions.cpp | 17 +- src/plugins/qtsupport/qtversions.h | 6 +- .../qtsupport/translationwizardpage.cpp | 19 +- 26 files changed, 417 insertions(+), 1110 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 98af546b3a9..e40973670ae 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -28664,7 +28664,7 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -28675,6 +28675,9 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v %1: Path to qmake executable Příkaz qmake: "%1" se nepodařilo nalézt, nebo není spustitelný. + + + QmakeProjectManager::QtVersion Qmake does not support build directories below the source directory. Qmake nepodporuje žádné sestavování v adresářích, které se nacházejí pod zdrojovým adresářem. @@ -28685,7 +28688,7 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v - QtVersion + QtSupport No qmake path set Není nastavena žádná cesta ke qmake @@ -31177,7 +31180,7 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto - QtSupport::Internal::DebuggingHelper + QtSupport Used to extract QML type information from library-based plugins. Používá se k určení informace o typu QML pro na knihovně založené přídavné moduly. @@ -31240,7 +31243,7 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Název verze: @@ -31255,7 +31258,7 @@ Vyžaduje Qt 4.7.4 nebo novější, a soubor součástek nainstalovaný pro tuto - QtSupport::Internal::QtVersionManager + QtSupport Name Název @@ -39808,47 +39811,7 @@ Vyžaduje <b>Qt 4.7.0</b> nebo novější. - QtSupport::Internal::GettingStartedWelcomePage - - Demos and Examples - Dema a příklady - - - Copy Project to writable Location? - Má se projekt zkopírovat do zapisovatelného umístění? - - - <p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p> - <p>Projekt, který se chystáte otevřít, je v místě chráněném před zápisem:</p><blockquote>%1</blockquote><p>Níže vyberte zapisovatelné umístění a klepněte na "Kopírovat projekt a otevřít" abyste otevřeli upravovatelnou kopii projektu, anebo klepněte na "Zachovat projekt a otevřít" abyste otevřeli projektu na místě.</p><p><b>Poznámka:</b> V současném umístění projekt nelze ani sestavit ani změnit.</p> - - - &Location: - &Umístění: - - - &Copy Project and Open - &Kopírovat projekt a otevřít - - - &Keep Project and Open - &Zachovat projekt a otevřít - - - Cannot Use Location - Umístění nelze použít - - - The specified location already exists. Please specify a valid location. - Zadané umístění již existuje. Zadejte, prosím, platné umístění. - - - Cannot Copy Project - Chyba při kopírování projektu - - - Failed to open project - Nepodařilo se otevřít projekt - + QtSupport Getting Started Jak začít @@ -39963,7 +39926,7 @@ Důvod: %2 - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <Zadejte název> @@ -40099,7 +40062,7 @@ Důvod: %2 - QtSupport::QtVersionManager + QtSupport MinGW from %1 MinGW z %1 @@ -46425,7 +46388,7 @@ Tyto předpony se používají dodatečně k nynějšímu názvu souboru na Pře - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Záznam o sestavení pomocného ladicího programu @@ -51082,7 +51045,7 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Příklady @@ -54291,7 +54254,7 @@ Chcete, aby jej Qt Creator pro váš projekt vytvořil? - QtSupport::Internal::CustomExecutableConfigurationWidget + QtSupport Command: Příkaz: @@ -54320,18 +54283,6 @@ Chcete, aby jej Qt Creator pro váš projekt vytvořil? Base environment for this run configuration: Základní prostředí pro toto nastavení spuštění: - - Clean Environment - Smazat prostředí - - - System Environment - Prostředí systému - - - Build Environment - Prostředí pro sestavování - CustomExecutableDialog @@ -54341,7 +54292,7 @@ Chcete, aby jej Qt Creator pro váš projekt vytvořil? - QtSupport::CustomExecutableRunConfiguration + QtSupport No executable. Žádný spustitelný soubor. @@ -54376,14 +54327,7 @@ nelze najít v cestě. - QtSupport::CustomExecutableRunConfigurationFactory - - Custom Executable - Uživatelsky stanovený spustitelný soubor - - - - QtSupport::Internal::QtKitConfigWidget + QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. Knihovna Qt k použití pro všechny projekty používající tuto sadu.<br>Je požadována verze Qt pro projekty založené na qmake a jako volitelná při použití jiných sestavovacích systémů. @@ -54392,10 +54336,6 @@ nelze najít v cestě. Manage... Spravovat... - - None - Žádný - Qt version: Verze Qt: @@ -54406,7 +54346,7 @@ nelze najít v cestě. - QtSupport::QtKitInformation + QtSupport Qt version Verze Qt @@ -57480,14 +57420,14 @@ Commit now? - QtSupport::Internal::QtVersionsModel + QtSupport All Versions Všechny verze - QtSupport::Internal::QtSupportPlugin + QtSupport Full path to the host bin directory of the current project's Qt version. Úplná cesta k adresáři bin hostitele verze Qt nynějšího projektu. @@ -57498,7 +57438,7 @@ Commit now? - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: '%1' Pro QMake nebyla nalezena žádná továrna: '%1' diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index b867cf77879..0aa00ff2460 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -30505,7 +30505,7 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro- - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -30516,6 +30516,9 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro- %1: Path to qmake executable Qmake-kommandoen "%1" blev ikke fundet eller er ikke eksekverbar. + + + QmakeProjectManager::QtVersion The build directory needs to be at the same level as the source directory. Bygmappen skal være på samme niveau som kildemappen. @@ -34534,7 +34537,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Embedding of the UI Class Indlejring af brugerflade-klassen @@ -34569,7 +34572,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Eksempler @@ -34624,11 +34627,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtKitConfigWidget - - None - Ingen - + QtSupport Qt version: Qt version: @@ -34643,7 +34642,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <angiv et navn> @@ -34726,7 +34725,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtSupportPlugin + QtSupport Full path to the host bin directory of the current project's Qt version. Fuld sti til værtens bin-mappe af det aktuelle projekts Qt version. @@ -34737,7 +34736,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Versionsnavn: @@ -34752,7 +34751,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtVersionManager + QtSupport Add... Tilføj... @@ -34767,21 +34766,21 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Fejlretningshjælper byglog - QtSupport::ProMessageHandler + QtSupport [Inexact] [ineksakt] - QtSupport::QtKitInformation + QtSupport Qt version Qt version @@ -34880,7 +34879,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: "%1" Ingen fabrik fundet for qmake: "%1" @@ -34901,7 +34900,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf - QtVersion + QtSupport <unknown> <ukendt> diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 891580cc66f..a15c6b19e32 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -9898,7 +9898,7 @@ Dies ist unabhängig vom Wert der Eigenschaft "visible" in QML. - QtVersion + QtSupport No qmake path set Es ist keine qmake-Pfad gesetzt @@ -14457,7 +14457,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält. - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Name der Version: @@ -14472,7 +14472,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält. - QtSupport::Internal::QtVersionManager + QtSupport Remove Entfernen @@ -15526,7 +15526,7 @@ Wollen Sie die Daten vorher speichern? - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <Geben Sie einen Namen an> @@ -15583,10 +15583,6 @@ Wollen Sie die Daten vorher speichern? All Alle - - None - Keine - Remove Invalid Qt Versions Ungültige Qt-Versionen entfernen @@ -15655,10 +15651,6 @@ Wollen Sie die Daten vorher speichern? Choose the Qt installation directory, or a directory that contains "%1". Wählen Sie das Qt-Installationsverzeichnis oder ein Verzeichnis, das "%1" enthält. - - Link with Qt - Mit Qt verknüpfen - Cancel Abbrechen @@ -17544,7 +17536,7 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header- - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Erstellungsprotokoll der Ausgabe-Hilfsbibliothek @@ -18401,7 +18393,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Beispiele @@ -20789,7 +20781,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve - QtSupport::Internal::QtKitConfigWidget + QtSupport %1 (invalid) %1 (ungültig) @@ -21584,7 +21576,7 @@ Entfernt: %4 - QtSupport::Internal::QtSupportPlugin + QtSupport Link with a Qt installation to automatically register Qt versions and kits? To do this later, select Options > Kits > Qt Versions > Link with Qt. Mit einer Qt-Installation verknüpfen, um automatisch Qt-Versionen und Kits zu registrieren? Um dies später zu tun, wählen Sie Einstellungen > Kits > Qt-Versionen > Mit Qt verknüpfen. @@ -21603,7 +21595,7 @@ Entfernt: %4 - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: "%1" Es konnte keine Factory für qmake gefunden werden: "%1" @@ -25638,7 +25630,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -28254,7 +28246,7 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer. - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Embedding of the UI Class Verwendung der UI-Klasse @@ -48885,7 +48877,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - QtSupport::BaseQtVersion + QtSupport Device type is not supported by Qt version. Der Gerätetyp wird von der Qt-Version nicht unterstützt. @@ -48904,7 +48896,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - QtSupport::QtKitAspect + QtSupport Qt version Qt-Version @@ -49015,7 +49007,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - QtSupport::QtQuickCompilerAspect + QtSupport Qt Quick Compiler: Qt-Quick-Compiler: @@ -49026,7 +49018,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - QtSupport::Internal::TranslationWizardPage + QtSupport <none> <leer> @@ -50340,7 +50332,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - QtSupport::QtVersion + QtSupport Qt Version Qt-Version diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index e0ec59d7445..756477b217a 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -28826,7 +28826,7 @@ Nécessite <b>Qt 4.8</b> ou plus récent. - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -28837,6 +28837,9 @@ Nécessite <b>Qt 4.8</b> ou plus récent. %1: Path to qmake executable La commande qmake "%1" n'a pas été trouvée ou n'est pas exécutable. + + + QmakeProjectManager::QtVersion Qmake does not support build directories below the source directory. Qmake ne permet pas d'avoir des répertoires de compilation à un niveau en-dessous des répertoires sources. @@ -28855,7 +28858,7 @@ Nécessite <b>Qt 4.8</b> ou plus récent. - QtVersion + QtSupport No qmake path set Chemin de qmake non spécifié @@ -38824,7 +38827,7 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install - QtSupport::Internal::DebuggingHelper + QtSupport Used to extract QML type information from library-based plugins. Utilisé pour extraire le type d'information QML pour les bibliothèques basées sur des plug-ins. @@ -38887,7 +38890,7 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Nom de version : @@ -38902,7 +38905,7 @@ Ils requièrent Qt 4.7.4 ou supérieur et l'ensemble de composants install - QtSupport::Internal::QtVersionManager + QtSupport Name Nom @@ -41407,54 +41410,7 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f - QtSupport::Internal::GettingStartedWelcomePage - - Demos and Examples - Démonstrations et exemples - - - Copy Project to writable Location? - Copier le projet à un emplacement accessible en écriture ? - - - <p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p> - <p>Le projet que vous vous apprêtez à ouvrir se trouve dans un emplacement accessible en lecture seule :</p><blockquote>%1</blockquote><p>Veuillez sélectionner un emplacement accessible en écriture et cliquez sur "Copier projet et ouvrir" pour ouvrir une copie modifiable. Cliquez sur "Conserver l'emplacement et ouvrir" pour ouvrir le projet à l'emplacement courant.</p><p><b>Note :</b> vous ne pourrez pas modifier ou compiler votre projet à l'emplacement courant.</p> - - - &Location: - &Emplacement : - - - &Copy Project and Open - &Copier le projet et ouvrir - - - &Keep Project and Open - &Conserver l'emplacement et ouvrir - - - Cannot Use Location - Impossible d'utiliser l'emplacement - - - The specified location already exists. Please specify a valid location. - L'emplacement spécifié existe déjà. Veuillez spécifier un autre emplacement. - - - Cannot Copy Project - Impossible de copier le projet - - - Failed to open project - Échec d'ouverture du projet - - - Getting Started - Commencer - - - - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <spécifier un nom> @@ -41590,7 +41546,7 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f - QtSupport::QtVersionManager + QtSupport MinGW from %1 MinGW depuis %1 @@ -45333,7 +45289,7 @@ Ces chemines sont utilisés en complément au répertoire courant pour basculer - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Journal de compilation de l'assistant de debogage @@ -47736,7 +47692,7 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Exemples @@ -52855,7 +52811,7 @@ Voulez-vous que Qt Creator le génère pour votre projet ? - QtSupport::Internal::CustomExecutableConfigurationWidget + QtSupport Command: Commande : @@ -52884,18 +52840,6 @@ Voulez-vous que Qt Creator le génère pour votre projet ? Base environment for this run configuration: Environnement de base pour cette configuration d'exécution : - - Clean Environment - Environnement de nettoyage - - - System Environment - Environnement système - - - Build Environment - Environnement de compilation - CustomExecutableDialog @@ -52905,7 +52849,7 @@ Voulez-vous que Qt Creator le génère pour votre projet ? - QtSupport::CustomExecutableRunConfiguration + QtSupport No executable. Pas d'exécutable. @@ -52940,14 +52884,7 @@ n'a pas pu être trouvé dans le dossier. - QtSupport::CustomExecutableRunConfigurationFactory - - Custom Executable - Exécutable personnalisé - - - - QtSupport::Internal::QtKitConfigWidget + QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. La bibliothèque Qt à utiliser pour tous les projets utilisant ce kit.<br>Une version de Qt est nécesaire pour les projets basés sur qmake et est optionnelle pour les autres systèmes de compilation. @@ -52956,10 +52893,6 @@ n'a pas pu être trouvé dans le dossier. Manage... Gérer... - - None - Aucune - Qt version: Version de Qt : @@ -52970,7 +52903,7 @@ n'a pas pu être trouvé dans le dossier. - QtSupport::QtKitInformation + QtSupport Qt version Version de Qt @@ -57540,14 +57473,14 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un - QtSupport::Internal::QtVersionsModel + QtSupport All Versions Toutes les versions - QtSupport::Internal::QtSupportPlugin + QtSupport Full path to the host bin directory of the current project's Qt version. Chemin complet vers le répertoire bin d'origine de la version Qt actuelle du projet. @@ -57558,7 +57491,7 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: '%1' Aucune fabrique trouvée pour qmake : "%1" diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 36dbacfeaff..c394dd1f4dc 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -7956,7 +7956,7 @@ Sigurno želiš nastaviti? - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Embedding of the UI Class Ugrađivanje klasa korisničkog sučelja @@ -7991,7 +7991,7 @@ Sigurno želiš nastaviti? - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Naziv verzije: @@ -8006,7 +8006,7 @@ Sigurno želiš nastaviti? - QtSupport::Internal::QtVersionManager + QtSupport Add... Dodaj … @@ -8021,7 +8021,7 @@ Sigurno želiš nastaviti? - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Zapis gradnje pomoćnika za uklanjanje grešaka @@ -33733,6 +33733,9 @@ Neither the path to the library nor the path to its includes is added to the .pr The build directory needs to be at the same level as the source directory. + + + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -37260,7 +37263,7 @@ Saving failed. - QtVersion + QtSupport <unknown> <nepoznato> @@ -37408,188 +37411,15 @@ Saving failed. - QtSupport::QtKitInformation - - Qt version - - - - The version string of the current Qt version. - - - - The type of the current Qt version. - - - - The mkspec of the current Qt version. - - - - The installation prefix of the current Qt version. - - - - The installation location of the current Qt version's data. - - - - The installation location of the current Qt version's header files. - - - - The installation location of the current Qt version's library files. - - - - The installation location of the current Qt version's documentation files. - - - - The installation location of the current Qt version's executable files. - - - - The installation location of the current Qt version's plugins. - - - - The installation location of the current Qt version's QML files. - - - - The installation location of the current Qt version's imports. - - - - The installation location of the current Qt version's translation files. - - - - The installation location of the current Qt version's examples. - - - - The installation location of the current Qt version's demos. - - - - The current Qt version's default mkspecs (Qt 4). - - - - The current Qt version's default mkspec (Qt 5; host system). - - - - The current Qt version's default mkspec (Qt 5; target system). - - - - The current Qt's qmake version. - - - - None - Bez - - - Name of Qt Version - - + QtSupport unknown nepoznato - - Path to the qmake executable - - - - - QtSupport::Internal::ExamplesWelcomePage - - Examples - - - - Tutorials - - - - Copy Project to writable Location? - - - - <p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p> - - - - &Location: - - - - &Copy Project and Open - - - - &Keep Project and Open - - - - Cannot Use Location - - - - The specified location already exists. Please specify a valid location. - - - - Cannot Copy Project - - - - Tags: - - - - Search in Examples... - - - - Search in Tutorials... - - - - - QtSupport::ProMessageHandler - - [Inexact] - Prefix used for output from the cumulative evaluation of project files. - - - - - QtSupport::Internal::QtKitConfigWidget None Bez - - Qt version - - - - The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. - - - - %1 (invalid) - - - - - QtSupport::Internal::QtOptionsPageWidget <specify a name> <odredi naziv> @@ -37610,95 +37440,6 @@ Saving failed. qmake Location qmake mjesto - - Remove Invalid Qt Versions - - - - Do you want to remove all invalid Qt Versions?<br><ul><li>%1</li></ul><br>will be removed. - - - - Qt version %1 for %2 - - - - Display Name is not unique. - - - - No compiler can produce code for this Qt version. Please define one or more compilers for: %1 - - - - Not all possible target environments can be supported due to missing compilers. - - - - The following ABIs are currently not supported: %1 - - - - Debugging Helper Build Log for "%1" - - - - Select a qmake Executable - - - - Qt Version Already Known - - - - This Qt version was already registered as "%1". - - - - Qmake Not Executable - - - - The qmake executable %1 could not be added: %2 - - - - Incompatible Qt Versions - - - - The Qt version selected must match the device type. - - - - - QtSupport - - Qt Versions - - - - Qt Class Generation - - - - - QtSupport::Internal::QtSupportPlugin - - Full path to the host bin directory of the current project's Qt version. - - - - Full path to the target bin directory of the current project's Qt version.<br>You probably want %1 instead. - - - - - QtSupport::QtVersionFactory - - No factory found for qmake: "%1" - - RemoteLinux diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 270ae73321f..5332939525a 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -6065,7 +6065,7 @@ Add, modify, and remove document filters, which determine the documentation set - QtSupport::Internal::QtVersionInfo + QtSupport Version name: バージョン名: @@ -6080,7 +6080,7 @@ Add, modify, and remove document filters, which determine the documentation set - QtSupport::Internal::QtVersionManager + QtSupport Add... 追加... @@ -6103,7 +6103,7 @@ Add, modify, and remove document filters, which determine the documentation set - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log デバッグヘルパのビルドログ @@ -30909,7 +30909,7 @@ Do you want to save the data first? - QtVersion + QtSupport <unknown> <不明> @@ -31071,7 +31071,7 @@ Do you want to save the data first? - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -31082,6 +31082,9 @@ Do you want to save the data first? %1: Path to qmake executable qmake コマンド "%1" が見つからないか実行可能ではありません。 + + + QmakeProjectManager::QtVersion The build directory needs to be at the same level as the source directory. ビルドディレクトリはソースディレクトリと同じ階層にある必要があります。 @@ -31140,7 +31143,7 @@ cannot be found in the path. - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples サンプル @@ -31191,121 +31194,18 @@ cannot be found in the path. - QtSupport::Internal::QtKitConfigWidget - - None - なし - + QtSupport Qt version: Qt バージョン: - - The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. - このキットを用いるすべてのプロジェクトで使用する Qt ライブラリです。<br>Qt には qmake ベースのプロジェクトが必要ですが、オプションとしてその他のビルドシステムも使用できます。 - %1 (invalid) %1 (無効) - QtSupport::QtKitInformation - - Qt version - Qt バージョン - - - The version string of the current Qt version. - 現在の Qt のバージョンを表す文字列です。 - - - The type of the current Qt version. - 現在の Qt の種類です。 - - - The mkspec of the current Qt version. - 現在の Qt の mkspec です。 - - - The installation prefix of the current Qt version. - 現在の Qt のインストールプレフィックスです。 - - - The installation location of the current Qt version's data. - 現在の Qt のデータのインストールパスです。 - - - The installation location of the current Qt version's header files. - 現在の Qt のヘッダーファイルのインストールパスです。 - - - The installation location of the current Qt version's library files. - 現在の Qt のライブラリのインストールパスです。 - - - The installation location of the current Qt version's documentation files. - 現在の Qt のドキュメントのインストールパスです。 - - - The installation location of the current Qt version's executable files. - 現在の Qt の実行ファイルのインストールパスです。 - - - The installation location of the current Qt version's plugins. - 現在の Qt のプラグインのインストールパスです。 - - - The installation location of the current Qt version's imports. - 現在の Qt の QML モジュールのインストールパスです。 - - - The installation location of the current Qt version's translation files. - 現在の Qt の翻訳ファイルのインストールパスです。 - - - The installation location of the current Qt version's examples. - 現在の Qt のサンプルのインストールパスです。 - - - The installation location of the current Qt version's demos. - 現在の Qt のデモのインストールパスです。 - - - The current Qt version's default mkspecs (Qt 4). - 現在の Qt の既定の mkspec (Qt 4) です。 - - - The current Qt version's default mkspec (Qt 5; host system) - 現在の Qt の既定の mkspec (Qt 5、ホストシステム) です。 - - - The current Qt version's default mkspec (Qt 5; target system). - 現在の Qt の既定の mkspec (Qt 5、ターゲットシステム) です。 - - - The current Qt's qmake version. - 現在の Qt の qmake のバージョンです。 - - - None - なし - - - Name of Qt Version - Qt バージョン名 - - - unknown - 不明 - - - Path to the qmake executable - qmake 実行ファイルのパス - - - - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <名前を入力> @@ -31416,7 +31316,7 @@ cannot be found in the path. - QtSupport::Internal::QtSupportPlugin + QtSupport Full path to the host bin directory of the current project's Qt version. 現在のプロジェクトの Qt のホスト上の bin ディレクトリのフルパスです。 @@ -31427,7 +31327,7 @@ cannot be found in the path. - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: "%1" qmake 用ファクトリが見つかりません: "%1" @@ -38022,7 +37922,7 @@ the program. - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Form フォーム @@ -45423,7 +45323,7 @@ Android パッケージソースディレクトリのファイルはビルドデ - QtSupport::ProMessageHandler + QtSupport [Inexact] [不完全] @@ -55820,7 +55720,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - QtSupport::BaseQtVersion + QtSupport Device type is not supported by Qt version. Qt がサポートしていないデバイスの種類です。 @@ -55835,7 +55735,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - QtSupport::QtKitAspect + QtSupport Qt version Qt バージョン @@ -55934,21 +55834,11 @@ Stepping into the module or setting breakpoints by file and line is expected to - QtSupport::QtQuickCompilerAspect + QtSupport Disables QML debugging. QML profiling will still work. QML デバッグを無効化します。QML プロファイラは利用可能です。 - - - QtSupport::QtKitAspectWidget - - %1 (invalid) - %1 (無効) - - - - QtSupport::Internal::TranslationWizardPage Language: 言語: diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index ea9c7af5181..4f2dc965d6c 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -12185,7 +12185,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - QtVersion + QtSupport No qmake path set Nie ustawiono ścieżki do qmake @@ -12595,7 +12595,7 @@ które można ustawić poniżej. - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -12606,6 +12606,9 @@ które można ustawić poniżej. %1: Path to qmake executable Komenda qmake "%1" nie została odnaleziona lub nie jest plikiem wykonywalnym. + + + QmakeProjectManager::QtVersion The build directory needs to be at the same level as the source directory. Katalog przeznaczony do budowania musi być na tym samym poziomie co katalog ze źródłami. @@ -16703,7 +16706,7 @@ if (a && - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Nazwa wersji: @@ -16718,7 +16721,7 @@ if (a && - QtSupport::Internal::QtVersionManager + QtSupport Remove Usuń @@ -17946,7 +17949,7 @@ Do you want to save the data first? - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <Podaj nazwę> @@ -20104,7 +20107,7 @@ Przedrostki te, w dodatku do nazwy bieżącego pliku, używane są do przełącz - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Log kompilacji programów pomocniczych debuggera @@ -22820,7 +22823,7 @@ poinstruuje Qt Creatora o URI. - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Przykłady @@ -24088,15 +24091,11 @@ You can choose another communication channel here, such as a serial line or cust - QtSupport::Internal::QtKitConfigWidget + QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. Biblioteka Qt, która zostanie użyta do budowania wszystkich projektów dla tego zestawu narzędzi.<br>Wersja Qt jest wymagana dla projektów bazujących na qmake i opcjonalna dla innych systemów budowania. - - None - Brak - Qt version: Wersja Qt: @@ -24107,7 +24106,7 @@ You can choose another communication channel here, such as a serial line or cust - QtSupport::QtKitInformation + QtSupport Qt version Wersja Qt @@ -26828,7 +26827,7 @@ Zdalny: %4 - QtSupport::Internal::QtSupportPlugin + QtSupport Full path to the host bin directory of the current project's Qt version. Pełna ścieżka do źródłowego podkatalogu "bin" w katalogu instalacji bieżącej wersji Qt. @@ -26839,7 +26838,7 @@ Zdalny: %4 - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: "%1" Brak fabryki dla qmake: "%1" @@ -30421,7 +30420,7 @@ Czy kontynuować instalację? - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Form Formularz @@ -38863,7 +38862,7 @@ Czy nadpisać go? - QtSupport::ProMessageHandler + QtSupport [Inexact] [niedokładny] @@ -43486,7 +43485,7 @@ Termin wygaśnięcia: %3 - QtSupport::Internal::ExamplesPageWidget + QtSupport Search in Examples... Szukaj w przykładach... diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index b4d4118e450..c1c4eee7f8f 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -38662,7 +38662,7 @@ Neither the path to the library nor the path to its includes is added to the .pr - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -44218,7 +44218,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::BaseQtVersion + QtSupport Device type is not supported by Qt version. Устройства этого типа не поддерживается профилем Qt. @@ -44237,7 +44237,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Embedding of the UI Class Встраивание класса UI @@ -44272,7 +44272,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Примеры @@ -44323,14 +44323,11 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtKitConfigWidget + QtSupport %1 (invalid) %1 (неверный) - - - QtSupport::Internal::QtOptionsPageWidget <specify a name> <укажите имя> @@ -44359,10 +44356,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf All Все - - None - Ничего - Do you want to remove all invalid Qt Versions?<br><ul><li>%1</li></ul><br>will be removed. Обнаружены неверные профили Qt:<br><ul><li>%1</li></ul><br>Удалить? @@ -44473,15 +44466,11 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtSupportPlugin + QtSupport Link with a Qt installation to automatically register Qt versions and kits? To do this later, select Options > Kits > Qt Versions > Link with Qt. Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Параметры > Комплекты > Профили Qt > Связать с Qt. - - Link with Qt - Связать с Qt - Full path to the host bin directory of the current project's Qt version. Полный путь на хосте к каталогу bin профиля Qt, используемого в текущем проекте. @@ -44492,7 +44481,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Название профиля: @@ -44507,7 +44496,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtVersionManager + QtSupport Remove Удалить @@ -44524,20 +44513,16 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Register documentation: Регистрация документации: - - Link with Qt... - Связать с Qt... - - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Журнал сборки помощника отладчика - QtSupport::Internal::TranslationWizardPage + QtSupport If you plan to provide translations for your project's user interface via the Qt Linguist tool, please select a language here. A corresponding translation (.ts) file will be generated for you. Укажите здесь язык, если планируете обеспечить проект переводами интерфейса утилитой Qt Linguist. Будет создан соответствующий файл перевода (.ts). @@ -44556,7 +44541,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::QmlDebuggingAspect + QtSupport QML debugging and profiling: Отладка и профилирование QML: @@ -44567,7 +44552,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::QtKitAspect + QtSupport Qt version Профиль Qt @@ -44670,14 +44655,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::QtKitAspectWidget - - None - Нет - - - - QtSupport::QtQuickCompilerAspect + QtSupport Qt Quick Compiler: Компилятор Qt Quick: @@ -44688,7 +44666,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::QtVersion + QtSupport Qt Version Профиль Qt @@ -44699,7 +44677,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: "%1" Не удалось найти фабрику для qmake: «%1» @@ -44720,7 +44698,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtVersion + QtSupport No qmake path set Путь к qmake не указан diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index aff0d4087e0..f8e39fac8a6 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -17998,7 +17998,7 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi. - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -18011,6 +18011,9 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi. Ukaza qmake »%1« ni bilo moč najti ali pa ni izvedljiv. + + + QmakeProjectManager::QtVersion Qmake does not support build directories below the source directory. QMake ne podpira map za gradnjo v mapi z izvorno kodo. @@ -18021,7 +18024,7 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi. - QtVersion + QtSupport No qmake path set Nastavljene ni nobene poti do qmake @@ -20525,7 +20528,7 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt. - QtSupport::Internal::DebuggingHelper + QtSupport Used to extract QML type information from library-based plugins. Uporabljeno za ugotovitev podatkov o vrsti QML iz vstavkov na osnovi knjižnic. @@ -20587,7 +20590,7 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt. - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Ime različice: @@ -20604,7 +20607,7 @@ Potreben je Qt 4.7.4 ali novejši in nabor komponent za vašo različico Qt. - QtSupport::Internal::QtVersionManager + QtSupport Name Ime @@ -27593,7 +27596,7 @@ Program lahko zgradite in ga razmestite na namizju ali na mobilnih platformah. N - QtSupport::Internal::GettingStartedWelcomePage + QtSupport Copy Project to writable Location? Ali želite skopirati projekt na zapisljivo mesto? @@ -27728,7 +27731,7 @@ Razlog: %2 - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <vnesite ime> @@ -27817,7 +27820,7 @@ Razlog: %2 - QtSupport::QtVersionManager + QtSupport MinGW from %1 MinGW iz %1 diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 2428ce8e743..5cf1c375ec2 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -20239,7 +20239,7 @@ Reason: %2 - QmakeProjectManager::QtVersion + QtSuppport The Qt version is invalid: %1 %1: Reason for being invalid @@ -20250,6 +20250,9 @@ Reason: %2 %1: Path to qmake executable Команда qmake "%1" не знайдено або вона не є виконуваним модулем. + + + QmakeProjectManager::QtVersion Qmake does not support build directories below the source directory. Qmake не підтримує тек збірки нижче теки з кодом. @@ -20444,7 +20447,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::DebuggingHelper + QtSupport Used to extract QML type information from library-based plugins. Використовується для отримання інформації про типи QML з додатків-бібліотек. @@ -20495,14 +20498,14 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::GettingStartedWelcomePage + QtSupport Getting Started Починаючи роботу - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <вкажіть назву> @@ -20563,14 +20566,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Remove Invalid Qt Versions Видалити неправильні версії Qt - - Name - Назва - - - qmake Location - Розташування qmake - Type Тип @@ -20626,7 +20621,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtVersionInfo + QtSupport Version name: Назва версії: @@ -20641,7 +20636,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtSupport::Internal::QtVersionManager + QtSupport Name Назва @@ -20668,7 +20663,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf - QtVersion + QtSupport <unknown> <невідома> @@ -20808,30 +20803,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Qt Version is used for embedded Linux development Вбудований Linux - - Maemo - Maemo - - - Qt Simulator - Симулятор Qt - - - Qt for WinCE - Qt для WinCE - - - Harmattan - Harmattan - - - Embedded Linux - Вбудований Linux - - - Desktop - Стаціонарний комп'ютер - RangeDetails @@ -26080,7 +26051,7 @@ These prefixes are used in addition to current file name on Switch Header/Source - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log Журнал збирання помічника зневадження @@ -28205,7 +28176,7 @@ Do you want to kill it? - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples Приклади @@ -33587,7 +33558,7 @@ Do you want to retry? - QtSupport::Internal::CustomExecutableConfigurationWidget + QtSupport Executable: Виконуваний модуль: @@ -33613,7 +33584,7 @@ Do you want to retry? - QtSupport::CustomExecutableRunConfiguration + QtSupport No executable. Немає виконуваного модуля. @@ -33626,24 +33597,20 @@ cannot be found in the path. %1 в стандартних шляхах. - - Custom Executable - Користувацький виконуваний модуль - Run %1 Запустити %1 - QtSupport::CustomExecutableRunConfigurationFactory + QtSupport Custom Executable Користувацький виконуваний модуль - QtSupport::Internal::QtKitConfigWidget + QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. Бібліотека Qt, що буде вживатись усіма проектами, що використовують цей комплект.<br>Версія Qt необхідна для проектів на базі qmake та опціональна для інших систем збірки. @@ -33652,10 +33619,6 @@ cannot be found in the path. Manage... Управління... - - None - Немає - Qt version: Версія Qt: @@ -33666,7 +33629,7 @@ cannot be found in the path. - QtSupport::QtKitInformation + QtSupport The version string of the current Qt version. Рядок версії поточної Qt. @@ -36326,7 +36289,7 @@ Remote: %4 - QtSupport::Internal::QtSupportPlugin + QtSupport Full path to the host bin directory of the current project's Qt version. Повний шлях до host-теки bin версії Qt поточного проекту. @@ -36341,7 +36304,7 @@ Remote: %4 - QtSupport::QtVersionFactory + QtSupport No factory found for qmake: '%1' Не знайдено фабрику для qmake: '%1' @@ -45278,7 +45241,7 @@ Deploying local Qt libraries is incompatible with Android 5. - QtSupport::Internal::CodeGenSettingsPageWidget + QtSupport Form Форма @@ -54041,7 +54004,7 @@ references to elements in other files, loops, and so on.) - QtSupport::ProMessageHandler + QtSupport [Inexact] [Неточно] diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 293002cbcb1..7c81cd968a1 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -25682,7 +25682,7 @@ Requires <b>Qt 4.7.4</b> or newer. - QtVersion + QtSupport No qmake path set 没有设置qmake路径 @@ -26742,7 +26742,7 @@ with a password, which you can enter below. - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -26753,6 +26753,9 @@ with a password, which you can enter below. %1: Path to qmake executable qmake命令 "%1" 没有找到或不可执行。 + + + QmakeProjectManager::QtVersion Qmake does not support build directories below the source directory. Qmake不支持源文件目录下的构建目录。 @@ -36355,7 +36358,7 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. - QtSupport::Internal::DebuggingHelper + QtSupport Used to extract QML type information from library-based plugins. 用于从基于库的插件解析出QML的类型信息。 @@ -36414,7 +36417,7 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. - QtSupport::Internal::QtVersionInfo + QtSupport Version name: 版本名称: @@ -36429,7 +36432,7 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version. - QtSupport::Internal::QtVersionManager + QtSupport Name 名称 @@ -38097,54 +38100,11 @@ Do you want to continue? - QtSupport::Internal::GettingStartedWelcomePage - - Demos and Examples - 演示和范例 - - - Copy Project to writable Location? - 复制项目到可写位置? - - - <p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p> - <p>您正在打开的项目处于写入保护状态:</p><blockquote>%1</blockquote><p>请选择一个可写的位置然后单击"复制项目并且打开" 来打开一个可修改的项目拷贝或者单击 "保留项目然后打开" 就在此处打开项目.</p><p><b>Note:</b> 在当前位置，您将不能修改或者编译项目.</p> - - - &Location: - 路径(&L): - - - &Copy Project and Open - 复制项目并且打开(&C) - - - &Keep Project and Open - 保留项目并且打开(&K) - - - Cannot Use Location - 无法定位 - - - The specified location already exists. Please specify a valid location. - 指定路径已经存在，请指定有效路径。 - - - Cannot Copy Project - 无法复制项目 - - - Failed to open project - 打开项目失败 - + QtSupport Getting Started 入门 - - - QtSupport::Internal::QtOptionsPageWidget <specify a name> <指定一个名字> @@ -38260,7 +38220,7 @@ Do you want to continue? - QtSupport::QtVersionManager + QtSupport MinGW from %1 MinGW 从%1 @@ -43717,7 +43677,7 @@ p, li { white-space: pre-wrap; } - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log 调试助手构建日志 @@ -49184,7 +49144,7 @@ references to elements in other files, loops, etc.) - QtSupport::Internal::CustomExecutableConfigurationWidget + QtSupport Command: 命令: @@ -49213,14 +49173,6 @@ references to elements in other files, loops, etc.) Clean Environment 清理时的环境变量 - - System Environment - 系统环境变量 - - - Build Environment - 构建时的环境变量 - CustomExecutableDialog @@ -49230,7 +49182,7 @@ references to elements in other files, loops, etc.) - QtSupport::CustomExecutableRunConfiguration + QtSupport No executable. 无执行档。 @@ -49243,10 +49195,6 @@ cannot be found in the path. %1 在搜索路径中找不到。 - - Clean Environment - 清除时的环境变量 - System Environment 系统环境变量 @@ -49255,24 +49203,14 @@ cannot be found in the path. Build Environment 构建时的环境变量 - - Custom Executable - 自定义执行档 - Run %1 运行%1 - - - QtSupport::CustomExecutableRunConfigurationFactory Custom Executable 自定义执行档 - - - QtSupport::Internal::ExamplesWelcomePage Examples 示例 @@ -49319,7 +49257,7 @@ cannot be found in the path. - QtSupport::Internal::QtKitConfigWidget + QtSupport The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. 所有使用该构建套件的项目使用的Qt库。<br> 基于qmake的项目必需一个Qt版本，而使用其他构建系统的项目则为可选。 @@ -49328,17 +49266,13 @@ cannot be found in the path. Manage... 管理... - - None - 无 - Qt version: Qt 版本: - QtSupport::QtKitInformation + QtSupport Qt version Qt 版本 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 0e62b93f508..936cb963927 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -14721,7 +14721,7 @@ Requires <b>Qt 4.7.4</b> or newer. - QtVersion + QtSupport No qmake path set 沒有設定 qmake 路徑 @@ -15173,7 +15173,7 @@ with a password, which you can enter below. - QmakeProjectManager::QtVersion + QtSupport The Qt version is invalid: %1 %1: Reason for being invalid @@ -15184,6 +15184,9 @@ with a password, which you can enter below. %1: Path to qmake executable 找不到 qmake 指令 "%1"，或該指令無法執行。 + + + QmakeProjectManager::QtVersion Qmake does not support build directories below the source directory. Qmake 不支援在源碼目錄下使用建置目錄。 @@ -22427,7 +22430,7 @@ if (a && - QtSupport::Internal::DebuggingHelper + QtSupport Used to extract QML type information from library-based plugins. 用於從基於函式庫的外掛程式中展開 QML 型態資訊。 @@ -22482,7 +22485,7 @@ if (a && - QtSupport::Internal::QtVersionInfo + QtSupport Version name: 版本名稱： @@ -22497,7 +22500,7 @@ if (a && - QtSupport::Internal::QtVersionManager + QtSupport Name 名稱 @@ -23798,14 +23801,14 @@ Do you want to retry? - QtSupport::Internal::GettingStartedWelcomePage + QtSupport Getting Started 入門 - QtSupport::Internal::QtOptionsPageWidget + QtSupport <specify a name> <指定一個名稱> @@ -23921,7 +23924,7 @@ Do you want to retry? - QtSupport::QtVersionManager + QtSupport MinGW from %1 MinGW 從 %1 @@ -27421,7 +27424,7 @@ p, li { white-space: pre-wrap; } - QtSupport::Internal::ShowBuildLog + QtSupport Debugging Helper Build Log 除錯小助手建置紀錄 @@ -29538,7 +29541,7 @@ references to elements in other files, loops, etc.) - QtSupport::Internal::ExamplesWelcomePage + QtSupport Examples 範例 @@ -33653,7 +33656,7 @@ Do you want to retry? - QtSupport::Internal::CustomExecutableConfigurationWidget + QtSupport Command: 指令： @@ -33682,14 +33685,6 @@ Do you want to retry? Clean Environment - - System Environment - 系統環境變數 - - - Build Environment - 建置環境變數 - CustomExecutableDialog @@ -33699,21 +33694,7 @@ Do you want to retry? - QtSupport::CustomExecutableRunConfiguration - - No executable. - - - - The executable -%1 -cannot be found in the path. - - - - Clean Environment - - + QtSupport System Environment 系統環境變數 @@ -33726,20 +33707,6 @@ cannot be found in the path. Custom Executable 自訂執行檔 - - Run %1 - - - - - QtSupport::CustomExecutableRunConfigurationFactory - - Custom Executable - 自訂執行檔 - - - - QtSupport::Internal::QtKitConfigWidget The Qt library to use for all projects using this kit.<br>A Qt version is required for qmake-based projects and optional when using other build systems. @@ -33757,17 +33724,6 @@ cannot be found in the path. Qt 版本： - - QtSupport::QtKitInformation - - Qt version - - - - None - 無 - - ResourceEditor::Internal::QrcEditor diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 07a1e11a113..859a3e55c28 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -24,27 +24,29 @@ ****************************************************************************/ #include "baseqtversion.h" + +#include "profilereader.h" #include "qtconfigwidget.h" #include "qtkitinformation.h" - +#include "qtsupportconstants.h" +#include "qtsupporttr.h" #include "qtversionfactory.h" #include "qtversionmanager.h" -#include "profilereader.h" #include #include + #include + #include #include -#include -#include -#include #include #include +#include #include #include -#include -#include +#include +#include #include #include @@ -351,14 +353,14 @@ QString QtVersion::defaultUnexpandedDisplayName() const { QString location; if (qmakeFilePath().isEmpty()) { - location = QCoreApplication::translate("QtVersion", ""); + location = Tr::tr(""); } else { // Deduce a description from '/foo/qt-folder/[qtbase]/bin/qmake' -> '/foo/qt-folder'. // '/usr' indicates System Qt 4.X on Linux. for (FilePath dir = qmakeFilePath().parentDir(); !dir.isEmpty(); dir = dir.parentDir()) { const QString dirName = dir.fileName(); if (dirName == "usr") { // System-installed Qt. - location = QCoreApplication::translate("QtVersion", "System"); + location = Tr::tr("System"); break; } location = dirName; @@ -372,8 +374,8 @@ QString QtVersion::defaultUnexpandedDisplayName() const } return detectionSource() == "PATH" ? - QCoreApplication::translate("QtVersion", "Qt %{Qt:Version} in PATH (%2)").arg(location) : - QCoreApplication::translate("QtVersion", "Qt %{Qt:Version} (%2)").arg(location); + Tr::tr("Qt %{Qt:Version} in PATH (%2)").arg(location) : + Tr::tr("Qt %{Qt:Version} (%2)").arg(location); } QSet QtVersion::availableFeatures() const @@ -522,7 +524,7 @@ Tasks QtVersion::validateKit(const Kit *k) if (dt != "DockerDeviceType") { const QSet tdt = targetDeviceTypes(); if (!tdt.isEmpty() && !tdt.contains(dt)) - result << BuildSystemTask(Task::Warning, tr("Device type is not supported by Qt version.")); + result << BuildSystemTask(Task::Warning, Tr::tr("Device type is not supported by Qt version.")); } if (ToolChain *tc = ToolChainKitAspect::cxxToolChain(k)) { @@ -552,15 +554,15 @@ Tasks QtVersion::validateKit(const Kit *k) QString message; if (!fullMatch) { if (!fuzzyMatch) - message = tr("The compiler \"%1\" (%2) cannot produce code for the Qt version \"%3\" (%4)."); + message = Tr::tr("The compiler \"%1\" (%2) cannot produce code for the Qt version \"%3\" (%4)."); else - message = tr("The compiler \"%1\" (%2) may not produce code compatible with the Qt version \"%3\" (%4)."); + message = Tr::tr("The compiler \"%1\" (%2) may not produce code compatible with the Qt version \"%3\" (%4)."); message = message.arg(tc->displayName(), targetAbi.toString(), version->displayName(), qtAbiString); result << BuildSystemTask(fuzzyMatch ? Task::Warning : Task::Error, message); } } else if (ToolChainKitAspect::cToolChain(k)) { - const QString message = tr("The kit has a Qt version, but no C++ compiler."); + const QString message = Tr::tr("The kit has a Qt version, but no C++ compiler."); result << BuildSystemTask(Task::Warning, message); } return result; @@ -797,18 +799,18 @@ QtVersion::Predicate QtVersion::isValidPredicate(const QtVersion::Predicate &pre QString QtVersion::invalidReason() const { if (displayName().isEmpty()) - return QCoreApplication::translate("QtVersion", "Qt version has no name"); + return Tr::tr("Qt version has no name"); if (qmakeFilePath().isEmpty()) - return QCoreApplication::translate("QtVersion", "No qmake path set"); + return Tr::tr("No qmake path set"); if (!d->m_qmakeIsExecutable) - return QCoreApplication::translate("QtVersion", "qmake does not exist or is not executable"); + return Tr::tr("qmake does not exist or is not executable"); if (!d->m_data.installed) - return QCoreApplication::translate("QtVersion", "Qt version is not properly installed, please run make install"); + return Tr::tr("Qt version is not properly installed, please run make install"); if (binPath().isEmpty()) - return QCoreApplication::translate("QtVersion", - "Could not determine the path to the binaries of the Qt installation, maybe the qmake path is wrong?"); + return Tr::tr("Could not determine the path to the binaries of the Qt installation, " + "maybe the qmake path is wrong?"); if (d->m_mkspecUpToDate && d->m_mkspecFullPath.isEmpty()) - return QCoreApplication::translate("QtVersion", "The default mkspec symlink is broken."); + return Tr::tr("The default mkspec symlink is broken."); return QString(); } @@ -816,10 +818,10 @@ QStringList QtVersion::warningReason() const { QStringList ret; if (qtAbis().isEmpty()) - ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching compiler when building."); + ret << Tr::tr("ABI detection failed: Make sure to use a matching compiler when building."); if (d->m_versionInfo.value(ProKey("QT_INSTALL_PREFIX/get")) != d->m_versionInfo.value(ProKey("QT_INSTALL_PREFIX"))) { - ret << QCoreApplication::translate("QtVersion", "Non-installed -prefix build - for internal development only."); + ret << Tr::tr("Non-installed -prefix build - for internal development only."); } return ret; } @@ -918,14 +920,14 @@ QString QtVersion::toHtml(bool verbose) const QString rc; QTextStream str(&rc); str << ""; - str << ""; if (!isValid()) { str << ""; } else { - str << ""; const Abis abis = qtAbis(); if (abis.isEmpty()) { @@ -938,23 +940,23 @@ QString QtVersion::toHtml(bool verbose) const } } const OsType osType = d->m_qmakeCommand.osType(); - str << ""; - str << ""; - str << ""; ensureMkSpecParsed(); if (!mkspecPath().isEmpty()) { if (d->m_defaultConfigIsDebug || d->m_defaultConfigIsDebugAndRelease) { - str << ""; } // default config. } - str << ""; if (verbose) { const QHash vInfo = d->versionInfo(); @@ -1478,146 +1480,139 @@ QtVersion::createMacroExpander(const std::function &qtVersi }; }; std::unique_ptr expander(new MacroExpander); - expander->setDisplayName(QtKitAspect::tr("Qt version")); + expander->setDisplayName(Tr::tr("Qt version")); expander->registerVariable("Qt:Version", - QtKitAspect::tr("The version string of the current Qt version."), + Tr::tr("The version string of the current Qt version."), versionProperty([](const QtVersion *version) { return version->qtVersionString(); })); expander->registerVariable( "Qt:Type", - QtKitAspect::tr("The type of the current Qt version."), + Tr::tr("The type of the current Qt version."), versionProperty([](const QtVersion *version) { return version->type(); })); expander->registerVariable( "Qt:Mkspec", - QtKitAspect::tr("The mkspec of the current Qt version."), + Tr::tr("The mkspec of the current Qt version."), versionProperty([](const QtVersion *version) { return QDir::toNativeSeparators(version->mkspec()); })); expander->registerVariable("Qt:QT_INSTALL_PREFIX", - QtKitAspect::tr( - "The installation prefix of the current Qt version."), + Tr::tr("The installation prefix of the current Qt version."), versionProperty([](const QtVersion *version) { return version->prefix().path(); })); expander->registerVariable("Qt:QT_INSTALL_DATA", - QtKitAspect::tr( + Tr::tr( "The installation location of the current Qt version's data."), versionProperty([](const QtVersion *version) { return version->dataPath().path(); })); expander->registerVariable("Qt:QT_HOST_PREFIX", - QtKitAspect::tr( - "The host location of the current Qt version."), + Tr::tr("The host location of the current Qt version."), versionProperty([](const QtVersion *version) { return version->hostPrefixPath().path(); })); expander->registerVariable("Qt:QT_HOST_LIBEXECS", - QtKitAspect::tr("The installation location of the current Qt " - "version's internal host executable files."), + Tr::tr("The installation location of the current Qt " + "version's internal host executable files."), versionProperty([](const QtVersion *version) { return version->hostLibexecPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_HEADERS", - QtKitAspect::tr("The installation location of the current Qt version's header files."), + Tr::tr("The installation location of the current Qt version's header files."), versionProperty( [](const QtVersion *version) { return version->headerPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_LIBS", - QtKitAspect::tr("The installation location of the current Qt version's library files."), + Tr::tr("The installation location of the current Qt version's library files."), versionProperty( [](const QtVersion *version) { return version->libraryPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_DOCS", - QtKitAspect::tr( - "The installation location of the current Qt version's documentation files."), + Tr::tr("The installation location of the current Qt version's documentation files."), versionProperty( [](const QtVersion *version) { return version->docsPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_BINS", - QtKitAspect::tr("The installation location of the current Qt version's executable files."), + Tr::tr("The installation location of the current Qt version's executable files."), versionProperty([](const QtVersion *version) { return version->binPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_LIBEXECS", - QtKitAspect::tr( - "The installation location of the current Qt version's internal executable files."), + Tr::tr("The installation location of the current Qt version's internal executable files."), versionProperty( [](const QtVersion *version) { return version->libExecPath().path(); })); expander ->registerVariable("Qt:QT_INSTALL_PLUGINS", - QtKitAspect::tr( - "The installation location of the current Qt version's plugins."), + Tr::tr("The installation location of the current Qt version's plugins."), versionProperty([](const QtVersion *version) { return version->pluginPath().path(); })); expander ->registerVariable("Qt:QT_INSTALL_QML", - QtKitAspect::tr( - "The installation location of the current Qt version's QML files."), + Tr::tr("The installation location of the current Qt version's QML files."), versionProperty([](const QtVersion *version) { return version->qmlPath().path(); })); expander ->registerVariable("Qt:QT_INSTALL_IMPORTS", - QtKitAspect::tr( - "The installation location of the current Qt version's imports."), + Tr::tr("The installation location of the current Qt version's imports."), versionProperty([](const QtVersion *version) { return version->importsPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_TRANSLATIONS", - QtKitAspect::tr("The installation location of the current Qt version's translation files."), + Tr::tr("The installation location of the current Qt version's translation files."), versionProperty( [](const QtVersion *version) { return version->translationsPath().path(); })); expander->registerVariable( "Qt:QT_INSTALL_CONFIGURATION", - QtKitAspect::tr("The installation location of the current Qt version's translation files."), + Tr::tr("The installation location of the current Qt version's translation files."), versionProperty( [](const QtVersion *version) { return version->configurationPath().path(); })); expander ->registerVariable("Qt:QT_INSTALL_EXAMPLES", - QtKitAspect::tr( + Tr::tr( "The installation location of the current Qt version's examples."), versionProperty([](const QtVersion *version) { return version->examplesPath().path(); })); expander->registerVariable("Qt:QT_INSTALL_DEMOS", - QtKitAspect::tr( + Tr::tr( "The installation location of the current Qt version's demos."), versionProperty([](const QtVersion *version) { return version->demosPath().path(); })); expander->registerVariable("Qt:QMAKE_MKSPECS", - QtKitAspect::tr("The current Qt version's default mkspecs (Qt 4)."), + Tr::tr("The current Qt version's default mkspecs (Qt 4)."), versionProperty([](const QtVersion *version) { return version->d->qmakeProperty("QMAKE_MKSPECS"); })); expander->registerVariable("Qt:QMAKE_SPEC", - QtKitAspect::tr( + Tr::tr( "The current Qt version's default mkspec (Qt 5; host system)."), versionProperty([](const QtVersion *version) { return version->d->qmakeProperty("QMAKE_SPEC"); @@ -1625,21 +1620,20 @@ QtVersion::createMacroExpander(const std::function &qtVersi expander ->registerVariable("Qt:QMAKE_XSPEC", - QtKitAspect::tr( - "The current Qt version's default mkspec (Qt 5; target system)."), + Tr::tr("The current Qt version's default mkspec (Qt 5; target system)."), versionProperty([](const QtVersion *version) { return version->d->qmakeProperty("QMAKE_XSPEC"); })); expander->registerVariable("Qt:QMAKE_VERSION", - QtKitAspect::tr("The current Qt's qmake version."), + Tr::tr("The current Qt's qmake version."), versionProperty([](const QtVersion *version) { return version->d->qmakeProperty("QMAKE_VERSION"); })); // FIXME: Re-enable once we can detect expansion loops. // expander->registerVariable("Qt:Name", - // QtKitAspect::tr("The display name of the current Qt version."), + // Tr::tr("The display name of the current Qt version."), // versionProperty([](QtVersion *version) { // return version->displayName(); // })); @@ -1757,14 +1751,14 @@ Tasks QtVersion::reportIssuesImpl(const QString &proFile, const QString &buildDi if (!isValid()) { //: %1: Reason for being invalid - const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", "The Qt version is invalid: %1").arg(invalidReason()); + const QString msg = Tr::tr("The Qt version is invalid: %1").arg(invalidReason()); results.append(BuildSystemTask(Task::Error, msg)); } FilePath qmake = qmakeFilePath(); if (!qmake.isExecutableFile()) { //: %1: Path to qmake executable - const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", + const QString msg = Tr::tr( "The qmake command \"%1\" was not found or is not executable.").arg(qmake.displayName()); results.append(BuildSystemTask(Task::Error, msg)); } @@ -1802,19 +1796,17 @@ static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env, process.start(); if (!process.waitForFinished()) { - *error = QCoreApplication::translate("QtVersion", "Timeout running \"%1\".") - .arg(binary.displayName()); + *error = Tr::tr("Timeout running \"%1\".").arg(binary.displayName()); return {}; } if (process.exitStatus() != QProcess::NormalExit) { - *error = QCoreApplication::translate("QtVersion", "\"%1\" crashed.") - .arg(binary.displayName()); + *error = Tr::tr("\"%1\" crashed.").arg(binary.displayName()); return {}; } const QByteArray out = process.readAllStandardOutput(); if (out.isEmpty()) { - *error = QCoreApplication::translate("QtVersion", "\"%1\" produced no output: %2.") + *error = Tr::tr("\"%1\" produced no output: %2.") .arg(binary.displayName(), process.cleanedStdErr()); return {}; } @@ -1824,15 +1816,14 @@ static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env, } bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environment &env, - QHash *versionInfo, QString *error) + QHash *versionInfo, QString *error) { QString tmp; if (!error) error = &tmp; if (!binary.isExecutableFile()) { - *error = QCoreApplication::translate("QtVersion", "qmake \"%1\" is not an executable.") - .arg(binary.displayName()); + *error = Tr::tr("qmake \"%1\" is not an executable.").arg(binary.displayName()); return false; } @@ -2036,7 +2027,7 @@ bool QtVersion::isQmlDebuggingSupported(const Kit *k, QString *reason) QtVersion *version = QtKitAspect::qtVersion(k); if (!version) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "No Qt version."); + *reason = Tr::tr("No Qt version."); return false; } return version->isQmlDebuggingSupported(reason); @@ -2046,13 +2037,13 @@ bool QtVersion::isQmlDebuggingSupported(QString *reason) const { if (!isValid()) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "Invalid Qt version."); + *reason = Tr::tr("Invalid Qt version."); return false; } if (qtVersion() < QtVersionNumber(5, 0, 0)) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "Requires Qt 5.0.0 or newer."); + *reason = Tr::tr("Requires Qt 5.0.0 or newer."); return false; } @@ -2065,7 +2056,7 @@ bool QtVersion::isQtQuickCompilerSupported(const Kit *k, QString *reason) QtVersion *version = QtKitAspect::qtVersion(k); if (!version) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "No Qt version."); + *reason = Tr::tr("No Qt version."); return false; } return version->isQtQuickCompilerSupported(reason); @@ -2075,20 +2066,20 @@ bool QtVersion::isQtQuickCompilerSupported(QString *reason) const { if (!isValid()) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "Invalid Qt version."); + *reason = Tr::tr("Invalid Qt version."); return false; } if (qtVersion() < QtVersionNumber(5, 3, 0)) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "Requires Qt 5.3.0 or newer."); + *reason = Tr::tr("Requires Qt 5.3.0 or newer."); return false; } const QString qtQuickCompilerPrf = mkspecsPath().toString() + "/features/qtquickcompiler.prf"; if (!QFileInfo::exists(qtQuickCompilerPrf)) { if (reason) - *reason = QCoreApplication::translate("QtVersion", "This Qt Version does not contain Qt Quick Compiler."); + *reason = Tr::tr("This Qt Version does not contain Qt Quick Compiler."); return false; } @@ -2374,8 +2365,7 @@ QtVersion *QtVersionFactory::createQtVersionFromQMakePath } ProFileCacheManager::instance()->decRefCount(); if (error) { - *error = QCoreApplication::translate("QtSupport::QtVersionFactory", - "No factory found for qmake: \"%1\"").arg(qmakePath.displayName()); + *error = Tr::tr("No factory found for qmake: \"%1\"").arg(qmakePath.displayName()); } return nullptr; } diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 269a6507168..416e54c536c 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -87,8 +87,6 @@ class QtVersionPrivate; class QTSUPPORT_EXPORT QtVersion { - Q_DECLARE_TR_FUNCTIONS(QtSupport::QtVersion) - public: using Predicate = std::function; diff --git a/src/plugins/qtsupport/codegensettings.cpp b/src/plugins/qtsupport/codegensettings.cpp index df96cc8a24a..aa984f107fe 100644 --- a/src/plugins/qtsupport/codegensettings.cpp +++ b/src/plugins/qtsupport/codegensettings.cpp @@ -30,29 +30,28 @@ #include -static const char CODE_GEN_GROUP[] = "FormClassWizardPage"; -static const char TRANSLATION_KEY[] = "RetranslationSupport"; -static const char EMBEDDING_KEY[] = "Embedding"; -static const char INCLUDE_QT_MODULE_KEY[] = "IncludeQtModule"; -static const char ADD_QT_VERSION_CHECK_KEY[] = "AddQtVersionCheck"; - -static const bool retranslationSupportDefault = false; -static const QtSupport::CodeGenSettings::UiClassEmbedding embeddingDefault - = QtSupport::CodeGenSettings::PointerAggregatedUiClass; -static const bool includeQtModuleDefault = false; -static const bool addQtVersionCheckDefault = false; - using namespace Utils; namespace QtSupport { +const char CODE_GEN_GROUP[] = "FormClassWizardPage"; +const char TRANSLATION_KEY[] = "RetranslationSupport"; +const char EMBEDDING_KEY[] = "Embedding"; +const char INCLUDE_QT_MODULE_KEY[] = "IncludeQtModule"; +const char ADD_QT_VERSION_CHECK_KEY[] = "AddQtVersionCheck"; + +const bool retranslationSupportDefault = false; +const CodeGenSettings::UiClassEmbedding embeddingDefault + = CodeGenSettings::PointerAggregatedUiClass; +const bool includeQtModuleDefault = false; +const bool addQtVersionCheckDefault = false; + CodeGenSettings::CodeGenSettings() : embedding(embeddingDefault) , retranslationSupport(retranslationSupportDefault) , includeQtModule(includeQtModuleDefault) , addQtVersionCheck(addQtVersionCheckDefault) { - } bool CodeGenSettings::equals(const CodeGenSettings &rhs) const diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp index c7c26ad14a2..bf7622c06f6 100644 --- a/src/plugins/qtsupport/codegensettingspage.cpp +++ b/src/plugins/qtsupport/codegensettingspage.cpp @@ -27,6 +27,7 @@ #include "codegensettings.h" #include "qtsupportconstants.h" +#include "qtsupporttr.h" #include @@ -35,15 +36,12 @@ #include #include -#include #include namespace QtSupport::Internal { class CodeGenSettingsPageWidget : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(QtSupport::Internal::CodeGenSettingsPage) - public: CodeGenSettingsPageWidget(); @@ -69,31 +67,31 @@ CodeGenSettingsPageWidget::CodeGenSettingsPageWidget() using namespace Utils::Layouting; - m_ptrAggregationRadioButton = new QRadioButton(tr("Aggregation as a pointer member")); + m_ptrAggregationRadioButton = new QRadioButton(Tr::tr("Aggregation as a pointer member")); m_ptrAggregationRadioButton->setChecked (parameters.embedding == CodeGenSettings::PointerAggregatedUiClass); - m_aggregationButton = new QRadioButton(tr("Aggregation")); + m_aggregationButton = new QRadioButton(Tr::tr("Aggregation")); m_aggregationButton->setChecked (parameters.embedding == CodeGenSettings::AggregatedUiClass); - m_multipleInheritanceButton = new QRadioButton(tr("Multiple inheritance")); + m_multipleInheritanceButton = new QRadioButton(Tr::tr("Multiple inheritance")); m_multipleInheritanceButton->setChecked (parameters.embedding == CodeGenSettings::InheritedUiClass); - m_retranslateCheckBox = new QCheckBox(tr("Support for changing languages at runtime")); + m_retranslateCheckBox = new QCheckBox(Tr::tr("Support for changing languages at runtime")); m_retranslateCheckBox->setChecked(parameters.retranslationSupport); - m_includeQtModuleCheckBox = new QCheckBox(tr("Use Qt module name in #include-directive")); + m_includeQtModuleCheckBox = new QCheckBox(Tr::tr("Use Qt module name in #include-directive")); m_includeQtModuleCheckBox->setChecked(parameters.includeQtModule); - m_addQtVersionCheckBox = new QCheckBox(tr("Add Qt version #ifdef for module names")); + m_addQtVersionCheckBox = new QCheckBox(Tr::tr("Add Qt version #ifdef for module names")); m_addQtVersionCheckBox->setChecked(parameters.addQtVersionCheck); m_addQtVersionCheckBox->setEnabled(false); Column { Group { - Title(tr("Embedding of the UI Class")), + Title(Tr::tr("Embedding of the UI Class")), Column { m_ptrAggregationRadioButton, m_aggregationButton, @@ -101,7 +99,7 @@ CodeGenSettingsPageWidget::CodeGenSettingsPageWidget() } }, Group { - Title(tr("Code Generation")), + Title(Tr::tr("Code Generation")), Column { m_retranslateCheckBox, m_includeQtModuleCheckBox, @@ -139,7 +137,7 @@ int CodeGenSettingsPageWidget::uiEmbedding() const CodeGenSettingsPage::CodeGenSettingsPage() { setId(Constants::CODEGEN_SETTINGS_PAGE_ID); - setDisplayName(QCoreApplication::translate("QtSupport", "Qt Class Generation")); + setDisplayName(Tr::tr("Qt Class Generation")); setCategory(CppEditor::Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory( QCoreApplication::translate("CppEditor", CppEditor::Constants::CPP_SETTINGS_NAME)); diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 404a565463e..cd87a872458 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -43,7 +43,6 @@ #include #include -#include #include #include #include diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index ffe3262b7ce..c924c03e6ff 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -26,6 +26,7 @@ #include "gettingstartedwelcomepage.h" #include "exampleslistmodel.h" +#include "qtsupporttr.h" #include #include @@ -73,7 +74,7 @@ ExamplesWelcomePage::ExamplesWelcomePage(bool showExamples) QString ExamplesWelcomePage::title() const { - return m_showExamples ? tr("Examples") : tr("Tutorials"); + return m_showExamples ? Tr::tr("Examples") : Tr::tr("Tutorials"); } int ExamplesWelcomePage::priority() const @@ -92,22 +93,22 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI QDialog d(ICore::dialogParent()); auto lay = new QGridLayout(&d); auto descrLbl = new QLabel; - d.setWindowTitle(tr("Copy Project to writable Location?")); + d.setWindowTitle(Tr::tr("Copy Project to writable Location?")); descrLbl->setTextFormat(Qt::RichText); descrLbl->setWordWrap(false); const QString nativeProjectDir = QDir::toNativeSeparators(projectDir); descrLbl->setText(QString::fromLatin1("
%1
").arg(nativeProjectDir)); descrLbl->setMinimumWidth(descrLbl->sizeHint().width()); descrLbl->setWordWrap(true); - descrLbl->setText(tr("

The project you are about to open is located in the " - "write-protected location:

%1
" - "

Please select a writable location below and click \"Copy Project and Open\" " - "to open a modifiable copy of the project or click \"Keep Project and Open\" " - "to open the project in location.

Note: You will not " - "be able to alter or compile your project in the current location.

") + descrLbl->setText(Tr::tr("

The project you are about to open is located in the " + "write-protected location:

%1
" + "

Please select a writable location below and click \"Copy Project and Open\" " + "to open a modifiable copy of the project or click \"Keep Project and Open\" " + "to open the project in location.

Note: You will not " + "be able to alter or compile your project in the current location.

") .arg(nativeProjectDir)); lay->addWidget(descrLbl, 0, 0, 1, 2); - auto txt = new QLabel(tr("&Location:")); + auto txt = new QLabel(Tr::tr("&Location:")); auto chooser = new PathChooser; txt->setBuddy(chooser); chooser->setExpectedKind(PathChooser::ExistingDirectory); @@ -119,10 +120,10 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI lay->addWidget(chooser, 1, 1); enum { Copy = QDialog::Accepted + 1, Keep = QDialog::Accepted + 2 }; auto bb = new QDialogButtonBox; - QPushButton *copyBtn = bb->addButton(tr("&Copy Project and Open"), QDialogButtonBox::AcceptRole); + QPushButton *copyBtn = bb->addButton(Tr::tr("&Copy Project and Open"), QDialogButtonBox::AcceptRole); connect(copyBtn, &QAbstractButton::released, &d, [&d] { d.done(Copy); }); copyBtn->setDefault(true); - QPushButton *keepBtn = bb->addButton(tr("&Keep Project and Open"), QDialogButtonBox::RejectRole); + QPushButton *keepBtn = bb->addButton(Tr::tr("&Keep Project and Open"), QDialogButtonBox::RejectRole); connect(keepBtn, &QAbstractButton::released, &d, [&d] { d.done(Keep); }); lay->addWidget(bb, 2, 0, 1, 2); connect(chooser, &PathChooser::validChanged, copyBtn, &QWidget::setEnabled); @@ -135,9 +136,9 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI if (toDirWithExamplesDir.cd(exampleDirName)) { toDirWithExamplesDir.cdUp(); // step out, just to not be in the way QMessageBox::warning(ICore::dialogParent(), - tr("Cannot Use Location"), - tr("The specified location already exists. " - "Please specify a valid location."), + Tr::tr("Cannot Use Location"), + Tr::tr("The specified location already exists. " + "Please specify a valid location."), QMessageBox::Ok, QMessageBox::NoButton); return QString(); @@ -157,7 +158,7 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI if (!FileUtils::copyRecursively(FilePath::fromString(dependency), targetFile, &error)) { QMessageBox::warning(ICore::dialogParent(), - tr("Cannot Copy Project"), + Tr::tr("Cannot Copy Project"), error); // do not fail, just warn; } @@ -166,7 +167,7 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI return targetDir + QLatin1Char('/') + proFileInfo.fileName(); } else { - QMessageBox::warning(ICore::dialogParent(), tr("Cannot Copy Project"), error); + QMessageBox::warning(ICore::dialogParent(), Tr::tr("Cannot Copy Project"), error); } } @@ -295,7 +296,7 @@ public: auto hbox = new QHBoxLayout(searchBar); hbox->setContentsMargins(0, 0, 0, 0); if (m_isExamples) { - m_searcher->setPlaceholderText(ExamplesWelcomePage::tr("Search in Examples...")); + m_searcher->setPlaceholderText(Tr::tr("Search in Examples...")); auto exampleSetSelector = new QComboBox(this); QPalette pal = exampleSetSelector->palette(); @@ -315,7 +316,7 @@ public: hbox->setSpacing(Core::WelcomePageHelpers::HSpacing); hbox->addWidget(exampleSetSelector); } else { - m_searcher->setPlaceholderText(ExamplesWelcomePage::tr("Search in Tutorials...")); + m_searcher->setPlaceholderText(Tr::tr("Search in Tutorials...")); } hbox->addWidget(searchBox); grid->addWidget(WelcomePageHelpers::panelBar(this), 0, 0); diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp index d1cbfbf8300..67f610ea4d8 100644 --- a/src/plugins/qtsupport/qtbuildaspects.cpp +++ b/src/plugins/qtsupport/qtbuildaspects.cpp @@ -26,6 +26,7 @@ #include "qtbuildaspects.h" #include "baseqtversion.h" +#include "qtsupporttr.h" #include #include @@ -47,7 +48,7 @@ QmlDebuggingAspect::QmlDebuggingAspect(BuildConfiguration *buildConfig) : m_buildConfig(buildConfig) { setSettingsKey("EnableQmlDebugging"); - setDisplayName(tr("QML debugging and profiling:")); + setDisplayName(Tr::tr("QML debugging and profiling:")); setValue(ProjectExplorerPlugin::buildPropertiesSettings().qmlDebugging.value()); } @@ -66,8 +67,8 @@ void QmlDebuggingAspect::addToLayout(LayoutBuilder &builder) if (!supported) { setValue(TriState::Default); } else if (value() == TriState::Enabled) { - warningText = tr("Might make your application vulnerable.
" - "Only use in a safe environment."); + warningText = Tr::tr("Might make your application vulnerable.
" + "Only use in a safe environment."); } warningLabel->setText(warningText); setVisible(supported); @@ -84,7 +85,7 @@ QtQuickCompilerAspect::QtQuickCompilerAspect(BuildConfiguration *buildConfig) : m_buildConfig(buildConfig) { setSettingsKey("QtQuickCompiler"); - setDisplayName(tr("Qt Quick Compiler:")); + setDisplayName(Tr::tr("Qt Quick Compiler:")); setValue(ProjectExplorerPlugin::buildPropertiesSettings().qtQuickCompiler.value()); } @@ -106,7 +107,7 @@ void QtQuickCompilerAspect::addToLayout(LayoutBuilder &builder) if (value() == TriState::Enabled) { if (auto qmlDebuggingAspect = m_buildConfig->aspect()) { if (qmlDebuggingAspect->value() == TriState::Enabled) - warningText = tr("Disables QML debugging. QML profiling will still work."); + warningText = Tr::tr("Disables QML debugging. QML profiling will still work."); } } warningLabel->setText(warningText); diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 3df7a70f8f3..ece06b7f8c6 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -25,10 +25,11 @@ #include "qtkitinformation.h" -#include "qtsupportconstants.h" -#include "qtversionmanager.h" #include "qtparser.h" +#include "qtsupportconstants.h" +#include "qtsupporttr.h" #include "qttestparser.h" +#include "qtversionmanager.h" #include #include @@ -51,13 +52,12 @@ namespace Internal { class QtKitAspectWidget final : public KitAspectWidget { - Q_DECLARE_TR_FUNCTIONS(QtSupport::QtKitAspectWidget) public: QtKitAspectWidget(Kit *k, const KitAspect *ki) : KitAspectWidget(k, ki) { m_combo = createSubWidget(); m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); - m_combo->addItem(tr("None"), -1); + m_combo->addItem(Tr::tr("None"), -1); QList versionIds = Utils::transform(QtVersionManager::versions(), &QtVersion::uniqueId); versionsChanged(versionIds, QList(), QList()); @@ -100,7 +100,7 @@ private: QTC_ASSERT(v, return QString()); QString name = v->displayName(); if (!v->isValid()) - name = tr("%1 (invalid)").arg(v->displayName()); + name = Tr::tr("%1 (invalid)").arg(v->displayName()); return name; } @@ -148,10 +148,10 @@ QtKitAspect::QtKitAspect() { setObjectName(QLatin1String("QtKitAspect")); setId(QtKitAspect::id()); - setDisplayName(tr("Qt version")); - setDescription(tr("The Qt library to use for all projects using this kit.
" - "A Qt version is required for qmake-based projects " - "and optional when using other build systems.")); + setDisplayName(Tr::tr("Qt version")); + setDescription(Tr::tr("The Qt library to use for all projects using this kit.
" + "A Qt version is required for qmake-based projects " + "and optional when using other build systems.")); setPriority(26000); connect(KitManager::instance(), &KitManager::kitsLoaded, @@ -275,7 +275,7 @@ QString QtKitAspect::displayNamePostfix(const Kit *k) const KitAspect::ItemList QtKitAspect::toUserOutput(const Kit *k) const { QtVersion *version = qtVersion(k); - return {{tr("Qt version"), version ? version->displayName() : tr("None")}}; + return {{Tr::tr("Qt version"), version ? version->displayName() : Tr::tr("None")}}; } void QtKitAspect::addToBuildEnvironment(const Kit *k, Environment &env) const @@ -313,12 +313,12 @@ void QtKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const QTC_ASSERT(kit, return); expander->registerSubProvider(QtMacroSubProvider(kit)); - expander->registerVariable("Qt:Name", tr("Name of Qt Version"), + expander->registerVariable("Qt:Name", Tr::tr("Name of Qt Version"), [kit]() -> QString { QtVersion *version = qtVersion(kit); - return version ? version->displayName() : tr("unknown"); + return version ? version->displayName() : Tr::tr("unknown"); }); - expander->registerVariable("Qt:qmakeExecutable", tr("Path to the qmake executable"), + expander->registerVariable("Qt:qmakeExecutable", Tr::tr("Path to the qmake executable"), [kit]() -> QString { QtVersion *version = qtVersion(kit); return version ? version->qmakeFilePath().path() : QString(); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 09c053daedf..a5af4d83d79 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -27,6 +27,7 @@ #include "qtconfigwidget.h" #include "qtsupportconstants.h" +#include "qtsupporttr.h" #include "qtversionmanager.h" #include "qtversionfactory.h" @@ -76,13 +77,10 @@ using namespace Utils; const char kInstallSettingsKey[] = "Settings/InstallSettings"; -namespace QtSupport { -namespace Internal { +namespace QtSupport::Internal { class QtVersionItem : public TreeItem { - Q_DECLARE_TR_FUNCTIONS(QtSupport::QtVersion) - public: explicit QtVersionItem(QtVersion *version) : m_version(version) @@ -134,8 +132,8 @@ public: const QString row = "
%1:
" "
%2
"; return QString("
" - + row.arg(tr("Qt Version"), m_version->qtVersionString()) - + row.arg(tr("Location of qmake"), m_version->qmakeFilePath().toUserOutput()) + + row.arg(Tr::tr("Qt Version"), m_version->qtVersionString()) + + row.arg(Tr::tr("Location of qmake"), m_version->qmakeFilePath().toUserOutput()) + "
"); } @@ -179,8 +177,6 @@ private: class QtOptionsPageWidget : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(QtSupport::Internal::QtOptionsPageWidget) - public: QtOptionsPageWidget(); ~QtOptionsPageWidget(); @@ -253,7 +249,7 @@ private: }; QtOptionsPageWidget::QtOptionsPageWidget() - : m_specifyNameString(tr("")) + : m_specifyNameString(Tr::tr("")) , m_infoBrowser(new QTextBrowser) , m_invalidVersionIcon(Utils::Icons::CRITICAL.icon()) , m_warningVersionIcon(Utils::Icons::WARNING.icon()) @@ -270,10 +266,10 @@ QtOptionsPageWidget::QtOptionsPageWidget() m_documentationSetting = new QComboBox(this); - auto addButton = new QPushButton(tr("Add...")); - m_delButton = new QPushButton(tr("Remove")); - m_linkWithQtButton = new QPushButton(tr("Link with Qt...")); - m_cleanUpButton = new QPushButton(tr("Clean Up")); + auto addButton = new QPushButton(Tr::tr("Add...")); + m_delButton = new QPushButton(Tr::tr("Remove")); + m_linkWithQtButton = new QPushButton(Tr::tr("Link with Qt...")); + m_cleanUpButton = new QPushButton(Tr::tr("Clean Up")); m_nameEdit = new QLineEdit; @@ -281,7 +277,7 @@ QtOptionsPageWidget::QtOptionsPageWidget() m_qmakePath->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); m_qmakePath->setTextInteractionFlags(Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse); - m_editPathPushButton = new QPushButton(tr("Edit")); + m_editPathPushButton = new QPushButton(Tr::tr("Edit")); m_editPathPushButton->setText(PathChooser::browseButtonLabel()); m_errorLabel = new QLabel; @@ -289,20 +285,23 @@ QtOptionsPageWidget::QtOptionsPageWidget() using namespace Utils::Layouting; auto versionInfoWidget = new QWidget; + // clang-format off Form { - tr("Name:"), m_nameEdit, br, - tr("qmake path:"), Row { m_qmakePath, m_editPathPushButton }, br, + Tr::tr("Name:"), m_nameEdit, br, + Tr::tr("qmake path:"), Row { m_qmakePath, m_editPathPushButton }, br, Span(2, m_errorLabel) }.attachTo(versionInfoWidget, false); + // clang-format on m_formLayout = qobject_cast(versionInfoWidget->layout()); + // clang-format off Row { Column { m_qtdirList, m_versionInfoWidget, m_infoWidget, - Row { tr("Register documentation:"), m_documentationSetting, st } + Row { Tr::tr("Register documentation:"), m_documentationSetting, st } }, Column { @@ -314,6 +313,7 @@ QtOptionsPageWidget::QtOptionsPageWidget() st, } }.attachTo(this); + // clang-format on setupLinkWithQtButton(); @@ -333,7 +333,7 @@ QtOptionsPageWidget::QtOptionsPageWidget() m_manualItem = new StaticTreeItem(ProjectExplorer::Constants::msgManual()); m_model = new TreeModel(); - m_model->setHeader({tr("Name"), tr("qmake Path")}); + m_model->setHeader({Tr::tr("Name"), Tr::tr("qmake Path")}); m_model->rootItem()->appendChild(m_autoItem); m_model->rootItem()->appendChild(m_manualItem); @@ -353,10 +353,10 @@ QtOptionsPageWidget::QtOptionsPageWidget() m_qtdirList->setTextElideMode(Qt::ElideMiddle); m_qtdirList->sortByColumn(0, Qt::AscendingOrder); - m_documentationSetting->addItem(tr("Highest Version Only"), + m_documentationSetting->addItem(Tr::tr("Highest Version Only"), int(QtVersionManager::DocumentationSetting::HighestOnly)); - m_documentationSetting->addItem(tr("All"), int(QtVersionManager::DocumentationSetting::All)); - m_documentationSetting->addItem(tr("None"), + m_documentationSetting->addItem(Tr::tr("All"), int(QtVersionManager::DocumentationSetting::All)); + m_documentationSetting->addItem(Tr::tr("None"), int(QtVersionManager::DocumentationSetting::None)); const int selectedIndex = m_documentationSetting->findData( int(QtVersionManager::documentationSetting())); @@ -436,10 +436,10 @@ void QtOptionsPageWidget::cleanUpQtVersions() return; - if (QMessageBox::warning(nullptr, tr("Remove Invalid Qt Versions"), - tr("Do you want to remove all invalid Qt Versions?
" - "
  • %1

" - "will be removed.").arg(text), + if (QMessageBox::warning(nullptr, Tr::tr("Remove Invalid Qt Versions"), + Tr::tr("Do you want to remove all invalid Qt Versions?
" + "
  • %1

" + "will be removed.").arg(text), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) return; @@ -490,7 +490,7 @@ QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const Qt if (!version) return info; - info.description = tr("Qt version %1 for %2").arg(version->qtVersionString(), version->description()); + info.description = Tr::tr("Qt version %1 for %2").arg(version->qtVersionString(), version->description()); if (!version->isValid()) { info.icon = m_invalidVersionIcon; info.message = version->invalidReason(); @@ -515,20 +515,20 @@ QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const Qt bool useable = true; QStringList warnings; if (!isNameUnique(version)) - warnings << tr("Display Name is not unique."); + warnings << Tr::tr("Display Name is not unique."); if (!missingToolChains.isEmpty()) { if (missingToolChains.count() == qtAbis.size()) { // Yes, this Qt version can't be used at all! info.message = - tr("No compiler can produce code for this Qt version." - " Please define one or more compilers for: %1").arg(formatAbiHtmlList(qtAbis)); + Tr::tr("No compiler can produce code for this Qt version." + " Please define one or more compilers for: %1").arg(formatAbiHtmlList(qtAbis)); info.icon = m_invalidVersionIcon; useable = false; } else { // Yes, some ABIs are unsupported - warnings << tr("Not all possible target environments can be supported due to missing compilers."); - info.toolTip = tr("The following ABIs are currently not supported: %1") + warnings << Tr::tr("Not all possible target environments can be supported due to missing compilers."); + info.toolTip = Tr::tr("The following ABIs are currently not supported: %1") .arg(formatAbiHtmlList(missingToolChains)); info.icon = m_warningVersionIcon; } @@ -637,7 +637,7 @@ void QtOptionsPageWidget::addQtDir() { FilePath qtVersion = FileUtils::getOpenFilePath(this, - tr("Select a qmake Executable"), + Tr::tr("Select a qmake Executable"), {}, BuildableHelperLibrary::filterForQmakeFileDialog(), nullptr, @@ -669,8 +669,8 @@ void QtOptionsPageWidget::addQtDir() if (alreadyExists) { // Already exist - QMessageBox::warning(this, tr("Qt Version Already Known"), - tr("This Qt version was already registered as \"%1\".") + QMessageBox::warning(this, Tr::tr("Qt Version Already Known"), + Tr::tr("This Qt version was already registered as \"%1\".") .arg(otherName)); return; } @@ -686,8 +686,8 @@ void QtOptionsPageWidget::addQtDir() m_nameEdit->setFocus(); m_nameEdit->selectAll(); } else { - QMessageBox::warning(this, tr("Qmake Not Executable"), - tr("The qmake executable %1 could not be added: %2").arg(qtVersion.toUserOutput()).arg(error)); + QMessageBox::warning(this, Tr::tr("Qmake Not Executable"), + Tr::tr("The qmake executable %1 could not be added: %2").arg(qtVersion.toUserOutput()).arg(error)); return; } updateCleanUpButton(); @@ -709,7 +709,7 @@ void QtOptionsPageWidget::editPath() QtVersion *current = currentVersion(); FilePath qtVersion = FileUtils::getOpenFilePath(this, - tr("Select a qmake Executable"), + Tr::tr("Select a qmake Executable"), current->qmakeFilePath().absolutePath(), BuildableHelperLibrary::filterForQmakeFileDialog(), nullptr, @@ -722,8 +722,8 @@ void QtOptionsPageWidget::editPath() // Same type? then replace! if (current->type() != version->type()) { // not the same type, error out - QMessageBox::critical(this, tr("Incompatible Qt Versions"), - tr("The Qt version selected must match the device type."), + QMessageBox::critical(this, Tr::tr("Incompatible Qt Versions"), + Tr::tr("The Qt version selected must match the device type."), QMessageBox::Ok); delete version; return; @@ -853,7 +853,7 @@ static Utils::optional currentlyLinkedQtDir(bool *hasInstallSettings) static QString linkingPurposeText() { - return QtOptionsPageWidget::tr( + return Tr::tr( "Linking with a Qt installation automatically registers Qt versions and kits, and other " "tools that were installed with that Qt installer, in this Qt Creator installation. Other " "Qt Creator installations are not affected."); @@ -869,7 +869,7 @@ static bool canLinkWithQt(QString *toolTip) tip << linkingPurposeText(); if (!Core::ICore::resourcePath().isWritableDir()) { canLink = false; - tip << QtOptionsPageWidget::tr("%1's resource directory is not writable.") + tip << Tr::tr("%1's resource directory is not writable.") .arg(Core::Constants::IDE_DISPLAY_NAME); } // guard against redirecting Qt Creator that is part of a Qt installations @@ -877,12 +877,12 @@ static bool canLinkWithQt(QString *toolTip) // TODO this will fail when make Qt Creator non-required in the Qt installers if (installSettingsExist && !installSettingsValue) { canLink = false; - tip << QtOptionsPageWidget::tr("%1 is part of a Qt installation.") + tip << Tr::tr("%1 is part of a Qt installation.") .arg(Core::Constants::IDE_DISPLAY_NAME); } const FilePath link = installSettingsValue ? *installSettingsValue : FilePath(); if (!link.isEmpty()) - tip << QtOptionsPageWidget::tr("%1 is currently linked to \"%2\".") + tip << Tr::tr("%1 is currently linked to \"%2\".") .arg(QString(Core::Constants::IDE_DISPLAY_NAME), link.toUserOutput()); if (toolTip) *toolTip = tip.join("\n\n"); @@ -970,7 +970,7 @@ static bool validateQtInstallDir(FancyLineEdit *input, QString *errorString) if (!settingsDirForQtDir(qtDir)) { if (errorString) { const QStringList filesToCheck = settingsFilesToCheck() + qtversionFilesToCheck(); - *errorString = "" + QtOptionsPageWidget::tr( + *errorString = "" + Tr::tr( "Qt installation information was not found in \"%1\". " "Choose a directory that contains one of the files %2") .arg(qtDir, "
" + filesToCheck.join('\n') + "
"); @@ -989,8 +989,8 @@ static FilePath defaultQtInstallationPath() void QtOptionsPageWidget::linkWithQt() { - const QString title = tr("Choose Qt Installation"); - const QString restartText = tr("The change will take effect after restart."); + const QString title = Tr::tr("Choose Qt Installation"); + const QString restartText = Tr::tr("The change will take effect after restart."); bool askForRestart = false; QDialog dialog(Core::ICore::dialogParent()); dialog.setWindowTitle(title); @@ -1001,9 +1001,9 @@ void QtOptionsPageWidget::linkWithQt() layout->addWidget(tipLabel); auto pathLayout = new QHBoxLayout; layout->addLayout(pathLayout); - auto pathLabel = new QLabel(tr("Qt installation path:")); + auto pathLabel = new QLabel(Tr::tr("Qt installation path:")); pathLabel->setToolTip( - tr("Choose the Qt installation directory, or a directory that contains \"%1\".") + Tr::tr("Choose the Qt installation directory, or a directory that contains \"%1\".") .arg(settingsFile(""))); pathLayout->addWidget(pathLabel); auto pathInput = new PathChooser; @@ -1023,11 +1023,11 @@ void QtOptionsPageWidget::linkWithQt() auto buttons = new QDialogButtonBox; layout->addStretch(10); layout->addWidget(buttons); - auto linkButton = buttons->addButton(tr("Link with Qt"), QDialogButtonBox::AcceptRole); + auto linkButton = buttons->addButton(Tr::tr("Link with Qt"), QDialogButtonBox::AcceptRole); connect(linkButton, &QPushButton::clicked, &dialog, &QDialog::accept); - auto cancelButton = buttons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole); + auto cancelButton = buttons->addButton(Tr::tr("Cancel"), QDialogButtonBox::RejectRole); connect(cancelButton, &QPushButton::clicked, &dialog, &QDialog::reject); - auto unlinkButton = buttons->addButton(tr("Remove Link"), QDialogButtonBox::DestructiveRole); + auto unlinkButton = buttons->addButton(Tr::tr("Remove Link"), QDialogButtonBox::DestructiveRole); unlinkButton->setEnabled(currentLink.has_value()); connect(unlinkButton, &QPushButton::clicked, &dialog, [&dialog, &askForRestart] { bool removeSettingsFile = false; @@ -1066,7 +1066,7 @@ void QtOptionsPageWidget::linkWithQt() QtOptionsPage::QtOptionsPage() { setId(Constants::QTVERSION_SETTINGS_PAGE_ID); - setDisplayName(QCoreApplication::translate("QtSupport", "Qt Versions")); + setDisplayName(Tr::tr("Qt Versions")); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); setWidgetCreator([] { return new QtOptionsPageWidget; }); } @@ -1086,5 +1086,4 @@ void QtOptionsPage::linkWithQt() QtOptionsPageWidget::linkWithQt(); } -} // namespace Internal -} // namespace QtSupport +} // QtSupport::Internal diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h index 6f5599f51a1..c4b44dbfa4c 100644 --- a/src/plugins/qtsupport/qtoptionspage.h +++ b/src/plugins/qtsupport/qtoptionspage.h @@ -27,8 +27,7 @@ #include -namespace QtSupport { -namespace Internal { +namespace QtSupport::Internal { class QtOptionsPage final : public Core::IOptionsPage { @@ -40,5 +39,4 @@ public: static void linkWithQt(); }; -} // Internal -} // QtSupport +} // QtSupport::Internal diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 442175a30f7..c1b53f9a240 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -33,7 +33,7 @@ #include "qtkitinformation.h" #include "qtoptionspage.h" #include "qtoutputformatter.h" -#include "qtsupportconstants.h" +#include "qtsupporttr.h" #include "qtversionmanager.h" #include "qtversions.h" #include "translationwizardpage.h" @@ -117,11 +117,11 @@ static void askAboutQtInstallation() Utils::InfoBarEntry info( kLinkWithQtInstallationSetting, - QtSupportPlugin::tr( + Tr::tr( "Link with a Qt installation to automatically register Qt versions and kits? To do " "this later, select Edit > Preferences > Kits > Qt Versions > Link with Qt."), Utils::InfoBarEntry::GlobalSuppression::Enabled); - info.addCustomButton(QtSupportPlugin::tr("Link with Qt"), [] { + info.addCustomButton(Tr::tr("Link with Qt"), [] { ICore::infoBar()->removeInfo(kLinkWithQtInstallationSetting); QTimer::singleShot(0, ICore::dialogParent(), &QtOptionsPage::linkWithQt); }); @@ -141,8 +141,8 @@ void QtSupportPlugin::extensionsInitialized() static const char kCurrentHostBins[] = "CurrentDocument:Project:QT_HOST_BINS"; expander->registerVariable( kCurrentHostBins, - tr("Full path to the host bin directory of the Qt version in the active kit " - "of the project containing the current document."), + Tr::tr("Full path to the host bin directory of the Qt version in the active kit " + "of the project containing the current document."), []() { const QtVersion * const qt = currentQtVersion(); return qt ? qt->hostBinPath().toUserOutput() : QString(); @@ -150,8 +150,8 @@ void QtSupportPlugin::extensionsInitialized() expander->registerVariable( "CurrentDocument:Project:QT_INSTALL_BINS", - tr("Full path to the target bin directory of the Qt version in the active kit " - "of the project containing the current document.
You probably want %1 instead.") + Tr::tr("Full path to the target bin directory of the Qt version in the active kit " + "of the project containing the current document.
You probably want %1 instead.") .arg(QString::fromLatin1(kCurrentHostBins)), []() { const QtVersion * const qt = currentQtVersion(); @@ -160,8 +160,8 @@ void QtSupportPlugin::extensionsInitialized() expander->registerVariable( "CurrentDocument:Project:QT_HOST_LIBEXECS", - tr("Full path to the host libexec directory of the Qt version in the active kit " - "of the project containing the current document."), + Tr::tr("Full path to the host libexec directory of the Qt version in the active kit " + "of the project containing the current document."), []() { const QtVersion *const qt = currentQtVersion(); return qt ? qt->hostLibexecPath().toUserOutput() : QString(); @@ -176,8 +176,8 @@ void QtSupportPlugin::extensionsInitialized() static const char kActiveHostBins[] = "ActiveProject:QT_HOST_BINS"; expander->registerVariable( kActiveHostBins, - tr("Full path to the host bin directory of the Qt version in the active kit " - "of the active project."), + Tr::tr("Full path to the host bin directory of the Qt version in the active kit " + "of the active project."), []() { const QtVersion * const qt = activeQtVersion(); return qt ? qt->hostBinPath().toUserOutput() : QString(); @@ -185,8 +185,8 @@ void QtSupportPlugin::extensionsInitialized() expander->registerVariable( "ActiveProject:QT_INSTALL_BINS", - tr("Full path to the target bin directory of the Qt version in the active kit " - "of the active project.
You probably want %1 instead.") + Tr::tr("Full path to the target bin directory of the Qt version in the active kit " + "of the active project.
You probably want %1 instead.") .arg(QString::fromLatin1(kActiveHostBins)), []() { const QtVersion * const qt = activeQtVersion(); @@ -195,8 +195,8 @@ void QtSupportPlugin::extensionsInitialized() expander->registerVariable( "ActiveProject::QT_HOST_LIBEXECS", - tr("Full path to the libexec bin directory of the Qt version in the active kit " - "of the active project."), + Tr::tr("Full path to the libexec bin directory of the Qt version in the active kit " + "of the active project."), []() { const QtVersion *const qt = activeQtVersion(); return qt ? qt->hostLibexecPath().toUserOutput() : QString(); diff --git a/src/plugins/qtsupport/qtversions.cpp b/src/plugins/qtsupport/qtversions.cpp index 12a73e73355..c5b0bb456ec 100644 --- a/src/plugins/qtsupport/qtversions.cpp +++ b/src/plugins/qtsupport/qtversions.cpp @@ -27,6 +27,7 @@ #include "baseqtversion.h" #include "qtsupportconstants.h" +#include "qtsupporttr.h" #include #include @@ -39,11 +40,7 @@ #include #include -#include -#include - -namespace QtSupport { -namespace Internal { +namespace QtSupport::Internal { class DesktopQtVersion : public QtVersion { @@ -63,14 +60,14 @@ QStringList DesktopQtVersion::warningReason() const QStringList ret = QtVersion::warningReason(); if (qtVersion() >= QtVersionNumber(5, 0, 0)) { if (qmlRuntimeFilePath().isEmpty()) - ret << QCoreApplication::translate("QtVersion", "No QML utility installed."); + ret << Tr::tr("No QML utility installed."); } return ret; } QString DesktopQtVersion::description() const { - return QCoreApplication::translate("QtVersion", "Desktop", "Qt Version is meant for the desktop"); + return Tr::tr("Desktop", "Qt Version is meant for the desktop"); } QSet DesktopQtVersion::availableFeatures() const @@ -111,8 +108,7 @@ public: QString description() const override { - return QCoreApplication::translate("QtVersion", "Embedded Linux", - "Qt Version is used for embedded Linux development"); + return Tr::tr("Embedded Linux", "Qt Version is used for embedded Linux development"); } QSet targetDeviceTypes() const override @@ -130,5 +126,4 @@ EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory() setRestrictionChecker([](const SetupData &) { return false; }); } -} // Internal -} // QtSupport +} // QtSupport::Internal diff --git a/src/plugins/qtsupport/qtversions.h b/src/plugins/qtsupport/qtversions.h index eb939816d48..621710b1129 100644 --- a/src/plugins/qtsupport/qtversions.h +++ b/src/plugins/qtsupport/qtversions.h @@ -27,8 +27,7 @@ #include "qtversionfactory.h" -namespace QtSupport { -namespace Internal { +namespace QtSupport::Internal { class DesktopQtVersionFactory : public QtVersionFactory { @@ -42,5 +41,4 @@ public: EmbeddedLinuxQtVersionFactory(); }; -} // Internal -} // QtSupport +} // QtSupport::Internal diff --git a/src/plugins/qtsupport/translationwizardpage.cpp b/src/plugins/qtsupport/translationwizardpage.cpp index 36386bc4b25..fa7ea814bd1 100644 --- a/src/plugins/qtsupport/translationwizardpage.cpp +++ b/src/plugins/qtsupport/translationwizardpage.cpp @@ -25,9 +25,12 @@ #include "translationwizardpage.h" +#include "qtsupporttr.h" + #include + #include -#include +#include #include #include @@ -88,14 +91,14 @@ TranslationWizardPage::TranslationWizardPage(const QString &enabledExpr) { const auto mainLayout = new QVBoxLayout(this); const auto descriptionLabel = new QLabel( - tr("If you plan to provide translations for your project's " - "user interface via the Qt Linguist tool, please select a language here. " - "A corresponding translation (.ts) file will be generated for you.")); + Tr::tr("If you plan to provide translations for your project's " + "user interface via the Qt Linguist tool, please select a language here. " + "A corresponding translation (.ts) file will be generated for you.")); descriptionLabel->setWordWrap(true); mainLayout->addWidget(descriptionLabel); const auto formLayout = new QFormLayout; mainLayout->addLayout(formLayout); - m_languageComboBox.addItem(tr("")); + m_languageComboBox.addItem(Tr::tr("")); QList allLocales = QLocale::matchingLocales( QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry); allLocales.removeOne(QLocale::C); @@ -113,12 +116,12 @@ TranslationWizardPage::TranslationWizardPage(const QString &enabledExpr) localeStrings.end()); for (const LocalePair &lp : qAsConst(localeStrings)) m_languageComboBox.addItem(lp.first, lp.second); - formLayout->addRow(tr("Language:"), &m_languageComboBox); + formLayout->addRow(Tr::tr("Language:"), &m_languageComboBox); const auto fileNameLayout = new QHBoxLayout; m_fileNameLineEdit.setReadOnly(true); fileNameLayout->addWidget(&m_fileNameLineEdit); fileNameLayout->addStretch(1); - formLayout->addRow(tr("Translation file:"), fileNameLayout); + formLayout->addRow(Tr::tr("Translation file:"), fileNameLayout); connect(&m_languageComboBox, &QComboBox::currentIndexChanged, this, &TranslationWizardPage::updateLineEdit); } @@ -154,7 +157,7 @@ void TranslationWizardPage::updateLineEdit() m_fileNameLineEdit.setText(projectName + '_' + m_languageComboBox.currentData().toString()); } else { m_fileNameLineEdit.clear(); - m_fileNameLineEdit.setPlaceholderText(tr("")); + m_fileNameLineEdit.setPlaceholderText(Tr::tr("")); } emit completeChanged(); }
" << QCoreApplication::translate("QtVersion", "Name:") + str << "
" << Tr::tr("Name:") << "" << displayName() << "
" - << QCoreApplication::translate("QtVersion", "Invalid Qt version") + << Tr::tr("Invalid Qt version") << "
" << QCoreApplication::translate("QtVersion", "ABI:") + str << "
" << Tr::tr("ABI:") << "
" << QCoreApplication::translate("QtVersion", "Source:") + str << "
" << Tr::tr("Source:") << "" << sourcePath().toUserOutput() << "
" << QCoreApplication::translate("QtVersion", "mkspec:") + str << "
" << Tr::tr("mkspec:") << "" << QDir::toNativeSeparators(mkspec()) << "
" << QCoreApplication::translate("QtVersion", "qmake:") + str << "
" << Tr::tr("qmake:") << "" << d->m_qmakeCommand.toUserOutput() << "
" << QCoreApplication::translate("QtVersion", "Default:") << "" + str << "
" << Tr::tr("Default:") << "" << (d->m_defaultConfigIsDebug ? "debug" : "release"); if (d->m_defaultConfigIsDebugAndRelease) str << " debug_and_release"; str << "
" << QCoreApplication::translate("QtVersion", "Version:") + str << "
" << Tr::tr("Version:") << "" << qtVersionString() << "