diff --git a/share/qtcreator/qmldesigner/landingpage/content/InstallQdsStatusBlock.ui.qml b/share/qtcreator/qmldesigner/landingpage/content/InstallQdsStatusBlock.ui.qml index 7f63c60e2f9..f12372b0ff9 100644 --- a/share/qtcreator/qmldesigner/landingpage/content/InstallQdsStatusBlock.ui.qml +++ b/share/qtcreator/qmldesigner/landingpage/content/InstallQdsStatusBlock.ui.qml @@ -35,19 +35,19 @@ Rectangle { width: parent.width topPadding: 0 padding: Theme.Values.spacing - text: qsTr("No Qt Design Studio installation found") + text: qsTranslate("::QmlProjectManager", "No Qt Design Studio installation found") } PageText { id: suggestionText width: parent.width padding: Theme.Values.spacing - text: qsTr("Would you like to install it now?") + text: qsTranslate("::QmlProjectManager", "Would you like to install it now?") } PushButton { id: installButton - text: qsTr("Install") + text: qsTranslate("::QmlProjectManager", "Install") anchors.horizontalCenter: parent.horizontalCenter } } diff --git a/share/qtcreator/qmldesigner/landingpage/content/ProjectInfoStatusBlock.ui.qml b/share/qtcreator/qmldesigner/landingpage/content/ProjectInfoStatusBlock.ui.qml index f0887b7c7fd..4704d8399f2 100644 --- a/share/qtcreator/qmldesigner/landingpage/content/ProjectInfoStatusBlock.ui.qml +++ b/share/qtcreator/qmldesigner/landingpage/content/ProjectInfoStatusBlock.ui.qml @@ -19,8 +19,8 @@ Rectangle { property bool qdsInstalled: qdsVersionText.text.length > 0 property bool projectFileExists: false - property string qtVersion: qsTr("Unknown") - property string qdsVersion: qsTr("Unknown") + property string qtVersion: qsTranslate("::QmlProjectManager", "Unknown") + property string qdsVersion: qsTranslate("::QmlProjectManager", "Unknown") property alias generateProjectFileButton: generateProjectFileButton color: Theme.Colors.backgroundSecondary @@ -41,7 +41,7 @@ Rectangle { PageText { id: projectFileInfoTitle width: parent.width - text: qsTr("QML PROJECT FILE INFO") + text: qsTranslate("::QmlProjectManager", "QML PROJECT FILE INFO") } Column { @@ -53,14 +53,14 @@ Rectangle { id: qtVersionText width: parent.width padding: Theme.Values.spacing - text: qsTr("Qt Version - ") + root.qtVersion + text: qsTranslate("::QmlProjectManager", "Qt Version - ") + root.qtVersion } PageText { id: qdsVersionText width: parent.width padding: Theme.Values.spacing - text: qsTr("Qt Design Studio Version - ") + root.qdsVersion + text: qsTranslate("::QmlProjectManager", "Qt Design Studio Version - ") + root.qdsVersion } } @@ -73,12 +73,12 @@ Rectangle { id: projectFileInfoMissingText width: parent.width padding: Theme.Values.spacing - text: qsTr("No QML project file found - Would you like to create one?") + text: qsTranslate("::QmlProjectManager", "No QML project file found - Would you like to create one?") } PushButton { id: generateProjectFileButton - text: qsTr("Generate") + text: qsTranslate("::QmlProjectManager", "Generate") anchors.horizontalCenter: parent.horizontalCenter } } diff --git a/share/qtcreator/qmldesigner/landingpage/content/Screen01.ui.qml b/share/qtcreator/qmldesigner/landingpage/content/Screen01.ui.qml index 16611edaf2f..6929a3ec6ac 100644 --- a/share/qtcreator/qmldesigner/landingpage/content/Screen01.ui.qml +++ b/share/qtcreator/qmldesigner/landingpage/content/Screen01.ui.qml @@ -101,7 +101,7 @@ Rectangle { Text { id: qdsText anchors.horizontalCenter: parent.horizontalCenter - text: qsTr("Qt Design Studio") + text: qsTranslate("::QmlProjectManager", "Qt Design Studio") font.pixelSize: Theme.Values.fontSizeTitle font.family: Theme.Values.baseFont color: Theme.Colors.text @@ -150,13 +150,13 @@ Rectangle { id: openQdsText width: buttonBoxGrid.tmpWidth padding: Theme.Values.spacing - text: qsTr("Open with Qt Design Studio") + text: qsTranslate("::QmlProjectManager", "Open with Qt Design Studio") wrapMode: Text.NoWrap } PushButton { id: openQds - text: qsTr("Open") + text: qsTranslate("::QmlProjectManager", "Open") enabled: LandingPageApi.qdsInstalled anchors.horizontalCenter: parent.horizontalCenter } @@ -170,20 +170,20 @@ Rectangle { id: openQtcText width: buttonBoxGrid.tmpWidth padding: Theme.Values.spacing - text: qsTr("Open with Qt Creator - Text Mode") + text: qsTranslate("::QmlProjectManager", "Open with Qt Creator - Text Mode") wrapMode: Text.NoWrap } PushButton { id: openQtc - text: qsTr("Open") + text: qsTranslate("::QmlProjectManager", "Open") anchors.horizontalCenter: parent.horizontalCenter } } CustomCheckBox { id: rememberCheckbox - text: qsTr("Remember my choice") + text: qsTranslate("::QmlProjectManager", "Remember my choice") font.family: Theme.Values.baseFont Layout.columnSpan: buttonBoxGrid.columns Layout.alignment: Qt.AlignHCenter diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index b77d9fed4a0..510dd70d325 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -11075,7 +11075,7 @@ přidat do správy verzí (%2)? - QmlProjectManager::Internal::QmlNewProjectWizard + ::QmlProjectManager QML Application Program QML @@ -11092,9 +11092,6 @@ přidat do správy verzí (%2)? The project %1 could not be opened. Projekt %1 se nepodařilo otevřít. - - - QmlProjectManager::Internal::QmlNewProjectWizardDialog New QML Project Nový projekt QML @@ -11103,9 +11100,6 @@ přidat do správy verzí (%2)? This wizard generates a QML application project. Tento průvodce vytvoří jeden projekt programu QML. - - - QmlProjectManager::Internal::QmlProjectWizard Import of existing QML directory Zavést stávající adresář QML @@ -11114,17 +11108,6 @@ přidat do správy verzí (%2)? Creates a QML project from an existing directory of QML files. Vytvoří projekt QML ze stávajícího adresáře se soubory QML. - - Projects - Projekty - - - The project %1 could not be opened. - Projekt %1 se nepodařilo otevřít. - - - - QmlProjectManager::Internal::QmlProjectWizardDialog Import of QML Project Zavedení projektu QML @@ -11141,13 +11124,6 @@ přidat do správy verzí (%2)? Location: Umístění: - - - QmlProjectManager::Internal::QmlRunConfiguration - - QML Viewer - Prohlížeč QML - <Current File> <Nynější soubor> @@ -18323,7 +18299,7 @@ Důvod: %2 - QmlProjectManager::Internal::QmlMakeStepConfigWidget + ::QmlProjectManager <b>QML Make</b> <b>QML Make</b> @@ -24180,7 +24156,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - QmlProjectManager::QmlTarget + ::QmlProjectManager QML Viewer QML Viewer target display name @@ -25304,7 +25280,7 @@ Ověřte, prosím, nastavení svého projektu. - QmlProjectManager::QmlProject + ::QmlProjectManager Error while loading project file! Chyba při nahrávání projektového souboru! @@ -25337,28 +25313,6 @@ Ověřte, prosím, nastavení svého projektu. No Qt version set in kit. V sadě není nastavena verze Qt. - - - QmlProjectManager::Internal::QmlProjectApplicationWizardDialog - - New QML Project - Nový projekt QML - - - This wizard generates a QML application project. - Tento průvodce vytvoří jeden projekt programu QML. - - - New Qt Quick UI Project - Nový projekt Qt Quick UI - - - This wizard generates a Qt Quick UI project. - Tento průvodce vytvoří projekt Qt Quick UI. - - - - QmlProjectManager::Internal::QmlProjectApplicationWizard Qt QML Application Program Qt QML @@ -25375,10 +25329,6 @@ Ověřte, prosím, nastavení svého projektu. Comment added to generated .qmlproject file Seznam adresářů s přídavnými moduly podaný pro dobu běhu QML - - Qt Quick UI - Qt Quick UI - Creates a Qt Quick UI project with a single QML file that contains the main view. @@ -25407,16 +25357,10 @@ You can review Qt Quick UI projects in the QML Viewer and you need not build the Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v prohlížeči QML. K vytvoření a ke spuštění tohoto typu projektů není potřeba, aby bylo ve vašem počítači nainstalováno vývojářské prostředí. - - - ::QmlProjectManager Qt Quick Project Projekt Qt Quick - - - QmlProjectManager::Internal::QmlProjectImportWizardDialog Import Existing Qt QML Directory Zavést stávající adresář Qt QML @@ -25425,50 +25369,16 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v Project Name and Location Název a adresář projektu - - Project name: - Název projektu: - - - Location: - Umístění: - Location Umístění - - - QmlProjectManager::Internal::QmlProjectImportWizard - - Import Existing Qt QML Directory - Zavést stávající adresář Qt QML - - - Creates a QML project from an existing directory of QML files. - Vytvoří projekt QML ze stávajícího adresáře se soubory QML. - File generated by QtCreator qmlproject Template Comment added to generated .qmlproject file Soubor vytvořený programem Qt Creator - - Include .qml, .js, and image files from current directory and subdirectories - qmlproject Template - Comment added to generated .qmlproject file - Zahrnout soubory .qml, .js a soubory s obrázky z nynějšího adresáře a podadresářů - - - List of plugin directories passed to QML runtime - qmlproject Template - Comment added to generated .qmlproject file - Seznam adresářů s přídavnými moduly podaný pro dobu běhu QML - - - - QmlProjectManager::Internal::Manager Failed opening project '%1': Project already open Projekt '%1' se nepodařil otevřít, neboť projekt je již otevřen @@ -25481,9 +25391,6 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v Failed opening project '%1': Project is not a file Projekt '%1' se nepodařil otevřít: Daný projektový soubor není soubor - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlobserver found. Žádný qmlviewer nebo qmlobserver se nepodařilo najít. @@ -25502,18 +25409,6 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v QMLRunConfiguration display name. Prohlížeč QML - - QML Viewer - Prohlížeč QML - - - QML Viewer arguments: - Argumenty pro prohlížeč QML: - - - Main QML File: - Hlavní soubor QML: - Debugging Address: Adresa pro ladění: @@ -25531,7 +25426,7 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory + ::QmlProjectManager Run QML Script Spustit skript QML @@ -25544,9 +25439,6 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v QML Scene Scéna QML - - - QmlProjectManager::Internal::QmlRunControl Starting %1 %2 Spouští se %1 %2 @@ -25555,16 +25447,10 @@ Projekty Qt Quick UI není potřeba je sestavovat a lze je spouštět přímo v %1 exited with code %2 %1 ukončen. Vrácená hodnota %2 - - - QmlProjectManager::Internal::QmlRunControlFactory Run Spustit - - - QmlProjectManager::Internal::QmlTaskManager QML QML @@ -34000,7 +33886,7 @@ Chcete pokračovat? - QmlProjectManager::QmlProjectPlugin + ::QmlProjectManager Open Qt4 Options Otevřít nastavení pro knihovnu Qt4 @@ -34033,9 +33919,6 @@ Sestavení pozorovatele QML se děje na stránce pro nastavení Qt pomocí výb QML Observer is used to offer debugging features for QML applications, such as interactive debugging and inspection tools. It must be compiled for each used Qt version separately. On the Qt4 options page, select the current Qt installation and click Rebuild. Pozorovatel QML se používá pro nabídnutí dodatečných funkcí pro programy QML, jako je například interaktivní náhled na změny kódu a další nástroje ke zkoumání. Musí být pro každou použitou verzi Qt sestaven odděleně. To se děje na stránce 'Nastavení Qt' pomocí výběru nynější instalace Qt a klepnutí na 'Sestavit znovu'. - - - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget Manage Qt versions Spravovat verze Qt @@ -34064,17 +33947,10 @@ Sestavení pozorovatele QML se děje na stránce pro nastavení Qt pomocí výb Run Environment Prováděcí prostředí - - System Environment - Prostředí systému - Invalid Qt version Neplatná verze Qt - - - QmlProjectManager::Internal::QmlProjectRunControl Starting %1 %2 @@ -34087,13 +33963,6 @@ Sestavení pozorovatele QML se děje na stránce pro nastavení Qt pomocí výb %1 ukončen. Vrácená hodnota %2 - - - QmlProjectManager::Internal::QmlProjectRunControlFactory - - Run - Spustit - Not enough free ports for QML debugging. Není dostatek volných portů pro ladění QML. @@ -51331,7 +51200,7 @@ Vzdálený: %4 - QmlProjectManager::Internal::QmlApplicationWizardDialog + ::QmlProjectManager New Qt Quick UI Project Nový projekt Qt Quick UI @@ -51344,9 +51213,6 @@ Vzdálený: %4 Component Set Sada součástek - - - QmlProjectManager::Internal::QmlApplicationWizard Qt Quick Application Program Qt Quick @@ -53297,7 +53163,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - QmlProjectManager::QmlProjectEnvironmentAspect + ::QmlProjectManager System Environment Prostředí systému @@ -53577,7 +53443,7 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen - QmlProjectManager::QmlApplicationWizardDialog + ::QmlProjectManager Creates a Qt Quick 1 UI project with a single QML file that contains the main view.&lt;br/&gt;You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.&lt;br/&gt;&lt;br/&gt;Requires &lt;b&gt;Qt 4.8&lt;/b&gt; or newer. Vytvoří projekt Qt Quick 1 UI s jediným souborem QML, který obsahuje hlavní pohled.&lt;br/&gt;Projekty Qt Quick 1 UI není potřeba je sestavovat a lze je spouštět přímo v prohlížeči QML. K vytvoření a ke spuštění tohoto typu projektů není potřeba, aby bylo ve vašem počítači nainstalováno vývojářské prostředí.&lt;br/&gt;&lt;br/&gt;Vyžaduje &lt;b&gt;Qt 4.8&lt;/b&gt; nebo novější. @@ -55326,14 +55192,11 @@ Zavřete, prosím, všechny běžící instance své aplikace, předtím než za - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 Neplatný kořenový prvek: %1 - - - QmlProjectManager::Internal::QmlComponentSetPage Select Qt Quick Component Set Vybrat sadu součástek Qt Quick @@ -55751,7 +55614,7 @@ se vyskytla chyba - QmlProjectManager::QmlApplicationWizard + ::QmlProjectManager Creates a Qt Quick 1 UI project with a single QML file that contains the main view. You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 4.8 or newer. Vytvoří projekt Qt Quick 1 UI s jediným souborem QML, který obsahuje hlavní pohled. diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 8c0daeffddb..9c1beee6c60 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -30440,7 +30440,7 @@ Vil du gemme dataene først? - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget + ::QmlProjectManager Arguments: Argumenter: @@ -30449,9 +30449,6 @@ Vil du gemme dataene først? Main QML file: Hoved-QML-fil: - - - QmlProjectManager::QmlProject Error while loading project file %1. Fejl ved indlæsning af projektfilen %1. @@ -30480,9 +30477,6 @@ Vil du gemme dataene først? Non-desktop Qt is used with a desktop device. Ikke-skrivebords Qt brugt med en skrivebordsenhed. - - - QmlProjectManager::QmlProjectEnvironmentAspect System Environment Systemmiljø @@ -30491,16 +30485,10 @@ Vil du gemme dataene først? Clean Environment Rensmiljø - - - QmlProjectManager::QmlProjectFileFormat Invalid root element: %1 Ugyldigt rodelement: %1 - - - QmlProjectManager::QmlProjectRunConfiguration QML Scene QMLRunConfiguration display name. @@ -30522,9 +30510,6 @@ Vil du gemme dataene først? No script file to execute. Ingen script-fil at eksekvere. - - - QmlProjectManager::QmlTarget QML Viewer QML Viewer target display name diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 808dc2551d3..bacb26fc4fb 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -14613,7 +14613,7 @@ Locked components cannot be modified or selected. - QmlProjectManager::QmlProject + ::QmlProjectManager Kit has no device. Das Kit hat kein Gerät. @@ -14634,9 +14634,6 @@ Locked components cannot be modified or selected. No Qt version set in kit. Im Kit ist keine Qt-Version gesetzt. - - - QmlProjectManager::QmlProjectRunConfiguration System Environment Systemumgebung @@ -28409,7 +28406,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 Ungültiges Wurzelelement: %1 @@ -45789,14 +45786,11 @@ Do you want to display them anyway? - QmlProjectManager::QmlMainFileAspect + ::QmlProjectManager Main QML file: QML-Hauptdatei: - - - QmlProjectManager::QmlBuildSystem Error while loading project file %1. Fehler beim Laden der Projektdatei %1. @@ -47326,7 +47320,7 @@ Exporting assets: %2 - InstallQdsStatusBlock.ui + ::QmlProjectManager No Qt Design Studio installation found @@ -47339,9 +47333,6 @@ Exporting assets: %2 Install Installieren - - - ProjectInfoStatusBlock.ui Unknown Unbekannt @@ -47366,9 +47357,6 @@ Exporting assets: %2 Generate - - - Screen01.ui Qt Design Studio Qt Design Studio @@ -54872,7 +54860,7 @@ fails because Clang does not understand the target architecture. - QmlDesigner::GenerateCmake + ::QmlProjectManager Select Files to Generate @@ -54921,9 +54909,6 @@ The following files or directories are missing: Cannot Generate CMake Files - - - QmlDesigner::CmakeProjectConverter Export as Latest Project Format @@ -54946,9 +54931,6 @@ The following files or directories are missing: %1. - - - QmlDesigner::CmakeProjectConverterDialog This process creates a copy of the existing project. The new project's folder structure is adjusted for CMake build process and necessary related new files are generated. @@ -54991,9 +54973,6 @@ The new project can be opened in Qt Creator using the main CMakeLists.txt file.< Project directory already exists. - - - QmlProjectManager::QmlMultiLanguageAspect Use MultiLanguage in 2D view @@ -55002,13 +54981,6 @@ The new project can be opened in Qt Creator using the main CMakeLists.txt file.< Reads translations from MultiLanguage plugin. - - - QmlProjectManager::Internal::QmlProjectPlugin - - Qt Design Studio - Qt Design Studio - No project file (*.qmlproject) found for Qt Design Studio. Qt Design Studio requires a .qmlproject based project to open the .ui.qml file. diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 4030a0f7dfb..22426d47515 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -7784,7 +7784,7 @@ al control de versiones (%2)? - QmlProjectManager::Internal::QmlNewProjectWizard + ::QmlProjectManager QML Application Aplicación QML @@ -7801,9 +7801,6 @@ al control de versiones (%2)? The project %1 could not be opened. El proyecto %1 no pudo ser abierto. - - - QmlProjectManager::Internal::QmlNewProjectWizardDialog New QML Project Nuevo proyecto QML @@ -7812,9 +7809,6 @@ al control de versiones (%2)? This wizard generates a QML application project. Este asistente genera un proyecto de aplicación QML. - - - QmlProjectManager::Internal::QmlProjectWizard Import of existing QML directory Importación de directorio existente con QML @@ -7823,17 +7817,6 @@ al control de versiones (%2)? Creates a QML project from an existing directory of QML files. Crea un proyecto a partir de un directorio existente conteniendo archivos QML. - - Projects - Proyectos - - - The project %1 could not be opened. - El proyecto %1 no pudo ser abierto. - - - - QmlProjectManager::Internal::QmlProjectWizardDialog Import of QML Project Importación de proyecto QML @@ -7850,9 +7833,6 @@ al control de versiones (%2)? Location: Localización: - - - QmlProjectManager::Internal::QmlRunConfiguration QML Viewer Visualizador QML @@ -12403,7 +12383,7 @@ Reason: %2 - QmlProjectManager::Internal::QmlMakeStepConfigWidget + ::QmlProjectManager <b>QML Make</b> diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index a3dcfbce30a..805e68ded47 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -11428,7 +11428,7 @@ au système de gestion de version (%2) ? - QmlProjectManager::Internal::QmlNewProjectWizard + ::QmlProjectManager QML Application Application QML @@ -11445,9 +11445,6 @@ au système de gestion de version (%2) ? The project %1 could not be opened. Le projet %1 n'a pas pu être ouvert. - - - QmlProjectManager::Internal::QmlNewProjectWizardDialog New QML Project Nouveau projet QML @@ -11456,9 +11453,6 @@ au système de gestion de version (%2) ? This wizard generates a QML application project. Cet assistant génère un projet pour une application QML. - - - QmlProjectManager::Internal::QmlProjectWizard Import of existing QML directory Importer un répertoire QML existant @@ -11467,17 +11461,6 @@ au système de gestion de version (%2) ? Creates a QML project from an existing directory of QML files. Crée un projet QML à partir d'un répertoire existant de fichiers QML. - - Projects - Projets - - - The project %1 could not be opened. - Le projet %1 n'a pas pu être ouvert. - - - - QmlProjectManager::Internal::QmlProjectWizardDialog Import of QML Project Importation de projet QML @@ -11494,13 +11477,6 @@ au système de gestion de version (%2) ? Location: Emplacement : - - - QmlProjectManager::Internal::QmlRunConfiguration - - QML Viewer - Visualisateur QML - <Current File> <Fichier courant> @@ -17454,7 +17430,7 @@ Raison : %2 - QmlProjectManager::Internal::QmlMakeStepConfigWidget + ::QmlProjectManager <b>QML Make</b> <b>Make de QML</b> @@ -23247,7 +23223,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - QmlProjectManager::QmlTarget + ::QmlProjectManager QML Viewer QML Viewer target display name @@ -24372,7 +24348,7 @@ Erreurs : - QmlProjectManager::QmlProject + ::QmlProjectManager Error while loading project file! Erreur lors du chargement du fichier de projet ! @@ -24406,30 +24382,6 @@ Erreurs : No Qt version set in kit. Pas de version de Qt définie dans le kit. - - - QmlProjectManager::Internal::QmlProjectApplicationWizardDialog - - New QML Project - Nouveau projet QML - - - This wizard generates a QML application project. - Cet assistant génère un projet pour une application QML. - - - New Qt Quick UI Project - myzu : garder UI ou traduire ? John : Je pense qu'on peut traduire ! - Nouveau projet d'IHM Qt Quick - - - This wizard generates a Qt Quick UI project. - myzu : traduire UI ? - Cet assistant génère un projet UI Qt Quick. - - - - QmlProjectManager::Internal::QmlProjectApplicationWizard Qt QML Application Application QML @@ -24440,10 +24392,6 @@ Erreurs : QML application projects are executed through the QML runtime and do not need to be built. Créer un projet pour une application QML avec un seul fichier QML contenant la vue principale.\n\nLes applications QML sont exécutées sur le runtine QML et n'ont pas besoin d'être compilées. - - Qt Quick UI - IHM Qt Quick - Creates a Qt Quick UI project with a single QML file that contains the main view. @@ -24470,18 +24418,6 @@ Vous pouvez voir le projet d'interface Qt Quick dans le visualiseur QML san Comment added to generated .qmlproject file Fichier généré par Qt Creator - - Include .qml, .js, and image files from current directory and subdirectories - qmlproject Template - Comment added to generated .qmlproject file - Inclure les fichiers .qml, .ls et les images depuis le répertoire courrant et ses sous-répertoires - - - List of plugin directories passed to QML runtime - qmlproject Template - Comment added to generated .qmlproject file - Liste des répertoires passés au runtime QML - Qt Quick 2 UI Interface utilisateur Qt Quick 2 @@ -24514,16 +24450,10 @@ Vous pouvez vérifier les projets d''interface utilisateur Qt Quick 1 Nécessite <b>Qt 4.8</b> ou plus récent. - - - ::QmlProjectManager Qt Quick Project Projet Qt Quick - - - QmlProjectManager::Internal::QmlProjectImportWizardDialog Import Existing Qt QML Directory Importer un répertoire Qt QML existant @@ -24532,35 +24462,10 @@ Nécessite <b>Qt 4.8</b> ou plus récent. Project Name and Location Nom du projet et emplacement - - Project name: - Nom du projet : - - - Location: - Emplacement : - Location Emplacement - - - QmlProjectManager::Internal::QmlProjectImportWizard - - Import Existing Qt QML Directory - Importer un répertoire Qt QML existant - - - Creates a QML project from an existing directory of QML files. - Crée un projet QML à partir d'un répertoire existant de fichiers QML. - - - File generated by QtCreator - qmlproject Template - Comment added to generated .qmlproject file - Fichier généré par Q tCreator - Include .qml, .js, and image files from current directory and subdirectories qmlproject Template @@ -24573,9 +24478,6 @@ Nécessite <b>Qt 4.8</b> ou plus récent. Comment added to generated .qmlproject file Liste des répertoires des plug-ins passée au runtime QML - - - QmlProjectManager::Internal::Manager Failed opening project '%1': Project already open Échec de l'ouverture du projet "%1" : projet déjà ouvert @@ -24588,9 +24490,6 @@ Nécessite <b>Qt 4.8</b> ou plus récent. Failed opening project '%1': Project is not a file Échec de l'ouverture du projet "%1" : le projet n'est pas un fichier - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlobserver found. Pas de qmlviewer ou qmlobserver trouvé. @@ -24617,34 +24516,14 @@ Nécessite <b>Qt 4.8</b> ou plus récent. Qt version: Version de Qt : - - Arguments: - Arguments : - Debugger: Débogueur : - - Main QML file: - Fichier QML principal : - Invalid Qt version Version de Qt invalide - - QML Viewer - Visualisateur QML - - - QML Viewer arguments: - Arguments du visualisateur QML : - - - Main QML File: - Fichier QML principal : - Debugging Address: Addresse du débogeur : @@ -24662,7 +24541,7 @@ Nécessite <b>Qt 4.8</b> ou plus récent. - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory + ::QmlProjectManager Run QML Script Executer le script QML @@ -24675,9 +24554,6 @@ Nécessite <b>Qt 4.8</b> ou plus récent. QML Scene QML Scene - - - QmlProjectManager::Internal::QmlRunControl Starting %1 %2 Démarrer %1 %2 @@ -24686,9 +24562,6 @@ Nécessite <b>Qt 4.8</b> ou plus récent. %1 exited with code %2 %1 a quitté avec le code %2 - - - QmlProjectManager::Internal::QmlRunControlFactory Run Exécuter @@ -24701,10 +24574,6 @@ Nécessite <b>Qt 4.8</b> ou plus récent. Cancel Annuler - - QML Observer Missing - L'observateur QML est manquant - QML Observer could not be found. L'observateur QML n'a pas pu être trouvé. @@ -24714,9 +24583,6 @@ Nécessite <b>Qt 4.8</b> ou plus récent. pour "telles": s'accorde avec fonctionnalités (cf http://home.ican.net/~galandor/grammair/fich_002.htm ) L'observateur QML est utilisé pour offrir des fonctionnalités de débogage pour les applications QML, telles que des outils de débogage interactif et d'inspection. Il doit être compilé séparément pour chaque version de Qt utilisée. Sur la page d'options Qt4, séléctionner l'installation courante de Qt et cliquer sur recompiler. - - - QmlProjectManager::Internal::QmlTaskManager QML QML @@ -31938,19 +31804,11 @@ Please build the debugging helpers on the Qt version options page. - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget - - Manage Qt versions - Gérer les versions de Qt - + ::QmlProjectManager Manage Qt versions... Gestionnaire des versions de Qt... - - Qt version: - Version de Qt : - Arguments: Arguments : @@ -35236,7 +35094,7 @@ Souhaitez-vous réessayer ? - QmlProjectManager::Internal::QmlProjectRunControl + ::QmlProjectManager Starting %1 %2 @@ -35248,33 +35106,6 @@ Souhaitez-vous réessayer ? %1 a quitté avec le code %2 - - - QmlProjectManager::Internal::QmlProjectRunControlFactory - - Run - Exécuter - - - Open Qt4 Options - Ouvrir les options de Qt4 - - - Cancel - Annuler - - - QML Observer Missing - L'observateur QML est manquant - - - QML Observer could not be found. - L'observateur QML n'a pas pu être trouvé. - - - QML Observer is used to offer debugging features for QML applications, such as interactive debugging and inspection tools. It must be compiled for each used Qt version separately. On the Qt4 options page, select the current Qt installation and click Rebuild. - L'observateur QML est utilisé pour offrir des fonctionnalités de débogage pour les applications QML, telles que des outils de débogage interactif et d'inspection. Il doit être compilé séparément pour chaque version de Qt utilisée. Sur la page d'options Qt4, séléctionner l'installation courante de Qt et cliquer sur recompiler. - Not enough free ports for QML debugging. Pas assez de ports disponibles pour le débogage QML. @@ -37074,11 +36905,7 @@ Remote error output was: %1 - QmlProjectManager::QmlProjectPlugin - - Open Qt4 Options - Ouvrir les options de Qt4 - + ::QmlProjectManager Open Qt Versions Ouvrir les versions de Qt @@ -37099,14 +36926,6 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi Pour compiler l'observateur QML, allez à la page des versions de Qt, sélectionnez la versions actuelle de Qt et cliquez sur Construire dans la section Assistants. - - QML Observer could not be found. - L'observateur QML n'a pas pu être trouvé. - - - QML Observer is used to offer debugging features for QML applications, such as interactive debugging and inspection tools. It must be compiled for each used Qt version separately. On the Qt4 options page, select the current Qt installation and click Rebuild. - L'observateur QML est utilisé pour offrir des fonctionnalités de débogage pour les applications QML, telles que des outils de débogage interactif et d'inspection. Il doit être compilé séparément pour chaque version de Qt utilisée. Sur la page d'options Qt4, séléctionner l'installation courante de Qt et cliquer sur recompiler. - ::RemoteLinux @@ -49678,7 +49497,7 @@ Distant : %4 - QmlProjectManager::Internal::QmlApplicationWizardDialog + ::QmlProjectManager New Qt Quick UI Project Nouveau projet d'IHM Qt Quick @@ -49691,9 +49510,6 @@ Distant : %4 Component Set Ensemble de composants - - - QmlProjectManager::Internal::QmlApplicationWizard Qt Quick Application Application Qt Quick @@ -49710,9 +49526,6 @@ Distant : %4 Creates a Qt Quick UI project. Créé un projet d'interface graphique Qt Quick. - - - QmlProjectManager::QmlProjectEnvironmentAspect System Environment Environnement du système @@ -50380,7 +50193,7 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un - QmlProjectManager::QmlApplicationWizardDialog + ::QmlProjectManager Creates a Qt Quick 1 UI project with a single QML file that contains the main view.&lt;br/&gt;You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.&lt;br/&gt;&lt;br/&gt;Requires &lt;b&gt;Qt 4.8&lt;/b&gt; or newer. Crée un projet d'interface utilisateur Qt Quick 1 contenant un seul fichier QML contenant la vue principale.&lt;br/&gt;Vous pouvez revoir les projets d'interface utilisateur Qt Quick 1 dans QML Viewer sans avoir besoin de les compiler. Vous n'avez pas besoin d'un environnement de développement installé sur votre ordinateur pour créer et exécuter ce type de projet.&lt;br/&gt;&lt;br/&gt;Nécessite &lt;b&gt;Qt 4.8&lt;/b&gt; ou supérieur. @@ -52062,14 +51875,11 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 L'élément racine est invalide : %1 - - - QmlProjectManager::Internal::QmlComponentSetPage Select Qt Quick Component Set Sélectionner l'ensemble des composant Qt Quick @@ -52443,7 +52253,7 @@ Veuillez fermer toutes les instances de votre application en cours d'exécu - QmlProjectManager::QmlApplicationWizard + ::QmlProjectManager Creates a Qt Quick 1 UI project with a single QML file that contains the main view. You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 4.8 or newer. Crée un projet d'interface utilisateur Qt Quick 1 avec un seul fichier QML qui contient la vue principale. Vous pouvez vérifier les projets d''interface utilisateur Qt Quick 1 dans le QML Viewer, sans devoir les compiler. Il n'est pas nécessaire d'avoir un environnement de développement installé sur votre ordinateur pour créer et exécuter ce type de projets. Nécessite Qt 4.8 ou plus récent. diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 9d8d1265feb..3bb50d629b6 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -32365,14 +32365,11 @@ Saving failed. - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 - - - QmlProjectManager::QmlProject Error while loading project file %1. @@ -32401,9 +32398,6 @@ Saving failed. Non-desktop Qt is used with a desktop device. - - - QmlProjectManager::QmlProjectEnvironmentAspect System Environment @@ -32421,7 +32415,7 @@ Saving failed. - QmlProjectManager::QmlProjectRunConfiguration + ::QmlProjectManager Main QML file: diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 6151a2141b4..f835ce8b73a 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -12160,7 +12160,7 @@ a verziókövetőhöz (%2)? - QmlProjectManager::Internal::0 + ::QmlProjectManager QML Application QML Alkalmazás @@ -12225,16 +12225,10 @@ a verziókövetőhöz (%2)? Main QML File: Fő QML fájl: - - - QmlProjectManager::Internal::QmlMakeStepConfigWidget <b>QML Make</b> <b>QML Make</b> - - - QmlProjectManager::Internal::QmlNewProjectWizard QML Application QML Alkalmazás @@ -12251,9 +12245,6 @@ a verziókövetőhöz (%2)? The project %1 could not be opened. Nem sikerült megnyitni %1 projektet. - - - QmlProjectManager::Internal::QmlNewProjectWizardDialog New QML Project Új QML projekt @@ -12262,9 +12253,6 @@ a verziókövetőhöz (%2)? This wizard generates a QML application project. Ez a varázsló egy QML alkalmazási projektet generál. - - - QmlProjectManager::Internal::QmlProjectWizard Import of existing QML directory Létező QML könyvtár importálása @@ -12273,17 +12261,6 @@ a verziókövetőhöz (%2)? Creates a QML project from an existing directory of QML files. QML projekt létrehozása QML fájlok létező könyvtárából. - - Projects - Projektek - - - The project %1 could not be opened. - Nem sikerült megnyitni %1 projektet. - - - - QmlProjectManager::Internal::QmlProjectWizardDialog Import of QML Project QML projekt importálása @@ -12300,9 +12277,6 @@ a verziókövetőhöz (%2)? Location: Hely: - - - QmlProjectManager::Internal::QmlRunConfiguration QML Viewer QML nézegető diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 5d1370716dd..78fde2219e7 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -7677,7 +7677,7 @@ al VCS (%2)? - QmlProjectManager::Internal::QmlNewProjectWizard + ::QmlProjectManager QML Application Applicazione QML @@ -7694,9 +7694,6 @@ al VCS (%2)? The project %1 could not be opened. Non è possibile aprire il progetto %1. - - - QmlProjectManager::Internal::QmlNewProjectWizardDialog New QML Project Nuovo Progetto QML @@ -7705,9 +7702,6 @@ al VCS (%2)? This wizard generates a QML application project. Questa procedura guidata genera un'applicazione QML. - - - QmlProjectManager::Internal::QmlProjectWizard Import of existing QML directory Importa una cartella QML esistente @@ -7716,17 +7710,6 @@ al VCS (%2)? Creates a QML project from an existing directory of QML files. Crea un progetto QML da una cartella che contiene file QML. - - Projects - Progetti - - - The project %1 could not be opened. - Non è possibile aprire il progetto %1. - - - - QmlProjectManager::Internal::QmlProjectWizardDialog Import of QML Project Importazione di un Progetto QML @@ -7743,9 +7726,6 @@ al VCS (%2)? Location: Posizione: - - - QmlProjectManager::Internal::QmlRunConfiguration QML Viewer Visualizzatore QML @@ -12151,7 +12131,7 @@ Reason: %2 - QmlProjectManager::Internal::QmlMakeStepConfigWidget + ::QmlProjectManager <b>QML Make</b> diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 314c6a09c69..f9b9813fb18 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -24989,7 +24989,7 @@ to project "%2". - QmlProjectManager::QmlTarget + ::QmlProjectManager QML Viewer QML Viewer target display name @@ -28003,14 +28003,11 @@ Do you want to save the data first? - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 無効なルート要素: %1 - - - QmlProjectManager::QmlProject Error while loading project file %1. プロジェクトファイル %1 の読み込み中にエラーが発生しました。 @@ -28051,9 +28048,6 @@ Do you want to save the data first? Non-desktop Qt is used with a desktop device. デスクトップ用ではない Qt が、デスクトップ端末で使われています。 - - - QmlProjectManager::QmlProjectEnvironmentAspect System Environment システム環境変数 @@ -28062,9 +28056,6 @@ Do you want to save the data first? Kit Environment キット環境変数 - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlscene found. qmlviewer や qmlscene が見つかりません。 @@ -28073,10 +28064,6 @@ Do you want to save the data first? QML Viewer: QML ビューア: - - System Environment - システム環境変数 - Clean Environment 環境変数なし @@ -28107,20 +28094,10 @@ Do you want to save the data first? QMLRunConfiguration display name. QML ビューア - - - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory QML Viewer QML ビューア - - QML Scene - QML Scene - - - - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget Arguments: 引数: @@ -48040,22 +48017,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - QmlProjectManager::QmlMainFileAspect - - Main QML file: - メイン QML ファイル: - - - - QmlProjectManager::QmlBuildSystem - - Error while loading project file %1. - プロジェクトファイル %1 の読み込み中にエラーが発生しました。 - - - Warning while loading project file %1. - プロジェクトファイル %1 を読み込み中に警告がありました。 - + ::QmlProjectManager ::Qnx diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 445db668cda..dc6e888e047 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -11487,7 +11487,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - QmlProjectManager::QmlProject + ::QmlProjectManager Error while loading project file %1. Błąd ładowania pliku projektu %1. @@ -11508,9 +11508,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM No Qt version set in kit. Brak wersji Qt w zestawie narzędzi. - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlscene found. Nie odnaleziono qmlviewer ani qmlscene. @@ -11534,7 +11531,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory + ::QmlProjectManager QML Viewer QML Viewer @@ -12194,7 +12191,7 @@ Identyfikatory muszą rozpoczynać się małą literą. - QmlProjectManager::QmlTarget + ::QmlProjectManager QML Viewer QML Viewer target display name @@ -15379,7 +15376,7 @@ Ponowić próbę? - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget + ::QmlProjectManager Arguments: Argumenty: @@ -25155,7 +25152,7 @@ Zdalny: %4 - QmlProjectManager::QmlProjectEnvironmentAspect + ::QmlProjectManager System Environment Środowisko systemowe @@ -26824,7 +26821,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 Niepoprawny główny element: %1 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 8d9552c72f4..38042812414 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -39560,7 +39560,7 @@ Saving failed. - QmlProjectManager::QmlBuildSystem + ::QmlProjectManager Error while loading project file %1. Ошибка при загрузке файла проекта %1. @@ -39569,16 +39569,10 @@ Saving failed. Warning while loading project file %1. Предупреждение при загрузке файла проекта %1. - - - QmlProjectManager::QmlMainFileAspect Main QML file: Основной файл QML: - - - QmlProjectManager::QmlMultiLanguageAspect Use MultiLanguage translation database. Использовать БД переводов. @@ -39587,9 +39581,6 @@ Saving failed. Enable loading application with special desktop SQLite translation database. Включение загрузки приложения со специальной базой даных переводов на множество языков (SQLite). - - - QmlProjectManager::QmlProject Kit has no device. У комплекта не задано устройство. @@ -39610,16 +39601,10 @@ Saving failed. No Qt version set in kit. Для комплекта не задан профиль Qt. - - - QmlProjectManager::QmlProjectFileFormat Invalid root element: %1 Неверный корневой элемент: %1 - - - QmlProjectManager::QmlProjectRunConfiguration System Environment Системная среда diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index c656bcfa4d5..779c07b0d88 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -15970,7 +15970,7 @@ cilj »%1«? - QmlProjectManager::QmlTarget + ::QmlProjectManager QML Viewer QML Viewer target display name @@ -16463,7 +16463,7 @@ ID-ji se morajo začeti z malo črko. - QmlProjectManager::QmlProject + ::QmlProjectManager Error while loading project file %1. Napaka pri nalaganju projektne datoteke %1. @@ -16476,9 +16476,6 @@ ID-ji se morajo začeti z malo črko. Error while loading project file! Napaka pri nalaganju projektne datoteke. - - - QmlProjectManager::Internal::QmlProjectApplicationWizardDialog New Qt Quick UI Project Nov projekt uporabniškega vmesnika Qt Quick @@ -16495,9 +16492,6 @@ ID-ji se morajo začeti z malo črko. This wizard generates a QML application project. Ta čarovnik ustvari projekt programa QML. - - - QmlProjectManager::Internal::QmlProjectApplicationWizard Qt Quick UI Uporabniški vmesnik Qt Quick @@ -16543,23 +16537,14 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi. Seznam map z vstavki, ki bo podan izvajalnemu okolju QML - - - ::QmlProjectManager Qt Quick Project Projekt Qt Quick - - - QmlProjectManager::Internal::Manager Failed opening project '%1': Project already open Odpiranje projekta »%1« ni uspelo: projekt je že odprt - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlobserver found. Ni bilo moč najti »qmlviewer« ali »qmlobserver«. @@ -16598,7 +16583,7 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi. - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory + ::QmlProjectManager Run QML Script Zaženi skript QML @@ -24578,7 +24563,7 @@ Raje uporabite gumb za ustavitev. - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget + ::QmlProjectManager Manage Qt versions Upravljanje različic Qt ... @@ -24611,9 +24596,6 @@ Raje uporabite gumb za ustavitev. Invalid Qt version Neveljavna različica Qt - - - QmlProjectManager::Internal::QmlProjectRunControl Starting %1 %2 @@ -24626,9 +24608,6 @@ Raje uporabite gumb za ustavitev. %1 je končal s kodo %2 - - - QmlProjectManager::Internal::QmlProjectRunControlFactory Run Zaženi @@ -29062,11 +29041,7 @@ Preverite pravice za dostop do mape. - QmlProjectManager::Internal::QmlRunConfiguration - - QML Viewer - Pregledovalnik QML - + ::QmlProjectManager ::QmakeProjectManager @@ -31348,7 +31323,7 @@ Preverite nastavitve projekta. - QmlProjectManager::Internal::QmlProjectImportWizardDialog + ::QmlProjectManager Import Existing QML Directory Uvoz obstoječe mape s QML @@ -31369,41 +31344,10 @@ Preverite nastavitve projekta. Location Lokacija - - - QmlProjectManager::Internal::QmlProjectImportWizard - - Import Existing QML Directory - Uvoz obstoječe mape s QML - Creates a QML project from an existing directory of QML files. Ustvari projekt QML iz obstoječe mape z datotekami QML. - - File generated by QtCreator - qmlproject Template - Comment added to generated .qmlproject file - - Datoteko je ustvaril Qt Creator - - - Include .qml, .js, and image files from current directory and subdirectories - qmlproject Template - Comment added to generated .qmlproject file - - Iz trenutne mape in podmap vključi datoteke *.qml, *.js in slike - - - List of plugin directories passed to QML runtime - qmlproject Template - Comment added to generated .qmlproject file - - Seznam map z vstavki, ki bo podan izvajalnemu okolju QML - - - - QmlProjectManager::Internal::QmlRunControl Starting %1 %2 Zaganjanje %1 %2 @@ -31412,16 +31356,6 @@ Preverite nastavitve projekta. %1 exited with code %2 %1 je končal s kodo %2 - - - QmlProjectManager::Internal::QmlRunControlFactory - - Run - Zaženi - - - - QmlProjectManager::Internal::QmlTaskManager QML QML diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 08b98620a69..03c55013c22 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -16002,7 +16002,7 @@ Do you want to save the data first? - QmlProjectManager::Internal::Manager + ::QmlProjectManager Failed opening project '%1': Project is not a file Збій відкриття проекту '%1': Проект не є файлом @@ -16011,9 +16011,6 @@ Do you want to save the data first? Failed opening project "%1": Project is not a file. Збій відкриття проекту "%1": Проект не є файлом. - - - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget Arguments: Аргументи: @@ -16022,9 +16019,6 @@ Do you want to save the data first? Main QML file: Головний файл QML: - - - QmlProjectManager::Internal::QmlProjectRunControl Starting %1 %2 @@ -16037,16 +16031,10 @@ Do you want to save the data first? %1 завершився з кодом %2 - - - QmlProjectManager::Internal::QmlProjectRunControlFactory Not enough free ports for QML debugging. Недостатньо вільних портів для зневадження QML. - - - QmlProjectManager::QmlProject Error while loading project file %1. Помилка під час завантаження файлу проекту %1. @@ -16067,9 +16055,6 @@ Do you want to save the data first? No Qt version set in kit. В комплекті не задано версію Qt. - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlscene found. Не знайдено qmlviewer або qmlscene. @@ -16084,26 +16069,11 @@ Do you want to save the data first? QMLRunConfiguration display name. Переглядач QML - - QML Viewer - Переглядач QML - - - QML Scene - QML Scene - - - - QmlProjectManager::QmlTarget QML Viewer QML Viewer target display name Переглядач QML - - QML Viewer - Переглядач QML - QrcEditor @@ -28598,7 +28568,7 @@ Do you want to retry? - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory + ::QmlProjectManager QML Viewer Переглядач QML @@ -31304,7 +31274,7 @@ Remote: %4 - QmlProjectManager::Internal::QmlApplicationWizardDialog + ::QmlProjectManager New Qt Quick UI Project Новий проект Qt Quick UI @@ -32446,7 +32416,7 @@ Partial names can be used if they are unambiguous. - QmlProjectManager::QmlProjectEnvironmentAspect + ::QmlProjectManager System Environment Системне середовище @@ -32842,7 +32812,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - QmlProjectManager::QmlApplicationWizard + ::QmlProjectManager Creates a Qt Quick 1 UI project with a single QML file that contains the main view. You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 4.8 or newer. Створює проект Qt Quick 1 UI з одним файлом QML, що містить головний перегляд. Ви можете оглядати проекти Qt Quick 1 UI в Переглядачі QML не будуючи їх. Вам не потрібне встановлене середовище розробки на вашому комп'ютері, щоб створювати та запускати цей тип проекту. Необхідна Qt 4.8 або новіша. @@ -34725,14 +34695,11 @@ Please close all running instances of your application before starting a build.< - QmlProjectManager::QmlProjectFileFormat + ::QmlProjectManager Invalid root element: %1 Неправильний кореневий елемент: %1 - - - QmlProjectManager::Internal::QmlApplicationWizard Qt Quick UI Qt Quick UI @@ -34741,9 +34708,6 @@ Please close all running instances of your application before starting a build.< Creates a Qt Quick UI project. Створює проект Qt Quick UI. - - - QmlProjectManager::Internal::QmlComponentSetPage Select Qt Quick Component Set Вибір набору компонентів Qt Quick @@ -34752,10 +34716,6 @@ Please close all running instances of your application before starting a build.< Qt Quick component set: Набір компонентів Qt Quick: - - Component Set - Набір компонентів - ::Qnx diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 7463245e546..cd6623ac4c3 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -33121,7 +33121,7 @@ Exporting assets: %2 - QmlDesigner::CmakeProjectConverter + ::QmlProjectManager Export as Latest Project Format @@ -33144,9 +33144,6 @@ Exporting assets: %2 %1. - - - QmlDesigner::CmakeProjectConverterDialog This process creates a copy of the existing project. The new project's folder structure is adjusted for CMake build process and necessary related new files are generated. @@ -33653,7 +33650,7 @@ The new project can be opened in Qt Creator using the main CMakeLists.txt file.< - QmlDesigner::GenerateCmake + ::QmlProjectManager Select Files to Generate @@ -38107,7 +38104,7 @@ Saving failed. - QmlProjectManager::Internal::QmlProjectPlugin + ::QmlProjectManager Qt Design Studio @@ -38125,9 +38122,6 @@ Qt Design Studio requires a .qmlproject based project to open the .ui.qml file.< Set as Main .ui.qml File - - - QmlProjectManager::QmlBuildSystem Error while loading project file %1. 载入项目文件%1时发生错误。 @@ -38136,16 +38130,10 @@ Qt Design Studio requires a .qmlproject based project to open the .ui.qml file.< Warning while loading project file %1. 载入项目文件 %1时收到警告信息。 - - - QmlProjectManager::QmlMainFileAspect Main QML file: - - - QmlProjectManager::QmlMultiLanguageAspect Use MultiLanguage in Form Editor. @@ -38154,9 +38142,6 @@ Qt Design Studio requires a .qmlproject based project to open the .ui.qml file.< Reads translations from MultiLanguage plugin. - - - QmlProjectManager::QmlProject No Qt version set in kit. 构建套件中未设置Qt版本。 @@ -38177,16 +38162,10 @@ Qt Design Studio requires a .qmlproject based project to open the .ui.qml file.< Non-desktop Qt is used with a desktop device. - - - QmlProjectManager::QmlProjectFileFormat Invalid root element: %1 - - - QmlProjectManager::QmlProjectRunConfiguration QML Runtime QML运行环境 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 7f3d9414168..405d8cde1a0 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -13114,7 +13114,7 @@ For qmlproject projects, use the importPaths property to add import paths. - QmlProjectManager::QmlTarget + ::QmlProjectManager QML Viewer QML Viewer target display name @@ -13501,7 +13501,7 @@ For qmlproject projects, use the importPaths property to add import paths. - QmlProjectManager::QmlProject + ::QmlProjectManager Error while loading project file %1. 載入專案檔案 %1 時發生錯誤。 @@ -13526,9 +13526,6 @@ For qmlproject projects, use the importPaths property to add import paths.No Qt version set in kit. - - - QmlProjectManager::Internal::QmlProjectApplicationWizardDialog New Qt Quick UI Project 新增 Qt Quick 使用者介面專案 @@ -13537,9 +13534,6 @@ For qmlproject projects, use the importPaths property to add import paths.This wizard generates a Qt Quick UI project. 此精靈將產生一個 Qt Quick 使用者介面的專案。 - - - QmlProjectManager::Internal::QmlProjectApplicationWizard Qt Quick UI Qt Quick UI @@ -13556,9 +13550,6 @@ Requires <b>Qt 4.7.4</b> or newer. 需要 <b>Qt 4.7.4</b> 或以後的版本。 - - - QmlProjectManager::Internal::Manager Failed opening project '%1': Project already open 開啟專案 '%1' 失敗：專案已開啟 @@ -13567,9 +13558,6 @@ Requires <b>Qt 4.7.4</b> or newer. Failed opening project '%1': Project file is not a file 開啟專案 '%1' 失敗：專案檔本身不是個檔案 - - - QmlProjectManager::QmlProjectRunConfiguration No qmlviewer or qmlobserver found. 找不到 qmlviewer 或 qmlobserver。 @@ -13597,7 +13585,7 @@ Requires <b>Qt 4.7.4</b> or newer. - QmlProjectManager::Internal::QmlProjectRunConfigurationFactory + ::QmlProjectManager Run QML Script 執行 QML 腳本 @@ -19768,7 +19756,7 @@ Error: %2 - QmlProjectManager::Internal::QmlProjectRunConfigurationWidget + ::QmlProjectManager Manage Qt versions... 管理 Qt 版本... @@ -21913,7 +21901,7 @@ Do you want to retry? - QmlProjectManager::Internal::QmlProjectRunControl + ::QmlProjectManager Starting %1 %2 @@ -21926,9 +21914,6 @@ Do you want to retry? %1 已離開，離開代碼 %2 - - - QmlProjectManager::Internal::QmlProjectRunControlFactory Run 執行 @@ -23198,7 +23183,7 @@ In addition, device connectivity will be tested. - QmlProjectManager::QmlProjectPlugin + ::QmlProjectManager Open Qt Versions 開啟 Qt 版本 diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp index 15447a030b6..6ac7d9098dd 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialog.cpp @@ -4,6 +4,7 @@ #include "cmakegeneratordialog.h" #include "cmakegeneratordialogtreemodel.h" #include "generatecmakelistsconstants.h" +#include "../qmlprojectmanagertr.h" #include #include @@ -25,12 +26,9 @@ CmakeGeneratorDialog::CmakeGeneratorDialog(const FilePath &rootDir, const FilePa m_rootDir(rootDir), m_files(files) { - setWindowTitle(QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Select Files to Generate")); + setWindowTitle(Tr::tr("Select Files to Generate")); - QLabel *mainLabel = new QLabel(QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Start CMakeFiles.txt generation"), - this); + QLabel *mainLabel = new QLabel(Tr::tr("Start CMakeFiles.txt generation"), this); mainLabel->setMargin(30); QVBoxLayout *dialogLayout = new QVBoxLayout(this); @@ -75,8 +73,7 @@ QWidget* CmakeGeneratorDialog::createDetailsWidget() DetailsWidget *advancedWidget = new DetailsWidget(this); advancedWidget->setMinimumWidth(600); advancedWidget->setWidget(advancedInnerWidget); - advancedWidget->setSummaryText(QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Advanced Options")); + advancedWidget->setSummaryText(Tr::tr("Advanced Options")); connect(advancedWidget, &DetailsWidget::expanded, this, &CmakeGeneratorDialog::advancedVisibilityChanged); return advancedWidget; @@ -107,10 +104,8 @@ FilePaths CmakeGeneratorDialog::getFilePaths() return paths; } -const QString FILE_CREATE_NOTIFICATION = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "File %1 will be created.\n"); -const QString FILE_OVERWRITE_NOTIFICATION = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "File %1 will be overwritten.\n"); +const QString FILE_CREATE_NOTIFICATION = Tr::tr("File %1 will be created.\n"); +const QString FILE_OVERWRITE_NOTIFICATION = Tr::tr("File %1 will be overwritten.\n"); void CmakeGeneratorDialog::refreshNotificationText() { diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp index 8f71c871eda..525230bdfdd 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakegeneratordialogtreemodel.cpp @@ -4,6 +4,7 @@ #include "cmakegeneratordialogtreemodel.h" #include "generatecmakelistsconstants.h" #include "checkablefiletreeitem.h" +#include "../qmlprojectmanagertr.h" #include @@ -49,11 +50,9 @@ QVariant CMakeGeneratorDialogTreeModel::data(const QModelIndex &index, int role) } else if (role == Qt::ToolTipRole) { if (node->isFile()) - return QCoreApplication::translate("QmlDesigner::GenerateCmake", - "This file already exists and will be overwritten."); + return Tr::tr("This file already exists and will be overwritten."); if (!node->toFilePath().exists()) - return QCoreApplication::translate("QmlDesigner::GenerateCmake", - "This file or folder will be created."); + return Tr::tr("This file or folder will be created."); } } diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp index 7a553358c7c..99995bc2abe 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverter.cpp @@ -4,6 +4,7 @@ #include "cmakeprojectconverterdialog.h" #include "generatecmakelists.h" #include "generatecmakelistsconstants.h" +#include "../qmlprojectmanagertr.h" #include #include @@ -25,16 +26,11 @@ using namespace QmlProjectManager::GenerateCmake::Constants; namespace QmlProjectManager { namespace GenerateCmake { -const QString MENU_ITEM_CONVERT = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", - "Export as Latest Project Format..."); -const QString ERROR_TITLE = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", - "Creating Project"); -const QString SUCCESS_TITLE = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", - "Creating Project"); -const QString ERROR_TEXT = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", - "Creating project failed.\n%1"); -const QString SUCCESS_TEXT = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", - "Creating project succeeded."); +const QString MENU_ITEM_CONVERT = Tr::tr("Export as Latest Project Format..."); +const QString ERROR_TITLE = Tr::tr("Creating Project"); +const QString SUCCESS_TITLE = Tr::tr("Creating Project"); +const QString ERROR_TEXT = Tr::tr("Creating project failed.\n%1"); +const QString SUCCESS_TEXT = Tr::tr("Creating project succeeded."); void CmakeProjectConverter::generateMenuEntry(QObject *parent) { @@ -173,8 +169,7 @@ bool CmakeProjectConverter::isDirBlacklisted(const Utils::FilePath &dir) const return false; } -const QString ERROR_CANNOT_WRITE_DIR = QCoreApplication::translate("QmlDesigner::CmakeProjectConverter", - "Unable to write to directory\n%1."); +const QString ERROR_CANNOT_WRITE_DIR = Tr::tr("Unable to write to directory\n%1."); bool CmakeProjectConverter::performSanityCheck() { diff --git a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp index 378c24e829c..1d67a92b394 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/cmakeprojectconverterdialog.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "cmakeprojectconverterdialog.h" +#include "../qmlprojectmanagertr.h" #include @@ -30,17 +31,9 @@ static bool dirValidationFunction(FancyLineEdit *editor, QString *) return FilePath::fromString(editor->text()).isWritableDir(); } -const QString EXPLANATION_TEXT = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "This process creates a copy of the existing project. The new project's folder structure is adjusted for CMake build process and necessary related new files are generated.\n\nThe new project can be opened in Qt Creator using the main CMakeLists.txt file."); - -const QString PROJECT_NAME_LABEL = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Name:"); - -const QString PARENT_DIR_LABEL = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Create in:"); +const QString EXPLANATION_TEXT = Tr::tr("This process creates a copy of the existing project. The new project's folder structure is adjusted for CMake build process and necessary related new files are generated.\n\nThe new project can be opened in Qt Creator using the main CMakeLists.txt file."); +const QString PROJECT_NAME_LABEL = Tr::tr("Name:"); +const QString PARENT_DIR_LABEL = Tr::tr("Create in:"); CmakeProjectConverterDialog::CmakeProjectConverterDialog(const QmlProjectManager::QmlProject *oldProject) : QDialog() @@ -121,28 +114,14 @@ const QString CmakeProjectConverterDialog::startsWithBlacklisted(const QString & return {}; } -const QString ERROR_TEXT_NAME_EMPTY = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Name is empty."); -const QString ERROR_TEXT_NAME_BAD_START = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Name must not start with \"%1\"."); -const QString ERROR_TEXT_NAME_LOWERCASE_START = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Name must begin with a capital letter"); -const QString ERROR_TEXT_NAME_BAD_CHARACTERS = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Name must contain only letters, numbers or characters - _."); +const QString ERROR_TEXT_NAME_EMPTY = Tr::tr("Name is empty."); +const QString ERROR_TEXT_NAME_BAD_START = Tr::tr("Name must not start with \"%1\"."); +const QString ERROR_TEXT_NAME_LOWERCASE_START = Tr::tr("Name must begin with a capital letter"); +const QString ERROR_TEXT_NAME_BAD_CHARACTERS = Tr::tr("Name must contain only letters, numbers or characters - _."); -const QString ERROR_DIR_NOT_DIR = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Target is not a directory."); -const QString ERROR_DIR_NOT_WRITABLE = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Cannot write to target directory."); -const QString ERROR_DIR_EXISTS = QCoreApplication::translate( - "QmlDesigner::CmakeProjectConverterDialog", - "Project directory already exists."); +const QString ERROR_DIR_NOT_DIR = Tr::tr("Target is not a directory."); +const QString ERROR_DIR_NOT_WRITABLE = Tr::tr("Cannot write to target directory."); +const QString ERROR_DIR_EXISTS = Tr::tr("Project directory already exists."); const QString CmakeProjectConverterDialog::errorText() const { diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index 969281bb8e2..ef83206d982 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -4,6 +4,7 @@ #include "generatecmakelists.h" #include "generatecmakelistsconstants.h" #include "cmakegeneratordialog.h" +#include "../qmlprojectmanagertr.h" #include #include @@ -56,8 +57,7 @@ enum ProjectDirectoryError { MissingEnvHeader = 1<<12 }; -const QString MENU_ITEM_GENERATE = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Generate CMake Build Files..."); +const QString MENU_ITEM_GENERATE = Tr::tr("Generate CMake Build Files..."); void generateMenuEntry(QObject *parent) { @@ -66,8 +66,7 @@ void generateMenuEntry(QObject *parent) Core::ActionContainer *exportMenu = Core::ActionManager::createMenu( QmlProjectManager::Constants::EXPORT_MENU); - exportMenu->menu()->setTitle( - QCoreApplication::translate("QmlDesigner::GenerateCmake", "Export Project")); + exportMenu->menu()->setTitle(Tr::tr("Export Project")); menu->addMenu(exportMenu, Core::Constants::G_FILE_EXPORT); exportMenu->appendGroup(QmlProjectManager::Constants::G_EXPORT_GENERATE); @@ -159,14 +158,10 @@ int isProjectCorrectlyFormed(const FilePath &rootDir) return errors; } -const QString WARNING_MISSING_STRUCTURE_FATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "The project is not properly structured for automatically generating CMake files.\n\nAborting process.\n\nThe following files or directories are missing:\n\n%1"); -//const QString WARNING_MISSING_STRUCTURE_NONFATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", -// "The project is not properly structured for automatically generating CMake files.\n\nThe following files or directories are missing and may be created:\n\n%1"); -const QString WARNING_TITLE_FATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Cannot Generate CMake Files"); -//const QString WARNING_TITLE_NONFATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", -// "Problems with Generating CMake Files"); +const QString WARNING_MISSING_STRUCTURE_FATAL = Tr::tr("The project is not properly structured for automatically generating CMake files.\n\nAborting process.\n\nThe following files or directories are missing:\n\n%1"); +//const QString WARNING_MISSING_STRUCTURE_NONFATAL = Tr::tr("The project is not properly structured for automatically generating CMake files.\n\nThe following files or directories are missing and may be created:\n\n%1"); +const QString WARNING_TITLE_FATAL = Tr::tr("Cannot Generate CMake Files"); +//const QString WARNING_TITLE_NONFATAL = Tr::tr("Problems with Generating CMake Files"); void showProjectDirErrorDialog(int error) { diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp index 4065b7f6584..27e5809f943 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp @@ -3,8 +3,9 @@ #include "qmlprojectfileformat.h" -#include "qmlprojectitem.h" #include "filefilteritems.h" +#include "qmlprojectitem.h" +#include "../qmlprojectmanagertr.h" #include @@ -189,7 +190,7 @@ std::unique_ptr QmlProjectFileFormat::parseProjectFile(const Uti } if (errorMessage) - *errorMessage = tr("Invalid root element: %1").arg(rootNode->name()); + *errorMessage = Tr::tr("Invalid root element: %1").arg(rootNode->name()); return nullptr; } diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h index 40e777c7b8f..72c77999711 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h @@ -14,8 +14,6 @@ class QmlProjectItem; class QmlProjectFileFormat { - Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectFileFormat) - public: static std::unique_ptr parseProjectFile(const Utils::FilePath &fileName, QString *errorMessage = nullptr); diff --git a/src/plugins/qmlprojectmanager/projectfilecontenttools.cpp b/src/plugins/qmlprojectmanager/projectfilecontenttools.cpp index a79b1d212e7..8ae0efe3119 100644 --- a/src/plugins/qmlprojectmanager/projectfilecontenttools.cpp +++ b/src/plugins/qmlprojectmanager/projectfilecontenttools.cpp @@ -3,6 +3,8 @@ #include "projectfilecontenttools.h" +#include "qmlprojectmanagertr.h" + #include #include @@ -40,7 +42,7 @@ const QString qdsVersion(const Utils::FilePath &projectFilePath) return version; } - return QObject::tr("Unknown"); + return Tr::tr("Unknown"); } QRegularExpression quickRegexp("(quickVersion:)\\s*\"(\\d+.\\d+)\"", @@ -50,7 +52,7 @@ QRegularExpression qt6Regexp("(qt6Project:)\\s*\"*(true|false)\"*", const QString qtVersion(const Utils::FilePath &projectFilePath) { - const QString defaultReturn = QObject::tr("Unknown"); + const QString defaultReturn = Tr::tr("Unknown"); const QString data = readFileContents(projectFilePath); // First check if quickVersion is contained in the project file @@ -61,8 +63,8 @@ const QString qtVersion(const Utils::FilePath &projectFilePath) // If quickVersion wasn't found check for qt6Project match = qt6Regexp.match(data); if (match.hasMatch()) - return match.captured(2).contains("true", Qt::CaseInsensitive) ? QObject::tr("Qt 6") - : QObject::tr("Qt 5"); + return match.captured(2).contains("true", Qt::CaseInsensitive) ? Tr::tr("Qt 6") + : Tr::tr("Qt 5"); return defaultReturn; } diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index 934c93f742d..05ea639c757 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -5,6 +5,7 @@ #include "qmlproject.h" #include "qmlprojectmanagerconstants.h" +#include "qmlprojectmanagertr.h" #include @@ -29,7 +30,7 @@ using namespace Utils; namespace QmlProjectManager { const char M_CURRENT_FILE[] = "CurrentFile"; -const char CURRENT_FILE[] = QT_TRANSLATE_NOOP("QmlManager", ""); +const char CURRENT_FILE[] = QT_TRANSLATE_NOOP("::QmlProjectManager", ""); static bool caseInsensitiveLessThan(const QString &s1, const QString &s2) { @@ -66,7 +67,7 @@ void QmlMainFileAspect::addToLayout(LayoutBuilder &builder) this, &QmlMainFileAspect::updateFileComboBox); connect(m_fileListCombo, &QComboBox::activated, this, &QmlMainFileAspect::setMainScript); - builder.addItems({tr("Main QML file:"), m_fileListCombo.data()}); + builder.addItems({Tr::tr("Main QML file:"), m_fileListCombo.data()}); } void QmlMainFileAspect::toMap(QVariantMap &map) const diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp index b73c74f1cf1..4ca9f9aa626 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp @@ -3,6 +3,8 @@ #include "qmlmultilanguageaspect.h" +#include "qmlprojectmanagertr.h" + #include #include @@ -54,8 +56,8 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(ProjectExplorer::Target *target) { setVisible(isMultilanguagePresent()); setSettingsKey(Constants::USE_MULTILANGUAGE_KEY); - setLabel(tr("Use MultiLanguage in 2D view"), BoolAspect::LabelPlacement::AtCheckBox); - setToolTip(tr("Reads translations from MultiLanguage plugin.")); + setLabel(Tr::tr("Use MultiLanguage in 2D view"), BoolAspect::LabelPlacement::AtCheckBox); + setToolTip(Tr::tr("Reads translations from MultiLanguage plugin.")); setDefaultValue(!databaseFilePath().isEmpty()); QVariantMap getDefaultValues; diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 6ec4e86589c..6ce64397796 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -7,6 +7,7 @@ #include "fileformat/qmlprojectitem.h" #include "qmlprojectconstants.h" #include "qmlprojectmanagerconstants.h" +#include "qmlprojectmanagertr.h" #include "qmlprojectnodes.h" #include @@ -210,7 +211,7 @@ void QmlBuildSystem::parseProject(RefreshOptions options) } else { MessageManager::writeFlashing( - tr("Error while loading project file %1.").arg(projectFilePath().toUserOutput())); + Tr::tr("Error while loading project file %1.").arg(projectFilePath().toUserOutput())); MessageManager::writeSilently(errorMessage); } } @@ -235,7 +236,7 @@ void QmlBuildSystem::parseProject(RefreshOptions options) Utils::FileReader reader; QString errorMessage; if (!reader.fetch(Utils::FilePath::fromString(mainFilePath), &errorMessage)) { - MessageManager::writeFlashing(tr("Warning while loading project file %1.") + MessageManager::writeFlashing(Tr::tr("Warning while loading project file %1.") .arg(projectFilePath().toUserOutput())); MessageManager::writeSilently(errorMessage); } @@ -533,14 +534,14 @@ Tasks QmlProject::projectIssues(const Kit *k) const const QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version) - result.append(createProjectTask(Task::TaskType::Warning, tr("No Qt version set in kit."))); + result.append(createProjectTask(Task::TaskType::Warning, Tr::tr("No Qt version set in kit."))); IDevice::ConstPtr dev = DeviceKitAspect::device(k); if (dev.isNull()) - result.append(createProjectTask(Task::TaskType::Error, tr("Kit has no device."))); + result.append(createProjectTask(Task::TaskType::Error, Tr::tr("Kit has no device."))); if (version && version->qtVersion() < QVersionNumber(5, 0, 0)) - result.append(createProjectTask(Task::TaskType::Error, tr("Qt version is too old."))); + result.append(createProjectTask(Task::TaskType::Error, Tr::tr("Qt version is too old."))); if (dev.isNull() || !version) return result; // No need to check deeper than this @@ -549,12 +550,12 @@ Tasks QmlProject::projectIssues(const Kit *k) const if (version->type() == QtSupport::Constants::DESKTOPQT) { if (version->qmlRuntimeFilePath().isEmpty()) { result.append(createProjectTask(Task::TaskType::Error, - tr("Qt version has no QML utility."))); + Tr::tr("Qt version has no QML utility."))); } } else { // Non-desktop Qt on a desktop device? We don't support that. result.append(createProjectTask(Task::TaskType::Error, - tr("Non-desktop Qt is used with a desktop device."))); + Tr::tr("Non-desktop Qt is used with a desktop device."))); } } else { // If not a desktop device, don't check the Qt version for qml runtime binary. diff --git a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp index c7911a606fd..32506183fa7 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp @@ -3,6 +3,7 @@ #include "qmlprojectgenerator.h" #include "../cmakegen/generatecmakelists.h" +#include "../qmlprojectmanagertr.h" #include #include @@ -73,8 +74,8 @@ bool QmlProjectFileGenerator::execute() file.close(); QMessageBox::information(Core::ICore::dialogParent(), - QObject::tr("Project File Generated"), - QObject::tr("File created:\n\n%1").arg(m_targetFile.toString()), + Tr::tr("Project File Generated"), + Tr::tr("File created:\n\n%1").arg(m_targetFile.toString()), QMessageBox::Ok); return true; @@ -151,9 +152,9 @@ const FilePath QmlProjectFileGenerator::selectTargetFile(const FilePath &uiFileP bool selectionCompleted = false; do { targetFile = Core::DocumentManager::getSaveFileNameWithExtension( - QObject::tr("Select File Location"), + Tr::tr("Select File Location"), suggestedDir, - QObject::tr("Qt Design Studio Project Files (*.qmlproject)")); + Tr::tr("Qt Design Studio Project Files (*.qmlproject)")); selectionCompleted = isDirAcceptable(targetFile.parentDir(), uiFilePath); } while (!selectionCompleted); @@ -166,8 +167,8 @@ bool QmlProjectFileGenerator::isDirAcceptable(const FilePath &dir, const FilePat if (dir.isChildOf(uiFileParentDir)) { QMessageBox::warning(Core::ICore::dialogParent(), - QObject::tr("Invalid Directory"), - QObject::tr("Project file must be placed in a parent directory of the QML files."), + Tr::tr("Invalid Directory"), + Tr::tr("Project file must be placed in a parent directory of the QML files."), QMessageBox::Ok); return false; } @@ -177,8 +178,8 @@ bool QmlProjectFileGenerator::isDirAcceptable(const FilePath &dir, const FilePat QStringList components = relativePath.toString().split("/"); if (components.size() > 2) { QMessageBox::StandardButton sel = QMessageBox::question(Core::ICore::dialogParent(), - QObject::tr("Problem"), - QObject::tr("Selected directory is far away from the QML file. This can cause unexpected results.\n\nAre you sure?"), + Tr::tr("Problem"), + Tr::tr("Selected directory is far away from the QML file. This can cause unexpected results.\n\nAre you sure?"), QMessageBox::Yes | QMessageBox::No); if (sel == QMessageBox::No) return false; diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 6e647f3719f..fc3877ed718 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -5,6 +5,7 @@ #include "qmlprojectplugin.h" #include "qmlproject.h" #include "qmlprojectconstants.h" +#include "qmlprojectmanagertr.h" #include "qmlprojectrunconfiguration.h" #include "projectfilecontenttools.h" #include "cmakegen/cmakeprojectconverter.h" @@ -123,7 +124,7 @@ void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName) if (!qdsStarted) { QMessageBox::warning(Core::ICore::dialogParent(), fileName.fileName(), - QObject::tr("Failed to start Qt Design Studio.")); + Tr::tr("Failed to start Qt Design Studio.")); if (alwaysOpenWithMode() == Core::Constants::MODE_DESIGN) clearAlwaysOpenWithMode(); } @@ -212,8 +213,8 @@ void QmlProjectPlugin::openInQDSWithProject(const Utils::FilePath &filePath) QTimer::singleShot(4000, [filePath] { openQDS(filePath); }); } else { Core::AsynchronousMessageBox::warning( - tr("Qt Design Studio"), - tr("No project file (*.qmlproject) found for Qt Design " + Tr::tr("Qt Design Studio"), + Tr::tr("No project file (*.qmlproject) found for Qt Design " "Studio.\nQt Design Studio requires a .qmlproject " "based project to open the .ui.qml file.")); } @@ -269,7 +270,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) if (QmlProject::isQtDesignStudio()) { Core::ActionContainer *menu = Core::ActionManager::actionContainer( ProjectExplorer::Constants::M_FILECONTEXT); - QAction *mainfileAction = new QAction(tr("Set as Main .qml File"), this); + QAction *mainfileAction = new QAction(Tr::tr("Set as Main .qml File"), this); mainfileAction->setEnabled(false); connect(mainfileAction, &QAction::triggered, this, []() { @@ -312,7 +313,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) != fileNode->filePath()); }); - QAction *mainUifileAction = new QAction(tr("Set as Main .ui.qml File"), this); + QAction *mainUifileAction = new QAction(Tr::tr("Set as Main .ui.qml File"), this); mainUifileAction->setEnabled(false); connect(mainUifileAction, &QAction::triggered, this, []() { diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index c77625e0a85..081a0bec574 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -2,10 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmlprojectrunconfiguration.h" -#include "qmlproject.h" -#include "qmlprojectmanagerconstants.h" #include "qmlmainfileaspect.h" #include "qmlmultilanguageaspect.h" +#include "qmlproject.h" +#include "qmlprojectmanagerconstants.h" +#include "qmlprojectmanagertr.h" #include #include @@ -46,8 +47,6 @@ namespace QmlProjectManager::Internal { class QmlProjectRunConfiguration final : public RunConfiguration { - Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration) - public: QmlProjectRunConfiguration(Target *target, Id id); @@ -69,7 +68,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) : RunConfiguration(target, id) { m_qmlViewerAspect = addAspect(); - m_qmlViewerAspect->setLabelText(tr("Override device QML viewer:")); + m_qmlViewerAspect->setLabelText(Tr::tr("Override device QML viewer:")); m_qmlViewerAspect->setPlaceHolderText(qmlRuntimeFilePath().toUserOutput()); m_qmlViewerAspect->setDisplayStyle(StringAspect::PathChooserDisplay); m_qmlViewerAspect->setHistoryCompleter("QmlProjectManager.viewer.history"); @@ -152,12 +151,12 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) const Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(target->kit()); if (deviceTypeId == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { - envAspect->addPreferredBaseEnvironment(tr("System Environment"), [envModifier] { + envAspect->addPreferredBaseEnvironment(Tr::tr("System Environment"), [envModifier] { return envModifier(Environment::systemEnvironment()); }); } - envAspect->addSupportedBaseEnvironment(tr("Clean Environment"), [envModifier] { + envAspect->addSupportedBaseEnvironment(Tr::tr("Clean Environment"), [envModifier] { Environment environment; return envModifier(environment); }); @@ -172,23 +171,23 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display()); }); - setDisplayName(tr("QML Utility", "QMLRunConfiguration display name.")); + setDisplayName(Tr::tr("QML Utility", "QMLRunConfiguration display name.")); update(); } QString QmlProjectRunConfiguration::disabledReason() const { if (mainScript().isEmpty()) - return tr("No script file to execute."); + return Tr::tr("No script file to execute."); const FilePath viewer = qmlRuntimeFilePath(); if (DeviceTypeKitAspect::deviceTypeId(kit()) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE && !viewer.exists()) { - return tr("No QML utility found."); + return Tr::tr("No QML utility found."); } if (viewer.isEmpty()) - return tr("No QML utility specified for target device."); + return Tr::tr("No QML utility specified for target device."); return RunConfiguration::disabledReason(); } @@ -230,7 +229,7 @@ void QmlProjectRunConfiguration::createQtVersionAspect() m_qtversionAspect = addAspect(); m_qtversionAspect->setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox); - m_qtversionAspect->setLabelText(tr("Qt Version:")); + m_qtversionAspect->setLabelText(Tr::tr("Qt Version:")); m_qtversionAspect->setSettingsKey("QmlProjectManager.kit"); Kit *kit = target()->kit(); @@ -241,11 +240,11 @@ void QmlProjectRunConfiguration::createQtVersionAspect() const bool isQt6Project = buildSystem && buildSystem->qt6Project(); if (isQt6Project) { - m_qtversionAspect->addOption(tr("Qt 6")); + m_qtversionAspect->addOption(Tr::tr("Qt 6")); m_qtversionAspect->setReadOnly(true); } else { /* Only if this is not a Qt 6 project changing kits makes sense */ - m_qtversionAspect->addOption(tr("Qt 5")); - m_qtversionAspect->addOption(tr("Qt 6")); + m_qtversionAspect->addOption(Tr::tr("Qt 5")); + m_qtversionAspect->addOption(Tr::tr("Qt 6")); const int valueForVersion = version->qtVersion().majorVersion() == 6 ? 1 : 0; @@ -301,7 +300,7 @@ QString QmlProjectRunConfiguration::mainScript() const // QmlProjectRunConfigurationFactory QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory() - : FixedRunConfigurationFactory(QmlProjectRunConfiguration::tr("QML Runtime"), false) + : FixedRunConfigurationFactory(Tr::tr("QML Runtime"), false) { registerRunConfiguration ("QmlProjectManager.QmlRunConfiguration.Qml");