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

CMake: Move to Tr::tr

Browse Source 
Change-Id: I169da93b5184351cb915d4c198fd33318fcfe06f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2022-09-29 15:26:31 +02:00
parent 9f25c2dedf
commit ab4c9b9679
65 changed files with 509 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
share/qtcreator/translations/qtcreator_cs.ts
View File

@@ -278,7 +278,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Clear system environment</source> <source>Clear system environment</source>
<translation type="obsolete">Vyprázdnit prostředí systému</translation> <translation type="obsolete">Vyprázdnit prostředí systému</translation>
@@ -287,9 +287,6 @@
<source>Build Environment</source> <source>Build Environment</source>
<translation type="obsolete">Prostředí pro sestavování</translation> <translation type="obsolete">Prostředí pro sestavování</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Run cmake</source> <source>Run cmake</source>
<translation>Provést cmake</translation> <translation>Provést cmake</translation>
@@ -310,16 +307,10 @@
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>Průvodce CMake</translation> <translation>Průvodce CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Argumenty:</translation> <translation>Argumenty:</translation>
@@ -372,17 +363,10 @@
<source>System Environment</source> <source>System Environment</source>
<translation type="obsolete">Prostředí systému</translation> <translation type="obsolete">Prostředí systému</translation>
</message> </message>
<message>
<source>Build Environment</source>
<translation type="obsolete">Prostředí pro sestavování</translation>
</message>
<message> <message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source> <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation type="obsolete">Spouští se spustitelný soubor: &lt;b&gt;%1&lt;/b&gt; %2</translation> <translation type="obsolete">Spouští se spustitelný soubor: &lt;b&gt;%1&lt;/b&gt; %2</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message> <message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source> <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="obsolete">Zadejte, prosím, cestu ke spustitelnému souboru cmake. V cestě nebyl nalezen žádný spustitelný soubor cmake.</translation> <translation type="obsolete">Zadejte, prosím, cestu ke spustitelnému souboru cmake. V cestě nebyl nalezen žádný spustitelný soubor cmake.</translation>
@@ -399,10 +383,6 @@
<source> The path %1 is not a valid cmake.</source> <source> The path %1 is not a valid cmake.</source>
<translation type="obsolete">Cesta &apos;%1&apos; není platným cmake.</translation> <translation type="obsolete">Cesta &apos;%1&apos; není platným cmake.</translation>
</message> </message>
<message>
<source>Arguments:</source>
<translation>Argumenty:</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation>Generátor:</translation> <translation>Generátor:</translation>
@@ -439,14 +419,6 @@
<source>Refreshing cbp file in %1.</source> <source>Refreshing cbp file in %1.</source>
<translation>Soubor cpb ve složce %1 se vytváří znovu.</translation> <translation>Soubor cpb ve složce %1 se vytváří znovu.</translation>
</message> </message>
<message>
<source>MinGW Generator (%1)</source>
<translation type="obsolete">Generátor MinGW (%1)</translation>
</message>
<message>
<source>Unix Generator (%1)</source>
<translation type="obsolete">Generátor Unix (%1)</translation>
</message>
<message> <message>
<source>No generator selected.</source> <source>No generator selected.</source>
<translation>Nevybrán žádný generátor.</translation> <translation>Nevybrán žádný generátor.</translation>
@@ -479,14 +451,6 @@
<source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs.</source> <source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running cmake. Some projects require command line arguments to the initial cmake call. Note that cmake remembers command line arguments from the previous runs.</source>
<translation type="obsolete">Adresář %1, který byl zadán v nastavení sestavování, neobsahuje soubor cbp. Qt Creator musí soubor vytvořit pomocí vyvolání cmake. U některých projektů jsou k tomu vyžadovány argumenty příkazového řádku. Všimněte si, že cmake ukládá argumenty příkazového řádku z předchozího vyvolání.</translation> <translation type="obsolete">Adresář %1, který byl zadán v nastavení sestavování, neobsahuje soubor cbp. Qt Creator musí soubor vytvořit pomocí vyvolání cmake. U některých projektů jsou k tomu vyžadovány argumenty příkazového řádku. Všimněte si, že cmake ukládá argumenty příkazového řádku z předchozího vyvolání.</translation>
</message> </message>
<message>
<source>NMake Generator</source>
<translation type="obsolete">Tvůrce NMake</translation>
</message>
<message>
<source>NMake Generator (%1)</source>
<translation type="obsolete">Generátor NMake (%1)</translation>
</message>
<message> <message>
<source>MinGW Generator</source> <source>MinGW Generator</source>
<translation type="obsolete">Tvůrce MinGW</translation> <translation type="obsolete">Tvůrce MinGW</translation>
@@ -499,13 +463,6 @@
<source>Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call.</source> <source>Qt Creator needs to run cmake in the new build directory. Some projects require command line arguments to the initial cmake call.</source>
<translation type="obsolete">Qt Creator musí vyvolat cmake v novém adresáři pro sestavování. U některých projektů jsou k tomu vyžadovány argumenty příkazového řádku.</translation> <translation type="obsolete">Qt Creator musí vyvolat cmake v novém adresáři pro sestavování. U některých projektů jsou k tomu vyžadovány argumenty příkazového řádku.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Executable:</source> <source>Executable:</source>
<translation>Spustitelný soubor:</translation> <translation>Spustitelný soubor:</translation>
@@ -518,9 +475,6 @@
<source>CMake executable</source> <source>CMake executable</source>
<translation type="obsolete">Spustitelný soubor CMake</translation> <translation type="obsolete">Spustitelný soubor CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>Bylo zjištěno &lt;b&gt;sestavování ve zdrojovém adresáři v %1&lt;/b&gt;, které zabraňuje stínovým sestavováním. Adresář se sestavováním nelze v Qt Creatoru změnit. Pokud chcete stínové sestavování, vyčistěte, prosím, svůj zdrojový adresář a otevřte projekt znovu ještě jednou.</translation> <translation>Bylo zjištěno &lt;b&gt;sestavování ve zdrojovém adresáři v %1&lt;/b&gt;, které zabraňuje stínovým sestavováním. Adresář se sestavováním nelze v Qt Creatoru změnit. Pokud chcete stínové sestavování, vyčistěte, prosím, svůj zdrojový adresář a otevřte projekt znovu ještě jednou.</translation>
@@ -529,9 +483,6 @@
<source>Build Location</source> <source>Build Location</source>
<translation>Umístění sestavování</translation> <translation>Umístění sestavování</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>Dodatečné argumenty:</translation> <translation>Dodatečné argumenty:</translation>
@@ -565,9 +516,6 @@
<source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source> <source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;Neznámá sada nástrojů&lt;/b&gt;</translation> <translation type="obsolete">&lt;b&gt;Neznámá sada nástrojů&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt.</translation> <translation>Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt.</translation>
@@ -580,14 +528,6 @@
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source> <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation>Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt.. Doporučuje se, nepoužívat pro vytvoření projektu zdrojový adresář. Tím se zajistí, že zdrojový adresář zůstane volný, a umožní různá sestavení s rozdílnými nastaveními.</translation> <translation>Zadejte, prosím, adresář, ve kterém chcete vytvořit svůj projekt.. Doporučuje se, nepoužívat pro vytvoření projektu zdrojový adresář. Tím se zajistí, že zdrojový adresář zůstane volný, a umožní různá sestavení s rozdílnými nastaveními.</translation>
</message> </message>
<message>
<source>Build directory:</source>
<translation>Adresář pro sestavování:</translation>
</message>
<message>
<source>Build Location</source>
<translation>Umístění sestavování</translation>
</message>
</context> </context>
<context> <context>
<name>CPlusPlus::OverviewModel</name> <name>CPlusPlus::OverviewModel</name>
@@ -18430,7 +18370,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Create</source> <source>Create</source>
<translation type="obsolete">Vytvořit</translation> <translation type="obsolete">Vytvořit</translation>
@@ -24033,7 +23973,7 @@ Desetinná hodnota se znaménkem (velký endian): %4</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake target</source> <source>Run CMake target</source>
<translation type="obsolete">CMake-Ziel ausführen</translation> <translation type="obsolete">CMake-Ziel ausführen</translation>
@@ -24046,18 +23986,6 @@ Desetinná hodnota se znaménkem (velký endian): %4</translation>
<source>(disabled)</source> <source>(disabled)</source>
<translation>(vypnuto)</translation> <translation>(vypnuto)</translation>
</message> </message>
<message>
<source>Clean Environment</source>
<translation type="obsolete">Smazat prostředí</translation>
</message>
<message>
<source>System Environment</source>
<translation type="obsolete">Prostředí systému</translation>
</message>
<message>
<source>Build Environment</source>
<translation type="obsolete">Prostředí pro sestavování</translation>
</message>
<message> <message>
<source>The executable is not built by the current build configuration</source> <source>The executable is not built by the current build configuration</source>
<translation>Spustitelný soubor není sestaven současným nastavením pro sestavování</translation> <translation>Spustitelný soubor není sestaven současným nastavením pro sestavování</translation>
@@ -24070,17 +23998,11 @@ Desetinná hodnota se znaménkem (velký endian): %4</translation>
<source> (disabled)</source> <source> (disabled)</source>
<translation>(zakázáno)</translation> <translation>(zakázáno)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
<translation>Stolní počítač</translation> <translation>Stolní počítač</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStep</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>CMakeProjectManager::MakeStep display name.</comment> <comment>CMakeProjectManager::MakeStep display name.</comment>
@@ -24099,9 +24021,6 @@ Desetinná hodnota se znaménkem (velký endian): %4</translation>
<source>Configuration is faulty. Check the Issues view for details.</source> <source>Configuration is faulty. Check the Issues view for details.</source>
<translation>Nastavení je chybné. Prověřte, prosím, pohled na potíže kvůli podrobnostem.</translation> <translation>Nastavení je chybné. Prověřte, prosím, pohled na potíže kvůli podrobnostem.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment> <comment>Display name for CMakeProjectManager::MakeStep id.</comment>
@@ -33291,7 +33210,7 @@ Server: %2.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeEditor</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changes to cmake files are shown in the project tree after building.</source> <source>Changes to cmake files are shown in the project tree after building.</source>
<translation>Změny v souborech cmake budou ukázány po vytvoření projektového stromu.</translation> <translation>Změny v souborech cmake budou ukázány po vytvoření projektového stromu.</translation>
@@ -33300,13 +33219,6 @@ Server: %2.</translation>
<source>Build now</source> <source>Build now</source>
<translation>Sestavit nyní</translation> <translation>Sestavit nyní</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message>
<source>Run CMake</source>
<translation>Provést CMake</translation>
</message>
<message> <message>
<source>Failed opening project &apos;%1&apos;: Project is not a file</source> <source>Failed opening project &apos;%1&apos;: Project is not a file</source>
<translation>Projekt &apos;%1&apos; se nepodařil otevřít: Daný projektový soubor není soubor</translation> <translation>Projekt &apos;%1&apos; se nepodařil otevřít: Daný projektový soubor není soubor</translation>
@@ -47822,7 +47734,7 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Sestavit cíl CMake</translation> <translation>Sestavit cíl CMake</translation>
@@ -50979,7 +50891,7 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::ChooseCMakePage</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Choose Cmake Executable</source> <source>Choose Cmake Executable</source>
<translation type="obsolete">Vybrat spustitelný soubor Cmake</translation> <translation type="obsolete">Vybrat spustitelný soubor Cmake</translation>
@@ -50988,22 +50900,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
<source>The cmake executable is valid.</source> <source>The cmake executable is valid.</source>
<translation type="obsolete">Spustitelný soubor cmake je platný.</translation> <translation type="obsolete">Spustitelný soubor cmake je platný.</translation>
</message> </message>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="obsolete">Zadejte, prosím, cestu ke spustitelnému souboru cmake. V cestě nebyl nalezen žádný spustitelný soubor cmake.</translation>
</message>
<message>
<source> The cmake executable (%1) does not exist.</source>
<translation type="obsolete"> Spustitelný soubor cmake (%1) neexistuje.</translation>
</message>
<message>
<source> The path %1 is not a executable.</source>
<translation type="obsolete">Cesta &apos;%1&apos; není spustitelným souborem.</translation>
</message>
<message>
<source> The path %1 is not a valid cmake.</source>
<translation type="obsolete">Cesta &apos;%1&apos; není platným cmake.</translation>
</message>
<message> <message>
<source>CMake Executable:</source> <source>CMake Executable:</source>
<translation>Spustitelný soubor CMake:</translation> <translation>Spustitelný soubor CMake:</translation>
@@ -54348,7 +54244,7 @@ nelze najít v cestě.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::GeneratorInfo</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Ninja (%1)</source> <source>Ninja (%1)</source>
<translation>Ninja (%1)</translation> <translation>Ninja (%1)</translation>
@@ -54365,9 +54261,6 @@ nelze najít v cestě.</translation>
<source>Unix Generator (%1)</source> <source>Unix Generator (%1)</source>
<translation>Generátor Unix (%1)</translation> <translation>Generátor Unix (%1)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::NoKitPage</name>
<message> <message>
<source>Show Options</source> <source>Show Options</source>
<translation>Ukázat volby</translation> <translation>Ukázat volby</translation>

145
share/qtcreator/translations/qtcreator_da.ts
View File

@@ -4302,23 +4302,14 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Value requested by kit: %1</source> <source>Value requested by kit: %1</source>
<translation>Værdi anmodet af kit: %1</translation> <translation>Værdi anmodet af kit: %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message> <message>
<source>The build configuration is currently disabled.</source> <source>The build configuration is currently disabled.</source>
<translation>Byggekonfigurationen er deaktiveret på nuværende tidspunkt.</translation> <translation>Byggekonfigurationen er deaktiveret på nuværende tidspunkt.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message> <message>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>Kunne ikke åbne %1 til læsning.</translation> <translation>Kunne ikke åbne %1 til læsning.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message> <message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source> <source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>CMake-konfigurationen har ikke sat nogen sti til en qmake-binær, selvom kittet har en gyldig Qt version.</translation> <translation>CMake-konfigurationen har ikke sat nogen sti til en qmake-binær, selvom kittet har en gyldig Qt version.</translation>
@@ -4363,9 +4354,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>CMake Configuration</source> <source>CMake Configuration</source>
<translation>CMake-konfiguration</translation> <translation>CMake-konfiguration</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message> <message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source> <source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>CMake-værktøj er ikke konfigureret, CMake-generator ignoreres.</translation> <translation>CMake-værktøj er ikke konfigureret, CMake-generator ignoreres.</translation>
@@ -4406,9 +4394,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;Use Default Generator&gt;</source> <source>&lt;Use Default Generator&gt;</source>
<translation>&lt;brug standard generator&gt;</translation> <translation>&lt;brug standard generator&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message> <message>
<source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source> <source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source>
<translation>CMake-version %1 understøttes ikke. Opdater venligst til version 3.0 eller senere.</translation> <translation>CMake-version %1 understøttes ikke. Opdater venligst til version 3.0 eller senere.</translation>
@@ -4425,9 +4410,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Path to the cmake executable</source> <source>Path to the cmake executable</source>
<translation>Sti til cmake-eksekverbaren</translation> <translation>Sti til cmake-eksekverbaren</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message> <message>
<source>No cmake tool set.</source> <source>No cmake tool set.</source>
<translation>Intet cmake-værktøj sat.</translation> <translation>Intet cmake-værktøj sat.</translation>
@@ -4440,9 +4422,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Scan &quot;%1&quot; project tree</source> <source>Scan &quot;%1&quot; project tree</source>
<translation>Skan &quot;%1&quot; projekttræ</translation> <translation>Skan &quot;%1&quot; projekttræ</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source> (Default)</source> <source> (Default)</source>
<translation> (standard)</translation> <translation> (standard)</translation>
@@ -4487,9 +4466,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Path:</source> <source>Path:</source>
<translation>Sti:</translation> <translation>Sti:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>CMake at %1</source> <source>CMake at %1</source>
<translation>CMake ved %1</translation> <translation>CMake ved %1</translation>
@@ -4498,9 +4474,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>System CMake at %1</source> <source>System CMake at %1</source>
<translation>Systemets CMake ved %1</translation> <translation>Systemets CMake ved %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message> <message>
<source>Key</source> <source>Key</source>
<translation>Nøgle</translation> <translation>Nøgle</translation>
@@ -4521,9 +4494,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Value</source> <source>Value</source>
<translation>Værdi</translation> <translation>Værdi</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<message> <message>
<source>Select a file for %1</source> <source>Select a file for %1</source>
<translation>Vælg en fil for %1</translation> <translation>Vælg en fil for %1</translation>
@@ -4532,9 +4502,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Select a directory for %1</source> <source>Select a directory for %1</source>
<translation>Vælg en mappe for %1</translation> <translation>Vælg en mappe for %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildDirManager</name>
<message> <message>
<source>Failed to create build directory &quot;%1&quot;.</source> <source>Failed to create build directory &quot;%1&quot;.</source>
<translation>Kunne ikke oprette bygmappe &quot;%1&quot;.</translation> <translation>Kunne ikke oprette bygmappe &quot;%1&quot;.</translation>
@@ -4555,14 +4522,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;removed&gt;</source> <source>&lt;removed&gt;</source>
<translation>&lt;fjernet&gt;</translation> <translation>&lt;fjernet&gt;</translation>
</message> </message>
<message>
<source>Key</source>
<translation>Nøgle</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Project</source> <source>Project</source>
<translation>Projekt</translation> <translation>Projekt</translation>
@@ -4579,16 +4538,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Apply Changes to Project</source> <source>Apply Changes to Project</source>
<translation>Anvend ændringer til projekt</translation> <translation>Anvend ændringer til projekt</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message> <message>
<source>CMake configuration set by the kit was overridden in the project.</source> <source>CMake configuration set by the kit was overridden in the project.</source>
<translation>CMake-konfiguration sat af kittet blev tilsidesat af projektet.</translation> <translation>CMake-konfiguration sat af kittet blev tilsidesat af projektet.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Default</source> <source>Default</source>
<extracomment>The name of the build configuration created by default for a cmake project.</extracomment> <extracomment>The name of the build configuration created by default for a cmake project.</extracomment>
@@ -4614,13 +4567,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Release with Debug Information</source> <source>Release with Debug Information</source>
<translation>Udgivelse med fejlretinformation</translation> <translation>Udgivelse med fejlretinformation</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>Bygmappe:</translation> <translation>Bygmappe:</translation>
@@ -4685,10 +4631,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Apply Configuration Changes</source> <source>Apply Configuration Changes</source>
<translation>Anvend konfigurationsændringer</translation> <translation>Anvend konfigurationsændringer</translation>
</message> </message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;AFSÆT&gt;</translation>
</message>
<message> <message>
<source>bool</source> <source>bool</source>
<comment>display string for cmake type BOOLEAN</comment> <comment>display string for cmake type BOOLEAN</comment>
@@ -4713,9 +4655,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Force to %1</source> <source>Force to %1</source>
<translation>Tving til %1</translation> <translation>Tving til %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message> <message>
<source>CMake Build</source> <source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -4741,9 +4680,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Project did not parse successfully, cannot build.</source> <source>Project did not parse successfully, cannot build.</source>
<translation>Projekt blev ikke parset, kan ikke bygge.</translation> <translation>Projekt blev ikke parset, kan ikke bygge.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message> <message>
<source>Tool arguments:</source> <source>Tool arguments:</source>
<translation>Værktøjsargumenter:</translation> <translation>Værktøjsargumenter:</translation>
@@ -4761,25 +4697,15 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source> <source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;Ingen byggekonfiguration fundet i dette kit.&lt;/b&gt;</translation> <translation>&lt;b&gt;Ingen byggekonfiguration fundet i dette kit.&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepFactory</name>
<message> <message>
<source>Build</source> <source>Build</source>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Byg</translation> <translation>Byg</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>Skift...</translation> <translation>Skift...</translation>
</message> </message>
<message>
<source>CMake Configuration</source>
<translation>CMake-konfiguration</translation>
</message>
<message> <message>
<source>Default configuration passed to CMake when setting up a project.</source> <source>Default configuration passed to CMake when setting up a project.</source>
<translation>Standard konfiguration videregivet til CMake når et projekt sættes op.</translation> <translation>Standard konfiguration videregivet til CMake når et projekt sættes op.</translation>
@@ -4792,20 +4718,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Indtast én variabel pr. linje med variabelnavnet separeret fra variablens værdi med &quot;=&quot;.&lt;br&gt;Du kan give et tip om type ved at tilføje &quot;:TYPE&quot; før &quot;=&quot;.</translation> <translation>Indtast én variabel pr. linje med variabelnavnet separeret fra variablens værdi med &quot;=&quot;.&lt;br&gt;Du kan give et tip om type ved at tilføje &quot;:TYPE&quot; før &quot;=&quot;.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name>
<message> <message>
<source>CMake Editor</source> <source>CMake Editor</source>
<translation>CMake-redigering</translation> <translation>CMake-redigering</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Skift...</translation>
</message>
<message> <message>
<source>CMake generator:</source> <source>CMake generator:</source>
<translation>CMake-generator:</translation> <translation>CMake-generator:</translation>
@@ -4822,10 +4738,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source> <source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>CMake-generator definerer hvordan et projekt bygges ved brug af CMake.&lt;br&gt;Denne indstilling ignoreres når andre byggesystemer bruges.</translation> <translation>CMake-generator definerer hvordan et projekt bygges ved brug af CMake.&lt;br&gt;Denne indstilling ignoreres når andre byggesystemer bruges.</translation>
</message> </message>
<message>
<source>CMake Generator</source>
<translation>CMake-generator</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation>Generator:</translation> <translation>Generator:</translation>
@@ -4842,9 +4754,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Toolset:</source> <source>Toolset:</source>
<translation>Værktøjssæt:</translation> <translation>Værktøjssæt:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name>
<message> <message>
<source>CMake Tool:</source> <source>CMake Tool:</source>
<translation>CMake-værktøj:</translation> <translation>CMake-værktøj:</translation>
@@ -4857,16 +4766,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Intet tilgængeligt CMake-værktøj&gt;</translation> <translation>&lt;Intet tilgængeligt CMake-værktøj&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Byg CMake-mål</translation> <translation>Byg CMake-mål</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>Kør CMake</translation> <translation>Kør CMake</translation>
@@ -4879,47 +4782,24 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Rescan Project</source> <source>Rescan Project</source>
<translation>Genskan projekt</translation> <translation>Genskan projekt</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
<message>
<source>Build</source>
<translation>Byg</translation>
</message>
<message> <message>
<source>Build &quot;%1&quot;</source> <source>Build &quot;%1&quot;</source>
<translation>Byg &quot;%1&quot;</translation> <translation>Byg &quot;%1&quot;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message> <message>
<source>The project no longer builds the target associated with this run configuration.</source> <source>The project no longer builds the target associated with this run configuration.</source>
<translation>Projektet bygger ikke længere målet tilknyttet med denne kør-konfiguration.</translation> <translation>Projektet bygger ikke længere målet tilknyttet med denne kør-konfiguration.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
<translation>Desktop</translation> <translation>Desktop</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Tilføj</translation> <translation>Tilføj</translation>
@@ -4948,9 +4828,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>New CMake</source> <source>New CMake</source>
<translation>Ny CMake</translation> <translation>Ny CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerMode</name>
<message> <message>
<source>Running &quot;%1 %2&quot; in %3.</source> <source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Kører &quot;%1 %2&quot; i %3.</translation> <translation>Kører &quot;%1 %2&quot; i %3.</translation>
@@ -5035,9 +4912,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>Received a signal in reply to a request.</source> <source>Received a signal in reply to a request.</source>
<translation>Modtog et signal som svar til en anmodning.</translation> <translation>Modtog et signal som svar til en anmodning.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerModeReader</name>
<message> <message>
<source>Parsing of CMake project failed: Connection to CMake server lost.</source> <source>Parsing of CMake project failed: Connection to CMake server lost.</source>
<translation>Parsing af CMake-projekt mislykkedes: Forbindelse til CMake-server tabt.</translation> <translation>Parsing af CMake-projekt mislykkedes: Forbindelse til CMake-server tabt.</translation>
@@ -5094,21 +4968,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
<source>&lt;Headers&gt;</source> <source>&lt;Headers&gt;</source>
<translation>&lt;headere&gt;</translation> <translation>&lt;headere&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::TeaLeafReader</name>
<message> <message>
<source>The build directory is not for %1 but for %2</source> <source>The build directory is not for %1 but for %2</source>
<translation>Bygmappen er ikke til %1 men til %2</translation> <translation>Bygmappen er ikke til %1 men til %2</translation>
</message> </message>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Kører &quot;%1 %2&quot; i %3.</translation>
</message>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfigurerer &quot;%1&quot;</translation>
</message>
<message> <message>
<source>*** cmake process crashed.</source> <source>*** cmake process crashed.</source>
<translation>*** cmake-proces holdt op med at virke.</translation> <translation>*** cmake-proces holdt op med at virke.</translation>
@@ -42843,7 +42706,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source> <source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Beslutter om filstier kopieres til udklipsholderen til indsættelse i CMakeLists.txt-filen, når du tilføjer nye filer til CMake-projekter.</translation> <translation>Beslutter om filstier kopieres til udklipsholderen til indsættelse i CMakeLists.txt-filen, når du tilføjer nye filer til CMake-projekter.</translation>
@@ -43479,11 +43342,7 @@ Kopiér stien til kildefilerne til udklipsholderen?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingsPage</name> <name>CMakeProjectManager</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context> </context>
<context> <context>
<name>Core::HelpManager</name> <name>Core::HelpManager</name>

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

@@ -197,7 +197,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Filter</source> <source>Filter</source>
<translation>Filter</translation> <translation>Filter</translation>
@@ -13548,7 +13548,7 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.</translati
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeManager</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>CMake ausführen</translation> <translation>CMake ausführen</translation>
@@ -31899,7 +31899,7 @@ Senden selbst auch Zeit benötigt.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::CMakeProject</name> <name>CMakeProjectManager</name>
<message> <message>
<source>No cmake tool set.</source> <source>No cmake tool set.</source>
<translation>Keine CMake Anwendung konfiguriert.</translation> <translation>Keine CMake Anwendung konfiguriert.</translation>
@@ -31908,9 +31908,6 @@ Senden selbst auch Zeit benötigt.</translation>
<source>No compilers set in kit.</source> <source>No compilers set in kit.</source>
<translation>Im Kit sind keine Compiler eingerichtet.</translation> <translation>Im Kit sind keine Compiler eingerichtet.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source>Version: %1&lt;br&gt;Supports fileApi: %2</source> <source>Version: %1&lt;br&gt;Supports fileApi: %2</source>
<translation>Version: %1&lt;br&gt;Unterstützt fileApi: %2</translation> <translation>Version: %1&lt;br&gt;Unterstützt fileApi: %2</translation>
@@ -31975,9 +31972,6 @@ Senden selbst auch Zeit benötigt.</translation>
<source>Help file:</source> <source>Help file:</source>
<translation>Hilfedatei:</translation> <translation>Hilfedatei:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Hinzufügen</translation> <translation>Hinzufügen</translation>
@@ -32006,21 +32000,10 @@ Senden selbst auch Zeit benötigt.</translation>
<source>New CMake</source> <source>New CMake</source>
<translation>Neues CMake</translation> <translation>Neues CMake</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>System CMake at %1</source> <source>System CMake at %1</source>
<translation>System-CMake in %1</translation> <translation>System-CMake in %1</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context> </context>
<context> <context>
<name>Core::BaseFileWizard</name> <name>Core::BaseFileWizard</name>
@@ -34923,7 +34906,7 @@ Dies könnte Probleme während der Ausführung verursachen.
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake Build</source> <source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -34958,9 +34941,6 @@ Dies könnte Probleme während der Ausführung verursachen.
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Erstellen</translation> <translation>Erstellen</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message> <message>
<source>CMake arguments:</source> <source>CMake arguments:</source>
<translation>Kommandozeilenargumente für CMake:</translation> <translation>Kommandozeilenargumente für CMake:</translation>
@@ -34978,9 +34958,6 @@ Dies könnte Probleme während der Ausführung verursachen.
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment> <comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
<translation>Build</translation> <translation>Build</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message> <message>
<source>Key</source> <source>Key</source>
<translation>Schlüssel</translation> <translation>Schlüssel</translation>
@@ -34993,10 +34970,6 @@ Dies könnte Probleme während der Ausführung verursachen.
<source>Current kit: %1</source> <source>Current kit: %1</source>
<translation>Aktuelles Kit: %1</translation> <translation>Aktuelles Kit: %1</translation>
</message> </message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;UNGESETZT&gt;</translation>
</message>
<message> <message>
<source>Value</source> <source>Value</source>
<translation>Wert</translation> <translation>Wert</translation>
@@ -36081,7 +36054,7 @@ Siehe auch die Einstellungen für Google Test.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changing Build Directory</source> <source>Changing Build Directory</source>
<translation>Build-Verzeichnis ändern</translation> <translation>Build-Verzeichnis ändern</translation>
@@ -37677,7 +37650,7 @@ Fehler: %5</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::CMakeConfigItem</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>Die Datei %1 konnte nicht zum Lesen geöffnet werden.</translation> <translation>Die Datei %1 konnte nicht zum Lesen geöffnet werden.</translation>
@@ -37706,23 +37679,16 @@ Fehler: %5</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
<message>
<source>Build</source>
<translation>Erstellen</translation>
</message>
<message> <message>
<source>Build &quot;%1&quot;</source> <source>Build &quot;%1&quot;</source>
<translation>&quot;%1&quot; erstellen</translation> <translation>&quot;%1&quot; erstellen</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager</name>
<message> <message>
<source>Current CMake: %1</source> <source>Current CMake: %1</source>
<translation>Aktuelles CMake: %1</translation> <translation>Aktuelles CMake: %1</translation>
@@ -40352,7 +40318,7 @@ Breche ausstehende Operationen ab...
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Select a file for %1</source> <source>Select a file for %1</source>
<translation>Wählen Sie eine Datei für %1</translation> <translation>Wählen Sie eine Datei für %1</translation>
@@ -40870,7 +40836,7 @@ Breche ausstehende Operationen ab...
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source> <source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Legt fest, ob beim Hinzufügen von neuen Dateien zu CMake-Projekten deren Dateipfade in die Zwischenablage kopiert werden, um sie in die CMakeLists.txt-Datei einzufügen.</translation> <translation>Legt fest, ob beim Hinzufügen von neuen Dateien zu CMake-Projekten deren Dateipfade in die Zwischenablage kopiert werden, um sie in die CMakeLists.txt-Datei einzufügen.</translation>
@@ -45786,7 +45752,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildSystem</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Scan &quot;%1&quot; project tree</source> <source>Scan &quot;%1&quot; project tree</source>
<translation>Durchsuche &quot;%1&quot;-Projektbaum</translation> <translation>Durchsuche &quot;%1&quot;-Projektbaum</translation>
@@ -45811,16 +45777,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>CMakeCache.txt file not found.</source> <source>CMakeCache.txt file not found.</source>
<translation>Datei CMakeCache.txt nicht gefunden.</translation> <translation>Datei CMakeCache.txt nicht gefunden.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitAspect</name>
<message> <message>
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Kein CMake-Werkzeug verfügbar&gt;</translation> <translation>&lt;Kein CMake-Werkzeug verfügbar&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitAspect</name>
<message> <message>
<source>CMake Tool</source> <source>CMake Tool</source>
<translation>CMake-Werkzeug</translation> <translation>CMake-Werkzeug</translation>
@@ -45829,10 +45789,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>The CMake Tool to use when building a project with CMake.&lt;br&gt;This setting is ignored when using other build systems.</source> <source>The CMake Tool to use when building a project with CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>Das zum Erstellen eines Projektes mit CMake zu verwendende CMake-Werkzeug.&lt;br&gt;Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert.</translation> <translation>Das zum Erstellen eines Projektes mit CMake zu verwendende CMake-Werkzeug.&lt;br&gt;Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert.</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Unconfigured</source> <source>Unconfigured</source>
<translation>Nicht konfiguriert</translation> <translation>Nicht konfiguriert</translation>
@@ -45841,9 +45797,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Path to the cmake executable</source> <source>Path to the cmake executable</source>
<translation>Pfad zur ausführbaren Datei von cmake</translation> <translation>Pfad zur ausführbaren Datei von cmake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitAspect</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>Ändern...</translation> <translation>Ändern...</translation>
@@ -45876,9 +45829,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Toolset:</source> <source>Toolset:</source>
<translation>Toolset:</translation> <translation>Toolset:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitAspect</name>
<message> <message>
<source>CMake generator</source> <source>CMake generator</source>
<translation>CMake-Generator</translation> <translation>CMake-Generator</translation>
@@ -45919,17 +45869,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Toolset: %1</source> <source>Toolset: %1</source>
<translation>Toolset: %1</translation> <translation>Toolset: %1</translation>
</message> </message>
<message>
<source>CMake Generator</source>
<translation>CMake-Generator</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitAspect</name>
<message>
<source>Change...</source>
<translation>Ändern...</translation>
</message>
<message> <message>
<source>Edit CMake Configuration</source> <source>Edit CMake Configuration</source>
<translation>CMake-Konfiguration bearbeiten</translation> <translation>CMake-Konfiguration bearbeiten</translation>
@@ -45938,9 +45877,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Eine Variable pro Zeile eingeben, Name und Wert durch &quot;=&quot; trennen.&lt;br&gt;Ein Typhinweis kann mit &quot;:TYPE&quot; vor dem &quot;=&quot; angegeben werden.</translation> <translation>Eine Variable pro Zeile eingeben, Name und Wert durch &quot;=&quot; trennen.&lt;br&gt;Ein Typhinweis kann mit &quot;:TYPE&quot; vor dem &quot;=&quot; angegeben werden.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitAspect</name>
<message> <message>
<source>CMake Configuration</source> <source>CMake Configuration</source>
<translation>CMake-Konfiguration</translation> <translation>CMake-Konfiguration</translation>
@@ -45989,23 +45925,14 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source> <source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source>
<translation>Die CMake-Konfiguration hat einen C++-Compiler gesetzt, der nicht mit dem Compiler der Toolchain übereinstimmt, die vom Kit verwendet wird.</translation> <translation>Die CMake-Konfiguration hat einen C++-Compiler gesetzt, der nicht mit dem Compiler der Toolchain übereinstimmt, die vom Kit verwendet wird.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>CMake-Ziel erstellen</translation> <translation>CMake-Ziel erstellen</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::OpenCMakeTargetLocatorFilter</name>
<message> <message>
<source>Open CMake target</source> <source>Open CMake target</source>
<translation>CMake-Ziel öffnen</translation> <translation>CMake-Ziel öffnen</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProcess</name>
<message> <message>
<source>Running %1 in %2.</source> <source>Running %1 in %2.</source>
<translation>Führe %1 in %2 aus.</translation> <translation>Führe %1 in %2 aus.</translation>
@@ -46014,16 +45941,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
<source>Configuring &quot;%1&quot;</source> <source>Configuring &quot;%1&quot;</source>
<translation>Konfiguriere &quot;%1&quot;</translation> <translation>Konfiguriere &quot;%1&quot;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApi</name>
<message> <message>
<source>&lt;Build Directory&gt;</source> <source>&lt;Build Directory&gt;</source>
<translation>&lt;Build-Verzeichnis&gt;</translation> <translation>&lt;Build-Verzeichnis&gt;</translation>
@@ -48863,22 +48780,11 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::FileApiReader</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Parsing has been canceled.</source> <source>Parsing has been canceled.</source>
<translation>Auswertung wurde abgebrochen.</translation> <translation>Auswertung wurde abgebrochen.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ProjectTreeHelper</name>
<message>
<source>&lt;Build Directory&gt;</source>
<translation>&lt;Build-Verzeichnis&gt;</translation>
</message>
<message>
<source>&lt;Other Locations&gt;</source>
<translation>&lt;Andere Orte&gt;</translation>
</message>
<message> <message>
<source>&lt;Headers&gt;</source> <source>&lt;Headers&gt;</source>
<translation>&lt;Header-Dateien&gt;</translation> <translation>&lt;Header-Dateien&gt;</translation>

32
share/qtcreator/translations/qtcreator_es.ts
View File

@@ -271,7 +271,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Clear system environment</source> <source>Clear system environment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -280,9 +280,6 @@
<source>Build Environment</source> <source>Build Environment</source>
<translation>Entorno de construcción</translation> <translation>Entorno de construcción</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Create</source> <source>Create</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -295,23 +292,14 @@
<source>New Configuration Name:</source> <source>New Configuration Name:</source>
<translation type="unfinished">Nombre para nueva configuración:</translation> <translation type="unfinished">Nombre para nueva configuración:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>&amp;Change</source> <source>&amp;Change</source>
<translation>&amp;Cambiar</translation> <translation>&amp;Cambiar</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>Asistente CMake</translation> <translation>Asistente CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Argumentos:</translation> <translation>Argumentos:</translation>
@@ -356,9 +344,6 @@
<source>Base environment for this runconfiguration:</source> <source>Base environment for this runconfiguration:</source>
<translation type="unfinished">Entorno base para éste ajuste de ejecución:</translation> <translation type="unfinished">Entorno base para éste ajuste de ejecución:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -368,9 +353,6 @@
<translatorcomment>shadow build ¿? en la sombra?</translatorcomment> <translatorcomment>shadow build ¿? en la sombra?</translatorcomment>
<translation type="obsolete">Qt Creator ha detectado un entorno de construcción entremezclado con las fuentes, lo que impide la construcción en un directorio separado. Qt Creator no le permitirá alterar el directorio de construcción. Si quiere construir en un directorio separado, limpie el directorio de los fuentes y abra nuevamente el proyecto.</translation> <translation type="obsolete">Qt Creator ha detectado un entorno de construcción entremezclado con las fuentes, lo que impide la construcción en un directorio separado. Qt Creator no le permitirá alterar el directorio de construcción. Si quiere construir en un directorio separado, limpie el directorio de los fuentes y abra nuevamente el proyecto.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message> <message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source> <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -431,9 +413,6 @@
<source>No valid cmake executable specified.</source> <source>No valid cmake executable specified.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<translation></translation> <translation></translation>
@@ -442,9 +421,6 @@
<source>CMake executable</source> <source>CMake executable</source>
<translation>Ejecutable CMake</translation> <translation>Ejecutable CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>Argumentos adicionales:</translation> <translation>Argumentos adicionales:</translation>
@@ -457,9 +433,6 @@
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source> <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>Por favor, ingrese el directorio en el que quiere construir el proyecto.</translation> <translation>Por favor, ingrese el directorio en el que quiere construir el proyecto.</translation>
@@ -472,9 +445,6 @@
<source>Build directory:</source> <source>Build directory:</source>
<translation>Directorio de construcción:</translation> <translation>Directorio de construcción:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<message> <message>
<source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source> <source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source>
<translation type="obsolete">Qt Creator ha encontrado un archivo cbp reciente, el mismo será interpretado para recopilar información acerca del proyecto. Puede cambiar los argumentos de línea de comandos usados para crear este archivo en el proyecto. Responda Finalizar para cargar el proyecto.</translation> <translation type="obsolete">Qt Creator ha encontrado un archivo cbp reciente, el mismo será interpretado para recopilar información acerca del proyecto. Puede cambiar los argumentos de línea de comandos usados para crear este archivo en el proyecto. Responda Finalizar para cargar el proyecto.</translation>

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

@@ -275,7 +275,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Clear system environment</source> <source>Clear system environment</source>
<translation type="obsolete">Nettoyer l&apos;environnement système</translation> <translation type="obsolete">Nettoyer l&apos;environnement système</translation>
@@ -284,9 +284,6 @@
<source>Build Environment</source> <source>Build Environment</source>
<translation type="obsolete">Environnement de compilation</translation> <translation type="obsolete">Environnement de compilation</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Create</source> <source>Create</source>
<translation type="obsolete">Créer</translation> <translation type="obsolete">Créer</translation>
@@ -316,9 +313,6 @@
<source>New Configuration Name:</source> <source>New Configuration Name:</source>
<translation type="obsolete">Nom de la nouvelle configuration :</translation> <translation type="obsolete">Nom de la nouvelle configuration :</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Run cmake</source> <source>Run cmake</source>
<translation>Exécuter CMake</translation> <translation>Exécuter CMake</translation>
@@ -339,16 +333,10 @@
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>Assistant CMake</translation> <translation>Assistant CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Arguments :</translation> <translation>Arguments :</translation>
@@ -393,10 +381,6 @@
<source>System Environment</source> <source>System Environment</source>
<translation type="obsolete">Environnement système</translation> <translation type="obsolete">Environnement système</translation>
</message> </message>
<message>
<source>Build Environment</source>
<translation type="obsolete">Environnement de compilation</translation>
</message>
<message> <message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source> <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation type="obsolete">Exécution en cours : &lt;b&gt;%1&lt;/b&gt; %2</translation> <translation type="obsolete">Exécution en cours : &lt;b&gt;%1&lt;/b&gt; %2</translation>
@@ -409,9 +393,6 @@
<source>Base environment for this runconfiguration:</source> <source>Base environment for this runconfiguration:</source>
<translation type="obsolete">Environnement de base pour cette configuration d&apos;éxecution :</translation> <translation type="obsolete">Environnement de base pour cette configuration d&apos;éxecution :</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>Qt Creator a détecté une &lt;b&gt;compilation dans les sources de %1&lt;/b&gt; qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un &quot;shadow build&quot;, nettoyez le répertoire source et rouvrez le projet.</translation> <translation>Qt Creator a détecté une &lt;b&gt;compilation dans les sources de %1&lt;/b&gt; qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un &quot;shadow build&quot;, nettoyez le répertoire source et rouvrez le projet.</translation>
@@ -424,29 +405,6 @@
<source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation type="obsolete">Qt Creator a détecté une compilation dans les sources qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un &quot;shadow build&quot;, nettoyez le répertoire source et rouvrez le projet.</translation> <translation type="obsolete">Qt Creator a détecté une compilation dans les sources qui empêche les shadow builds. Qt Creator ne permettra pas de changer le répertoire de compilation. Si vous voulez effectuer un &quot;shadow build&quot;, nettoyez le répertoire source et rouvrez le projet.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="obsolete">Veuillez spécifier l&apos;emplacement de l&apos;exécutable cmake. Aucun exécutable cmake n&apos;a été trouvé dans le path.</translation>
</message>
<message>
<source> The cmake executable (%1) does not exist.</source>
<translation type="obsolete">L&apos;exécutable cmake (%1) n&apos;existe pas.</translation>
</message>
<message>
<source> The path %1 is not a executable.</source>
<translation type="obsolete"> %1 n&apos;est pas le chemin d&apos;un exécutable.</translation>
</message>
<message>
<source> The path %1 is not a valid cmake.</source>
<translation type="obsolete">%1 n&apos;est pas une installation valide de cmake.</translation>
</message>
<message>
<source>Arguments:</source>
<translation>Arguments :</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation>Générateur : </translation> <translation>Générateur : </translation>
@@ -485,14 +443,6 @@
<translatorcomment>capitalisation de CMake, contenu inchangé (cmake -&gt; CMake)</translatorcomment> <translatorcomment>capitalisation de CMake, contenu inchangé (cmake -&gt; CMake)</translatorcomment>
<translation type="obsolete">Veuillez spécifier l&apos;emplacement de l&apos;exécutable CMake. Aucun exécutable CMake n&apos;a été trouvé dans la liste de répertoires standards.</translation> <translation type="obsolete">Veuillez spécifier l&apos;emplacement de l&apos;exécutable CMake. Aucun exécutable CMake n&apos;a été trouvé dans la liste de répertoires standards.</translation>
</message> </message>
<message>
<source> The CMake executable (%1) does not exist.</source>
<translation type="obsolete"> L&apos;exécutable CMake (%1) n&apos;existe pas.</translation>
</message>
<message>
<source> The path %1 is not a valid CMake.</source>
<translation type="obsolete"> %1 n&apos;est pas un CMake valide.</translation>
</message>
<message> <message>
<source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun CMake. Or simply finish the wizard directly.</source> <source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun CMake. Or simply finish the wizard directly.</source>
<translation type="obsolete">Le répertoire %1 contient déjà un fichier cbp qui est assez récent. Vous pouvez passer des arguments spéciaux ou changer la chaîne de compilation utilisée ici et réexécuter CMake. Vous pouvez aussi terminer l&apos;assistant directement.</translation> <translation type="obsolete">Le répertoire %1 contient déjà un fichier cbp qui est assez récent. Vous pouvez passer des arguments spéciaux ou changer la chaîne de compilation utilisée ici et réexécuter CMake. Vous pouvez aussi terminer l&apos;assistant directement.</translation>
@@ -525,14 +475,6 @@
<source>Refreshing cbp file in %1.</source> <source>Refreshing cbp file in %1.</source>
<translation>Rafraîchissement du fichier cbp dans %1 en cours.</translation> <translation>Rafraîchissement du fichier cbp dans %1 en cours.</translation>
</message> </message>
<message>
<source>MinGW Generator (%1)</source>
<translation type="obsolete">Générateur MinGW (%1)</translation>
</message>
<message>
<source>Unix Generator (%1)</source>
<translation type="obsolete">Générateur UNIX (%1)</translation>
</message>
<message> <message>
<source>No generator selected.</source> <source>No generator selected.</source>
<translation>Pas de générateur sélectionné.</translation> <translation>Pas de générateur sélectionné.</translation>
@@ -549,14 +491,6 @@
<source>NMake Generator</source> <source>NMake Generator</source>
<translation type="obsolete">Générateur NMake</translation> <translation type="obsolete">Générateur NMake</translation>
</message> </message>
<message>
<source>NMake Generator (%1)</source>
<translation type="obsolete">Générateur NMake (%1)</translation>
</message>
<message>
<source>MinGW Generator</source>
<translation type="obsolete">Générateur MinGW</translation>
</message>
<message> <message>
<source>No valid CMake executable specified.</source> <source>No valid CMake executable specified.</source>
<translation>L&apos;exécutable CMake spécifié est invalide.</translation> <translation>L&apos;exécutable CMake spécifié est invalide.</translation>
@@ -565,13 +499,6 @@
<source>No valid cmake executable specified.</source> <source>No valid cmake executable specified.</source>
<translation type="obsolete">L&apos;exécutable CMake spécifié est invalide.</translation> <translation type="obsolete">L&apos;exécutable CMake spécifié est invalide.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Executable:</source> <source>Executable:</source>
<translation>Exécutable :</translation> <translation>Exécutable :</translation>
@@ -584,9 +511,6 @@
<source>CMake executable</source> <source>CMake executable</source>
<translation type="obsolete">Exécutable CMake</translation> <translation type="obsolete">Exécutable CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>Arguments supplémentaires :</translation> <translation>Arguments supplémentaires :</translation>
@@ -620,9 +544,6 @@
<source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source> <source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;Chaîne de compilation inconnue&lt;/b&gt;</translation> <translation type="obsolete">&lt;b&gt;Chaîne de compilation inconnue&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. </translation> <translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. </translation>
@@ -635,17 +556,6 @@
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source> <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. Qt Creator recommande de ne pas utiliser le répertoire source pour la compilation. Cela garantit que le répertoire source reste propre et permet des compilations multiples avec différents paramètres.</translation> <translation>Veuillez spécifier le répertoire où vous voulez compiler votre projet. Qt Creator recommande de ne pas utiliser le répertoire source pour la compilation. Cela garantit que le répertoire source reste propre et permet des compilations multiples avec différents paramètres.</translation>
</message> </message>
<message>
<source>Build directory:</source>
<translation>Répertoire de compilation :</translation>
</message>
<message>
<source>Build Location</source>
<translation>Emplacement de compilation</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<message> <message>
<source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source> <source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source>
<translation type="obsolete">Qt Creator a trouvé un fichier cbp récent, Qt Creator va maintenant l&apos;analyser pour rassembler des informations sur le projet. Vous pouvez changer les arguments de ligne de commande utilisés pour la création de ce fichier depuis le mode &quot;projet&quot;. Cliquer sur Terminer pour charger le projet.</translation> <translation type="obsolete">Qt Creator a trouvé un fichier cbp récent, Qt Creator va maintenant l&apos;analyser pour rassembler des informations sur le projet. Vous pouvez changer les arguments de ligne de commande utilisés pour la création de ce fichier depuis le mode &quot;projet&quot;. Cliquer sur Terminer pour charger le projet.</translation>
@@ -24246,7 +24156,7 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake target</source> <source>Run CMake target</source>
<translation type="obsolete">Exécuter la cible CMake</translation> <translation type="obsolete">Exécuter la cible CMake</translation>
@@ -24259,18 +24169,6 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4</translation>
<source>(disabled)</source> <source>(disabled)</source>
<translation>(désactivé)</translation> <translation>(désactivé)</translation>
</message> </message>
<message>
<source>Clean Environment</source>
<translation type="obsolete">Environnement de nettoyage</translation>
</message>
<message>
<source>System Environment</source>
<translation type="obsolete">Environnement système</translation>
</message>
<message>
<source>Build Environment</source>
<translation type="obsolete">Environnement de compilation</translation>
</message>
<message> <message>
<source>The executable is not built by the current build configuration</source> <source>The executable is not built by the current build configuration</source>
<translation>L&apos;exécutable n&apos;est pas compilé pour la configuration de compilation courante</translation> <translation>L&apos;exécutable n&apos;est pas compilé pour la configuration de compilation courante</translation>
@@ -24283,17 +24181,11 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4</translation>
<source> (disabled)</source> <source> (disabled)</source>
<translation> (Désactivé)</translation> <translation> (Désactivé)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
<translation>Desktop</translation> <translation>Desktop</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStep</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>CMakeProjectManager::MakeStep display name.</comment> <comment>CMakeProjectManager::MakeStep display name.</comment>
@@ -24312,9 +24204,6 @@ Valeur précédente au format décimal signé (gros-boutiste) : %4</translation>
<source>Configuration is faulty. Check the Issues view for details.</source> <source>Configuration is faulty. Check the Issues view for details.</source>
<translation>La configuration est défectueuse, veuillez vérifier la vue des problèmes pour les détails.</translation> <translation>La configuration est défectueuse, veuillez vérifier la vue des problèmes pour les détails.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment> <comment>Display name for CMakeProjectManager::MakeStep id.</comment>
@@ -36858,11 +36747,7 @@ Voys pouvez compiler l&apos;application et la déployer sur desktop et mobile. P
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeManager</name> <name>CMakeProjectManager</name>
<message>
<source>Run CMake</source>
<translation>Exécuter CMake</translation>
</message>
<message> <message>
<source>Failed opening project &apos;%1&apos;: Project is not a file</source> <source>Failed opening project &apos;%1&apos;: Project is not a file</source>
<translation>Échec de l&apos;ouverture du projet &quot;%1&quot; : le projet n&apos;est pas un fichier</translation> <translation>Échec de l&apos;ouverture du projet &quot;%1&quot; : le projet n&apos;est pas un fichier</translation>
@@ -38882,7 +38767,7 @@ Avec la simulation de cache, d&apos;autres compteurs d&apos;événements sont ac
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeEditor</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changes to cmake files are shown in the project tree after building.</source> <source>Changes to cmake files are shown in the project tree after building.</source>
<translation>Les changements aux fichiers CMake sont montrés dans l&apos;arbre du projet après la compilation. </translation> <translation>Les changements aux fichiers CMake sont montrés dans l&apos;arbre du projet après la compilation. </translation>
@@ -45512,7 +45397,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Compiler la cible CMake</translation> <translation>Compiler la cible CMake</translation>
@@ -48641,7 +48526,7 @@ Oui :)</translatorcomment>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::ChooseCMakePage</name> <name>CMakeProjectManager</name>
<message> <message>
<source>cmake Executable:</source> <source>cmake Executable:</source>
<translation type="obsolete">Exécutable CMake :</translation> <translation type="obsolete">Exécutable CMake :</translation>
@@ -48662,10 +48547,6 @@ Oui :)</translatorcomment>
<source> The cmake executable (%1) does not exist.</source> <source> The cmake executable (%1) does not exist.</source>
<translation type="obsolete">L&apos;exécutable CMake (%1) n&apos;existe pas.</translation> <translation type="obsolete">L&apos;exécutable CMake (%1) n&apos;existe pas.</translation>
</message> </message>
<message>
<source> The path %1 is not a executable.</source>
<translation type="obsolete"> %1 n&apos;est pas le chemin d&apos;un exécutable.</translation>
</message>
<message> <message>
<source> The path %1 is not a valid cmake.</source> <source> The path %1 is not a valid cmake.</source>
<translation type="obsolete">%1 n&apos;est pas une installation valide de CMake.</translation> <translation type="obsolete">%1 n&apos;est pas une installation valide de CMake.</translation>
@@ -53501,7 +53382,7 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::GeneratorInfo</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Ninja (%1)</source> <source>Ninja (%1)</source>
<translation>Ninja (%1)</translation> <translation>Ninja (%1)</translation>
@@ -53518,9 +53399,6 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
<source>Unix Generator (%1)</source> <source>Unix Generator (%1)</source>
<translation>Générateur UNIX (%1)</translation> <translation>Générateur UNIX (%1)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::NoKitPage</name>
<message> <message>
<source>Show Options</source> <source>Show Options</source>
<translation>Afficher les options</translation> <translation>Afficher les options</translation>

144
share/qtcreator/translations/qtcreator_hr.ts
View File

@@ -2076,7 +2076,7 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source> <source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Određuje, da li se staze datoteke kopiraju u međuspremnik za lijepljenje u datoteku CMakeLists.txt, kad dodaješ nove datoteke CMake projektima.</translation> <translation>Određuje, da li se staze datoteke kopiraju u međuspremnik za lijepljenje u datoteku CMakeLists.txt, kad dodaješ nove datoteke CMake projektima.</translation>
@@ -17689,7 +17689,7 @@ Izlaz:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::BuildDirManager</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Failed to create build directory &quot;%1&quot;.</source> <source>Failed to create build directory &quot;%1&quot;.</source>
<translation>Neupjelo stvaranje direktorija za gradnju &quot;%1&quot;.</translation> <translation>Neupjelo stvaranje direktorija za gradnju &quot;%1&quot;.</translation>
@@ -17734,16 +17734,10 @@ Izlaz:
<source>Apply Changes to Project</source> <source>Apply Changes to Project</source>
<translation>Primijeni promjene u CMake</translation> <translation>Primijeni promjene u CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message> <message>
<source>CMake configuration set by the kit was overridden in the project.</source> <source>CMake configuration set by the kit was overridden in the project.</source>
<translation>CMake konfiguracija postavljena od kompleta je prepisana u ovom projektu.</translation> <translation>CMake konfiguracija postavljena od kompleta je prepisana u ovom projektu.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Default</source> <source>Default</source>
<extracomment>The name of the build configuration created by default for a cmake project.</extracomment> <extracomment>The name of the build configuration created by default for a cmake project.</extracomment>
@@ -17769,13 +17763,6 @@ Izlaz:
<source>Release with Debug Information</source> <source>Release with Debug Information</source>
<translation>Izdaj s podacima o ispravkama</translation> <translation>Izdaj s podacima o ispravkama</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>Direktorij izgradnje:</translation> <translation>Direktorij izgradnje:</translation>
@@ -17868,9 +17855,6 @@ Izlaz:
<source>Force to %1</source> <source>Force to %1</source>
<translation>Prisili na %1</translation> <translation>Prisili na %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message> <message>
<source>CMake Build</source> <source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -17901,9 +17885,6 @@ Izlaz:
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Gradnja</translation> <translation>Gradnja</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message> <message>
<source>The build configuration is currently disabled.</source> <source>The build configuration is currently disabled.</source>
<translation>Konfiguracija za gradnju je trenutačno onemogućena.</translation> <translation>Konfiguracija za gradnju je trenutačno onemogućena.</translation>
@@ -17925,7 +17906,7 @@ Izlaz:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build</source> <source>Build</source>
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment> <comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
@@ -17943,16 +17924,10 @@ Izlaz:
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source> <source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;U ovom kompletu nije nađena konfiguracija gradnje.&lt;/b&gt;</translation> <translation>&lt;b&gt;U ovom kompletu nije nađena konfiguracija gradnje.&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message> <message>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>Neuspjelo otvaranje od %1 za čitanje.</translation> <translation>Neuspjelo otvaranje od %1 za čitanje.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name>
<message> <message>
<source>CMake Tool</source> <source>CMake Tool</source>
<translation>CMake alat</translation> <translation>CMake alat</translation>
@@ -17965,9 +17940,6 @@ Izlaz:
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Nema dostupnog CMake alata&gt;</translation> <translation>&lt;Nema dostupnog CMake alata&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>Promijeni …</translation> <translation>Promijeni …</translation>
@@ -18008,13 +17980,6 @@ Izlaz:
<source>Toolset:</source> <source>Toolset:</source>
<translation>Skup alata:</translation> <translation>Skup alata:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Promijeni …</translation>
</message>
<message> <message>
<source>CMake Configuration</source> <source>CMake Configuration</source>
<translation>CMake konfiguracija</translation> <translation>CMake konfiguracija</translation>
@@ -18031,17 +17996,10 @@ Izlaz:
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Upiši jednu varijablu po retku, a naziv varijable odvoji od vrijednosti varijable s &quot;=&quot;. &lt;br&gt; Možeš navesti vrstu savjeta dodavanjem &quot;: TYPE&quot; prije &quot;=&quot;.</translation> <translation>Upiši jednu varijablu po retku, a naziv varijable odvoji od vrijednosti varijable s &quot;=&quot;. &lt;br&gt; Možeš navesti vrstu savjeta dodavanjem &quot;: TYPE&quot; prije &quot;=&quot;.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message> <message>
<source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source> <source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source>
<translation>CMake verzija %1 nije podržana. Aktualiziraj na verziju 3.0 ili noviju.</translation> <translation>CMake verzija %1 nije podržana. Aktualiziraj na verziju 3.0 ili noviju.</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Unconfigured</source> <source>Unconfigured</source>
<translation>Nekonfigurirano</translation> <translation>Nekonfigurirano</translation>
@@ -18050,9 +18008,6 @@ Izlaz:
<source>Path to the cmake executable</source> <source>Path to the cmake executable</source>
<translation>Staza do izvršne cmake</translation> <translation>Staza do izvršne cmake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message> <message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source> <source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>CMake alat nije konfiguriran, zanemarit će se CMake generator.</translation> <translation>CMake alat nije konfiguriran, zanemarit će se CMake generator.</translation>
@@ -18089,13 +18044,6 @@ Izlaz:
<source>Toolset: %1</source> <source>Toolset: %1</source>
<translation>Skup alata: %1</translation> <translation>Skup alata: %1</translation>
</message> </message>
<message>
<source>CMake Generator</source>
<translation>CMake generator</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message> <message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source> <source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -18136,20 +18084,10 @@ Izlaz:
<source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source> <source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>CMake Configuration</source>
<translation>CMake konfiguracija</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Odredište za CMake gradnju</translation> <translation>Odredište za CMake gradnju</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message> <message>
<source>No cmake tool set.</source> <source>No cmake tool set.</source>
<translation>Nijedan cmake alat nije postavljen.</translation> <translation>Nijedan cmake alat nije postavljen.</translation>
@@ -18162,16 +18100,10 @@ Izlaz:
<source>Scan &quot;%1&quot; project tree</source> <source>Scan &quot;%1&quot; project tree</source>
<translation>Pretraži &quot;%1&quot; stablo projekta</translation> <translation>Pretraži &quot;%1&quot; stablo projekta</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name>
<message> <message>
<source>CMake Editor</source> <source>CMake Editor</source>
<translation>CMake uređivač</translation> <translation>CMake uređivač</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>Pokreni CMake</translation> <translation>Pokreni CMake</translation>
@@ -18221,30 +18153,20 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
<message>
<source>Build</source>
<translation>Izgradi</translation>
</message>
<message> <message>
<source>Build &quot;%1&quot;</source> <source>Build &quot;%1&quot;</source>
<translation>Izgradi &quot;%1&quot;</translation> <translation>Izgradi &quot;%1&quot;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message> <message>
<source>The project no longer builds the target associated with this run configuration.</source> <source>The project no longer builds the target associated with this run configuration.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source> (Default)</source> <source> (Default)</source>
<translation> (Zadano)</translation> <translation> (Zadano)</translation>
@@ -18289,9 +18211,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Path:</source> <source>Path:</source>
<translation>Staza:</translation> <translation>Staza:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Dodaj</translation> <translation>Dodaj</translation>
@@ -18320,23 +18239,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>New CMake</source> <source>New CMake</source>
<translation>Novi CMake</translation> <translation>Novi CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>CMake at %1</source> <source>CMake at %1</source>
<translation>CMake pri %1</translation> <translation>CMake pri %1</translation>
@@ -18345,17 +18247,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>System CMake at %1</source> <source>System CMake at %1</source>
<translation>CMake sustava pri %1</translation> <translation>CMake sustava pri %1</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>Key</source>
<translation>Ključ</translation>
</message>
<message> <message>
<source>Value</source> <source>Value</source>
<translation>Vrijednost</translation> <translation>Vrijednost</translation>
@@ -18368,13 +18259,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Current kit: %1</source> <source>Current kit: %1</source>
<translation>Trenutačni komplet: %1</translation> <translation>Trenutačni komplet: %1</translation>
</message> </message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;NEPOSTAVLJENO&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager</name>
<message> <message>
<source>Current CMake: %1</source> <source>Current CMake: %1</source>
<translation>Trenutačni CMake: %1</translation> <translation>Trenutačni CMake: %1</translation>
@@ -18387,9 +18271,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Value requested by kit: %1</source> <source>Value requested by kit: %1</source>
<translation>Komplet zahtijeva vrijednost: %1</translation> <translation>Komplet zahtijeva vrijednost: %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<message> <message>
<source>Select a file for %1</source> <source>Select a file for %1</source>
<translation>Odaberi datoteku za %1</translation> <translation>Odaberi datoteku za %1</translation>
@@ -18398,9 +18279,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Select a directory for %1</source> <source>Select a directory for %1</source>
<translation>Odaberi direktorij za %1</translation> <translation>Odaberi direktorij za %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerMode</name>
<message> <message>
<source>Running &quot;%1 %2&quot; in %3.</source> <source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Pokretanje &quot;%1 %2&quot; u %3.</translation> <translation>Pokretanje &quot;%1 %2&quot; u %3.</translation>
@@ -18485,9 +18363,6 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>Received a signal in reply to a request.</source> <source>Received a signal in reply to a request.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerModeReader</name>
<message> <message>
<source>Parsing of CMake project failed: Connection to CMake server lost.</source> <source>Parsing of CMake project failed: Connection to CMake server lost.</source>
<translation>Obrada CMake projekta neuspjela: Veza sa CMake poslužiteljem izgubljena.</translation> <translation>Obrada CMake projekta neuspjela: Veza sa CMake poslužiteljem izgubljena.</translation>
@@ -18544,21 +18419,10 @@ Kopirati stazu do izvornih datoteka u međuspremnik?</translation>
<source>&lt;Headers&gt;</source> <source>&lt;Headers&gt;</source>
<translation>&lt;Zaglavlja&gt;</translation> <translation>&lt;Zaglavlja&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::TeaLeafReader</name>
<message> <message>
<source>The build directory is not for %1 but for %2</source> <source>The build directory is not for %1 but for %2</source>
<translation>Direktorij gradnje nije za %1, već za %2</translation> <translation>Direktorij gradnje nije za %1, već za %2</translation>
</message> </message>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Pokretanje &quot;%1 %2&quot; u %3.</translation>
</message>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfiguriranje &quot;%1&quot;</translation>
</message>
<message> <message>
<source>*** cmake process crashed.</source> <source>*** cmake process crashed.</source>
<translation>*** cmake proces se urušio.</translation> <translation>*** cmake proces se urušio.</translation>

36
share/qtcreator/translations/qtcreator_hu.ts
View File

@@ -263,7 +263,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::0</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build Environment</source> <source>Build Environment</source>
<translation type="obsolete">Fordítási környezet</translation> <translation type="obsolete">Fordítási környezet</translation>
@@ -356,9 +356,6 @@
<source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project</source> <source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project</source>
<translation type="obsolete">A Qt Creator megtalálta a legutolsó cbp fájlt, amelyet a Qt Creator elemzésre for használni, hogy információkat nyerhessen a projektről. Megváltoztathatja aparancssori argumentumokat, amelyeket új fájl létrehozására hoztak létre projekt módban. Kattintson a befejezés gombra a projekt betöltéséhez.</translation> <translation type="obsolete">A Qt Creator megtalálta a legutolsó cbp fájlt, amelyet a Qt Creator elemzésre for használni, hogy információkat nyerhessen a projektről. Megváltoztathatja aparancssori argumentumokat, amelyeket új fájl létrehozására hoztak létre projekt módban. Kattintson a befejezés gombra a projekt betöltéséhez.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Create</source> <source>Create</source>
<translation>Létrehozás</translation> <translation>Létrehozás</translation>
@@ -371,9 +368,6 @@
<source>New Configuration Name:</source> <source>New Configuration Name:</source>
<translation>Új konfiguráció név:</translation> <translation>Új konfiguráció név:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name>
<message> <message>
<source>Clear system environment</source> <source>Clear system environment</source>
<translation>Rendszer környezet megtisztítása</translation> <translation>Rendszer környezet megtisztítása</translation>
@@ -382,23 +376,14 @@
<source>Build Environment</source> <source>Build Environment</source>
<translation>Fordítási környezet</translation> <translation>Fordítási környezet</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>&amp;Change</source> <source>&amp;Change</source>
<translation>&amp;Váltotatás</translation> <translation>&amp;Váltotatás</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>CMake Varázsló</translation> <translation>CMake Varázsló</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Argumentumok:</translation> <translation>Argumentumok:</translation>
@@ -431,17 +416,10 @@
<source>System Environment</source> <source>System Environment</source>
<translation>Rendszer környezet</translation> <translation>Rendszer környezet</translation>
</message> </message>
<message>
<source>Build Environment</source>
<translation>Fordítási környezet</translation>
</message>
<message> <message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source> <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation></translation> <translation></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message> <message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source> <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation>Kérem határozza meg a cmake futtatható fájl útvonalát. Nem található cmake futtatható fájl az útvonalon.</translation> <translation>Kérem határozza meg a cmake futtatható fájl útvonalát. Nem található cmake futtatható fájl az útvonalon.</translation>
@@ -502,9 +480,6 @@
<source>No valid cmake executable specified.</source> <source>No valid cmake executable specified.</source>
<translation>Nincsen érvényes, meghatározott cmake futtatható.</translation> <translation>Nincsen érvényes, meghatározott cmake futtatható.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
@@ -513,16 +488,10 @@
<source>CMake executable</source> <source>CMake executable</source>
<translation>CMake futtatható fájl</translation> <translation>CMake futtatható fájl</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>A Qt Creator egy &lt;b&gt;beépített forrást észlelt a(z) %1-ben&lt;/b&gt;, amely megelőzi az árnyék építéstől. A Qt Creator nem fogja engedélyezni Önnek, hogy megváltoztassa az építési könyvtárat. Ha árnyék építést szeretne végrehajtani, ürítse ki a forrás könyvtárat és nyissa meg újra a projektet.</translation> <translation>A Qt Creator egy &lt;b&gt;beépített forrást észlelt a(z) %1-ben&lt;/b&gt;, amely megelőzi az árnyék építéstől. A Qt Creator nem fogja engedélyezni Önnek, hogy megváltoztassa az építési könyvtárat. Ha árnyék építést szeretne végrehajtani, ürítse ki a forrás könyvtárat és nyissa meg újra a projektet.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>További argumentumok:</translation> <translation>További argumentumok:</translation>
@@ -535,9 +504,6 @@
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source> <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
<translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation> <translation>&lt;b&gt;Make:&lt;/b&gt; %1 %2</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>Kérem gépelje be a könyvtár nevét, amelybe a projektet szeretné felépíteni.</translation> <translation>Kérem gépelje be a könyvtár nevét, amelybe a projektet szeretné felépíteni.</translation>

32
share/qtcreator/translations/qtcreator_it.ts
View File

@@ -294,7 +294,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Clear system environment</source> <source>Clear system environment</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -303,9 +303,6 @@
<source>Build Environment</source> <source>Build Environment</source>
<translation>Ambiente di Compilazione</translation> <translation>Ambiente di Compilazione</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Create</source> <source>Create</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -318,23 +315,14 @@
<source>New Configuration Name:</source> <source>New Configuration Name:</source>
<translation type="unfinished">Nome della Nuova Configurazione:</translation> <translation type="unfinished">Nome della Nuova Configurazione:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>&amp;Change</source> <source>&amp;Change</source>
<translation>&amp;Cambia</translation> <translation>&amp;Cambia</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>Procedura Guidata di CMake</translation> <translation>Procedura Guidata di CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Parametri:</translation> <translation>Parametri:</translation>
@@ -375,9 +363,6 @@
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source> <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -386,9 +371,6 @@
<source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an in-source-build which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation type="obsolete">Qt Creator ha rilevato che la compilazione avviene nella cartella dei file sorgenti e ciò impedisce la compilazione in cartelle separate. Qt Creator non permette di di cambiare la cartella di compilazione, perciò se vuoi una compilazione in cartella separata, pulisci la cartella dei file sorgenti e apri nuovamente il progetto.</translation> <translation type="obsolete">Qt Creator ha rilevato che la compilazione avviene nella cartella dei file sorgenti e ciò impedisce la compilazione in cartelle separate. Qt Creator non permette di di cambiare la cartella di compilazione, perciò se vuoi una compilazione in cartella separata, pulisci la cartella dei file sorgenti e apri nuovamente il progetto.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message> <message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source> <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -449,9 +431,6 @@
<source>No valid cmake executable specified.</source> <source>No valid cmake executable specified.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
@@ -460,9 +439,6 @@
<source>CMake executable</source> <source>CMake executable</source>
<translation>Eseguibile CMake</translation> <translation>Eseguibile CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>Parametri aggiuntivi:</translation> <translation>Parametri aggiuntivi:</translation>
@@ -475,9 +451,6 @@
<source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source> <source>&lt;b&gt;Make:&lt;/b&gt; %1 %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>Inserisci la cartella in cui vuoi compilare il tuo progetto. </translation> <translation>Inserisci la cartella in cui vuoi compilare il tuo progetto. </translation>
@@ -490,9 +463,6 @@
<source>Build directory:</source> <source>Build directory:</source>
<translation>Cartella di compilazione:</translation> <translation>Cartella di compilazione:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::XmlFileUpToDatePage</name>
<message> <message>
<source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source> <source>Qt Creator has found a recent cbp file, which Qt Creator will parse to gather information about the project. You can change the command line arguments used to create this file in the project mode. Click finish to load the project.</source>
<translation type="obsolete">Qt Creator ha rilevato un file cbp recente, e lo leggerà per ricavare informazioni sul progetto. Puoi cambiare i parametri usati per creare questo file nella modalità di progetto. Fai clic su fine per caricare il progetto.</translation> <translation type="obsolete">Qt Creator ha rilevato un file cbp recente, e lo leggerà per ricavare informazioni sul progetto. Puoi cambiare i parametri usati per creare questo file nella modalità di progetto. Fai clic su fine per caricare il progetto.</translation>

274
share/qtcreator/translations/qtcreator_ja.ts
View File

@@ -13419,7 +13419,7 @@ in the system&apos;s browser for manual download.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Default</source> <source>Default</source>
<extracomment>The name of the build configuration created by default for a cmake project.</extracomment> <extracomment>The name of the build configuration created by default for a cmake project.</extracomment>
@@ -13445,16 +13445,10 @@ in the system&apos;s browser for manual download.</source>
<source>Release with Debug Information</source> <source>Release with Debug Information</source>
<translation>デバッグ情報付きリリース</translation> <translation>デバッグ情報付きリリース</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>CMake ターゲットをビルド</translation> <translation>CMake ターゲットをビルド</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>ビルドディレクトリ:</translation> <translation>ビルドディレクトリ:</translation>
@@ -13607,9 +13601,6 @@ To unset a variable, use -U&lt;variable&gt;.
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>CMake の実行</translation> <translation>CMake の実行</translation>
@@ -13622,10 +13613,6 @@ To unset a variable, use -U&lt;variable&gt;.
<source>Rescan Project</source> <source>Rescan Project</source>
<translation>プロジェクトを再スキャン</translation> <translation>プロジェクトを再スキャン</translation>
</message> </message>
<message>
<source>Build</source>
<translation>ビルド</translation>
</message>
<message> <message>
<source>Build File</source> <source>Build File</source>
<translation>ファイルのビルド</translation> <translation>ファイルのビルド</translation>
@@ -13646,16 +13633,6 @@ To unset a variable, use -U&lt;variable&gt;.
<source>Failed opening project &quot;%1&quot;: Project is not a file</source> <source>Failed opening project &quot;%1&quot;: Project is not a file</source>
<translation>プロジェクト &quot;%1&quot; が開けません: プロジェクトがファイルではありません</translation> <translation>プロジェクト &quot;%1&quot; が開けません: プロジェクトがファイルではありません</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message> <message>
<source>Run CMake kit</source> <source>Run CMake kit</source>
<translation>CMake キットの実行</translation> <translation>CMake キットの実行</translation>
@@ -26770,7 +26747,7 @@ to project &quot;%2&quot;.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeTarget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
@@ -39167,7 +39144,7 @@ clang の実行ファイルを設定してください。</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::BuildDirManager</name> <name>CMakeProjectManager</name>
<message> <message>
<source>The build directory is not for %1 but for %2</source> <source>The build directory is not for %1 but for %2</source>
<translation>このビルドディレクトリは %2 向けで %1 向けではありません</translation> <translation>このビルドディレクトリは %2 向けで %1 向けではありません</translation>
@@ -39208,9 +39185,6 @@ clang の実行ファイルを設定してください。</translation>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>読み込み用に %1 を開くのに失敗しました。</translation> <translation>読み込み用に %1 を開くのに失敗しました。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message> <message>
<source>Make</source> <source>Make</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -39278,24 +39252,10 @@ clang の実行ファイルを設定してください。</translation>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>CMake ビルド</translation> <translation>CMake ビルド</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message> <message>
<source>Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options.</source> <source>Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options.</source>
<translation>ビルドする為には CMake ツールの設定が必要です。キットのオプションの CMake ツールを設定してください。</translation> <translation>ビルドする為には CMake ツールの設定が必要です。キットのオプションの CMake ツールを設定してください。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message>
<source>Tool arguments:</source>
<translation>ツールの引数:</translation>
</message>
<message>
<source>Targets:</source>
<translation>ターゲット:</translation>
</message>
<message> <message>
<source>Build</source> <source>Build</source>
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment> <comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
@@ -39305,17 +39265,11 @@ clang の実行ファイルを設定してください。</translation>
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source> <source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;このキットからビルド設定が見つかりません。&lt;/b&gt;</translation> <translation>&lt;b&gt;このキットからビルド設定が見つかりません。&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepFactory</name>
<message> <message>
<source>Build</source> <source>Build</source>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>ビルド</translation> <translation>ビルド</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name>
<message> <message>
<source>CMake Tool:</source> <source>CMake Tool:</source>
<translation>CMake ツール:</translation> <translation>CMake ツール:</translation>
@@ -39328,9 +39282,6 @@ clang の実行ファイルを設定してください。</translation>
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;CMake ツールが見つかりません&gt;</translation> <translation>&lt;CMake ツールが見つかりません&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message> <message>
<source>CMake Generator:</source> <source>CMake Generator:</source>
<translation>CMake ジェネレータ:</translation> <translation>CMake ジェネレータ:</translation>
@@ -39343,9 +39294,6 @@ clang の実行ファイルを設定してください。</translation>
<source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source> <source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>CMake ジェネレータは CMake 使用時のプロジェクトビルド方法を定義します。&lt;br&gt;他のビルドシステム使用時には無視されます。</translation> <translation>CMake ジェネレータは CMake 使用時のプロジェクトビルド方法を定義します。&lt;br&gt;他のビルドシステム使用時には無視されます。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>変更...</translation> <translation>変更...</translation>
@@ -39358,21 +39306,10 @@ clang の実行ファイルを設定してください。</translation>
<source>Default configuration passed to CMake when setting up a project.</source> <source>Default configuration passed to CMake when setting up a project.</source>
<translation>プロジェクト設定時に既定の設定が CMake に渡されます。</translation> <translation>プロジェクト設定時に既定の設定が CMake に渡されます。</translation>
</message> </message>
<message>
<source>Edit CMake Configuration</source>
<translation>CMake 設定の編集</translation>
</message>
<message> <message>
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>一行に付き一つの変数をその名と値を &quot;=&quot; で繋ぐ形式で入力してください。&lt;br&gt;&quot;=&quot; の前に &quot;:TYPE&quot; 形式で型のヒントを指定できます。</translation> <translation>一行に付き一つの変数をその名と値を &quot;=&quot; で繋ぐ形式で入力してください。&lt;br&gt;&quot;=&quot; の前に &quot;:TYPE&quot; 形式で型のヒントを指定できます。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Unconfigured</source> <source>Unconfigured</source>
<translation>未設定</translation> <translation>未設定</translation>
@@ -39381,9 +39318,6 @@ clang の実行ファイルを設定してください。</translation>
<source>Path to the cmake executable</source> <source>Path to the cmake executable</source>
<translation>cmake 実行ファイルへのパス</translation> <translation>cmake 実行ファイルへのパス</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message> <message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source> <source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>CMake ツールが設定されていないため、CMake ジェネレータは無視されます。</translation> <translation>CMake ツールが設定されていないため、CMake ジェネレータは無視されます。</translation>
@@ -39400,13 +39334,6 @@ clang の実行ファイルを設定してください。</translation>
<source>CMake Generator</source> <source>CMake Generator</source>
<translation>CMake ジェネレータ</translation> <translation>CMake ジェネレータ</translation>
</message> </message>
<message>
<source>&lt;Use Default Generator&gt;</source>
<translation>&lt;既定のジェネレータを使用&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message> <message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source> <source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>キットに有効な Qt が存在するにもかかわらず、CMake の設定に qmake へのパスが見つかりません。</translation> <translation>キットに有効な Qt が存在するにもかかわらず、CMake の設定に qmake へのパスが見つかりません。</translation>
@@ -39431,13 +39358,6 @@ clang の実行ファイルを設定してください。</translation>
<source>CMake configuration has a path to a C++ compiler set, that does not match up with the compiler path configured in the tool chain of the kit.</source> <source>CMake configuration has a path to a C++ compiler set, that does not match up with the compiler path configured in the tool chain of the kit.</source>
<translation>CMake の設定で指定されている C++ コンパイラのパスがキットのツールチェインのパスとは異なります。</translation> <translation>CMake の設定で指定されている C++ コンパイラのパスがキットのツールチェインのパスとは異なります。</translation>
</message> </message>
<message>
<source>CMake Configuration</source>
<translation>CMake 設定</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message> <message>
<source>No cmake tool set.</source> <source>No cmake tool set.</source>
<translation>CMake ツールが見つかりません。</translation> <translation>CMake ツールが見つかりません。</translation>
@@ -39446,9 +39366,6 @@ clang の実行ファイルを設定してください。</translation>
<source>No compilers set in kit.</source> <source>No compilers set in kit.</source>
<translation>キットにコンパイラが設定されていません。</translation> <translation>キットにコンパイラが設定されていません。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source>yes</source> <source>yes</source>
<translation>はい</translation> <translation>はい</translation>
@@ -39489,9 +39406,6 @@ clang の実行ファイルを設定してください。</translation>
<source>Help file:</source> <source>Help file:</source>
<translation>ヘルプファイル:</translation> <translation>ヘルプファイル:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>追加</translation> <translation>追加</translation>
@@ -39520,13 +39434,6 @@ clang の実行ファイルを設定してください。</translation>
<source>New CMake</source> <source>New CMake</source>
<translation>新しい CMake</translation> <translation>新しい CMake</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>CMake at %1</source> <source>CMake at %1</source>
<translation>CMake(パス: %1)</translation> <translation>CMake(パス: %1)</translation>
@@ -39535,21 +39442,10 @@ clang の実行ファイルを設定してください。</translation>
<source>System CMake at %1</source> <source>System CMake at %1</source>
<translation>システムの CMake(パス: %1)</translation> <translation>システムの CMake(パス: %1)</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message> <message>
<source> (ADVANCED)</source> <source> (ADVANCED)</source>
<translation> (拡張)</translation> <translation> (拡張)</translation>
</message> </message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;未定義&gt;</translation>
</message>
<message> <message>
<source>Setting</source> <source>Setting</source>
<translation>設定</translation> <translation>設定</translation>
@@ -39558,10 +39454,6 @@ clang の実行ファイルを設定してください。</translation>
<source>Value</source> <source>Value</source>
<translation>値</translation> <translation>値</translation>
</message> </message>
<message>
<source>Advanced</source>
<translation>拡張</translation>
</message>
</context> </context>
<context> <context>
<name>Core::BaseFileWizard</name> <name>Core::BaseFileWizard</name>
@@ -45590,22 +45482,11 @@ Output:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake configuration set by the kit was overridden in the project.</source> <source>CMake configuration set by the kit was overridden in the project.</source>
<translation>キットで設定された CMake 設定はプロジェクトで上書きされました。</translation> <translation>キットで設定された CMake 設定はプロジェクトで上書きされました。</translation>
</message> </message>
<message>
<source>Minimum Size Release</source>
<translation type="vanished">最小サイズリリース</translation>
</message>
<message>
<source>Release with Debug Information</source>
<translation type="vanished">デバッグ情報付きリリース</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name>
<message> <message>
<source>CMake Editor</source> <source>CMake Editor</source>
<translation>CMake エディタ</translation> <translation>CMake エディタ</translation>
@@ -49669,7 +49550,7 @@ Output:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::CMakeBuildConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changing Build Directory</source> <source>Changing Build Directory</source>
<translation>ビルドディレクトリの変更</translation> <translation>ビルドディレクトリの変更</translation>
@@ -49686,144 +49567,6 @@ Output:
<source>The CMake flag for the provisioning profile</source> <source>The CMake flag for the provisioning profile</source>
<translation>プロビジョニングプロファイルの CMake フラグ</translation> <translation>プロビジョニングプロファイルの CMake フラグ</translation>
</message> </message>
<message>
<source>Minimum Size Release</source>
<translation>最小サイズリリース</translation>
</message>
<message>
<source>Release with Debug Information</source>
<translation>デバッグ情報付きリリース</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message>
<source>Failed to open %1 for reading.</source>
<translation>読み込み用に %1 を開くのに失敗しました。</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitAspect</name>
<message>
<source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;CMake ツールが見つかりません&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitAspect</name>
<message>
<source>The CMake Tool to use when building a project with CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>CMake ツールはプロジェクトを CMake でビルドする際に使用します。&lt;br&gt;他のビルドシステム使用時には無視されます。</translation>
</message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
<source>Unconfigured</source>
<translation>未設定</translation>
</message>
<message>
<source>Path to the cmake executable</source>
<translation>cmake 実行ファイルへのパス</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitAspect</name>
<message>
<source>Change...</source>
<translation>変更...</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>CMake ジェネレータ</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitAspect</name>
<message>
<source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>CMake ジェネレータは CMake 使用時のプロジェクトビルド方法を定義します。&lt;br&gt;他のビルドシステム使用時には無視されます。</translation>
</message>
<message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>CMake ツールが設定されていないため、CMake ジェネレータは無視されます。</translation>
</message>
<message>
<source>CMake Tool does not support the configured generator.</source>
<translation>CMake ツールがジェネレータに対応していません。</translation>
</message>
<message>
<source>&lt;Use Default Generator&gt;</source>
<translation>&lt;既定のジェネレータを使用&gt;</translation>
</message>
<message>
<source>CMake Generator</source>
<translation>CMake ジェネレータ</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitAspect</name>
<message>
<source>Change...</source>
<translation>変更...</translation>
</message>
<message>
<source>Edit CMake Configuration</source>
<translation>CMake 設定の編集</translation>
</message>
<message>
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>一行に付き一つの変数をその名と値を &quot;=&quot; で繋ぐ形式で入力してください。&lt;br&gt;&quot;=&quot; の前に &quot;:TYPE&quot; 形式で型のヒントを指定できます。</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitAspect</name>
<message>
<source>CMake Configuration</source>
<translation>CMake 設定</translation>
</message>
<message>
<source>Default configuration passed to CMake when setting up a project.</source>
<translation>プロジェクト設定時に既定の設定が CMake に渡されます。</translation>
</message>
<message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>キットに有効な Qt が存在するにもかかわらず、CMake の設定に qmake へのパスが見つかりません。</translation>
</message>
<message>
<source>CMake configuration has a path to a qmake binary set, even though the kit has no valid Qt version.</source>
<translation>キットに有効な Qt が存在しないにもかかわらず、CMake の設定に qmake へのパスが存在します。</translation>
</message>
<message>
<source>CMake configuration has no path to a C++ compiler set, even though the kit has a valid tool chain.</source>
<translation>キットに有効なツールチェインが存在するにもかかわらず、CMake の設定に C++ コンパイラへのパスが見つかりません。</translation>
</message>
<message>
<source>CMake configuration has a path to a C++ compiler set, even though the kit has no valid tool chain.</source>
<translation>キットに有効なツールチェインが存在しないにもかかわらず、CMake の設定に C++ コンパイラへのパスが存在します。</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter</name>
<message>
<source>Build CMake target</source>
<translation>CMake ターゲットをビルド</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProcess</name>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>&quot;%1&quot; の設定中</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<message>
<source>Build</source>
<translation>ビルド</translation>
</message>
<message> <message>
<source>Build &quot;%1&quot;</source> <source>Build &quot;%1&quot;</source>
<translation>&quot;%1&quot; のビルド</translation> <translation>&quot;%1&quot; のビルド</translation>
@@ -49834,13 +49577,6 @@ Output:
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
</context> </context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context> <context>
<name>ConanPackageManager::Internal::ConanInstallStep</name> <name>ConanPackageManager::Internal::ConanInstallStep</name>
<message> <message>

116
share/qtcreator/translations/qtcreator_pl.ts
View File

@@ -2072,7 +2072,7 @@ Przyczyna: %3</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build directory:</source> <source>Build directory:</source>
<translation>Katalog wersji:</translation> <translation>Katalog wersji:</translation>
@@ -2126,13 +2126,6 @@ Przyczyna: %3</translation>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
</context> </context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context> <context>
<name>Core::BaseFileWizard</name> <name>Core::BaseFileWizard</name>
<message> <message>
@@ -10867,7 +10860,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake kit</source> <source>Run CMake kit</source>
<translation>Uruchom zestaw CMake</translation> <translation>Uruchom zestaw CMake</translation>
@@ -10880,9 +10873,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
<source>The executable is not built by the current build configuration</source> <source>The executable is not built by the current build configuration</source>
<translation>Plik wykonywalny nie został zbudowany przez bieżącą konfigurację budowania</translation> <translation>Plik wykonywalny nie został zbudowany przez bieżącą konfigurację budowania</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
@@ -14931,7 +14921,7 @@ Local pulls are not applied to the master branch.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeManager</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>Uruchom CMake</translation> <translation>Uruchom CMake</translation>
@@ -21446,7 +21436,7 @@ Wersje Qt można dodać w: Opcje &gt; Budowanie i uruchamianie &gt; Wersje Qt.</
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Zbudowanie programu CMake&apos;owego</translation> <translation>Zbudowanie programu CMake&apos;owego</translation>
@@ -34216,7 +34206,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake Tool:</source> <source>CMake Tool:</source>
<translation>Narzędzie CMake:</translation> <translation>Narzędzie CMake:</translation>
@@ -34229,17 +34219,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Brak narzędzia CMake&gt;</translation> <translation>&lt;Brak narzędzia CMake&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message> <message>
<source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source> <source>CMake version %1 is unsupported. Please update to version 3.0 or later.</source>
<translation>Wersja CMake %1 nie jest obsługiwana. Należy zainstalować wersję 3.0 lub nowszą.</translation> <translation>Wersja CMake %1 nie jest obsługiwana. Należy zainstalować wersję 3.0 lub nowszą.</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Unconfigured</source> <source>Unconfigured</source>
<translation>Nieskonfigurowane</translation> <translation>Nieskonfigurowane</translation>
@@ -34248,9 +34231,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>Path to the cmake executable</source> <source>Path to the cmake executable</source>
<translation>Ścieżka do pliku wykonywalnego cmake</translation> <translation>Ścieżka do pliku wykonywalnego cmake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source> (Default)</source> <source> (Default)</source>
<translatorcomment>what default???</translatorcomment> <translatorcomment>what default???</translatorcomment>
@@ -34288,9 +34268,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>Path:</source> <source>Path:</source>
<translation>Ścieżka:</translation> <translation>Ścieżka:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Dodaj</translation> <translation>Dodaj</translation>
@@ -34319,9 +34296,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
<source>New CMake</source> <source>New CMake</source>
<translation>Nowy CMake</translation> <translation>Nowy CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>CMake at %1</source> <source>CMake at %1</source>
<translation>CMake w %1</translation> <translation>CMake w %1</translation>
@@ -36359,7 +36333,7 @@ itself takes time.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::CMakeProject</name> <name>CMakeProjectManager</name>
<message> <message>
<source>No cmake tool set.</source> <source>No cmake tool set.</source>
<translation>Nie ustawiono narzędzia cmake.</translation> <translation>Nie ustawiono narzędzia cmake.</translation>
@@ -37739,7 +37713,7 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::BuildDirManager</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Failed to create temporary directory &quot;%1&quot;.</source> <source>Failed to create temporary directory &quot;%1&quot;.</source>
<translation>Nie można utworzyć katalogu tymczasowego &quot;%1&quot;.</translation> <translation>Nie można utworzyć katalogu tymczasowego &quot;%1&quot;.</translation>
@@ -37772,16 +37746,10 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Apply Changes to Project</source> <source>Apply Changes to Project</source>
<translation>Zastosuj zmiany w projekcie</translation> <translation>Zastosuj zmiany w projekcie</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message> <message>
<source>CMake configuration set by the kit was overridden in the project.</source> <source>CMake configuration set by the kit was overridden in the project.</source>
<translation>Konfiguracja CMake, ustawiona przez zestaw narzędzi, została nadpisana przez projekt.</translation> <translation>Konfiguracja CMake, ustawiona przez zestaw narzędzi, została nadpisana przez projekt.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message> <message>
<source>CMake Build</source> <source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -37809,16 +37777,10 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<translation>Błąd parsowania QMake: %1 <translation>Błąd parsowania QMake: %1
</translation> </translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message> <message>
<source>The build configuration is currently disabled.</source> <source>The build configuration is currently disabled.</source>
<translation>Konfiguracja budowania aktualnie wyłączona.</translation> <translation>Konfiguracja budowania aktualnie wyłączona.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message> <message>
<source>Tool arguments:</source> <source>Tool arguments:</source>
<translation>Argumenty narzędzia:</translation> <translation>Argumenty narzędzia:</translation>
@@ -37836,17 +37798,11 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source> <source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;Brak konfiguracji budowania dla tego zestawu narzędzi.&lt;/b&gt;</translation> <translation>&lt;b&gt;Brak konfiguracji budowania dla tego zestawu narzędzi.&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepFactory</name>
<message> <message>
<source>Build</source> <source>Build</source>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Budowanie</translation> <translation>Budowanie</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>Zmień...</translation> <translation>Zmień...</translation>
@@ -37887,13 +37843,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Toolset:</source> <source>Toolset:</source>
<translation>Zestaw narzędzi:</translation> <translation>Zestaw narzędzi:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message>
<source>Change...</source>
<translation>Zmień...</translation>
</message>
<message> <message>
<source>CMake Configuration</source> <source>CMake Configuration</source>
<translation>Konfiguracja CMake</translation> <translation>Konfiguracja CMake</translation>
@@ -37910,9 +37859,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>W każdej linii podaj jedną zmienną. Nazwa zmiennej powinna być oddzielona od wartości zmiennej przy użyciu &quot;=&quot;.&lt;br&gt;Informacje o typie można dodać poprzez umieszczenie &quot;:TYP&quot; przed &quot;=&quot;.</translation> <translation>W każdej linii podaj jedną zmienną. Nazwa zmiennej powinna być oddzielona od wartości zmiennej przy użyciu &quot;=&quot;.&lt;br&gt;Informacje o typie można dodać poprzez umieszczenie &quot;:TYP&quot; przed &quot;=&quot;.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message> <message>
<source>CMake Tool is unconfigured, CMake generator will be ignored.</source> <source>CMake Tool is unconfigured, CMake generator will be ignored.</source>
<translation>Narzędzie CMake nie jest skonfigurowane. Generator CMake zostanie zignorowany.</translation> <translation>Narzędzie CMake nie jest skonfigurowane. Generator CMake zostanie zignorowany.</translation>
@@ -37945,17 +37891,10 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>&lt;br&gt;Toolset: %1</source> <source>&lt;br&gt;Toolset: %1</source>
<translation>&lt;br&gt;Zestaw narzędzi: %1</translation> <translation>&lt;br&gt;Zestaw narzędzi: %1</translation>
</message> </message>
<message>
<source>CMake Generator</source>
<translation>Generator CMake</translation>
</message>
<message> <message>
<source>&lt;Use Default Generator&gt;</source> <source>&lt;Use Default Generator&gt;</source>
<translation>&lt;Użyj domyślnego generatora&gt;</translation> <translation>&lt;Użyj domyślnego generatora&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message> <message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source> <source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>Brak ścieżki do pliku wykonywalnego qmake w konfiguracji CMake, mimo że zestaw narzędzi posiada poprawną wersję Qt.</translation> <translation>Brak ścieżki do pliku wykonywalnego qmake w konfiguracji CMake, mimo że zestaw narzędzi posiada poprawną wersję Qt.</translation>
@@ -37996,17 +37935,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>CMake configuration has a path to a C++ compiler set, even though the kit has no valid tool chain.</source> <source>CMake configuration has a path to a C++ compiler set, even though the kit has no valid tool chain.</source>
<translation>Konfiguracja CMake posiada ustawioną ścieżkę do kompilatora C++, mimo że zestaw narzędzi nie posiada poprawnej ścieżki.</translation> <translation>Konfiguracja CMake posiada ustawioną ścieżkę do kompilatora C++, mimo że zestaw narzędzi nie posiada poprawnej ścieżki.</translation>
</message> </message>
<message>
<source>CMake Configuration</source>
<translation>Konfiguracja CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;USUNIĘTO&gt;</translation>
</message>
<message> <message>
<source>Kit value: %1</source> <source>Kit value: %1</source>
<translation>Wartość zestawu narzędzi: %1</translation> <translation>Wartość zestawu narzędzi: %1</translation>
@@ -38019,10 +37947,6 @@ Ustaw prawdziwy plik wykonywalny Clang.</translation>
<source>Value</source> <source>Value</source>
<translation>Wartość</translation> <translation>Wartość</translation>
</message> </message>
<message>
<source>Advanced</source>
<translation>Zaawansowane</translation>
</message>
</context> </context>
<context> <context>
<name>Core::Internal::ThemeChooser</name> <name>Core::Internal::ThemeChooser</name>
@@ -39127,7 +39051,7 @@ Komunikat:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeEditorFactory</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake Editor</source> <source>CMake Editor</source>
<translation>Edytor CMake</translation> <translation>Edytor CMake</translation>
@@ -41834,7 +41758,7 @@ Błąd: %2</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::CMakeConfigItem</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>Błąd otwierania %1 do odczytu.</translation> <translation>Błąd otwierania %1 do odczytu.</translation>
@@ -41863,7 +41787,7 @@ Błąd: %2</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
@@ -41877,9 +41801,6 @@ Błąd: %2</translation>
<source>Build &quot;%1&quot;</source> <source>Build &quot;%1&quot;</source>
<translation>Zbuduj &quot;%1&quot;</translation> <translation>Zbuduj &quot;%1&quot;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager</name>
<message> <message>
<source>Current CMake: %1</source> <source>Current CMake: %1</source>
<translation>Bieżący CMake: %1</translation> <translation>Bieżący CMake: %1</translation>
@@ -41888,9 +41809,6 @@ Błąd: %2</translation>
<source>Not in CMakeCache.txt</source> <source>Not in CMakeCache.txt</source>
<translation>Brak w CMakeCache.txt</translation> <translation>Brak w CMakeCache.txt</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerMode</name>
<message> <message>
<source>Running &quot;%1 %2&quot; in %3.</source> <source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Uruchamianie &quot;%1 %2&quot; w %3.</translation> <translation>Uruchamianie &quot;%1 %2&quot; w %3.</translation>
@@ -41975,9 +41893,6 @@ Błąd: %2</translation>
<source>Received a signal in reply to a request.</source> <source>Received a signal in reply to a request.</source>
<translation>Otrzymano sygnał w odpowiedzi na żądanie.</translation> <translation>Otrzymano sygnał w odpowiedzi na żądanie.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ServerModeReader</name>
<message> <message>
<source>Configuring &quot;%1&quot;</source> <source>Configuring &quot;%1&quot;</source>
<translation>Konfiguracja &quot;%1&quot;</translation> <translation>Konfiguracja &quot;%1&quot;</translation>
@@ -42010,21 +41925,10 @@ Błąd: %2</translation>
<source>&lt;Headers&gt;</source> <source>&lt;Headers&gt;</source>
<translation>&lt;Nagłówki&gt;</translation> <translation>&lt;Nagłówki&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::TeaLeafReader</name>
<message> <message>
<source>The build directory is not for %1 but for %2</source> <source>The build directory is not for %1 but for %2</source>
<translation>Katalog budowania nie jest przeznaczony dla %1, lecz dla %2</translation> <translation>Katalog budowania nie jest przeznaczony dla %1, lecz dla %2</translation>
</message> </message>
<message>
<source>Running &quot;%1 %2&quot; in %3.</source>
<translation>Uruchamianie &quot;%1 %2&quot; w %3.</translation>
</message>
<message>
<source>Configuring &quot;%1&quot;</source>
<translation>Konfiguracja &quot;%1&quot;</translation>
</message>
<message> <message>
<source>*** cmake process crashed.</source> <source>*** cmake process crashed.</source>
<translation>*** Proces cmake przerwał pracę.</translation> <translation>*** Proces cmake przerwał pracę.</translation>

133
share/qtcreator/translations/qtcreator_ru.ts
View File

@@ -6074,16 +6074,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Value requested by kit: %1</source> <source>Value requested by kit: %1</source>
<translation>Запрошенное комплектом значение: %1</translation> <translation>Запрошенное комплектом значение: %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigItem</name>
<message> <message>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>Не удалось открыть %1 для чтения.</translation> <translation>Не удалось открыть %1 для чтения.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitAspect</name>
<message> <message>
<source>CMake Configuration</source> <source>CMake Configuration</source>
<translation>Конфигурация CMake</translation> <translation>Конфигурация CMake</translation>
@@ -6132,9 +6126,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source> <source>CMake configuration has a path to a C++ compiler set that does not match the compiler path configured in the tool chain of the kit.</source>
<translation>В конфигурации CMake указан путь к компилятору С++, но он не совпадает с заданным в инструментарии комплекта.</translation> <translation>В конфигурации CMake указан путь к компилятору С++, но он не совпадает с заданным в инструментарии комплекта.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitAspect</name>
<message> <message>
<source>CMake generator</source> <source>CMake generator</source>
<translation>Генератор CMake</translation> <translation>Генератор CMake</translation>
@@ -6183,9 +6174,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake Generator</source> <source>CMake Generator</source>
<translation>Генератор CMake</translation> <translation>Генератор CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitAspect</name>
<message> <message>
<source>CMake Tool</source> <source>CMake Tool</source>
<translation>Программа CMake</translation> <translation>Программа CMake</translation>
@@ -6210,9 +6198,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Path to the cmake executable</source> <source>Path to the cmake executable</source>
<translation>Путь к программе cmake</translation> <translation>Путь к программе cmake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeProject</name>
<message> <message>
<source>No cmake tool set.</source> <source>No cmake tool set.</source>
<translation>Программа cmake не указана.</translation> <translation>Программа cmake не указана.</translation>
@@ -6221,9 +6206,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>No compilers set in kit.</source> <source>No compilers set in kit.</source>
<translation>У комплекта не заданы компиляторы.</translation> <translation>У комплекта не заданы компиляторы.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source>Version: %1&lt;br&gt;Supports fileApi: %2</source> <source>Version: %1&lt;br&gt;Supports fileApi: %2</source>
<translation>Версия: %1&lt;br&gt;Поддерживается fileApi: %2</translation> <translation>Версия: %1&lt;br&gt;Поддерживается fileApi: %2</translation>
@@ -6288,20 +6270,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Help file:</source> <source>Help file:</source>
<translation>Файл справки:</translation> <translation>Файл справки:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>System CMake at %1</source> <source>System CMake at %1</source>
<translation>Системная CMake в %1</translation> <translation>Системная CMake в %1</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message> <message>
<source>Key</source> <source>Key</source>
<translation>Ключ</translation> <translation>Ключ</translation>
@@ -6322,9 +6294,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Value</source> <source>Value</source>
<translation>Значение</translation> <translation>Значение</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::ConfigModelItemDelegate</name>
<message> <message>
<source>Select a file for %1</source> <source>Select a file for %1</source>
<translation>Выберите файл для %1</translation> <translation>Выберите файл для %1</translation>
@@ -6333,9 +6302,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Select a directory for %1</source> <source>Select a directory for %1</source>
<translation>Выберите каталог для %1</translation> <translation>Выберите каталог для %1</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal</name>
<message> <message>
<source>Failed to set up CMake file API support. Qt Creator cannot extract project information.</source> <source>Failed to set up CMake file API support. Qt Creator cannot extract project information.</source>
<translation>Не удалось настроить поддержку API файла CMake. Qt Creator не может извлечь информацию о проекте.</translation> <translation>Не удалось настроить поддержку API файла CMake. Qt Creator не может извлечь информацию о проекте.</translation>
@@ -6408,16 +6374,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Invalid target file generated by CMake: Broken indexes in target details.</source> <source>Invalid target file generated by CMake: Broken indexes in target details.</source>
<translation>CMake создал неверный цели файл: повреждены индексы в деталях цели.</translation> <translation>CMake создал неверный цели файл: повреждены индексы в деталях цели.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::BuildCMakeTargetLocatorFilter</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Собрать цель CMake</translation> <translation>Собрать цель CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfiguration</name>
<message> <message>
<source>Changing Build Directory</source> <source>Changing Build Directory</source>
<translation>Изменение каталога сборки</translation> <translation>Изменение каталога сборки</translation>
@@ -6434,9 +6394,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Release with Debug Information</source> <source>Release with Debug Information</source>
<translation>Выпуск с отладочной информацией</translation> <translation>Выпуск с отладочной информацией</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Filter</source> <source>Filter</source>
<translation>Фильтр</translation> <translation>Фильтр</translation>
@@ -6497,10 +6454,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Apply Configuration Changes</source> <source>Apply Configuration Changes</source>
<translation>Применить изменения</translation> <translation>Применить изменения</translation>
</message> </message>
<message>
<source>&lt;UNSET&gt;</source>
<translation>&lt;не задано&gt;</translation>
</message>
<message> <message>
<source>bool</source> <source>bool</source>
<comment>display string for cmake type BOOLEAN</comment> <comment>display string for cmake type BOOLEAN</comment>
@@ -6526,13 +6479,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<translatorcomment>Принудительно булевый/файл/каталог/строка</translatorcomment> <translatorcomment>Принудительно булевый/файл/каталог/строка</translatorcomment>
<translation>Принудительно %1</translation> <translation>Принудительно %1</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message> <message>
<source>CMake Build</source> <source>CMake Build</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -6567,9 +6513,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Сборка</translation> <translation>Сборка</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message> <message>
<source>CMake arguments:</source> <source>CMake arguments:</source>
<translation>Параметры CMake:</translation> <translation>Параметры CMake:</translation>
@@ -6587,9 +6530,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment> <comment>CMakeProjectManager::CMakeBuildStepConfigWidget display name.</comment>
<translation>Сборка</translation> <translation>Сборка</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSystem</name>
<message> <message>
<source>Scan &quot;%1&quot; project tree</source> <source>Scan &quot;%1&quot; project tree</source>
<translation>Сканирование дерева проекта «%1»</translation> <translation>Сканирование дерева проекта «%1»</translation>
@@ -6618,9 +6558,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMakeCache.txt file not found.</source> <source>CMakeCache.txt file not found.</source>
<translation>Не удалось найти файл CMakeCache.txt.</translation> <translation>Не удалось найти файл CMakeCache.txt.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitAspect</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>Изменить...</translation> <translation>Изменить...</translation>
@@ -6633,13 +6570,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Задавайте значения переменных по одной в строке, отделяя значение от имени символом &quot;=&quot;.&lt;br&gt;Можно указывать тип, добавляя «:ТИП» перед &quot;=&quot;.&lt;br&gt;Например: CMAKE_BUILD_TYPE:STRING=DebWithRelInfo.</translation> <translation>Задавайте значения переменных по одной в строке, отделяя значение от имени символом &quot;=&quot;.&lt;br&gt;Можно указывать тип, добавляя «:ТИП» перед &quot;=&quot;.&lt;br&gt;Например: CMAKE_BUILD_TYPE:STRING=DebWithRelInfo.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitAspect</name>
<message>
<source>Change...</source>
<translation>Изменить...</translation>
</message>
<message> <message>
<source>%1 - %2, Platform: %3, Toolset: %4</source> <source>%1 - %2, Platform: %3, Toolset: %4</source>
<translation>%1 - %2, Платформа: %3, Инструментарий: %4</translation> <translation>%1 - %2, Платформа: %3, Инструментарий: %4</translation>
@@ -6648,10 +6578,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>&lt;none&gt;</source> <source>&lt;none&gt;</source>
<translation>&lt;нет&gt;</translation> <translation>&lt;нет&gt;</translation>
</message> </message>
<message>
<source>CMake Generator</source>
<translation>Генератор CMake</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation>Генератор:</translation> <translation>Генератор:</translation>
@@ -6668,16 +6594,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Toolset:</source> <source>Toolset:</source>
<translation>Инструментарий:</translation> <translation>Инструментарий:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeKitAspect</name>
<message> <message>
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Программа CMake недоступна&gt;</translation> <translation>&lt;Программа CMake недоступна&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>Запустить CMake</translation> <translation>Запустить CMake</translation>
@@ -6730,9 +6650,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Build File is not supported for generator &quot;%1&quot;</source> <source>Build File is not supported for generator &quot;%1&quot;</source>
<translation>Операция «Собрать файл» не поддерживается генератором «%1»</translation> <translation>Операция «Собрать файл» не поддерживается генератором «%1»</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProcess</name>
<message> <message>
<source>Running %1 in %2.</source> <source>Running %1 in %2.</source>
<translation>Работа %1 на %2.</translation> <translation>Работа %1 на %2.</translation>
@@ -6753,25 +6670,15 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake process exited with exit code %1.</source> <source>CMake process exited with exit code %1.</source>
<translation>Процесс CMake завершился с кодом %1.</translation> <translation>Процесс CMake завершился с кодом %1.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeProjectPlugin</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<comment>SnippetProvider</comment> <comment>SnippetProvider</comment>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
<message>
<source>Build</source>
<translation>Собрать</translation>
</message>
<message> <message>
<source>Build &quot;%1&quot;</source> <source>Build &quot;%1&quot;</source>
<translation>Собрать «%1»</translation> <translation>Собрать «%1»</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name>
<message> <message>
<source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source> <source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
<translation>Определяет, будут ли копироваться в буфер обмена пути файлов для вставки в файл CMakeLists.txt при добавлении их в проект CMake.</translation> <translation>Определяет, будут ли копироваться в буфер обмена пути файлов для вставки в файл CMakeLists.txt при добавлении их в проект CMake.</translation>
@@ -6792,16 +6699,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>Copy file paths</source> <source>Copy file paths</source>
<translation>Копировать</translation> <translation>Копировать</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSpecificSettingWidget</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Добавить</translation> <translation>Добавить</translation>
@@ -6830,13 +6727,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>New CMake</source> <source>New CMake</source>
<translation>Новый CMake</translation> <translation>Новый CMake</translation>
</message> </message>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolTreeItem</name>
<message> <message>
<source>CMake executable path does not exist.</source> <source>CMake executable path does not exist.</source>
<translation>Не найден путь к программе CMake.</translation> <translation>Не найден путь к программе CMake.</translation>
@@ -6853,9 +6743,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>CMake executable does not provided required IDE integration features.</source> <source>CMake executable does not provided required IDE integration features.</source>
<translation>Не указана программа CMake необходимая для среды разработки.</translation> <translation>Не указана программа CMake необходимая для среды разработки.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApi</name>
<message> <message>
<source>&lt;Build Directory&gt;</source> <source>&lt;Build Directory&gt;</source>
<translation>&lt;Каталог сборки&gt;</translation> <translation>&lt;Каталог сборки&gt;</translation>
@@ -6864,38 +6751,18 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<source>&lt;Other Locations&gt;</source> <source>&lt;Other Locations&gt;</source>
<translation>&lt;Другие места&gt;</translation> <translation>&lt;Другие места&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::FileApiReader</name>
<message> <message>
<source>Parsing has been canceled.</source> <source>Parsing has been canceled.</source>
<translation>Разбор был отменён.</translation> <translation>Разбор был отменён.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InitialCMakeArgumentsAspect</name>
<message> <message>
<source>Initial CMake parameters:</source> <source>Initial CMake parameters:</source>
<translation>Начальные параметры CMake:</translation> <translation>Начальные параметры CMake:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::OpenCMakeTargetLocatorFilter</name>
<message> <message>
<source>Open CMake target</source> <source>Open CMake target</source>
<translation>Открыть цель CMake</translation> <translation>Открыть цель CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ProjectTreeHelper</name>
<message>
<source>&lt;Build Directory&gt;</source>
<translation>&lt;Каталог сборки&gt;</translation>
</message>
<message>
<source>&lt;Other Locations&gt;</source>
<translation>&lt;Другие места&gt;</translation>
</message>
<message> <message>
<source>&lt;Headers&gt;</source> <source>&lt;Headers&gt;</source>
<translation>&lt;Заголовки&gt;</translation> <translation>&lt;Заголовки&gt;</translation>

64
share/qtcreator/translations/qtcreator_sl.ts
View File

@@ -280,7 +280,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build</source> <source>Build</source>
<translation>Zgradi</translation> <translation>Zgradi</translation>
@@ -301,9 +301,6 @@
<source>New Configuration Name:</source> <source>New Configuration Name:</source>
<translation type="obsolete">Ime nove nastavitve:</translation> <translation type="obsolete">Ime nove nastavitve:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Reconfigure project:</source> <source>Reconfigure project:</source>
<translation>Ponastavi projekt:</translation> <translation>Ponastavi projekt:</translation>
@@ -312,16 +309,10 @@
<source>&amp;Change</source> <source>&amp;Change</source>
<translation>&amp;Spremeni</translation> <translation>&amp;Spremeni</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>Čarovnik za CMake</translation> <translation>Čarovnik za CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>Qt Creator je zaznal &lt;b&gt;gradnjo znotraj mape %1 z izvorno kodo&lt;/b&gt;, kar preprečuje gradnje izven te mape, zato vam Qt Creator ne bo dovolil spremeniti mape za gradnjo. Če želite gradnjo v ločeni mapi, počistite mapo z izvorno kodo in projekt odprite znova.</translation> <translation>Qt Creator je zaznal &lt;b&gt;gradnjo znotraj mape %1 z izvorno kodo&lt;/b&gt;, kar preprečuje gradnje izven te mape, zato vam Qt Creator ne bo dovolil spremeniti mape za gradnjo. Če želite gradnjo v ločeni mapi, počistite mapo z izvorno kodo in projekt odprite znova.</translation>
@@ -330,9 +321,6 @@
<source>Build Location</source> <source>Build Location</source>
<translation>Mesto gradnje</translation> <translation>Mesto gradnje</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message> <message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source> <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation>Določite pot do programa cmake. Programa cmak ni bilo moč najti v poti.</translation> <translation>Določite pot do programa cmake. Programa cmak ni bilo moč najti v poti.</translation>
@@ -437,9 +425,6 @@
<source>MinGW Generator</source> <source>MinGW Generator</source>
<translation type="obsolete">Ustvarjalnik za MinGW</translation> <translation type="obsolete">Ustvarjalnik za MinGW</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
@@ -448,9 +433,6 @@
<source>Executable:</source> <source>Executable:</source>
<translation>Program:</translation> <translation>Program:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>Dodatni argumenti:</translation> <translation>Dodatni argumenti:</translation>
@@ -476,9 +458,6 @@
<source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source> <source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;Neznana veriga orodij&lt;/b&gt;</translation> <translation type="obsolete">&lt;b&gt;Neznana veriga orodij&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>Vnesite mapo, v kateri želite zgraditi svoj projekt. </translation> <translation>Vnesite mapo, v kateri želite zgraditi svoj projekt. </translation>
@@ -491,10 +470,6 @@
<source>Build directory:</source> <source>Build directory:</source>
<translation>Mapa za gradnjo:</translation> <translation>Mapa za gradnjo:</translation>
</message> </message>
<message>
<source>Build Location</source>
<translation>Mesto gradnje</translation>
</message>
</context> </context>
<context> <context>
<name>CPlusPlus::OverviewModel</name> <name>CPlusPlus::OverviewModel</name>
@@ -12206,11 +12181,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name> <name>CMakeProjectManager</name>
<message>
<source>Arguments:</source>
<translation>Argumenti:</translation>
</message>
<message> <message>
<source>Select Working Directory</source> <source>Select Working Directory</source>
<translation>Izberite delovno mapo</translation> <translation>Izberite delovno mapo</translation>
@@ -13598,23 +13569,11 @@ Razlog: %2</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake target</source> <source>Run CMake target</source>
<translation>Zaženi cilj CMake</translation> <translation>Zaženi cilj CMake</translation>
</message> </message>
<message>
<source>Clean Environment</source>
<translation>Čisto okolje</translation>
</message>
<message>
<source>System Environment</source>
<translation>Sistemsko okolje</translation>
</message>
<message>
<source>Build Environment</source>
<translation>Okolje za gradnjo</translation>
</message>
<message> <message>
<source>The executable is not built by the current buildconfiguration</source> <source>The executable is not built by the current buildconfiguration</source>
<translation>Izvršljiva datoteka ni zgrajena s trenutno nastavitvijo gradnje</translation> <translation>Izvršljiva datoteka ni zgrajena s trenutno nastavitvijo gradnje</translation>
@@ -15613,15 +15572,12 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeTarget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
<translation>Namizje</translation> <translation>Namizje</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStep</name>
<message> <message>
<source>Make</source> <source>Make</source>
<extracomment>Default display name for the cmake make step. <extracomment>Default display name for the cmake make step.
@@ -15633,9 +15589,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
<comment>CMakeProjectManager::MakeStep display name.</comment> <comment>CMakeProjectManager::MakeStep display name.</comment>
<translation type="obsolete">Make</translation> <translation type="obsolete">Make</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment> <comment>Display name for CMakeProjectManager::MakeStep id.</comment>
@@ -22879,7 +22832,7 @@ Seznam za strežnik je: %2.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeEditor</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changes to cmake files are shown in the project tree after building.</source> <source>Changes to cmake files are shown in the project tree after building.</source>
<translation>Spremembe datotek *.cmake so v drevesu projektov vidne po gradnji.</translation> <translation>Spremembe datotek *.cmake so v drevesu projektov vidne po gradnji.</translation>
@@ -22889,13 +22842,6 @@ Seznam za strežnik je: %2.</translation>
<translation>Zgradi sedaj</translation> <translation>Zgradi sedaj</translation>
</message> </message>
</context> </context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message>
<source>Run CMake</source>
<translation>Zaženi CMake</translation>
</message>
</context>
<context> <context>
<name>Core::Internal::ExternalToolModel</name> <name>Core::Internal::ExternalToolModel</name>
<message> <message>

175
share/qtcreator/translations/qtcreator_uk.ts
View File

@@ -1047,7 +1047,7 @@ Local pulls are not applied to the master branch.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Default</source> <source>Default</source>
<extracomment>The name of the build configuration created by default for a cmake project.</extracomment> <extracomment>The name of the build configuration created by default for a cmake project.</extracomment>
@@ -1081,9 +1081,6 @@ Local pulls are not applied to the master branch.</source>
<source>New configuration name:</source> <source>New configuration name:</source>
<translation type="vanished">Назва нової конфігурації:</translation> <translation type="vanished">Назва нової конфігурації:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Run cmake</source> <source>Run cmake</source>
<translation type="vanished">Запустити cmake</translation> <translation type="vanished">Запустити cmake</translation>
@@ -1124,20 +1121,6 @@ Local pulls are not applied to the master branch.</source>
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeEditor</name>
<message>
<source>Changes to cmake files are shown in the project tree after building.</source>
<translation type="vanished">Зміни у файлах cmake будуть відображені в дереві проекту після збірки.</translation>
</message>
<message>
<source>Build now</source>
<translation type="vanished">Зібрати зараз</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message> <message>
<source>Run CMake</source> <source>Run CMake</source>
<translation>Запустити CMake</translation> <translation>Запустити CMake</translation>
@@ -1154,16 +1137,10 @@ Local pulls are not applied to the master branch.</source>
<source>Failed opening project &apos;%1&apos;: Project is not a file</source> <source>Failed opening project &apos;%1&apos;: Project is not a file</source>
<translation type="vanished">Збій відкриття проекту &apos;%1&apos;: Проект не є файлом</translation> <translation type="vanished">Збій відкриття проекту &apos;%1&apos;: Проект не є файлом</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation type="vanished">Майстер CMake</translation> <translation type="vanished">Майстер CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message> <message>
<source>Run CMake kit</source> <source>Run CMake kit</source>
<translation>Запустити комплект cmake</translation> <translation>Запустити комплект cmake</translation>
@@ -1180,9 +1157,6 @@ Local pulls are not applied to the master branch.</source>
<source> (disabled)</source> <source> (disabled)</source>
<translation type="vanished"> (вимкнено)</translation> <translation type="vanished"> (вимкнено)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation type="vanished">Аргументи:</translation> <translation type="vanished">Аргументи:</translation>
@@ -1211,17 +1185,6 @@ Local pulls are not applied to the master branch.</source>
<source>Run in Terminal</source> <source>Run in Terminal</source>
<translation type="vanished">Запускати в терміналі</translation> <translation type="vanished">Запускати в терміналі</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
<source>Run CMake</source>
<translation type="vanished">Запустити CMake</translation>
</message>
<message>
<source>Arguments:</source>
<translation type="vanished">Аргументи:</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation type="vanished">Генератор:</translation> <translation type="vanished">Генератор:</translation>
@@ -1290,13 +1253,6 @@ Local pulls are not applied to the master branch.</source>
<source>CMake exited with errors. Please check CMake output.</source> <source>CMake exited with errors. Please check CMake output.</source>
<translation type="vanished">CMake завершився з помилками. Будь ласка, перевірте виведення CMake.</translation> <translation type="vanished">CMake завершився з помилками. Будь ласка, перевірте виведення CMake.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Executable:</source> <source>Executable:</source>
<translation type="vanished">Виконуваний модуль:</translation> <translation type="vanished">Виконуваний модуль:</translation>
@@ -1305,9 +1261,6 @@ Local pulls are not applied to the master branch.</source>
<source>Prefer Ninja generator (CMake 2.8.9 or higher required)</source> <source>Prefer Ninja generator (CMake 2.8.9 or higher required)</source>
<translation type="vanished">Надавати перевагу генератору Ninja (необхідний CMake 2.8.9 або вище)</translation> <translation type="vanished">Надавати перевагу генератору Ninja (необхідний CMake 2.8.9 або вище)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
@@ -1317,9 +1270,6 @@ Local pulls are not applied to the master branch.</source>
<source>Desktop</source> <source>Desktop</source>
<translation type="vanished">Стаціонарний комп&apos;ютер</translation> <translation type="vanished">Стаціонарний комп&apos;ютер</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation type="vanished">Qt Creator знайшов &lt;b&gt;збірку в теці з кодом в%1&lt;/b&gt;, яка заважає тіньовим збіркам. Qt Creator не дозволить вам змінити теку збірки. Якщо ви хочете тіньової збірки, то очистіть теку з кодом та перевідкрийте проект.</translation> <translation type="vanished">Qt Creator знайшов &lt;b&gt;збірку в теці з кодом в%1&lt;/b&gt;, яка заважає тіньовим збіркам. Qt Creator не дозволить вам змінити теку збірки. Якщо ви хочете тіньової збірки, то очистіть теку з кодом та перевідкрийте проект.</translation>
@@ -1328,14 +1278,6 @@ Local pulls are not applied to the master branch.</source>
<source>Build Location</source> <source>Build Location</source>
<translation type="vanished">Розташування збірки</translation> <translation type="vanished">Розташування збірки</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStep</name>
<message>
<source>Make</source>
<extracomment>Default display name for the cmake make step.</extracomment>
<translation type="vanished">Make</translation>
</message>
<message> <message>
<source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source>
<translation type="vanished">Qt Creator потребує компілятора для збірки. Сконфігуруйте компілятор в налаштуваннях комплекту.</translation> <translation type="vanished">Qt Creator потребує компілятора для збірки. Сконфігуруйте компілятор в налаштуваннях комплекту.</translation>
@@ -1344,9 +1286,6 @@ Local pulls are not applied to the master branch.</source>
<source>Configuration is faulty. Check the Issues view for details.</source> <source>Configuration is faulty. Check the Issues view for details.</source>
<translation type="vanished">Конфігурація збійна. Перевірте вид &quot;Проблеми&quot; для деталей.</translation> <translation type="vanished">Конфігурація збійна. Перевірте вид &quot;Проблеми&quot; для деталей.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Override command:</source> <source>Override command:</source>
<translation type="vanished">Команда на заміну:</translation> <translation type="vanished">Команда на заміну:</translation>
@@ -1355,38 +1294,11 @@ Local pulls are not applied to the master branch.</source>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation type="vanished">Додаткові аргументи:</translation> <translation type="vanished">Додаткові аргументи:</translation>
</message> </message>
<message>
<source>Targets:</source>
<translation type="vanished">Цілі:</translation>
</message>
<message>
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation type="vanished">&lt;b&gt;Для цього комплекту відсутня конфігурація збірки.&lt;/b&gt;</translation>
</message>
<message>
<source>Make</source>
<comment>CMakeProjectManager::MakeStepConfigWidget display name.</comment>
<translation type="vanished">Make</translation>
</message>
<message>
<source>Make</source>
<translation type="vanished">Make</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment> <comment>Display name for CMakeProjectManager::MakeStep id.</comment>
<translation type="vanished">Make</translation> <translation type="vanished">Make</translation>
</message> </message>
<message>
<source>Make</source>
<translation type="vanished">Make</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation type="vanished">Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. </translation> <translation type="vanished">Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. </translation>
@@ -1399,14 +1311,6 @@ Local pulls are not applied to the master branch.</source>
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source> <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation type="vanished">Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. Qt Creator рекомендує не використовувати теку з кодом для збірки. Це гарантуватиме, що тека з кодом лишатиметься чистою, та дозволить здійснювати декілька збірок з різними налаштуваннями.</translation> <translation type="vanished">Будь ласка, введіть теку, в якій ви хочете зібрати ваш проект. Qt Creator рекомендує не використовувати теку з кодом для збірки. Це гарантуватиме, що тека з кодом лишатиметься чистою, та дозволить здійснювати декілька збірок з різними налаштуваннями.</translation>
</message> </message>
<message>
<source>Build directory:</source>
<translation type="vanished">Тека збірки:</translation>
</message>
<message>
<source>Build Location</source>
<translation type="vanished">Розташування збірки</translation>
</message>
</context> </context>
<context> <context>
<name>CPlusPlus::OverviewModel</name> <name>CPlusPlus::OverviewModel</name>
@@ -26701,7 +26605,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>Зібрати ціль CMake</translation> <translation>Зібрати ціль CMake</translation>
@@ -30259,7 +30163,7 @@ To add the Qt versions, select Options &gt; Build &amp; Run &gt; Qt Versions.</s
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::ChooseCMakePage</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake Executable:</source> <source>CMake Executable:</source>
<translation type="vanished">Виконуваний модуль CMake:</translation> <translation type="vanished">Виконуваний модуль CMake:</translation>
@@ -34123,7 +34027,7 @@ cannot be found in the path.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::GeneratorInfo</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Ninja (%1)</source> <source>Ninja (%1)</source>
<translation type="vanished">Ninja (%1)</translation> <translation type="vanished">Ninja (%1)</translation>
@@ -34140,9 +34044,6 @@ cannot be found in the path.</source>
<source>Unix Generator (%1)</source> <source>Unix Generator (%1)</source>
<translation type="vanished">Генератор для Unix (%1)</translation> <translation type="vanished">Генератор для Unix (%1)</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::NoKitPage</name>
<message> <message>
<source>Show Options</source> <source>Show Options</source>
<translation type="vanished">Показати опції</translation> <translation type="vanished">Показати опції</translation>
@@ -48789,7 +48690,7 @@ Setting breakpoints by file name and line number may fail.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeKitConfigWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>CMake Tool:</source> <source>CMake Tool:</source>
<translation>Інструмент CMake:</translation> <translation>Інструмент CMake:</translation>
@@ -48802,20 +48703,10 @@ Setting breakpoints by file name and line number may fail.</source>
<source>&lt;No CMake Tool available&gt;</source> <source>&lt;No CMake Tool available&gt;</source>
<translation>&lt;Немає інструмента CMake&gt;</translation> <translation>&lt;Немає інструмента CMake&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeKitInformation</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message> <message>
<source>Unconfigured</source> <source>Unconfigured</source>
<translation>Не сконфігуровано</translation> <translation>Не сконфігуровано</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::NoCMakePage</name>
<message> <message>
<source>Check CMake Tools</source> <source>Check CMake Tools</source>
<translation type="vanished">Перевірити інструменти CMake</translation> <translation type="vanished">Перевірити інструменти CMake</translation>
@@ -48828,9 +48719,6 @@ Setting breakpoints by file name and line number may fail.</source>
<source>Qt Creator has no CMake Tools that are required for CMake projects. Please configure at least one.</source> <source>Qt Creator has no CMake Tools that are required for CMake projects. Please configure at least one.</source>
<translation type="vanished">В Qt Creator немає інструментів CMake, які необхідні для проектів CMake. Будь ласка, сконфігуруйте хоча б один.</translation> <translation type="vanished">В Qt Creator немає інструментів CMake, які необхідні для проектів CMake. Будь ласка, сконфігуруйте хоча б один.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeSettingsPage</name>
<message> <message>
<source> (Default)</source> <source> (Default)</source>
<translation> (Типово)</translation> <translation> (Типово)</translation>
@@ -48859,9 +48747,6 @@ Setting breakpoints by file name and line number may fail.</source>
<source>Path:</source> <source>Path:</source>
<translation>Шлях:</translation> <translation>Шлях:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeToolConfigWidget</name>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Додати</translation> <translation>Додати</translation>
@@ -48886,10 +48771,6 @@ Setting breakpoints by file name and line number may fail.</source>
<source>Set as the default CMake Tool to use when creating a new Kit, or no value is set.</source> <source>Set as the default CMake Tool to use when creating a new Kit, or no value is set.</source>
<translation type="vanished">Встановити як типовий інструмент CMake для використання при створенні нових комлектів.</translation> <translation type="vanished">Встановити як типовий інструмент CMake для використання при створенні нових комлектів.</translation>
</message> </message>
<message>
<source>Prefer Ninja generator (CMake 2.8.9 or higher required)</source>
<translation type="vanished">Надавати перевагу генератору Ninja (необхідний CMake 2.8.9 або вище)</translation>
</message>
<message> <message>
<source>Clone of %1</source> <source>Clone of %1</source>
<translation>Клон %1</translation> <translation>Клон %1</translation>
@@ -48898,9 +48779,6 @@ Setting breakpoints by file name and line number may fail.</source>
<source>New CMake</source> <source>New CMake</source>
<translation>Новий CMake</translation> <translation>Новий CMake</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeToolManager</name>
<message> <message>
<source>CMake at %1</source> <source>CMake at %1</source>
<translation>CMake в %1</translation> <translation>CMake в %1</translation>
@@ -50229,7 +50107,7 @@ the program.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::CMakeProject</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Internal Error: No build configuration found in settings file.</source> <source>Internal Error: No build configuration found in settings file.</source>
<translation type="vanished">Внутрішня помилка: конфігурацію збірки не знайдено в файлі налаштувань.</translation> <translation type="vanished">Внутрішня помилка: конфігурацію збірки не знайдено в файлі налаштувань.</translation>
@@ -51680,7 +51558,7 @@ Please set a real Clang executable.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::BuildDirManager</name> <name>CMakeProjectManager</name>
<message> <message>
<source>The build directory is not for %1</source> <source>The build directory is not for %1</source>
<translation>Тека збірки не для %1</translation> <translation>Тека збірки не для %1</translation>
@@ -51705,9 +51583,6 @@ Please set a real Clang executable.</source>
<source>Failed to open %1 for reading.</source> <source>Failed to open %1 for reading.</source>
<translation>Збій відкриття %1 для читання.</translation> <translation>Збій відкриття %1 для читання.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStep</name>
<message> <message>
<source>Make</source> <source>Make</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -51717,16 +51592,10 @@ Please set a real Clang executable.</source>
<source>Persisting CMake state...</source> <source>Persisting CMake state...</source>
<translation>Збереження стану CMake...</translation> <translation>Збереження стану CMake...</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeBuildStep</name>
<message> <message>
<source>Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options.</source> <source>Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options.</source>
<translation>Qt Creator потребує заданого засобу CMake для збірки. Налаштуйте засіб CMake в опціях комплекту.</translation> <translation>Qt Creator потребує заданого засобу CMake для збірки. Налаштуйте засіб CMake в опціях комплекту.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepConfigWidget</name>
<message> <message>
<source>Tool arguments:</source> <source>Tool arguments:</source>
<translation>Аргументи для засобу:</translation> <translation>Аргументи для засобу:</translation>
@@ -51744,17 +51613,11 @@ Please set a real Clang executable.</source>
<source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source> <source>&lt;b&gt;No build configuration found on this kit.&lt;/b&gt;</source>
<translation>&lt;b&gt;Для цього комплекту відсутня конфігурація збірки.&lt;/b&gt;</translation> <translation>&lt;b&gt;Для цього комплекту відсутня конфігурація збірки.&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildStepFactory</name>
<message> <message>
<source>Build</source> <source>Build</source>
<comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment> <comment>Display name for CMakeProjectManager::CMakeBuildStep id.</comment>
<translation>Збірка</translation> <translation>Збірка</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeGeneratorKitConfigWidget</name>
<message> <message>
<source>CMake Generator:</source> <source>CMake Generator:</source>
<translation>Генератор CMake:</translation> <translation>Генератор CMake:</translation>
@@ -51767,9 +51630,6 @@ Please set a real Clang executable.</source>
<source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source> <source>CMake generator defines how a project is built when using CMake.&lt;br&gt;This setting is ignored when using other build systems.</source>
<translation>Генератор CMake визначає, як проект буде збудовано за допомогою CMake.&lt;br&gt;Це налаштування ігнорується для інших систем збірки.</translation> <translation>Генератор CMake визначає, як проект буде збудовано за допомогою CMake.&lt;br&gt;Це налаштування ігнорується для інших систем збірки.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeConfigurationKitConfigWidget</name>
<message> <message>
<source>Change...</source> <source>Change...</source>
<translation>Змінити...</translation> <translation>Змінити...</translation>
@@ -51794,9 +51654,6 @@ Please set a real Clang executable.</source>
<source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source> <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;You may provide a type hint by adding &quot;:TYPE&quot; before the &quot;=&quot;.</source>
<translation>Введіть змінні, по одній на кожний рядок. Назва змінної має відділятись від значення символом &quot;=&quot;.&lt;br&gt;Ви можете давати підказку типу, додаючи &quot;:TYPE&quot; перед &quot;=&quot;.</translation> <translation>Введіть змінні, по одній на кожний рядок. Назва змінної має відділятись від значення символом &quot;=&quot;.&lt;br&gt;Ви можете давати підказку типу, додаючи &quot;:TYPE&quot; перед &quot;=&quot;.</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::CMakeGeneratorKitInformation</name>
<message> <message>
<source>No CMake Tool configured, CMake generator will be ignored.</source> <source>No CMake Tool configured, CMake generator will be ignored.</source>
<translation>Засіб CMake не задано, генератор CMake буде зігноровано.</translation> <translation>Засіб CMake не задано, генератор CMake буде зігноровано.</translation>
@@ -51817,13 +51674,6 @@ Please set a real Clang executable.</source>
<source>CMake Generator</source> <source>CMake Generator</source>
<translation>Генератор CMake</translation> <translation>Генератор CMake</translation>
</message> </message>
<message>
<source>&lt;Use Default Generator&gt;</source>
<translation>&lt;Типовий генератор&gt;</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::CMakeConfigurationKitInformation</name>
<message> <message>
<source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source> <source>CMake configuration has no path to qmake binary set, even though the kit has a valid Qt version.</source>
<translation>Конфігурація CMake не має встановленого шляху до виконуваного модуля qmake, хоча комплект має правильну версію Qt.</translation> <translation>Конфігурація CMake не має встановленого шляху до виконуваного модуля qmake, хоча комплект має правильну версію Qt.</translation>
@@ -51848,13 +51698,6 @@ Please set a real Clang executable.</source>
<source>CMake configuration has a path to a C++ compiler set, that does not match up with the compiler path configured in the tool chain of the kit.</source> <source>CMake configuration has a path to a C++ compiler set, that does not match up with the compiler path configured in the tool chain of the kit.</source>
<translation>Конфігурація CMake має встановлений шлях до компілятора C++, який не збігається з шляхом до компілятора налаштованим в наборі інструментів комплекту.</translation> <translation>Конфігурація CMake має встановлений шлях до компілятора C++, який не збігається з шляхом до компілятора налаштованим в наборі інструментів комплекту.</translation>
</message> </message>
<message>
<source>CMake Configuration</source>
<translation>Конфігурація CMake</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::ConfigModel</name>
<message> <message>
<source>&lt;UNSET&gt;</source> <source>&lt;UNSET&gt;</source>
<translation>&lt;НЕ ЗАДАНО&gt;</translation> <translation>&lt;НЕ ЗАДАНО&gt;</translation>
@@ -51867,10 +51710,6 @@ Please set a real Clang executable.</source>
<source>Value</source> <source>Value</source>
<translation>Значення</translation> <translation>Значення</translation>
</message> </message>
<message>
<source>Advanced</source>
<translation>Додатково</translation>
</message>
</context> </context>
<context> <context>
<name>Core::Internal::ThemeChooser</name> <name>Core::Internal::ThemeChooser</name>

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

@@ -313,18 +313,11 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildEnvironmentWidget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Clear system environment</source> <source>Clear system environment</source>
<translation type="obsolete">清除系统环境变量</translation> <translation type="obsolete">清除系统环境变量</translation>
</message> </message>
<message>
<source>Build Environment</source>
<translation type="obsolete">构建时的环境变量</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message> <message>
<source>Create</source> <source>Create</source>
<translation type="obsolete">创建</translation> <translation type="obsolete">创建</translation>
@@ -349,9 +342,6 @@
<source>New Configuration Name:</source> <source>New Configuration Name:</source>
<translation type="obsolete">新配置名称:</translation> <translation type="obsolete">新配置名称:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Run cmake</source> <source>Run cmake</source>
<translation>执行cmake</translation> <translation>执行cmake</translation>
@@ -368,16 +358,10 @@
<source>Build directory:</source> <source>Build directory:</source>
<translation>构建目录:</translation> <translation>构建目录:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>CMake 向导</translation> <translation>CMake 向导</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>参数:</translation> <translation>参数:</translation>
@@ -434,9 +418,6 @@
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source> <source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation type="obsolete">运行的执行档: &lt;b&gt;%1&lt;/b&gt; %2</translation> <translation type="obsolete">运行的执行档: &lt;b&gt;%1&lt;/b&gt; %2</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>Qt Creator在&lt;b&gt;%1&lt;/b&gt;检测到一个&lt;b&gt;在源代码中的构建&lt;/b&gt;，无法进行shadow build. Qt Creator将不允许您更改编译目录。如果您想要进行shadow build，请清理源码目录再重新打开此项目。</translation> <translation>Qt Creator在&lt;b&gt;%1&lt;/b&gt;检测到一个&lt;b&gt;在源代码中的构建&lt;/b&gt;，无法进行shadow build. Qt Creator将不允许您更改编译目录。如果您想要进行shadow build，请清理源码目录再重新打开此项目。</translation>
@@ -445,29 +426,6 @@
<source>Build Location</source> <source>Build Location</source>
<translation>构建路径</translation> <translation>构建路径</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="obsolete">请指定cmake可执行档的路径，在环境变量path中没有找到cmake执行档。</translation>
</message>
<message>
<source> The cmake executable (%1) does not exist.</source>
<translation type="obsolete">cmake执行档 (%1) 不存在。</translation>
</message>
<message>
<source> The path %1 is not a executable.</source>
<translation type="obsolete"> 路径 (%1) 不是可执行程序。</translation>
</message>
<message>
<source> The path %1 is not a valid cmake.</source>
<translation type="obsolete"> 路径 (%1) 不是有效的cmake。</translation>
</message>
<message>
<source>Arguments:</source>
<translation>参数:</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation>创建器:</translation> <translation>创建器:</translation>
@@ -564,9 +522,6 @@
<source>No valid cmake executable specified.</source> <source>No valid cmake executable specified.</source>
<translation>没有指定有效的cmake执行档。</translation> <translation>没有指定有效的cmake执行档。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
@@ -579,9 +534,6 @@
<source>CMake executable</source> <source>CMake executable</source>
<translation type="obsolete">可执行的cmake </translation> <translation type="obsolete">可执行的cmake </translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>额外的参数:</translation> <translation>额外的参数:</translation>
@@ -611,9 +563,6 @@
<source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source> <source>&lt;b&gt;Unknown Toolchain&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;未知工具链&lt;/b&gt;</translation> <translation type="obsolete">&lt;b&gt;未知工具链&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>请进入您想构建项目的目录。</translation> <translation>请进入您想构建项目的目录。</translation>
@@ -622,14 +571,6 @@
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source> <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation>请进入您想构建项目的目录。Qt Creator 建议您不要使用源目录构建。这能确保源目录干净，并且可以针对不同设定多次构建。</translation> <translation>请进入您想构建项目的目录。Qt Creator 建议您不要使用源目录构建。这能确保源目录干净，并且可以针对不同设定多次构建。</translation>
</message> </message>
<message>
<source>Build directory:</source>
<translation>构建目录:</translation>
</message>
<message>
<source>Build Location</source>
<translation>构建路径</translation>
</message>
</context> </context>
<context> <context>
<name>CPlusPlus::OverviewModel</name> <name>CPlusPlus::OverviewModel</name>
@@ -20033,31 +19974,15 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake target</source> <source>Run CMake target</source>
<translation>执行 CMake 目标</translation> <translation>执行 CMake 目标</translation>
</message> </message>
<message>
<source>Clean Environment</source>
<translation>清理时的环境变量</translation>
</message>
<message>
<source>System Environment</source>
<translation>系统环境变量</translation>
</message>
<message>
<source>Build Environment</source>
<translation>构建时的环境变量</translation>
</message>
<message> <message>
<source>The executable is not built by the current build configuration</source> <source>The executable is not built by the current build configuration</source>
<translation>这个可执行档不是使用当前的构建配置构建出来的</translation> <translation>这个可执行档不是使用当前的构建配置构建出来的</translation>
</message> </message>
<message>
<source>The executable is not built by the current buildconfiguration</source>
<translation type="obsolete">这个可执行档不是使用当前的构建配置制作出来的</translation>
</message>
<message> <message>
<source> (disabled)</source> <source> (disabled)</source>
<translation>(禁用)</translation> <translation>(禁用)</translation>
@@ -22324,15 +22249,12 @@ Previous decimal signed value (big endian): %4</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeTarget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
<translation>桌面</translation> <translation>桌面</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment> <comment>Display name for CMakeProjectManager::MakeStep id.</comment>
@@ -27781,7 +27703,7 @@ Id必须以小写字母开头。</translation>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::MakeStep</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Make</source> <source>Make</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -32171,17 +32093,6 @@ Specifies how backspace interacts with indentation.
<translation>Bazaar 命令</translation> <translation>Bazaar 命令</translation>
</message> </message>
</context> </context>
<context>
<name>CMakeProjectManager::Internal::CMakeManager</name>
<message>
<source>Run cmake</source>
<translation type="obsolete">执行CMake</translation>
</message>
<message>
<source>Run CMake</source>
<translation>执行CMake</translation>
</message>
</context>
<context> <context>
<name>Core::Internal::ExternalToolModel</name> <name>Core::Internal::ExternalToolModel</name>
<message> <message>
@@ -36108,7 +36019,7 @@ With cache simulation, further event counters are enabled:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeEditor</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changes to cmake files are shown in the project tree after building.</source> <source>Changes to cmake files are shown in the project tree after building.</source>
<translation>构建之后在项目树中显示cmake文件的变化。</translation> <translation>构建之后在项目树中显示cmake文件的变化。</translation>
@@ -45200,14 +45111,11 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>构建 CMake 目标</translation> <translation>构建 CMake 目标</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ChooseCMakePage</name>
<message> <message>
<source>Choose Cmake Executable</source> <source>Choose Cmake Executable</source>
<translation>选择CMake 的执行档</translation> <translation>选择CMake 的执行档</translation>

91
share/qtcreator/translations/qtcreator_zh_TW.ts
View File

@@ -192,7 +192,7 @@
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build</source> <source>Build</source>
<translation>建置</translation> <translation>建置</translation>
@@ -205,9 +205,6 @@
<source>New configuration name:</source> <source>New configuration name:</source>
<translation>新設置名稱:</translation> <translation>新設置名稱:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message> <message>
<source>Run cmake</source> <source>Run cmake</source>
<translation>執行 cmake</translation> <translation>執行 cmake</translation>
@@ -220,20 +217,10 @@
<source>&amp;Change</source> <source>&amp;Change</source>
<translation>變更(&amp;C)</translation> <translation>變更(&amp;C)</translation>
</message> </message>
<message>
<source>Build directory:</source>
<translation>建置目錄:</translation>
</message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message> <message>
<source>CMake Wizard</source> <source>CMake Wizard</source>
<translation>CMake 精靈</translation> <translation>CMake 精靈</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>參數：</translation> <translation>參數：</translation>
@@ -274,9 +261,6 @@
<source>Build Environment</source> <source>Build Environment</source>
<translation>建置環境變數</translation> <translation>建置環境變數</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message> <message>
<source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source> <source>Qt Creator has detected an &lt;b&gt;in-source-build in %1&lt;/b&gt; which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>Qt Creator在&lt;b&gt;%1&lt;/b&gt;中偵測到先前做過&lt;b&gt;直接在源碼中建置&lt;/b&gt;，因此無法進行分離建置（shadow build）。Qt Creator將不會允許您變更建置目錄。如果你想要進行分離建置，請清除源碼中的編譯後再重新開啟此專案。</translation> <translation>Qt Creator在&lt;b&gt;%1&lt;/b&gt;中偵測到先前做過&lt;b&gt;直接在源碼中建置&lt;/b&gt;，因此無法進行分離建置（shadow build）。Qt Creator將不會允許您變更建置目錄。如果你想要進行分離建置，請清除源碼中的編譯後再重新開啟此專案。</translation>
@@ -285,29 +269,6 @@
<source>Build Location</source> <source>Build Location</source>
<translation>建置路徑</translation> <translation>建置路徑</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
<source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
<translation type="obsolete">請指定 cmake 執行檔的路徑。在環境變數 path 中找不到 cmake 執行檔。</translation>
</message>
<message>
<source> The cmake executable (%1) does not exist.</source>
<translation type="obsolete">cmake 執行檔 (%1) 不存在。</translation>
</message>
<message>
<source> The path %1 is not a executable.</source>
<translation type="obsolete"> 路徑 (%1) 不是可執行檔。</translation>
</message>
<message>
<source> The path %1 is not a valid cmake.</source>
<translation type="obsolete"> 路徑 (%1) 不是有效的 cmake。</translation>
</message>
<message>
<source>Arguments:</source>
<translation>參數：</translation>
</message>
<message> <message>
<source>Generator:</source> <source>Generator:</source>
<translation>建立器:</translation> <translation>建立器:</translation>
@@ -368,9 +329,6 @@
<source>No valid cmake executable specified.</source> <source>No valid cmake executable specified.</source>
<translation>沒有指定有效的 cmake 執行檔。</translation> <translation>沒有指定有效的 cmake 執行檔。</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message> <message>
<source>CMake</source> <source>CMake</source>
<translation>CMake</translation> <translation>CMake</translation>
@@ -379,9 +337,6 @@
<source>Executable:</source> <source>Executable:</source>
<translation>執行檔:</translation> <translation>執行檔:</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message> <message>
<source>Additional arguments:</source> <source>Additional arguments:</source>
<translation>額外的參數：</translation> <translation>額外的參數：</translation>
@@ -403,9 +358,6 @@
<source>&lt;b&gt;Unknown tool chain&lt;/b&gt;</source> <source>&lt;b&gt;Unknown tool chain&lt;/b&gt;</source>
<translation type="obsolete">&lt;b&gt;未知的工具鍊&lt;/b&gt;</translation> <translation type="obsolete">&lt;b&gt;未知的工具鍊&lt;/b&gt;</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message> <message>
<source>Please enter the directory in which you want to build your project. </source> <source>Please enter the directory in which you want to build your project. </source>
<translation>請輸入您想建置專案的目錄。</translation> <translation>請輸入您想建置專案的目錄。</translation>
@@ -414,14 +366,6 @@
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source> <source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation>請輸入您想建置專案的目錄。Qt Creator 建議您不要直接用源碼的目錄來做建置。這樣可以保持源碼目錄的乾淨，並且可以讓您用不同的設定進行多個建置。</translation> <translation>請輸入您想建置專案的目錄。Qt Creator 建議您不要直接用源碼的目錄來做建置。這樣可以保持源碼目錄的乾淨，並且可以讓您用不同的設定進行多個建置。</translation>
</message> </message>
<message>
<source>Build directory:</source>
<translation>建置目錄：</translation>
</message>
<message>
<source>Build Location</source>
<translation>建置路徑</translation>
</message>
</context> </context>
<context> <context>
<name>CPlusPlus::OverviewModel</name> <name>CPlusPlus::OverviewModel</name>
@@ -12184,23 +12128,11 @@ Reason: %2</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Run CMake target</source> <source>Run CMake target</source>
<translation>執行 CMake 目標</translation> <translation>執行 CMake 目標</translation>
</message> </message>
<message>
<source>Clean Environment</source>
<translation>清除環境變數</translation>
</message>
<message>
<source>System Environment</source>
<translation>系統環境變數</translation>
</message>
<message>
<source>Build Environment</source>
<translation>建置環境變數</translation>
</message>
<message> <message>
<source>The executable is not built by the current build configuration</source> <source>The executable is not built by the current build configuration</source>
<translation>這個可執行檔不是使用目前的建置設置製作出來的</translation> <translation>這個可執行檔不是使用目前的建置設置製作出來的</translation>
@@ -13086,15 +13018,12 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeTarget</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Desktop</source> <source>Desktop</source>
<comment>CMake Default target display name</comment> <comment>CMake Default target display name</comment>
<translation>桌面</translation> <translation>桌面</translation>
</message> </message>
</context>
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message> <message>
<source>Make</source> <source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment> <comment>Display name for CMakeProjectManager::MakeStep id.</comment>
@@ -16131,7 +16060,7 @@ Ids must begin with a lowercase letter.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::MakeStep</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Make</source> <source>Make</source>
<extracomment>Default display name for the cmake make step.</extracomment> <extracomment>Default display name for the cmake make step.</extracomment>
@@ -19249,11 +19178,7 @@ Local pulls are not applied to the master branch.</source>
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeManager</name> <name>CMakeProjectManager</name>
<message>
<source>Run CMake</source>
<translation>執行 CMake</translation>
</message>
</context> </context>
<context> <context>
<name>Core::Internal::ExternalToolModel</name> <name>Core::Internal::ExternalToolModel</name>
@@ -22384,7 +22309,7 @@ With cache simulation, further event counters are enabled:
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeEditor</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Changes to cmake files are shown in the project tree after building.</source> <source>Changes to cmake files are shown in the project tree after building.</source>
<translation>建置之後在專案樹中顯示 cmake 檔的變化。</translation> <translation>建置之後在專案樹中顯示 cmake 檔的變化。</translation>
@@ -28460,7 +28385,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::CMakeLocatorFilter</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Build CMake target</source> <source>Build CMake target</source>
<translation>建置 CMake 目標</translation> <translation>建置 CMake 目標</translation>
@@ -31259,7 +31184,7 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
</message> </message>
</context> </context>
<context> <context>
<name>CMakeProjectManager::Internal::ChooseCMakePage</name> <name>CMakeProjectManager</name>
<message> <message>
<source>Choose Cmake Executable</source> <source>Choose Cmake Executable</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

6
src/plugins/cmakeprojectmanager/builddirparameters.cpp
View File

@@ -18,8 +18,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
BuildDirParameters::BuildDirParameters() = default; BuildDirParameters::BuildDirParameters() = default;
@@ -78,5 +77,4 @@ CMakeTool *BuildDirParameters::cmakeTool() const
return CMakeToolManager::findById(cmakeToolId); return CMakeToolManager::findById(cmakeToolId);
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

6
src/plugins/cmakeprojectmanager/builddirparameters.h
View File

@@ -8,8 +8,7 @@
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/filepath.h> #include <utils/filepath.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeBuildSystem; class CMakeBuildSystem;
@@ -37,5 +36,4 @@ public:
QStringList additionalCMakeArguments; QStringList additionalCMakeArguments;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

6
src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
View File

@@ -5,8 +5,7 @@
#include <QRegularExpression> #include <QRegularExpression>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
CMakeAutoCompleter::CMakeAutoCompleter() CMakeAutoCompleter::CMakeAutoCompleter()
{ {
@@ -123,5 +122,4 @@ bool CMakeAutoCompleter::contextAllowsElectricCharacters(const QTextCursor &curs
return !isInComment(cursor) && !isInString(cursor); return !isInComment(cursor) && !isInString(cursor);
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

6
src/plugins/cmakeprojectmanager/cmakeautocompleter.h
View File

@@ -7,8 +7,7 @@
#include <texteditor/autocompleter.h> #include <texteditor/autocompleter.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMAKE_EXPORT CMakeAutoCompleter : public TextEditor::AutoCompleter class CMAKE_EXPORT CMakeAutoCompleter : public TextEditor::AutoCompleter
{ {
@@ -27,5 +26,4 @@ public:
bool contextAllowsElectricCharacters(const QTextCursor &cursor) const override; bool contextAllowsElectricCharacters(const QTextCursor &cursor) const override;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

127
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -10,6 +10,7 @@
#include "cmakekitinformation.h" #include "cmakekitinformation.h"
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h" #include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h" #include "cmakespecificsettings.h"
#include "configmodel.h" #include "configmodel.h"
@@ -75,8 +76,8 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
using namespace CMakeProjectManager::Internal;
using namespace CMakeProjectManager::Internal;
namespace CMakeProjectManager { namespace CMakeProjectManager {
static Q_LOGGING_CATEGORY(cmakeBuildConfigurationLog, "qtc.cmake.bc", QtWarningMsg); static Q_LOGGING_CATEGORY(cmakeBuildConfigurationLog, "qtc.cmake.bc", QtWarningMsg);
@@ -96,8 +97,6 @@ namespace Internal {
class CMakeBuildSettingsWidget : public NamedWidget class CMakeBuildSettingsWidget : public NamedWidget
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeBuildSettingsWidget)
public: public:
CMakeBuildSettingsWidget(CMakeBuildSystem *bc); CMakeBuildSettingsWidget(CMakeBuildSystem *bc);
@@ -165,7 +164,7 @@ static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex
} }
CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) : CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
NamedWidget(tr("CMake")), NamedWidget(Tr::tr("CMake")),
m_buildSystem(bs), m_buildSystem(bs),
m_configModel(new ConfigModel(this)), m_configModel(new ConfigModel(this)),
m_configFilterModel(new CategorySortFilterModel(this)), m_configFilterModel(new CategorySortFilterModel(this)),
@@ -211,19 +210,19 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
m_warningMessageLabel->setVisible(false); m_warningMessageLabel->setVisible(false);
m_configurationStates = new QTabBar(this); m_configurationStates = new QTabBar(this);
m_configurationStates->addTab(tr("Initial Configuration")); m_configurationStates->addTab(Tr::tr("Initial Configuration"));
m_configurationStates->addTab(tr("Current Configuration")); m_configurationStates->addTab(Tr::tr("Current Configuration"));
connect(m_configurationStates, &QTabBar::currentChanged, this, [this](int index) { connect(m_configurationStates, &QTabBar::currentChanged, this, [this](int index) {
updateConfigurationStateIndex(index); updateConfigurationStateIndex(index);
}); });
m_kitConfiguration = new QPushButton(tr("Kit Configuration")); m_kitConfiguration = new QPushButton(Tr::tr("Kit Configuration"));
m_kitConfiguration->setToolTip(tr("Edit the current kit's CMake configuration.")); m_kitConfiguration->setToolTip(Tr::tr("Edit the current kit's CMake configuration."));
m_kitConfiguration->setFixedWidth(m_kitConfiguration->sizeHint().width()); m_kitConfiguration->setFixedWidth(m_kitConfiguration->sizeHint().width());
connect(m_kitConfiguration, &QPushButton::clicked, this, [this]() { kitCMakeConfiguration(); }); connect(m_kitConfiguration, &QPushButton::clicked, this, [this]() { kitCMakeConfiguration(); });
m_filterEdit = new FancyLineEdit; m_filterEdit = new FancyLineEdit;
m_filterEdit->setPlaceholderText(tr("Filter")); m_filterEdit->setPlaceholderText(Tr::tr("Filter"));
m_filterEdit->setFiltering(true); m_filterEdit->setFiltering(true);
auto tree = new TreeView; auto tree = new TreeView;
connect(tree, &TreeView::activated, connect(tree, &TreeView::activated,
@@ -271,46 +270,46 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
m_showProgressTimer.setInterval(50); // don't show progress for < 50ms tasks m_showProgressTimer.setInterval(50); // don't show progress for < 50ms tasks
connect(&m_showProgressTimer, &QTimer::timeout, [this]() { m_progressIndicator->show(); }); connect(&m_showProgressTimer, &QTimer::timeout, [this]() { m_progressIndicator->show(); });
m_addButton = new QPushButton(tr("&Add")); m_addButton = new QPushButton(Tr::tr("&Add"));
m_addButton->setToolTip(tr("Add a new configuration value.")); m_addButton->setToolTip(Tr::tr("Add a new configuration value."));
auto addButtonMenu = new QMenu(this); auto addButtonMenu = new QMenu(this);
addButtonMenu->addAction(tr("&Boolean"))->setData( addButtonMenu->addAction(Tr::tr("&Boolean"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::BOOLEAN))); QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::BOOLEAN)));
addButtonMenu->addAction(tr("&String"))->setData( addButtonMenu->addAction(Tr::tr("&String"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::STRING))); QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::STRING)));
addButtonMenu->addAction(tr("&Directory"))->setData( addButtonMenu->addAction(Tr::tr("&Directory"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::DIRECTORY))); QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::DIRECTORY)));
addButtonMenu->addAction(tr("&File"))->setData( addButtonMenu->addAction(Tr::tr("&File"))->setData(
QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::FILE))); QVariant::fromValue(static_cast<int>(ConfigModel::DataItem::FILE)));
m_addButton->setMenu(addButtonMenu); m_addButton->setMenu(addButtonMenu);
m_editButton = new QPushButton(tr("&Edit")); m_editButton = new QPushButton(Tr::tr("&Edit"));
m_editButton->setToolTip(tr("Edit the current CMake configuration value.")); m_editButton->setToolTip(Tr::tr("Edit the current CMake configuration value."));
m_setButton = new QPushButton(tr("&Set")); m_setButton = new QPushButton(Tr::tr("&Set"));
m_setButton->setToolTip(tr("Set a value in the CMake configuration.")); m_setButton->setToolTip(Tr::tr("Set a value in the CMake configuration."));
m_unsetButton = new QPushButton(tr("&Unset")); m_unsetButton = new QPushButton(Tr::tr("&Unset"));
m_unsetButton->setToolTip(tr("Unset a value in the CMake configuration.")); m_unsetButton->setToolTip(Tr::tr("Unset a value in the CMake configuration."));
m_resetButton = new QPushButton(tr("&Reset")); m_resetButton = new QPushButton(Tr::tr("&Reset"));
m_resetButton->setToolTip(tr("Reset all unapplied changes.")); m_resetButton->setToolTip(Tr::tr("Reset all unapplied changes."));
m_resetButton->setEnabled(false); m_resetButton->setEnabled(false);
m_batchEditButton = new QPushButton(tr("Batch Edit...")); m_batchEditButton = new QPushButton(Tr::tr("Batch Edit..."));
m_batchEditButton->setToolTip(tr("Set or reset multiple values in the CMake configuration.")); m_batchEditButton->setToolTip(Tr::tr("Set or reset multiple values in the CMake configuration."));
m_showAdvancedCheckBox = new QCheckBox(tr("Advanced")); m_showAdvancedCheckBox = new QCheckBox(Tr::tr("Advanced"));
connect(m_configView->selectionModel(), &QItemSelectionModel::selectionChanged, connect(m_configView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, [this](const QItemSelection &, const QItemSelection &) { this, [this](const QItemSelection &, const QItemSelection &) {
updateSelection(); updateSelection();
}); });
m_reconfigureButton = new QPushButton(tr("Run CMake")); m_reconfigureButton = new QPushButton(Tr::tr("Run CMake"));
m_reconfigureButton->setEnabled(false); m_reconfigureButton->setEnabled(false);
auto clearBox = new QCheckBox(tr("Clear system environment"), this); auto clearBox = new QCheckBox(Tr::tr("Clear system environment"), this);
clearBox->setChecked(cbc->useClearConfigureEnvironment()); clearBox->setChecked(cbc->useClearConfigureEnvironment());
auto envWidget = new EnvironmentWidget(this, EnvironmentWidget::TypeLocal, clearBox); auto envWidget = new EnvironmentWidget(this, EnvironmentWidget::TypeLocal, clearBox);
@@ -479,14 +478,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
connect(addButtonMenu, &QMenu::triggered, this, [this](QAction *action) { connect(addButtonMenu, &QMenu::triggered, this, [this](QAction *action) {
ConfigModel::DataItem::Type type = ConfigModel::DataItem::Type type =
static_cast<ConfigModel::DataItem::Type>(action->data().value<int>()); static_cast<ConfigModel::DataItem::Type>(action->data().value<int>());
QString value = tr("<UNSET>"); QString value = Tr::tr("<UNSET>");
if (type == ConfigModel::DataItem::BOOLEAN) if (type == ConfigModel::DataItem::BOOLEAN)
value = QString::fromLatin1("OFF"); value = QString::fromLatin1("OFF");
m_configModel->appendConfiguration(tr("<UNSET>"), value, type, isInitialConfiguration()); m_configModel->appendConfiguration(Tr::tr("<UNSET>"), value, type, isInitialConfiguration());
const TreeItem *item = m_configModel->findNonRootItem([&value, type](TreeItem *item) { const TreeItem *item = m_configModel->findNonRootItem([&value, type](TreeItem *item) {
ConfigModel::DataItem dataItem = ConfigModel::dataItemFromIndex(item->index()); ConfigModel::DataItem dataItem = ConfigModel::dataItemFromIndex(item->index());
return dataItem.key == tr("<UNSET>") && dataItem.type == type && dataItem.value == value; return dataItem.key == Tr::tr("<UNSET>") && dataItem.type == type && dataItem.value == value;
}); });
QModelIndex idx = m_configModel->indexForItem(item); QModelIndex idx = m_configModel->indexForItem(item);
idx = m_configTextFilterModel->mapFromSource(m_configFilterModel->mapFromSource(idx)); idx = m_configTextFilterModel->mapFromSource(m_configFilterModel->mapFromSource(idx));
@@ -537,14 +536,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
void CMakeBuildSettingsWidget::batchEditConfiguration() void CMakeBuildSettingsWidget::batchEditConfiguration()
{ {
auto dialog = new QDialog(this); auto dialog = new QDialog(this);
dialog->setWindowTitle(tr("Edit CMake Configuration")); dialog->setWindowTitle(Tr::tr("Edit CMake Configuration"));
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setModal(true); dialog->setModal(true);
auto layout = new QVBoxLayout(dialog); auto layout = new QVBoxLayout(dialog);
auto editor = new QPlainTextEdit(dialog); auto editor = new QPlainTextEdit(dialog);
auto label = new QLabel(dialog); auto label = new QLabel(dialog);
label->setText(tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>" label->setText(Tr::tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
"To set or change a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>" "To set or change a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>"
"&lt;type&gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.<br/>" "&lt;type&gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.<br/>"
"To unset a variable, use -U&lt;variable&gt;.<br/>")); "To unset a variable, use -U&lt;variable&gt;.<br/>"));
@@ -598,9 +597,9 @@ void CMakeBuildSettingsWidget::reconfigureWithInitialParameters()
if (!doNotAsk) { if (!doNotAsk) {
QDialogButtonBox::StandardButton reply = Utils::CheckableMessageBox::question( QDialogButtonBox::StandardButton reply = Utils::CheckableMessageBox::question(
Core::ICore::dialogParent(), Core::ICore::dialogParent(),
tr("Re-configure with Initial Parameters"), Tr::tr("Re-configure with Initial Parameters"),
tr("Clear CMake configuration and configure with initial parameters?"), Tr::tr("Clear CMake configuration and configure with initial parameters?"),
tr("Do not ask again"), Tr::tr("Do not ask again"),
&doNotAsk, &doNotAsk,
QDialogButtonBox::Yes | QDialogButtonBox::No, QDialogButtonBox::Yes | QDialogButtonBox::No,
QDialogButtonBox::Yes); QDialogButtonBox::Yes);
@@ -657,7 +656,7 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration()
m_buildSystem->kit()->blockNotification(); m_buildSystem->kit()->blockNotification();
auto dialog = new QDialog(this); auto dialog = new QDialog(this);
dialog->setWindowTitle(tr("Kit CMake Configuration")); dialog->setWindowTitle(Tr::tr("Kit CMake Configuration"));
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setModal(true); dialog->setModal(true);
dialog->setSizeGripEnabled(true); dialog->setSizeGripEnabled(true);
@@ -708,7 +707,7 @@ void CMakeBuildSettingsWidget::updateConfigureDetailsWidgetsSummary(
cmd.addArgs(configurationArguments); cmd.addArgs(configurationArguments);
params.setCommandLine(cmd); params.setCommandLine(cmd);
m_configureDetailsWidget->setSummaryText(params.summary(tr("Configure"))); m_configureDetailsWidget->setSummaryText(params.summary(Tr::tr("Configure")));
m_configureDetailsWidget->setState(DetailsWidget::Expanded); m_configureDetailsWidget->setState(DetailsWidget::Expanded);
} }
@@ -777,14 +776,14 @@ void CMakeBuildSettingsWidget::updateButtonState()
// Update label and text boldness of the reconfigure button // Update label and text boldness of the reconfigure button
QFont reconfigureButtonFont = m_reconfigureButton->font(); QFont reconfigureButtonFont = m_reconfigureButton->font();
if (isParsing) { if (isParsing) {
m_reconfigureButton->setText(tr("Stop CMake")); m_reconfigureButton->setText(Tr::tr("Stop CMake"));
reconfigureButtonFont.setBold(false); reconfigureButtonFont.setBold(false);
} else { } else {
m_reconfigureButton->setEnabled(true); m_reconfigureButton->setEnabled(true);
if (isInitial) { if (isInitial) {
m_reconfigureButton->setText(tr("Re-configure with Initial Parameters")); m_reconfigureButton->setText(Tr::tr("Re-configure with Initial Parameters"));
} else { } else {
m_reconfigureButton->setText(tr("Run CMake")); m_reconfigureButton->setText(Tr::tr("Run CMake"));
} }
reconfigureButtonFont.setBold(isInitial ? m_configModel->hasChanges(isInitial) reconfigureButtonFont.setBold(isInitial ? m_configModel->hasChanges(isInitial)
: !configChanges.isEmpty()); : !configChanges.isEmpty());
@@ -998,21 +997,21 @@ QAction *CMakeBuildSettingsWidget::createForceAction(int type, const QModelIndex
QString typeString; QString typeString;
switch (type) { switch (type) {
case ConfigModel::DataItem::BOOLEAN: case ConfigModel::DataItem::BOOLEAN:
typeString = tr("bool", "display string for cmake type BOOLEAN"); typeString = Tr::tr("bool", "display string for cmake type BOOLEAN");
break; break;
case ConfigModel::DataItem::FILE: case ConfigModel::DataItem::FILE:
typeString = tr("file", "display string for cmake type FILE"); typeString = Tr::tr("file", "display string for cmake type FILE");
break; break;
case ConfigModel::DataItem::DIRECTORY: case ConfigModel::DataItem::DIRECTORY:
typeString = tr("directory", "display string for cmake type DIRECTORY"); typeString = Tr::tr("directory", "display string for cmake type DIRECTORY");
break; break;
case ConfigModel::DataItem::STRING: case ConfigModel::DataItem::STRING:
typeString = tr("string", "display string for cmake type STRING"); typeString = Tr::tr("string", "display string for cmake type STRING");
break; break;
case ConfigModel::DataItem::UNKNOWN: case ConfigModel::DataItem::UNKNOWN:
return nullptr; return nullptr;
} }
QAction *forceAction = new QAction(tr("Force to %1").arg(typeString), nullptr); QAction *forceAction = new QAction(Tr::tr("Force to %1").arg(typeString), nullptr);
forceAction->setEnabled(m_configModel->canForceTo(idx, t)); forceAction->setEnabled(m_configModel->canForceTo(idx, t));
connect(forceAction, &QAction::triggered, connect(forceAction, &QAction::triggered,
this, [this, idx, t]() { m_configModel->forceTo(idx, t); }); this, [this, idx, t]() { m_configModel->forceTo(idx, t); });
@@ -1033,7 +1032,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
auto menu = new QMenu(this); auto menu = new QMenu(this);
connect(menu, &QMenu::triggered, menu, &QMenu::deleteLater); connect(menu, &QMenu::triggered, menu, &QMenu::deleteLater);
auto help = new QAction(tr("Help"), this); auto help = new QAction(Tr::tr("Help"), this);
menu->addAction(help); menu->addAction(help);
connect(help, &QAction::triggered, this, [=] { connect(help, &QAction::triggered, this, [=] {
const CMakeConfigItem item = ConfigModel::dataItemFromIndex(idx).toCMakeConfigItem(); const CMakeConfigItem item = ConfigModel::dataItemFromIndex(idx).toCMakeConfigItem();
@@ -1058,8 +1057,8 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
menu->addSeparator(); menu->addSeparator();
auto applyKitOrInitialValue = new QAction(isInitialConfiguration() auto applyKitOrInitialValue = new QAction(isInitialConfiguration()
? tr("Apply Kit Value") ? Tr::tr("Apply Kit Value")
: tr("Apply Initial Configuration Value"), : Tr::tr("Apply Initial Configuration Value"),
this); this);
menu->addAction(applyKitOrInitialValue); menu->addAction(applyKitOrInitialValue);
connect(applyKitOrInitialValue, &QAction::triggered, this, [this] { connect(applyKitOrInitialValue, &QAction::triggered, this, [this] {
@@ -1079,7 +1078,7 @@ bool CMakeBuildSettingsWidget::eventFilter(QObject *target, QEvent *event)
menu->addSeparator(); menu->addSeparator();
auto copy = new QAction(tr("Copy"), this); auto copy = new QAction(Tr::tr("Copy"), this);
menu->addAction(copy); menu->addAction(copy);
connect(copy, &QAction::triggered, this, [this] { connect(copy, &QAction::triggered, this, [this] {
const QModelIndexList selectedIndexes = m_configView->selectionModel()->selectedIndexes(); const QModelIndexList selectedIndexes = m_configView->selectionModel()->selectedIndexes();
@@ -1377,8 +1376,8 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
if (QDir(oldDir).exists("CMakeCache.txt") && !QDir(newDir).exists("CMakeCache.txt")) { if (QDir(oldDir).exists("CMakeCache.txt") && !QDir(newDir).exists("CMakeCache.txt")) {
if (QMessageBox::information( if (QMessageBox::information(
Core::ICore::dialogParent(), Core::ICore::dialogParent(),
tr("Changing Build Directory"), Tr::tr("Changing Build Directory"),
tr("Change the build directory to \"%1\" and start with a " Tr::tr("Change the build directory to \"%1\" and start with a "
"basic CMake configuration?") "basic CMake configuration?")
.arg(newDir), .arg(newDir),
QMessageBox::Ok, QMessageBox::Ok,
@@ -1398,7 +1397,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); }); additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); });
macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG, macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG,
tr("The CMake flag for the development team"), Tr::tr("The CMake flag for the development team"),
[this] { [this] {
const CMakeConfig flags = signingFlags(); const CMakeConfig flags = signingFlags();
if (!flags.isEmpty()) if (!flags.isEmpty())
@@ -1406,7 +1405,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
return QString(); return QString();
}); });
macroExpander()->registerVariable(PROVISIONING_PROFILE_FLAG, macroExpander()->registerVariable(PROVISIONING_PROFILE_FLAG,
tr("The CMake flag for the provisioning profile"), Tr::tr("The CMake flag for the provisioning profile"),
[this] { [this] {
const CMakeConfig flags = signingFlags(); const CMakeConfig flags = signingFlags();
if (flags.size() > 1 && !flags.at(1).isUnset) { if (flags.size() > 1 && !flags.at(1).isUnset) {
@@ -1416,7 +1415,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
}); });
macroExpander()->registerVariable(CMAKE_OSX_ARCHITECTURES_FLAG, macroExpander()->registerVariable(CMAKE_OSX_ARCHITECTURES_FLAG,
tr("The CMake flag for the architecture on macOS"), Tr::tr("The CMake flag for the architecture on macOS"),
[target] { [target] {
if (HostOsInfo::isRunningUnderRosetta()) { if (HostOsInfo::isRunningUnderRosetta()) {
if (auto *qt = QtSupport::QtKitAspect::qtVersion(target->kit())) { if (auto *qt = QtSupport::QtKitAspect::qtVersion(target->kit())) {
@@ -1430,7 +1429,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
return QLatin1String(); return QLatin1String();
}); });
macroExpander()->registerVariable(QT_QML_DEBUG_FLAG, macroExpander()->registerVariable(QT_QML_DEBUG_FLAG,
tr("The CMake flag for QML debugging, if enabled"), Tr::tr("The CMake flag for QML debugging, if enabled"),
[this] { [this] {
if (aspect<QtSupport::QmlDebuggingAspect>()->value() if (aspect<QtSupport::QmlDebuggingAspect>()->value()
== TriState::Enabled) { == TriState::Enabled) {
@@ -1997,17 +1996,17 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType)
break; break;
case BuildTypeMinSizeRel: case BuildTypeMinSizeRel:
info.typeName = "MinSizeRel"; info.typeName = "MinSizeRel";
info.displayName = CMakeBuildConfiguration::tr("Minimum Size Release"); info.displayName = Tr::tr("Minimum Size Release");
info.buildType = BuildConfiguration::Release; info.buildType = BuildConfiguration::Release;
break; break;
case BuildTypeRelWithDebInfo: case BuildTypeRelWithDebInfo:
info.typeName = "RelWithDebInfo"; info.typeName = "RelWithDebInfo";
info.displayName = CMakeBuildConfiguration::tr("Release with Debug Information"); info.displayName = Tr::tr("Release with Debug Information");
info.buildType = BuildConfiguration::Profile; info.buildType = BuildConfiguration::Profile;
break; break;
case BuildTypeProfile: { case BuildTypeProfile: {
info.typeName = "Profile"; info.typeName = "Profile";
info.displayName = CMakeBuildConfiguration::tr("Profile"); info.displayName = Tr::tr("Profile");
info.buildType = BuildConfiguration::Profile; info.buildType = BuildConfiguration::Profile;
QVariantMap extraInfo; QVariantMap extraInfo;
// override CMake build type, which defaults to info.typeName // override CMake build type, which defaults to info.typeName
@@ -2125,9 +2124,9 @@ Environment CMakeBuildConfiguration::baseConfigureEnvironment() const
QString CMakeBuildConfiguration::baseConfigureEnvironmentText() const QString CMakeBuildConfiguration::baseConfigureEnvironmentText() const
{ {
if (useClearConfigureEnvironment()) if (useClearConfigureEnvironment())
return tr("Clean Environment"); return Tr::tr("Clean Environment");
else else
return tr("System Environment"); return Tr::tr("System Environment");
} }
QString CMakeBuildSystem::cmakeBuildType() const QString CMakeBuildSystem::cmakeBuildType() const
@@ -2262,7 +2261,7 @@ void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const
InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect() InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect()
{ {
setSettingsKey("CMake.Initial.Parameters"); setSettingsKey("CMake.Initial.Parameters");
setLabelText(tr("Additional CMake <a href=\"options\">options</a>:")); setLabelText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
setDisplayStyle(LineEditDisplay); setDisplayStyle(LineEditDisplay);
} }
@@ -2273,7 +2272,7 @@ InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect()
AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect() AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect()
{ {
setSettingsKey("CMake.Additional.Options"); setSettingsKey("CMake.Additional.Options");
setLabelText(tr("Additional CMake <a href=\"options\">options</a>:")); setLabelText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
setDisplayStyle(LineEditDisplay); setDisplayStyle(LineEditDisplay);
} }
@@ -2292,7 +2291,7 @@ SourceDirectoryAspect::SourceDirectoryAspect()
BuildTypeAspect::BuildTypeAspect() BuildTypeAspect::BuildTypeAspect()
{ {
setSettingsKey(CMAKE_BUILD_TYPE); setSettingsKey(CMAKE_BUILD_TYPE);
setLabelText(tr("Build type:")); setLabelText(Tr::tr("Build type:"));
setDisplayStyle(LineEditDisplay); setDisplayStyle(LineEditDisplay);
setDefaultValue("Unknown"); setDefaultValue("Unknown");
} }

47
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -9,6 +9,7 @@
#include "cmakeparser.h" #include "cmakeparser.h"
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketool.h" #include "cmaketool.h"
#include <coreplugin/find/itemviewfind.h> #include <coreplugin/find/itemviewfind.h>
@@ -38,8 +39,7 @@ using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets"; const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets";
const char CMAKE_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.CMakeArguments"; const char CMAKE_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.CMakeArguments";
@@ -112,17 +112,17 @@ QVariant CMakeTargetItem::data(int column, int role) const
if (column == 0) { if (column == 0) {
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
if (m_target.isEmpty()) if (m_target.isEmpty())
return CMakeBuildStep::tr("Current executable"); return Tr::tr("Current executable");
return m_target; return m_target;
} }
if (role == Qt::ToolTipRole) { if (role == Qt::ToolTipRole) {
if (m_target.isEmpty()) { if (m_target.isEmpty()) {
return CMakeBuildStep::tr("Build the executable used in the active run " return Tr::tr("Build the executable used in the active run "
"configuration. Currently: %1") "configuration. Currently: %1")
.arg(m_step->activeRunConfigTarget()); .arg(m_step->activeRunConfigTarget());
} }
return CMakeBuildStep::tr("Target: %1").arg(m_target); return Tr::tr("Target: %1").arg(m_target);
} }
if (role == Qt::CheckStateRole) if (role == Qt::CheckStateRole)
@@ -161,12 +161,12 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
{ {
m_cmakeArguments = addAspect<StringAspect>(); m_cmakeArguments = addAspect<StringAspect>();
m_cmakeArguments->setSettingsKey(CMAKE_ARGUMENTS_KEY); m_cmakeArguments->setSettingsKey(CMAKE_ARGUMENTS_KEY);
m_cmakeArguments->setLabelText(tr("CMake arguments:")); m_cmakeArguments->setLabelText(Tr::tr("CMake arguments:"));
m_cmakeArguments->setDisplayStyle(StringAspect::LineEditDisplay); m_cmakeArguments->setDisplayStyle(StringAspect::LineEditDisplay);
m_toolArguments = addAspect<StringAspect>(); m_toolArguments = addAspect<StringAspect>();
m_toolArguments->setSettingsKey(TOOL_ARGUMENTS_KEY); m_toolArguments->setSettingsKey(TOOL_ARGUMENTS_KEY);
m_toolArguments->setLabelText(tr("Tool arguments:")); m_toolArguments->setLabelText(Tr::tr("Tool arguments:"));
m_toolArguments->setDisplayStyle(StringAspect::LineEditDisplay); m_toolArguments->setDisplayStyle(StringAspect::LineEditDisplay);
Kit *kit = buildConfiguration()->kit(); Kit *kit = buildConfiguration()->kit();
@@ -176,13 +176,13 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
m_useiOSAutomaticProvisioningUpdates->setSettingsKey( m_useiOSAutomaticProvisioningUpdates->setSettingsKey(
IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY); IOS_AUTOMATIC_PROVISIONG_UPDATES_ARGUMENTS_KEY);
m_useiOSAutomaticProvisioningUpdates->setLabel( m_useiOSAutomaticProvisioningUpdates->setLabel(
tr("Enable automatic provisioning updates:")); Tr::tr("Enable automatic provisioning updates:"));
m_useiOSAutomaticProvisioningUpdates->setToolTip( m_useiOSAutomaticProvisioningUpdates->setToolTip(
tr("Tells xcodebuild to create and download a provisioning profile " Tr::tr("Tells xcodebuild to create and download a provisioning profile "
"if a valid one does not exist.")); "if a valid one does not exist."));
} }
m_buildTargetModel.setHeader({tr("Target")}); m_buildTargetModel.setHeader({Tr::tr("Target")});
setBuildTargets({defaultBuildTarget()}); setBuildTargets({defaultBuildTarget()});
auto *bs = qobject_cast<CMakeBuildSystem *>(buildSystem()); auto *bs = qobject_cast<CMakeBuildSystem *>(buildSystem());
@@ -248,7 +248,7 @@ bool CMakeBuildStep::init()
if (!bc->isEnabled()) { if (!bc->isEnabled()) {
emit addTask(BuildSystemTask(Task::Error, emit addTask(BuildSystemTask(Task::Error,
tr("The build configuration is currently disabled."))); Tr::tr("The build configuration is currently disabled.")));
emitFaultyConfigurationMessage(); emitFaultyConfigurationMessage();
return false; return false;
} }
@@ -256,7 +256,7 @@ bool CMakeBuildStep::init()
CMakeTool *tool = CMakeKitAspect::cmakeTool(kit()); CMakeTool *tool = CMakeKitAspect::cmakeTool(kit());
if (!tool || !tool->isValid()) { if (!tool || !tool->isValid()) {
emit addTask(BuildSystemTask(Task::Error, emit addTask(BuildSystemTask(Task::Error,
tr("A CMake tool must be set up for building. " Tr::tr("A CMake tool must be set up for building. "
"Configure a CMake tool in the kit options."))); "Configure a CMake tool in the kit options.")));
emitFaultyConfigurationMessage(); emitFaultyConfigurationMessage();
return false; return false;
@@ -280,7 +280,7 @@ bool CMakeBuildStep::init()
if (bc->buildDirectory() != projectDirectory) { if (bc->buildDirectory() != projectDirectory) {
if (projectDirectory.pathAppended("CMakeCache.txt").exists()) { if (projectDirectory.pathAppended("CMakeCache.txt").exists()) {
emit addTask(BuildSystemTask(Task::Warning, emit addTask(BuildSystemTask(Task::Warning,
tr("There is a CMakeCache.txt file in \"%1\", which suggest an " Tr::tr("There is a CMakeCache.txt file in \"%1\", which suggest an "
"in-source build was done before. You are now building in \"%2\", " "in-source build was done before. You are now building in \"%2\", "
"and the CMakeCache.txt file might confuse CMake.") "and the CMakeCache.txt file might confuse CMake.")
.arg(projectDirectory.toUserOutput(), bc->buildDirectory().toUserOutput()))); .arg(projectDirectory.toUserOutput(), bc->buildDirectory().toUserOutput())));
@@ -323,10 +323,10 @@ void CMakeBuildStep::doRun()
m_waiting = false; m_waiting = false;
auto bs = static_cast<CMakeBuildSystem *>(buildSystem()); auto bs = static_cast<CMakeBuildSystem *>(buildSystem());
if (bs->persistCMakeState()) { if (bs->persistCMakeState()) {
emit addOutput(tr("Persisting CMake state..."), BuildStep::OutputFormat::NormalMessage); emit addOutput(Tr::tr("Persisting CMake state..."), BuildStep::OutputFormat::NormalMessage);
m_waiting = true; m_waiting = true;
} else if (buildSystem()->isWaitingForParse()) { } else if (buildSystem()->isWaitingForParse()) {
emit addOutput(tr("Running CMake in preparation to build..."), BuildStep::OutputFormat::NormalMessage); emit addOutput(Tr::tr("Running CMake in preparation to build..."), BuildStep::OutputFormat::NormalMessage);
m_waiting = true; m_waiting = true;
} }
@@ -353,7 +353,7 @@ void CMakeBuildStep::handleProjectWasParsed(bool success)
} else if (success) { } else if (success) {
runImpl(); runImpl();
} else { } else {
AbstractProcessStep::stdError(tr("Project did not parse successfully, cannot build.")); AbstractProcessStep::stdError(Tr::tr("Project did not parse successfully, cannot build."));
emit finished(false); emit finished(false);
} }
} }
@@ -518,7 +518,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
setSummaryText(summaryText); setSummaryText(summaryText);
}; };
setDisplayName(tr("Build", "ConfigWidget display name.")); setDisplayName(Tr::tr("Build", "ConfigWidget display name."));
auto buildTargetsView = new QTreeView; auto buildTargetsView = new QTreeView;
buildTargetsView->setMinimumHeight(200); buildTargetsView->setMinimumHeight(200);
@@ -530,7 +530,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
ItemViewFind::LightColored); ItemViewFind::LightColored);
auto createAndAddEnvironmentWidgets = [this](Layouting::Form &builder) { auto createAndAddEnvironmentWidgets = [this](Layouting::Form &builder) {
auto clearBox = new QCheckBox(tr("Clear system environment")); auto clearBox = new QCheckBox(Tr::tr("Clear system environment"));
clearBox->setChecked(useClearEnvironment()); clearBox->setChecked(useClearEnvironment());
auto envWidget = new EnvironmentWidget(nullptr, EnvironmentWidget::TypeLocal, clearBox); auto envWidget = new EnvironmentWidget(nullptr, EnvironmentWidget::TypeLocal, clearBox);
@@ -564,7 +564,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
if (m_useiOSAutomaticProvisioningUpdates) if (m_useiOSAutomaticProvisioningUpdates)
builder.addRow(m_useiOSAutomaticProvisioningUpdates); builder.addRow(m_useiOSAutomaticProvisioningUpdates);
builder.addRow({new QLabel(tr("Targets:")), frame}); builder.addRow({new QLabel(Tr::tr("Targets:")), frame});
if (!isCleanStep() && !m_buildPreset.isEmpty()) if (!isCleanStep() && !m_buildPreset.isEmpty())
createAndAddEnvironmentWidgets(builder); createAndAddEnvironmentWidgets(builder);
@@ -712,9 +712,9 @@ Environment CMakeBuildStep::baseEnvironment() const
QString CMakeBuildStep::baseEnvironmentText() const QString CMakeBuildStep::baseEnvironmentText() const
{ {
if (useClearEnvironment()) if (useClearEnvironment())
return tr("Clean Environment"); return Tr::tr("Clean Environment");
else else
return tr("System Environment"); return Tr::tr("System Environment");
} }
void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status) void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status)
@@ -728,11 +728,10 @@ void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status)
CMakeBuildStepFactory::CMakeBuildStepFactory() CMakeBuildStepFactory::CMakeBuildStepFactory()
{ {
registerStep<CMakeBuildStep>(Constants::CMAKE_BUILD_STEP_ID); registerStep<CMakeBuildStep>(Constants::CMAKE_BUILD_STEP_ID);
setDisplayName(CMakeBuildStep::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id.")); setDisplayName(Tr::tr("CMake Build", "Display name for CMakeProjectManager::CMakeBuildStep id."));
setSupportedProjectType(Constants::CMAKE_PROJECT_ID); setSupportedProjectType(Constants::CMAKE_PROJECT_ID);
} }
} // Internal } // CMakeProjectManager::Internal
} // CMakeProjectManager
#include <cmakebuildstep.moc> #include <cmakebuildstep.moc>

6
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -11,8 +11,7 @@ class CommandLine;
class StringAspect; class StringAspect;
} // Utils } // Utils
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeBuildStep; class CMakeBuildStep;
@@ -123,5 +122,4 @@ public:
CMakeBuildStepFactory(); CMakeBuildStepFactory();
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

29
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -11,6 +11,7 @@
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectnodes.h" #include "cmakeprojectnodes.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h" #include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h" #include "cmakespecificsettings.h"
#include "projecttreehelper.h" #include "projecttreehelper.h"
@@ -59,8 +60,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
static void copySourcePathsToClipboard(const FilePaths &srcPaths, const ProjectNode *node) static void copySourcePathsToClipboard(const FilePaths &srcPaths, const ProjectNode *node)
{ {
@@ -92,8 +92,8 @@ static void noAutoAdditionNotify(const FilePaths &filePaths, const ProjectNode *
bool checkValue{false}; bool checkValue{false};
QDialogButtonBox::StandardButton reply = CheckableMessageBox::question( QDialogButtonBox::StandardButton reply = CheckableMessageBox::question(
Core::ICore::dialogParent(), Core::ICore::dialogParent(),
QMessageBox::tr("Copy to Clipboard?"), Tr::tr("Copy to Clipboard?"),
QMessageBox::tr("Files are not automatically added to the " Tr::tr("Files are not automatically added to the "
"CMakeLists.txt file of the CMake project." "CMakeLists.txt file of the CMake project."
"\nCopy the path to the source files to the clipboard?"), "\nCopy the path to the source files to the clipboard?"),
"Remember My Choice", "Remember My Choice",
@@ -359,7 +359,7 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa
if (!tool || !tool->isValid()) { if (!tool || !tool->isValid()) {
TaskHub::addTask( TaskHub::addTask(
BuildSystemTask(Task::Error, BuildSystemTask(Task::Error,
tr("The kit needs to define a CMake tool to parse this project."))); Tr::tr("The kit needs to define a CMake tool to parse this project.")));
return; return;
} }
if (!tool->hasFileApi()) { if (!tool->hasFileApi()) {
@@ -391,8 +391,8 @@ bool CMakeBuildSystem::mustApplyConfigurationChangesArguments(const BuildDirPara
return false; return false;
int answer = QMessageBox::question(Core::ICore::dialogParent(), int answer = QMessageBox::question(Core::ICore::dialogParent(),
tr("Apply configuration changes?"), Tr::tr("Apply configuration changes?"),
"<p>" + tr("Run CMake with configuration changes?") "<p>" + Tr::tr("Run CMake with configuration changes?")
+ "</p><pre>" + "</p><pre>"
+ parameters.configurationChangesArguments.join("\n") + parameters.configurationChangesArguments.join("\n")
+ "</pre>", + "</pre>",
@@ -498,7 +498,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
if (restoredFromBackup) if (restoredFromBackup)
project()->addIssue( project()->addIssue(
CMakeProject::IssueType::Warning, CMakeProject::IssueType::Warning,
tr("<b>CMake configuration failed<b>" Tr::tr("<b>CMake configuration failed<b>"
"<p>The backup of the previous configuration has been restored.</p>" "<p>The backup of the previous configuration has been restored.</p>"
"<p>Issues and \"Projects > Build\" settings " "<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p")); "show more information about the failure.</p"));
@@ -516,7 +516,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
project()->addIssue( project()->addIssue(
CMakeProject::IssueType::Warning, CMakeProject::IssueType::Warning,
tr("<b>Failed to load project<b>" Tr::tr("<b>Failed to load project<b>"
"<p>Issues and \"Projects > Build\" settings " "<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p")); "show more information about the failure.</p"));
} }
@@ -704,7 +704,7 @@ void CMakeBuildSystem::updateFallbackProjectData()
QTC_CHECK(m_treeScanner.isFinished()); QTC_CHECK(m_treeScanner.isFinished());
if (m_treeScanner.asyncScanForFiles(projectDirectory())) if (m_treeScanner.asyncScanForFiles(projectDirectory()))
Core::ProgressManager::addTask(m_treeScanner.future(), Core::ProgressManager::addTask(m_treeScanner.future(),
tr("Scan \"%1\" project tree") Tr::tr("Scan \"%1\" project tree")
.arg(project()->displayName()), .arg(project()->displayName()),
"CMake.Scan.Tree"); "CMake.Scan.Tree");
} }
@@ -853,13 +853,13 @@ void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters &parameters
const FilePath bdir = parameters.buildDirectory; const FilePath bdir = parameters.buildDirectory;
if (!buildConfiguration()->createBuildDirectory()) { if (!buildConfiguration()->createBuildDirectory()) {
handleParsingFailed(tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput())); handleParsingFailed(Tr::tr("Failed to create build directory \"%1\".").arg(bdir.toUserOutput()));
return; return;
} }
const CMakeTool *tool = parameters.cmakeTool(); const CMakeTool *tool = parameters.cmakeTool();
if (!tool) { if (!tool) {
handleParsingFailed(tr("No CMake tool set up in kit.")); handleParsingFailed(Tr::tr("No CMake tool set up in kit."));
return; return;
} }
@@ -867,7 +867,7 @@ void CMakeBuildSystem::ensureBuildDirectory(const BuildDirParameters &parameters
if (!tool->cmakeExecutable().ensureReachable(bdir)) { if (!tool->cmakeExecutable().ensureReachable(bdir)) {
// Make sure that the build directory is available on the device. // Make sure that the build directory is available on the device.
handleParsingFailed( handleParsingFailed(
tr("The remote CMake executable cannot write to the local build directory.")); Tr::tr("The remote CMake executable cannot write to the local build directory."));
} }
} }
} }
@@ -1337,5 +1337,4 @@ MakeInstallCommand CMakeBuildSystem::makeInstallCommand(const FilePath &installR
return cmd; return cmd;
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

5
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -3,6 +3,8 @@
#include "cmakeconfigitem.h" #include "cmakeconfigitem.h"
#include "cmakeprojectmanagertr.h"
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
@@ -337,8 +339,7 @@ CMakeConfig CMakeConfig::fromFile(const Utils::FilePath &cacheFile, QString *err
QFile cache(cacheFile.toString()); QFile cache(cacheFile.toString());
if (!cache.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!cache.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (errorMessage) if (errorMessage)
*errorMessage = QCoreApplication::translate("CMakeProjectManager::CMakeConfigItem", "Failed to open %1 for reading.") *errorMessage = Tr::tr("Failed to open %1 for reading.").arg(cacheFile.toUserOutput());
.arg(cacheFile.toUserOutput());
return CMakeConfig(); return CMakeConfig();
} }

1
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -5,7 +5,6 @@
#include "cmake_global.h" #include "cmake_global.h"
#include <QByteArray> #include <QByteArray>
#include <QStringList> #include <QStringList>

12
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -21,13 +21,18 @@
using namespace Core; using namespace Core;
using namespace TextEditor; using namespace TextEditor;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
// //
// CMakeEditor // CMakeEditor
// //
class CMakeEditor : public TextEditor::BaseTextEditor
{
public:
void contextHelp(const HelpCallback &callback) const final;
};
void CMakeEditor::contextHelp(const HelpCallback &callback) const void CMakeEditor::contextHelp(const HelpCallback &callback) const
{ {
int pos = position(); int pos = position();
@@ -239,5 +244,4 @@ CMakeEditorFactory::CMakeEditorFactory()
contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION)); contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION));
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

18
src/plugins/cmakeprojectmanager/cmakeeditor.h
View File

@@ -5,20 +5,7 @@
#include <texteditor/texteditor.h> #include <texteditor/texteditor.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeEditorWidget;
class CMakeEditor : public TextEditor::BaseTextEditor
{
Q_OBJECT
public:
void contextHelp(const HelpCallback &callback) const override;
friend class CMakeEditorWidget;
};
class CMakeEditorFactory : public TextEditor::TextEditorFactory class CMakeEditorFactory : public TextEditor::TextEditorFactory
{ {
@@ -26,5 +13,4 @@ public:
CMakeEditorFactory(); CMakeEditorFactory();
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

21
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
View File

@@ -14,18 +14,18 @@
#include <QFileInfo> #include <QFileInfo>
using namespace CMakeProjectManager::Internal;
using namespace TextEditor; using namespace TextEditor;
using namespace ProjectExplorer; using namespace ProjectExplorer;
// ------------------------------- namespace CMakeProjectManager::Internal {
// CMakeFileCompletionAssistProvider
// -------------------------------
IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor(const AssistInterface *) const class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor
{ {
return new CMakeFileCompletionAssist; public:
} CMakeFileCompletionAssist();
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) final;
};
CMakeFileCompletionAssist::CMakeFileCompletionAssist() : CMakeFileCompletionAssist::CMakeFileCompletionAssist() :
KeywordsCompletionAssistProcessor(Keywords()) KeywordsCompletionAssistProcessor(Keywords())
@@ -50,3 +50,10 @@ IAssistProposal *CMakeFileCompletionAssist::perform(const AssistInterface *inter
setKeywords(kw); setKeywords(kw);
return KeywordsCompletionAssistProcessor::perform(interface); return KeywordsCompletionAssistProcessor::perform(interface);
} }
IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor(const AssistInterface *) const
{
return new CMakeFileCompletionAssist;
}
} // CMakeProjectManager::Internal

19
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h
View File

@@ -5,25 +5,12 @@
#include <texteditor/codeassist/keywordscompletionassist.h> #include <texteditor/codeassist/keywordscompletionassist.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor
{
public:
CMakeFileCompletionAssist();
// IAssistProcessor interface
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
};
class CMakeFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider class CMakeFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider
{ {
Q_OBJECT
public: public:
TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override; TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const final;
}; };
} // Internal } // CMakeProjectManager::Internal
} // CMakeProjectManager

8
src/plugins/cmakeprojectmanager/cmakeindenter.cpp
View File

@@ -3,8 +3,7 @@
#include "cmakeindenter.h" #include "cmakeindenter.h"
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
CMakeIndenter::CMakeIndenter(QTextDocument *doc) CMakeIndenter::CMakeIndenter(QTextDocument *doc)
: TextEditor::TextIndenter(doc) : TextEditor::TextIndenter(doc)
@@ -111,7 +110,4 @@ int CMakeIndenter::indentFor(const QTextBlock &block,
return qMax(0, indentation); return qMax(0, indentation);
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

6
src/plugins/cmakeprojectmanager/cmakeindenter.h
View File

@@ -7,8 +7,7 @@
#include <texteditor/textindenter.h> #include <texteditor/textindenter.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMAKE_EXPORT CMakeIndenter : public TextEditor::TextIndenter class CMAKE_EXPORT CMakeIndenter : public TextEditor::TextIndenter
{ {
@@ -21,5 +20,4 @@ public:
int cursorPositionInEditor = -1) override; int cursorPositionInEditor = -1) override;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

99
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -1,10 +1,11 @@
// Copyright (C) 2016 Canonical Ltd. // Copyright (C) 2016 Canonical Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "cmakeconfigitem.h"
#include "cmakekitinformation.h" #include "cmakekitinformation.h"
#include "cmakeconfigitem.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h" #include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h" #include "cmakespecificsettings.h"
#include "cmaketool.h" #include "cmaketool.h"
@@ -50,9 +51,6 @@ using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager {
// --------------------------------------------------------------------
// CMakeKitAspect:
// --------------------------------------------------------------------
static bool isIos(const Kit *k) static bool isIos(const Kit *k)
{ {
@@ -69,7 +67,6 @@ static Id defaultCMakeToolId()
class CMakeKitAspectWidget final : public KitAspectWidget class CMakeKitAspectWidget final : public KitAspectWidget
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeKitAspect)
public: public:
CMakeKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki), CMakeKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki),
m_comboBox(createSubWidget<QComboBox>()), m_comboBox(createSubWidget<QComboBox>()),
@@ -137,7 +134,7 @@ private:
m_comboBox->removeItem(pos); m_comboBox->removeItem(pos);
if (m_comboBox->count() == 0) { if (m_comboBox->count() == 0) {
m_comboBox->addItem(tr("<No CMake Tool available>"), Id().toSetting()); m_comboBox->addItem(Tr::tr("<No CMake Tool available>"), Id().toSetting());
m_comboBox->setEnabled(false); m_comboBox->setEnabled(false);
} else { } else {
m_comboBox->setEnabled(true); m_comboBox->setEnabled(true);
@@ -199,8 +196,8 @@ CMakeKitAspect::CMakeKitAspect()
{ {
setObjectName(QLatin1String("CMakeKitAspect")); setObjectName(QLatin1String("CMakeKitAspect"));
setId(Constants::TOOL_ID); setId(Constants::TOOL_ID);
setDisplayName(tr("CMake Tool")); setDisplayName(Tr::tr("CMake Tool"));
setDescription(tr("The CMake Tool to use when building a project with CMake.<br>" setDescription(Tr::tr("The CMake Tool to use when building a project with CMake.<br>"
"This setting is ignored when using other build systems.")); "This setting is ignored when using other build systems."));
setPriority(20000); setPriority(20000);
@@ -278,7 +275,7 @@ void CMakeKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const
{ {
const CMakeTool *const tool = cmakeTool(k); const CMakeTool *const tool = cmakeTool(k);
return {{tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")}}; return {{Tr::tr("CMake"), tool ? tool->displayName() : Tr::tr("Unconfigured")}};
} }
KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
@@ -290,7 +287,7 @@ KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
void CMakeKitAspect::addToMacroExpander(Kit *k, MacroExpander *expander) const void CMakeKitAspect::addToMacroExpander(Kit *k, MacroExpander *expander) const
{ {
QTC_ASSERT(k, return); QTC_ASSERT(k, return);
expander->registerFileVariables("CMake:Executable", tr("Path to the cmake executable"), expander->registerFileVariables("CMake:Executable", Tr::tr("Path to the cmake executable"),
[k] { [k] {
CMakeTool *tool = CMakeKitAspect::cmakeTool(k); CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
return tool ? tool->cmakeExecutable() : FilePath(); return tool ? tool->cmakeExecutable() : FilePath();
@@ -306,7 +303,7 @@ QSet<Id> CMakeKitAspect::availableFeatures(const Kit *k) const
QString CMakeKitAspect::msgUnsupportedVersion(const QByteArray &versionString) QString CMakeKitAspect::msgUnsupportedVersion(const QByteArray &versionString)
{ {
return tr("CMake version %1 is unsupported. Update to " return Tr::tr("CMake version %1 is unsupported. Update to "
"version 3.14 (with file-api) or later.") "version 3.14 (with file-api) or later.")
.arg(QString::fromUtf8(versionString)); .arg(QString::fromUtf8(versionString));
} }
@@ -324,8 +321,6 @@ const char TOOLSET_KEY[] = "Toolset";
class CMakeGeneratorKitAspectWidget final : public KitAspectWidget class CMakeGeneratorKitAspectWidget final : public KitAspectWidget
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeGeneratorKitAspect)
public: public:
CMakeGeneratorKitAspectWidget(Kit *kit, const KitAspect *ki) CMakeGeneratorKitAspectWidget(Kit *kit, const KitAspect *ki)
: KitAspectWidget(kit, ki), : KitAspectWidget(kit, ki),
@@ -338,7 +333,7 @@ public:
}); });
m_label->setToolTip(ki->description()); m_label->setToolTip(ki->description());
m_changeButton->setText(tr("Change...")); m_changeButton->setText(Tr::tr("Change..."));
refresh(); refresh();
connect(m_changeButton, &QPushButton::clicked, connect(m_changeButton, &QPushButton::clicked,
this, &CMakeGeneratorKitAspectWidget::changeGenerator); this, &CMakeGeneratorKitAspectWidget::changeGenerator);
@@ -380,9 +375,9 @@ private:
messageLabel << generator; messageLabel << generator;
if (!platform.isEmpty()) if (!platform.isEmpty())
messageLabel << ", " << tr("Platform") << ": " << platform; messageLabel << ", " << Tr::tr("Platform") << ": " << platform;
if (!toolset.isEmpty()) if (!toolset.isEmpty())
messageLabel << ", " << tr("Toolset") << ": " << toolset; messageLabel << ", " << Tr::tr("Toolset") << ": " << toolset;
m_label->setText(messageLabel.join("")); m_label->setText(messageLabel.join(""));
} }
@@ -396,7 +391,7 @@ private:
flags |= Qt::MSWindowsFixedSizeDialogHint; flags |= Qt::MSWindowsFixedSizeDialogHint;
changeDialog->setWindowFlags(flags); changeDialog->setWindowFlags(flags);
changeDialog->setWindowTitle(tr("CMake Generator")); changeDialog->setWindowTitle(Tr::tr("CMake Generator"));
auto layout = new QGridLayout(changeDialog); auto layout = new QGridLayout(changeDialog);
layout->setSizeConstraint(QLayout::SetFixedSize); layout->setSizeConstraint(QLayout::SetFixedSize);
@@ -414,19 +409,19 @@ private:
layout->addWidget(cmakeLabel, row, 1); layout->addWidget(cmakeLabel, row, 1);
++row; ++row;
layout->addWidget(new QLabel(tr("Generator:")), row, 0); layout->addWidget(new QLabel(Tr::tr("Generator:")), row, 0);
layout->addWidget(generatorCombo, row, 1); layout->addWidget(generatorCombo, row, 1);
++row; ++row;
layout->addWidget(new QLabel(tr("Extra generator:")), row, 0); layout->addWidget(new QLabel(Tr::tr("Extra generator:")), row, 0);
layout->addWidget(extraGeneratorCombo, row, 1); layout->addWidget(extraGeneratorCombo, row, 1);
++row; ++row;
layout->addWidget(new QLabel(tr("Platform:")), row, 0); layout->addWidget(new QLabel(Tr::tr("Platform:")), row, 0);
layout->addWidget(platformEdit, row, 1); layout->addWidget(platformEdit, row, 1);
++row; ++row;
layout->addWidget(new QLabel(tr("Toolset:")), row, 0); layout->addWidget(new QLabel(Tr::tr("Toolset:")), row, 0);
layout->addWidget(toolsetEdit, row, 1); layout->addWidget(toolsetEdit, row, 1);
++row; ++row;
@@ -452,7 +447,7 @@ private:
generatorCombo->setCurrentText(name); generatorCombo->setCurrentText(name);
extraGeneratorCombo->clear(); extraGeneratorCombo->clear();
extraGeneratorCombo->addItem(tr("<none>"), QString()); extraGeneratorCombo->addItem(Tr::tr("<none>"), QString());
for (const QString &eg : qAsConst(it->extraGenerators)) for (const QString &eg : qAsConst(it->extraGenerators))
extraGeneratorCombo->addItem(eg, eg); extraGeneratorCombo->addItem(eg, eg);
extraGeneratorCombo->setEnabled(extraGeneratorCombo->count() > 1); extraGeneratorCombo->setEnabled(extraGeneratorCombo->count() > 1);
@@ -550,8 +545,8 @@ CMakeGeneratorKitAspect::CMakeGeneratorKitAspect()
{ {
setObjectName(QLatin1String("CMakeGeneratorKitAspect")); setObjectName(QLatin1String("CMakeGeneratorKitAspect"));
setId(GENERATOR_ID); setId(GENERATOR_ID);
setDisplayName(tr("CMake <a href=\"generator\">generator</a>")); setDisplayName(Tr::tr("CMake <a href=\"generator\">generator</a>"));
setDescription(tr("CMake generator defines how a project is built when using CMake.<br>" setDescription(Tr::tr("CMake generator defines how a project is built when using CMake.<br>"
"This setting is ignored when using other build systems.")); "This setting is ignored when using other build systems."));
setPriority(19000); setPriority(19000);
} }
@@ -755,7 +750,7 @@ Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const
}; };
if (!tool->isValid()) { if (!tool->isValid()) {
addWarning(tr("CMake Tool is unconfigured, CMake generator will be ignored.")); addWarning(Tr::tr("CMake Tool is unconfigured, CMake generator will be ignored."));
} else { } else {
const GeneratorInfo info = generatorInfo(k); const GeneratorInfo info = generatorInfo(k);
QList<CMakeTool::Generator> known = tool->supportedGenerators(); QList<CMakeTool::Generator> known = tool->supportedGenerators();
@@ -763,15 +758,15 @@ Tasks CMakeGeneratorKitAspect::validate(const Kit *k) const
return g.matches(info.generator, info.extraGenerator); return g.matches(info.generator, info.extraGenerator);
}); });
if (it == known.constEnd()) { if (it == known.constEnd()) {
addWarning(tr("CMake Tool does not support the configured generator.")); addWarning(Tr::tr("CMake Tool does not support the configured generator."));
} else { } else {
if (!it->supportsPlatform && !info.platform.isEmpty()) if (!it->supportsPlatform && !info.platform.isEmpty())
addWarning(tr("Platform is not supported by the selected CMake generator.")); addWarning(Tr::tr("Platform is not supported by the selected CMake generator."));
if (!it->supportsToolset && !info.toolset.isEmpty()) if (!it->supportsToolset && !info.toolset.isEmpty())
addWarning(tr("Toolset is not supported by the selected CMake generator.")); addWarning(Tr::tr("Toolset is not supported by the selected CMake generator."));
} }
if (!tool->hasFileApi()) { if (!tool->hasFileApi()) {
addWarning(tr("The selected CMake binary does not support file-api. " addWarning(Tr::tr("The selected CMake binary does not support file-api. "
"%1 will not be able to parse CMake projects.") "%1 will not be able to parse CMake projects.")
.arg(Core::Constants::IDE_DISPLAY_NAME)); .arg(Core::Constants::IDE_DISPLAY_NAME));
} }
@@ -838,15 +833,15 @@ KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
const GeneratorInfo info = generatorInfo(k); const GeneratorInfo info = generatorInfo(k);
QString message; QString message;
if (info.generator.isEmpty()) { if (info.generator.isEmpty()) {
message = tr("<Use Default Generator>"); message = Tr::tr("<Use Default Generator>");
} else { } else {
message = tr("Generator: %1<br>Extra generator: %2").arg(info.generator).arg(info.extraGenerator); message = Tr::tr("Generator: %1<br>Extra generator: %2").arg(info.generator).arg(info.extraGenerator);
if (!info.platform.isEmpty()) if (!info.platform.isEmpty())
message += "<br/>" + tr("Platform: %1").arg(info.platform); message += "<br/>" + Tr::tr("Platform: %1").arg(info.platform);
if (!info.toolset.isEmpty()) if (!info.toolset.isEmpty())
message += "<br/>" + tr("Toolset: %1").arg(info.toolset); message += "<br/>" + Tr::tr("Toolset: %1").arg(info.toolset);
} }
return {{tr("CMake Generator"), message}}; return {{Tr::tr("CMake Generator"), message}};
} }
KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const
@@ -880,8 +875,6 @@ const char QTC_CMAKE_PRESET_KEY[] = "QTC_CMAKE_PRESET";
class CMakeConfigurationKitAspectWidget final : public KitAspectWidget class CMakeConfigurationKitAspectWidget final : public KitAspectWidget
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeConfigurationKitAspect)
public: public:
CMakeConfigurationKitAspectWidget(Kit *kit, const KitAspect *ki) CMakeConfigurationKitAspectWidget(Kit *kit, const KitAspect *ki)
: KitAspectWidget(kit, ki), : KitAspectWidget(kit, ki),
@@ -889,7 +882,7 @@ public:
m_manageButton(createSubWidget<QPushButton>()) m_manageButton(createSubWidget<QPushButton>())
{ {
refresh(); refresh();
m_manageButton->setText(tr("Change...")); m_manageButton->setText(Tr::tr("Change..."));
connect(m_manageButton, &QAbstractButton::clicked, connect(m_manageButton, &QAbstractButton::clicked,
this, &CMakeConfigurationKitAspectWidget::editConfigurationChanges); this, &CMakeConfigurationKitAspectWidget::editConfigurationChanges);
} }
@@ -940,11 +933,11 @@ private:
const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit()); const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit());
m_dialog = new QDialog(m_summaryLabel->window()); m_dialog = new QDialog(m_summaryLabel->window());
m_dialog->setWindowTitle(tr("Edit CMake Configuration")); m_dialog->setWindowTitle(Tr::tr("Edit CMake Configuration"));
auto layout = new QVBoxLayout(m_dialog); auto layout = new QVBoxLayout(m_dialog);
m_editor = new QPlainTextEdit; m_editor = new QPlainTextEdit;
auto editorLabel = new QLabel(m_dialog); auto editorLabel = new QLabel(m_dialog);
editorLabel->setText(tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>" editorLabel->setText(Tr::tr("Enter one CMake <a href=\"variable\">variable</a> per line.<br/>"
"To set a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>" "To set a variable, use -D&lt;variable&gt;:&lt;type&gt;=&lt;value&gt;.<br/>"
"&lt;type&gt; can have one of the following values: FILEPATH, PATH, " "&lt;type&gt; can have one of the following values: FILEPATH, PATH, "
"BOOL, INTERNAL, or STRING.")); "BOOL, INTERNAL, or STRING."));
@@ -959,7 +952,7 @@ private:
m_additionalEditor = new QLineEdit; m_additionalEditor = new QLineEdit;
auto additionalLabel = new QLabel(m_dialog); auto additionalLabel = new QLabel(m_dialog);
additionalLabel->setText(tr("Additional CMake <a href=\"options\">options</a>:")); additionalLabel->setText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
connect(additionalLabel, &QLabel::linkActivated, this, [=](const QString &) { connect(additionalLabel, &QLabel::linkActivated, this, [=](const QString &) {
CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options"); CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake.1.html#options");
}); });
@@ -1042,8 +1035,8 @@ CMakeConfigurationKitAspect::CMakeConfigurationKitAspect()
{ {
setObjectName(QLatin1String("CMakeConfigurationKitAspect")); setObjectName(QLatin1String("CMakeConfigurationKitAspect"));
setId(CONFIGURATION_ID); setId(CONFIGURATION_ID);
setDisplayName(tr("CMake Configuration")); setDisplayName(Tr::tr("CMake Configuration"));
setDescription(tr("Default configuration passed to CMake when setting up a project.")); setDescription(Tr::tr("Default configuration passed to CMake when setting up a project."));
setPriority(18000); setPriority(18000);
} }
@@ -1185,22 +1178,22 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
// Validate Qt: // Validate Qt:
if (qmakePath.isEmpty()) { if (qmakePath.isEmpty()) {
if (version && version->isValid() && isQt4) { if (version && version->isValid() && isQt4) {
addWarning(tr("CMake configuration has no path to qmake binary set, " addWarning(Tr::tr("CMake configuration has no path to qmake binary set, "
"even though the kit has a valid Qt version.")); "even though the kit has a valid Qt version."));
} }
} else { } else {
if (!version || !version->isValid()) { if (!version || !version->isValid()) {
addWarning(tr("CMake configuration has a path to a qmake binary set, " addWarning(Tr::tr("CMake configuration has a path to a qmake binary set, "
"even though the kit has no valid Qt version.")); "even though the kit has no valid Qt version."));
} else if (qmakePath != version->qmakeFilePath() && isQt4) { } else if (qmakePath != version->qmakeFilePath() && isQt4) {
addWarning(tr("CMake configuration has a path to a qmake binary set " addWarning(Tr::tr("CMake configuration has a path to a qmake binary set "
"that does not match the qmake binary path " "that does not match the qmake binary path "
"configured in the Qt version.")); "configured in the Qt version."));
} }
} }
if (version && !qtInstallDirs.contains(version->prefix().path()) && !isQt4) { if (version && !qtInstallDirs.contains(version->prefix().path()) && !isQt4) {
if (version->isValid()) { if (version->isValid()) {
addWarning(tr("CMake configuration has no CMAKE_PREFIX_PATH set " addWarning(Tr::tr("CMake configuration has no CMAKE_PREFIX_PATH set "
"that points to the kit Qt version.")); "that points to the kit Qt version."));
} }
} }
@@ -1208,15 +1201,15 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
// Validate Toolchains: // Validate Toolchains:
if (tcCPath.isEmpty()) { if (tcCPath.isEmpty()) {
if (tcC && tcC->isValid()) { if (tcC && tcC->isValid()) {
addWarning(tr("CMake configuration has no path to a C compiler set, " addWarning(Tr::tr("CMake configuration has no path to a C compiler set, "
"even though the kit has a valid tool chain.")); "even though the kit has a valid tool chain."));
} }
} else { } else {
if (!tcC || !tcC->isValid()) { if (!tcC || !tcC->isValid()) {
addWarning(tr("CMake configuration has a path to a C compiler set, " addWarning(Tr::tr("CMake configuration has a path to a C compiler set, "
"even though the kit has no valid tool chain.")); "even though the kit has no valid tool chain."));
} else if (tcCPath != tcC->compilerCommand() && tcCPath != tcC->compilerCommand().onDevice(tcCPath)) { } else if (tcCPath != tcC->compilerCommand() && tcCPath != tcC->compilerCommand().onDevice(tcCPath)) {
addWarning(tr("CMake configuration has a path to a C compiler set " addWarning(Tr::tr("CMake configuration has a path to a C compiler set "
"that does not match the compiler path " "that does not match the compiler path "
"configured in the tool chain of the kit.")); "configured in the tool chain of the kit."));
} }
@@ -1224,15 +1217,15 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
if (tcCxxPath.isEmpty()) { if (tcCxxPath.isEmpty()) {
if (tcCxx && tcCxx->isValid()) { if (tcCxx && tcCxx->isValid()) {
addWarning(tr("CMake configuration has no path to a C++ compiler set, " addWarning(Tr::tr("CMake configuration has no path to a C++ compiler set, "
"even though the kit has a valid tool chain.")); "even though the kit has a valid tool chain."));
} }
} else { } else {
if (!tcCxx || !tcCxx->isValid()) { if (!tcCxx || !tcCxx->isValid()) {
addWarning(tr("CMake configuration has a path to a C++ compiler set, " addWarning(Tr::tr("CMake configuration has a path to a C++ compiler set, "
"even though the kit has no valid tool chain.")); "even though the kit has no valid tool chain."));
} else if (tcCxxPath != tcCxx->compilerCommand() && tcCxxPath != tcCxx->compilerCommand().onDevice(tcCxxPath)) { } else if (tcCxxPath != tcCxx->compilerCommand() && tcCxxPath != tcCxx->compilerCommand().onDevice(tcCxxPath)) {
addWarning(tr("CMake configuration has a path to a C++ compiler set " addWarning(Tr::tr("CMake configuration has a path to a C++ compiler set "
"that does not match the compiler path " "that does not match the compiler path "
"configured in the tool chain of the kit.")); "configured in the tool chain of the kit."));
} }
@@ -1254,7 +1247,7 @@ void CMakeConfigurationKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
{ {
return {{tr("CMake Configuration"), toStringList(k).join("<br>")}}; return {{Tr::tr("CMake Configuration"), toStringList(k).join("<br>")}};
} }
KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const

6
src/plugins/cmakeprojectmanager/cmakekitinformation.h
View File

@@ -10,11 +10,11 @@
#include <projectexplorer/kitmanager.h> #include <projectexplorer/kitmanager.h>
namespace CMakeProjectManager { namespace CMakeProjectManager {
class CMakeTool; class CMakeTool;
class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
{ {
Q_OBJECT
public: public:
CMakeKitAspect(); CMakeKitAspect();
@@ -40,7 +40,6 @@ public:
class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
{ {
Q_OBJECT
public: public:
CMakeGeneratorKitAspect(); CMakeGeneratorKitAspect();
@@ -73,7 +72,6 @@ private:
class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
{ {
Q_OBJECT
public: public:
CMakeConfigurationKitAspect(); CMakeConfigurationKitAspect();
@@ -104,4 +102,4 @@ private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const; QVariant defaultValue(const ProjectExplorer::Kit *k) const;
}; };
} // namespace CMakeProjectManager } // CMakeProjectManager

16
src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
View File

@@ -6,8 +6,10 @@
#include "cmakebuildstep.h" #include "cmakebuildstep.h"
#include "cmakebuildsystem.h" #include "cmakebuildsystem.h"
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectmanagertr.h"
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
@@ -15,11 +17,11 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager::Internal {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// CMakeTargetLocatorFilter: // CMakeTargetLocatorFilter:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -93,8 +95,8 @@ void CMakeTargetLocatorFilter::projectListUpdated()
BuildCMakeTargetLocatorFilter::BuildCMakeTargetLocatorFilter() BuildCMakeTargetLocatorFilter::BuildCMakeTargetLocatorFilter()
{ {
setId("Build CMake target"); setId("Build CMake target");
setDisplayName(tr("Build CMake target")); setDisplayName(Tr::tr("Build CMake target"));
setDescription(tr("Builds a target of any open CMake project.")); setDescription(Tr::tr("Builds a target of any open CMake project."));
setDefaultShortcutString("cm"); setDefaultShortcutString("cm");
setPriority(High); setPriority(High);
} }
@@ -143,8 +145,8 @@ void BuildCMakeTargetLocatorFilter::accept(const Core::LocatorFilterEntry &selec
OpenCMakeTargetLocatorFilter::OpenCMakeTargetLocatorFilter() OpenCMakeTargetLocatorFilter::OpenCMakeTargetLocatorFilter()
{ {
setId("Open CMake target definition"); setId("Open CMake target definition");
setDisplayName(tr("Open CMake target")); setDisplayName(Tr::tr("Open CMake target"));
setDescription(tr("Jumps to the definition of a target of any open CMake project.")); setDescription(Tr::tr("Jumps to the definition of a target of any open CMake project."));
setDefaultShortcutString("cmo"); setDefaultShortcutString("cmo");
setPriority(Medium); setPriority(Medium);
} }
@@ -169,3 +171,5 @@ void OpenCMakeTargetLocatorFilter::accept(const Core::LocatorFilterEntry &select
else else
Core::EditorManager::openEditor(file, {}, Core::EditorManager::AllowExternalEditor); Core::EditorManager::openEditor(file, {}, Core::EditorManager::AllowExternalEditor);
} }
} // CMakeProjectManager::Internal

12
src/plugins/cmakeprojectmanager/cmakelocatorfilter.h
View File

@@ -5,13 +5,10 @@
#include <coreplugin/locator/ilocatorfilter.h> #include <coreplugin/locator/ilocatorfilter.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeTargetLocatorFilter : public Core::ILocatorFilter class CMakeTargetLocatorFilter : public Core::ILocatorFilter
{ {
Q_OBJECT
public: public:
CMakeTargetLocatorFilter(); CMakeTargetLocatorFilter();
@@ -27,8 +24,6 @@ private:
class BuildCMakeTargetLocatorFilter : CMakeTargetLocatorFilter class BuildCMakeTargetLocatorFilter : CMakeTargetLocatorFilter
{ {
Q_OBJECT
public: public:
BuildCMakeTargetLocatorFilter(); BuildCMakeTargetLocatorFilter();
@@ -40,8 +35,6 @@ public:
class OpenCMakeTargetLocatorFilter : CMakeTargetLocatorFilter class OpenCMakeTargetLocatorFilter : CMakeTargetLocatorFilter
{ {
Q_OBJECT
public: public:
OpenCMakeTargetLocatorFilter(); OpenCMakeTargetLocatorFilter();
@@ -51,5 +44,4 @@ public:
int *selectionLength) const final; int *selectionLength) const final;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

36
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -5,6 +5,7 @@
#include "builddirparameters.h" #include "builddirparameters.h"
#include "cmakeparser.h" #include "cmakeparser.h"
#include "cmakeprojectmanagertr.h"
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <projectexplorer/buildsystem.h> #include <projectexplorer/buildsystem.h>
@@ -17,12 +18,11 @@
#include <QFutureWatcher> #include <QFutureWatcher>
using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
using namespace ProjectExplorer;
const int USER_STOP_EXIT_CODE = 15; const int USER_STOP_EXIT_CODE = 15;
static QString stripTrailingNewline(QString str) static QString stripTrailingNewline(QString str)
@@ -57,7 +57,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory) if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)
|| !cmakeExecutable.ensureReachable(parameters.buildDirectory)) { || !cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( QString msg = ::CMakeProjectManager::Tr::tr(
"The source or build directory is not reachable by the CMake executable."); "The source or build directory is not reachable by the CMake executable.");
BuildSystem::appendBuildSystemOutput(msg + '\n'); BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished(); emit finished();
@@ -68,8 +68,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const FilePath buildDirectory = parameters.buildDirectory.onDevice(cmakeExecutable); const FilePath buildDirectory = parameters.buildDirectory.onDevice(cmakeExecutable);
if (!buildDirectory.exists()) { if (!buildDirectory.exists()) {
QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( QString msg = ::CMakeProjectManager::Tr::tr( "The build directory \"%1\" does not exist")
"The build directory \"%1\" does not exist")
.arg(buildDirectory.toUserOutput()); .arg(buildDirectory.toUserOutput());
BuildSystem::appendBuildSystemOutput(msg + '\n'); BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished(); emit finished();
@@ -78,9 +77,8 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
if (buildDirectory.needsDevice()) { if (buildDirectory.needsDevice()) {
if (cmake->cmakeExecutable().host() != buildDirectory.host()) { if (cmake->cmakeExecutable().host() != buildDirectory.host()) {
QString msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( QString msg = ::CMakeProjectManager::Tr::tr("CMake executable \"%1\" and build directory "
"CMake executable \"%1\" and build directory " "\"%2\" must be on the same device.")
"\"%2\" must be on the same device.")
.arg(cmake->cmakeExecutable().toUserOutput(), .arg(cmake->cmakeExecutable().toUserOutput(),
buildDirectory.toUserOutput()); buildDirectory.toUserOutput());
BuildSystem::appendBuildSystemOutput(msg + '\n'); BuildSystem::appendBuildSystemOutput(msg + '\n');
@@ -120,15 +118,13 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
BuildSystem::startNewBuildSystemOutput( BuildSystem::startNewBuildSystemOutput(::CMakeProjectManager::Tr::tr("Running %1 in %2.")
::CMakeProjectManager::Internal::CMakeProcess::tr("Running %1 in %2.")
.arg(commandLine.toUserOutput(), buildDirectory.toUserOutput())); .arg(commandLine.toUserOutput(), buildDirectory.toUserOutput()));
m_futureInterface = QFutureInterface<void>(); m_futureInterface = QFutureInterface<void>();
m_futureInterface.setProgressRange(0, 1); m_futureInterface.setProgressRange(0, 1);
Core::ProgressManager::addTimedTask(m_futureInterface, Core::ProgressManager::addTimedTask(m_futureInterface,
::CMakeProjectManager::Internal::CMakeProcess::tr( ::CMakeProjectManager::Tr::tr("Configuring \"%1\"")
"Configuring \"%1\"")
.arg(parameters.projectName), .arg(parameters.projectName),
"CMake.Configure", "CMake.Configure",
10); 10);
@@ -160,17 +156,14 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
QString msg; QString msg;
if (resultData.m_error == QProcess::FailedToStart) { if (resultData.m_error == QProcess::FailedToStart) {
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr("CMake process failed to start."); msg = ::CMakeProjectManager::Tr::tr("CMake process failed to start.");
} else if (resultData.m_exitStatus != QProcess::NormalExit) { } else if (resultData.m_exitStatus != QProcess::NormalExit) {
if (m_futureInterface.isCanceled() || code == USER_STOP_EXIT_CODE) if (m_futureInterface.isCanceled() || code == USER_STOP_EXIT_CODE)
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( msg = ::CMakeProjectManager::Tr::tr("CMake process was canceled by the user.");
"CMake process was canceled by the user.");
else else
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr("CMake process crashed."); msg = ::CMakeProjectManager::Tr::tr("CMake process crashed.");
} else if (code != 0) { } else if (code != 0) {
msg = ::CMakeProjectManager::Internal::CMakeProcess::tr( msg = ::CMakeProjectManager::Tr::tr("CMake process exited with exit code %1.") .arg(code);
"CMake process exited with exit code %1.")
.arg(code);
} }
m_lastExitCode = code; m_lastExitCode = code;
@@ -190,5 +183,4 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
BuildSystem::appendBuildSystemOutput(elapsedTime + '\n'); BuildSystem::appendBuildSystemOutput(elapsedTime + '\n');
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

6
src/plugins/cmakeprojectmanager/cmakeprocess.h
View File

@@ -22,8 +22,7 @@ class ProcessResultData;
class QtcProcess; class QtcProcess;
} }
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class BuildDirParameters; class BuildDirParameters;
@@ -55,5 +54,4 @@ private:
int m_lastExitCode = 0; int m_lastExitCode = 0;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

14
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -6,6 +6,7 @@
#include "cmakekitinformation.h" #include "cmakekitinformation.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectimporter.h" #include "cmakeprojectimporter.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketool.h" #include "cmaketool.h"
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
@@ -19,11 +20,10 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
using namespace CMakeProjectManager::Internal;
namespace CMakeProjectManager { namespace CMakeProjectManager {
using namespace Internal;
/*! /*!
\class CMakeProject \class CMakeProject
*/ */
@@ -49,9 +49,9 @@ Tasks CMakeProject::projectIssues(const Kit *k) const
Tasks result = Project::projectIssues(k); Tasks result = Project::projectIssues(k);
if (!CMakeKitAspect::cmakeTool(k)) if (!CMakeKitAspect::cmakeTool(k))
result.append(createProjectTask(Task::TaskType::Error, tr("No cmake tool set."))); result.append(createProjectTask(Task::TaskType::Error, Tr::tr("No cmake tool set.")));
if (ToolChainKitAspect::toolChains(k).isEmpty()) if (ToolChainKitAspect::toolChains(k).isEmpty())
result.append(createProjectTask(Task::TaskType::Warning, tr("No compilers set in kit."))); result.append(createProjectTask(Task::TaskType::Warning, Tr::tr("No compilers set in kit.")));
result.append(m_issues); result.append(m_issues);
@@ -115,7 +115,7 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
if (presetsHash.contains(p.name)) { if (presetsHash.contains(p.name)) {
TaskHub::addTask( TaskHub::addTask(
BuildSystemTask(Task::TaskType::Error, BuildSystemTask(Task::TaskType::Error,
tr("CMakeUserPresets.json cannot re-define the %1 preset: %2") Tr::tr("CMakeUserPresets.json cannot re-define the %1 preset: %2")
.arg(presetType) .arg(presetType)
.arg(p.name), .arg(p.name),
"CMakeUserPresets.json")); "CMakeUserPresets.json"));
@@ -158,7 +158,7 @@ void CMakeProject::setupBuildPresets(Internal::PresetsData &presetsData)
if (!buildPreset.configurePreset) { if (!buildPreset.configurePreset) {
TaskHub::addTask(BuildSystemTask( TaskHub::addTask(BuildSystemTask(
Task::TaskType::Error, Task::TaskType::Error,
tr("Build preset %1 is missing a corresponding configure preset.") Tr::tr("Build preset %1 is missing a corresponding configure preset.")
.arg(buildPreset.name))); .arg(buildPreset.name)));
TaskHub::requestPopup(); TaskHub::requestPopup();
} }
@@ -189,7 +189,7 @@ void CMakeProject::readPresets()
data = parser.presetsData(); data = parser.presetsData();
} else { } else {
TaskHub::addTask(BuildSystemTask(Task::TaskType::Error, TaskHub::addTask(BuildSystemTask(Task::TaskType::Error,
tr("Failed to load %1: %2") Tr::tr("Failed to load %1: %2")
.arg(presetFile.fileName()) .arg(presetFile.fileName())
.arg(errorMessage), .arg(errorMessage),
presetFile, presetFile,

3
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -6,6 +6,7 @@
#include "cmakebuildconfiguration.h" #include "cmakebuildconfiguration.h"
#include "cmakekitinformation.h" #include "cmakekitinformation.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketoolmanager.h" #include "cmaketoolmanager.h"
#include "presetsmacros.h" #include "presetsmacros.h"
@@ -488,7 +489,7 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath,
.canonicalPath(); .canonicalPath();
const FilePath canonicalProjectDirectory = projectDirectory().canonicalPath(); const FilePath canonicalProjectDirectory = projectDirectory().canonicalPath();
if (data->cmakeHomeDirectory != canonicalProjectDirectory) { if (data->cmakeHomeDirectory != canonicalProjectDirectory) {
*warningMessage = tr("Unexpected source directory \"%1\", expected \"%2\". " *warningMessage = Tr::tr("Unexpected source directory \"%1\", expected \"%2\". "
"This can be correct in some situations, for example when " "This can be correct in some situations, for example when "
"importing a standalone Qt test, but usually this is an error. " "importing a standalone Qt test, but usually this is an error. "
"Import the build anyway?") "Import the build anyway?")

2
src/plugins/cmakeprojectmanager/cmakeprojectimporter.h
View File

@@ -16,8 +16,6 @@ namespace Internal {
class CMakeProjectImporter : public QtSupport::QtProjectImporter class CMakeProjectImporter : public QtSupport::QtProjectImporter
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeProjectImporter)
public: public:
CMakeProjectImporter(const Utils::FilePath &path, const Internal::PresetsData &presetsData); CMakeProjectImporter(const Utils::FilePath &path, const Internal::PresetsData &presetsData);

19
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -7,6 +7,7 @@
#include "cmakekitinformation.h" #include "cmakekitinformation.h"
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectnodes.h" #include "cmakeprojectnodes.h"
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
@@ -32,10 +33,10 @@ using namespace ProjectExplorer;
using namespace CMakeProjectManager::Internal; using namespace CMakeProjectManager::Internal;
CMakeManager::CMakeManager() CMakeManager::CMakeManager()
: m_runCMakeAction(new QAction(QIcon(), tr("Run CMake"), this)) : m_runCMakeAction(new QAction(QIcon(), Tr::tr("Run CMake"), this))
, m_clearCMakeCacheAction(new QAction(QIcon(), tr("Clear CMake Configuration"), this)) , m_clearCMakeCacheAction(new QAction(QIcon(), Tr::tr("Clear CMake Configuration"), this))
, m_runCMakeActionContextMenu(new QAction(QIcon(), tr("Run CMake"), this)) , m_runCMakeActionContextMenu(new QAction(QIcon(), Tr::tr("Run CMake"), this))
, m_rescanProjectAction(new QAction(QIcon(), tr("Rescan Project"), this)) , m_rescanProjectAction(new QAction(QIcon(), Tr::tr("Rescan Project"), this))
{ {
Core::ActionContainer *mbuild = Core::ActionContainer *mbuild =
Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT); Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
@@ -77,7 +78,7 @@ CMakeManager::CMakeManager()
runCMake(ProjectTree::currentBuildSystem()); runCMake(ProjectTree::currentBuildSystem());
}); });
m_buildFileContextMenu = new QAction(tr("Build"), this); m_buildFileContextMenu = new QAction(Tr::tr("Build"), this);
command = Core::ActionManager::registerAction(m_buildFileContextMenu, command = Core::ActionManager::registerAction(m_buildFileContextMenu,
Constants::BUILD_FILE_CONTEXT_MENU, Constants::BUILD_FILE_CONTEXT_MENU,
projectContext); projectContext);
@@ -95,15 +96,15 @@ CMakeManager::CMakeManager()
rescanProject(ProjectTree::currentBuildSystem()); rescanProject(ProjectTree::currentBuildSystem());
}); });
m_buildFileAction = new Utils::ParameterAction(tr("Build File"), m_buildFileAction = new Utils::ParameterAction(Tr::tr("Build File"),
tr("Build File \"%1\""), Tr::tr("Build File \"%1\""),
Utils::ParameterAction::AlwaysEnabled, Utils::ParameterAction::AlwaysEnabled,
this); this);
command = Core::ActionManager::registerAction(m_buildFileAction, Constants::BUILD_FILE); command = Core::ActionManager::registerAction(m_buildFileAction, Constants::BUILD_FILE);
command->setAttribute(Core::Command::CA_Hide); command->setAttribute(Core::Command::CA_Hide);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);
command->setDescription(m_buildFileAction->text()); command->setDescription(m_buildFileAction->text());
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+B"))); command->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+B")));
mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_BUILD); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_BUILD);
connect(m_buildFileAction, &QAction::triggered, this, [this] { buildFile(); }); connect(m_buildFileAction, &QAction::triggered, this, [this] { buildFile(); });
@@ -230,7 +231,7 @@ void CMakeManager::buildFile(Node *node)
targetBase = relativeBuildDir / "CMakeFiles" / (targetNode->displayName() + ".dir"); targetBase = relativeBuildDir / "CMakeFiles" / (targetNode->displayName() + ".dir");
} else if (!generator.contains("Makefiles")) { } else if (!generator.contains("Makefiles")) {
Core::MessageManager::writeFlashing( Core::MessageManager::writeFlashing(
tr("Build File is not supported for generator \"%1\"").arg(generator)); Tr::tr("Build File is not supported for generator \"%1\"").arg(generator));
return; return;
} }

42
src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
View File

@@ -5,29 +5,32 @@
#include "cmakebuildsystem.h" #include "cmakebuildsystem.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include <android/androidconstants.h> #include <android/androidconstants.h>
#include <ios/iosconstants.h> #include <ios/iosconstants.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
CMakeInputsNode::CMakeInputsNode(const Utils::FilePath &cmakeLists) : CMakeInputsNode::CMakeInputsNode(const FilePath &cmakeLists) :
ProjectExplorer::ProjectNode(cmakeLists) ProjectExplorer::ProjectNode(cmakeLists)
{ {
setPriority(Node::DefaultPriority - 10); // Bottom most! setPriority(Node::DefaultPriority - 10); // Bottom most!
setDisplayName(QCoreApplication::translate("CMakeFilesProjectNode", "CMake Modules")); setDisplayName(Tr::tr("CMake Modules"));
setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_MODULES)); setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_MODULES));
setListInProject(false); setListInProject(false);
} }
CMakeListsNode::CMakeListsNode(const Utils::FilePath &cmakeListPath) : CMakeListsNode::CMakeListsNode(const FilePath &cmakeListPath) :
ProjectExplorer::ProjectNode(cmakeListPath) ProjectExplorer::ProjectNode(cmakeListPath)
{ {
setIcon(DirectoryIcon(Constants::Icons::FILE_OVERLAY)); setIcon(DirectoryIcon(Constants::Icons::FILE_OVERLAY));
@@ -39,12 +42,12 @@ bool CMakeListsNode::showInSimpleTree() const
return false; return false;
} }
std::optional<Utils::FilePath> CMakeListsNode::visibleAfterAddFileAction() const std::optional<FilePath> CMakeListsNode::visibleAfterAddFileAction() const
{ {
return filePath().pathAppended("CMakeLists.txt"); return filePath().pathAppended("CMakeLists.txt");
} }
CMakeProjectNode::CMakeProjectNode(const Utils::FilePath &directory) : CMakeProjectNode::CMakeProjectNode(const FilePath &directory) :
ProjectExplorer::ProjectNode(directory) ProjectExplorer::ProjectNode(directory)
{ {
setPriority(Node::DefaultProjectPriority + 1000); setPriority(Node::DefaultProjectPriority + 1000);
@@ -57,7 +60,7 @@ QString CMakeProjectNode::tooltip() const
return QString(); return QString();
} }
CMakeTargetNode::CMakeTargetNode(const Utils::FilePath &directory, const QString &target) : CMakeTargetNode::CMakeTargetNode(const FilePath &directory, const QString &target) :
ProjectExplorer::ProjectNode(directory) ProjectExplorer::ProjectNode(directory)
{ {
m_target = target; m_target = target;
@@ -77,17 +80,17 @@ QString CMakeTargetNode::buildKey() const
return m_target; return m_target;
} }
Utils::FilePath CMakeTargetNode::buildDirectory() const FilePath CMakeTargetNode::buildDirectory() const
{ {
return m_buildDirectory; return m_buildDirectory;
} }
void CMakeTargetNode::setBuildDirectory(const Utils::FilePath &directory) void CMakeTargetNode::setBuildDirectory(const FilePath &directory)
{ {
m_buildDirectory = directory; m_buildDirectory = directory;
} }
QVariant CMakeTargetNode::data(Utils::Id role) const QVariant CMakeTargetNode::data(Id role) const
{ {
auto value = [this](const QByteArray &key) -> QVariant { auto value = [this](const QByteArray &key) -> QVariant {
for (const CMakeConfigItem &configItem : m_config) { for (const CMakeConfigItem &configItem : m_config) {
@@ -169,7 +172,7 @@ void CMakeTargetNode::setConfig(const CMakeConfig &config)
m_config = config; m_config = config;
} }
std::optional<Utils::FilePath> CMakeTargetNode::visibleAfterAddFileAction() const std::optional<FilePath> CMakeTargetNode::visibleAfterAddFileAction() const
{ {
return filePath().pathAppended("CMakeLists.txt"); return filePath().pathAppended("CMakeLists.txt");
} }
@@ -182,19 +185,16 @@ void CMakeTargetNode::build()
static_cast<CMakeBuildSystem *>(t->buildSystem())->buildCMakeTarget(displayName()); static_cast<CMakeBuildSystem *>(t->buildSystem())->buildCMakeTarget(displayName());
} }
void CMakeTargetNode::setTargetInformation(const QList<Utils::FilePath> &artifacts, void CMakeTargetNode::setTargetInformation(const QList<FilePath> &artifacts, const QString &type)
const QString &type)
{ {
m_tooltip = QCoreApplication::translate("CMakeTargetNode", "Target type: ") + type + "<br>"; m_tooltip = Tr::tr("Target type: ") + type + "<br>";
if (artifacts.isEmpty()) { if (artifacts.isEmpty()) {
m_tooltip += QCoreApplication::translate("CMakeTargetNode", "No build artifacts"); m_tooltip += Tr::tr("No build artifacts");
} else { } else {
const QStringList tmp = Utils::transform(artifacts, &Utils::FilePath::toUserOutput); const QStringList tmp = Utils::transform(artifacts, &FilePath::toUserOutput);
m_tooltip += QCoreApplication::translate("CMakeTargetNode", "Build artifacts:") + "<br>" m_tooltip += Tr::tr("Build artifacts:") + "<br>" + tmp.join("<br>");
+ tmp.join("<br>");
m_artifact = artifacts.first(); m_artifact = artifacts.first();
} }
} }
} // Internal } // CMakeProjectManager::Internal
} // CMakeBuildSystem

6
src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
View File

@@ -7,8 +7,7 @@
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeInputsNode : public ProjectExplorer::ProjectNode class CMakeInputsNode : public ProjectExplorer::ProjectNode
{ {
@@ -59,5 +58,4 @@ private:
CMakeConfig m_config; CMakeConfig m_config;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

15
src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
View File

@@ -12,6 +12,7 @@
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanager.h" #include "cmakeprojectmanager.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectnodes.h" #include "cmakeprojectnodes.h"
#include "cmakesettingspage.h" #include "cmakesettingspage.h"
#include "cmakespecificsettings.h" #include "cmakespecificsettings.h"
@@ -20,9 +21,11 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmanager.h> #include <projectexplorer/projectmanager.h>
#include <projectexplorer/projecttree.h> #include <projectexplorer/projecttree.h>
#include <texteditor/snippets/snippetprovider.h> #include <texteditor/snippets/snippetprovider.h>
#include <utils/fsengine/fileiconprovider.h> #include <utils/fsengine/fileiconprovider.h>
@@ -32,8 +35,7 @@ using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeProjectPluginPrivate class CMakeProjectPluginPrivate
{ {
@@ -41,8 +43,8 @@ public:
CMakeToolManager cmakeToolManager; // have that before the first CMakeKitAspect CMakeToolManager cmakeToolManager; // have that before the first CMakeKitAspect
ParameterAction buildTargetContextAction{ ParameterAction buildTargetContextAction{
CMakeProjectPlugin::tr("Build"), Tr::tr("Build"),
CMakeProjectPlugin:: tr("Build \"%1\""), Tr::tr("Build \"%1\""),
ParameterAction::AlwaysEnabled/*handled manually*/ ParameterAction::AlwaysEnabled/*handled manually*/
}; };
@@ -86,7 +88,7 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
"CMakeLists.txt"); "CMakeLists.txt");
TextEditor::SnippetProvider::registerGroup(Constants::CMAKE_SNIPPETS_GROUP_ID, TextEditor::SnippetProvider::registerGroup(Constants::CMAKE_SNIPPETS_GROUP_ID,
tr("CMake", "SnippetProvider")); Tr::tr("CMake", "SnippetProvider"));
ProjectManager::registerProjectType<CMakeProject>(Constants::CMAKE_PROJECT_MIMETYPE); ProjectManager::registerProjectType<CMakeProject>(Constants::CMAKE_PROJECT_MIMETYPE);
//register actions //register actions
@@ -131,6 +133,5 @@ void CMakeProjectPlugin::updateContextActions(Node *node)
d->buildTargetContextAction.setVisible(targetNode); d->buildTargetContextAction.setVisible(targetNode);
} }
} // Internal } // CMakeProjectManager::Internal
} // CMakeProjectManager

6
src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
View File

@@ -7,8 +7,7 @@
namespace ProjectExplorer { class Node; } namespace ProjectExplorer { class Node; }
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeSpecificSettings; class CMakeSpecificSettings;
@@ -45,5 +44,4 @@ private:
class CMakeProjectPluginPrivate *d = nullptr; class CMakeProjectPluginPrivate *d = nullptr;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

67
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -4,6 +4,7 @@
#include "cmakesettingspage.h" #include "cmakesettingspage.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketool.h" #include "cmaketool.h"
#include "cmaketoolmanager.h" #include "cmaketoolmanager.h"
@@ -21,7 +22,6 @@
#include <QBoxLayout> #include <QBoxLayout>
#include <QCheckBox> #include <QCheckBox>
#include <QCoreApplication>
#include <QFormLayout> #include <QFormLayout>
#include <QHeaderView> #include <QHeaderView>
#include <QLabel> #include <QLabel>
@@ -42,8 +42,6 @@ class CMakeToolTreeItem;
class CMakeToolItemModel : public TreeModel<TreeItem, TreeItem, CMakeToolTreeItem> class CMakeToolItemModel : public TreeModel<TreeItem, TreeItem, CMakeToolTreeItem>
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage)
public: public:
CMakeToolItemModel(); CMakeToolItemModel();
@@ -77,8 +75,6 @@ private:
class CMakeToolTreeItem : public TreeItem class CMakeToolTreeItem : public TreeItem
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage)
public: public:
CMakeToolTreeItem(const CMakeTool *item, bool changed) CMakeToolTreeItem(const CMakeTool *item, bool changed)
: m_id(item->id()) : m_id(item->id())
@@ -122,9 +118,9 @@ public:
cmake.setFilePath(m_executable); cmake.setFilePath(m_executable);
m_isSupported = cmake.hasFileApi(); m_isSupported = cmake.hasFileApi();
m_tooltip = tr("Version: %1").arg(cmake.versionDisplay()); m_tooltip = Tr::tr("Version: %1").arg(cmake.versionDisplay());
m_tooltip += "<br>" + tr("Supports fileApi: %1").arg(m_isSupported ? tr("yes") : tr("no")); m_tooltip += "<br>" + Tr::tr("Supports fileApi: %1").arg(m_isSupported ? Tr::tr("yes") : Tr::tr("no"));
m_tooltip += "<br>" + tr("Detection source: \"%1\"").arg(m_detectionSource); m_tooltip += "<br>" + Tr::tr("Detection source: \"%1\"").arg(m_detectionSource);
m_versionDisplay = cmake.versionDisplay(); m_versionDisplay = cmake.versionDisplay();
} }
@@ -141,7 +137,7 @@ public:
case 0: { case 0: {
QString name = m_name; QString name = m_name;
if (model()->defaultItemId() == m_id) if (model()->defaultItemId() == m_id)
name += tr(" (Default)"); name += Tr::tr(" (Default)");
return name; return name;
} }
case 1: { case 1: {
@@ -160,20 +156,13 @@ public:
QString result = m_tooltip; QString result = m_tooltip;
QString error; QString error;
if (!m_pathExists) { if (!m_pathExists) {
error = QCoreApplication::translate( error = Tr::tr("CMake executable path does not exist.");
"CMakeProjectManager::Internal::CMakeToolTreeItem",
"CMake executable path does not exist.");
} else if (!m_pathIsFile) { } else if (!m_pathIsFile) {
error = QCoreApplication::translate( error = Tr::tr("CMake executable path is not a file.");
"CMakeProjectManager::Internal::CMakeToolTreeItem",
"CMake executable path is not a file.");
} else if (!m_pathIsExecutable) { } else if (!m_pathIsExecutable) {
error = QCoreApplication::translate( error = Tr::tr("CMake executable path is not executable.");
"CMakeProjectManager::Internal::CMakeToolTreeItem",
"CMake executable path is not executable.");
} else if (!m_isSupported) { } else if (!m_isSupported) {
error = QCoreApplication::translate( error = Tr::tr(
"CMakeProjectManager::Internal::CMakeToolTreeItem",
"CMake executable does not provide required IDE integration features."); "CMake executable does not provide required IDE integration features.");
} }
if (result.isEmpty() || error.isEmpty()) if (result.isEmpty() || error.isEmpty())
@@ -213,11 +202,11 @@ public:
CMakeToolItemModel::CMakeToolItemModel() CMakeToolItemModel::CMakeToolItemModel()
{ {
setHeader({tr("Name"), tr("Path")}); setHeader({Tr::tr("Name"), Tr::tr("Path")});
rootItem()->appendChild( rootItem()->appendChild(
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()}, new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
{ProjectExplorer::Constants::msgAutoDetectedToolTip()})); {ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
rootItem()->appendChild(new StaticTreeItem(tr("Manual"))); rootItem()->appendChild(new StaticTreeItem(Tr::tr("Manual")));
const QList<CMakeTool *> items = CMakeToolManager::cmakeTools(); const QList<CMakeTool *> items = CMakeToolManager::cmakeTools();
for (const CMakeTool *item : items) for (const CMakeTool *item : items)
@@ -400,8 +389,6 @@ QString CMakeToolItemModel::uniqueDisplayName(const QString &base) const
class CMakeToolItemConfigWidget : public QWidget class CMakeToolItemConfigWidget : public QWidget
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage)
public: public:
explicit CMakeToolItemConfigWidget(CMakeToolItemModel *model); explicit CMakeToolItemConfigWidget(CMakeToolItemModel *model);
void load(const CMakeToolTreeItem *item); void load(const CMakeToolTreeItem *item);
@@ -437,20 +424,20 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model)
m_qchFileChooser->setMinimumWidth(400); m_qchFileChooser->setMinimumWidth(400);
m_qchFileChooser->setHistoryCompleter(QLatin1String("Cmake.qchFile.History")); m_qchFileChooser->setHistoryCompleter(QLatin1String("Cmake.qchFile.History"));
m_qchFileChooser->setPromptDialogFilter("*.qch"); m_qchFileChooser->setPromptDialogFilter("*.qch");
m_qchFileChooser->setPromptDialogTitle(tr("CMake .qch File")); m_qchFileChooser->setPromptDialogTitle(Tr::tr("CMake .qch File"));
m_versionLabel = new QLabel(this); m_versionLabel = new QLabel(this);
m_autoRunCheckBox = new QCheckBox; m_autoRunCheckBox = new QCheckBox;
m_autoRunCheckBox->setText(tr("Autorun CMake")); m_autoRunCheckBox->setText(Tr::tr("Autorun CMake"));
m_autoRunCheckBox->setToolTip(tr("Automatically run CMake after changes to CMake project files.")); m_autoRunCheckBox->setToolTip(Tr::tr("Automatically run CMake after changes to CMake project files."));
auto formLayout = new QFormLayout(this); auto formLayout = new QFormLayout(this);
formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
formLayout->addRow(new QLabel(tr("Name:")), m_displayNameLineEdit); formLayout->addRow(new QLabel(Tr::tr("Name:")), m_displayNameLineEdit);
formLayout->addRow(new QLabel(tr("Path:")), m_binaryChooser); formLayout->addRow(new QLabel(Tr::tr("Path:")), m_binaryChooser);
formLayout->addRow(new QLabel(tr("Version:")), m_versionLabel); formLayout->addRow(new QLabel(Tr::tr("Version:")), m_versionLabel);
formLayout->addRow(new QLabel(tr("Help file:")), m_qchFileChooser); formLayout->addRow(new QLabel(Tr::tr("Help file:")), m_qchFileChooser);
formLayout->addRow(m_autoRunCheckBox); formLayout->addRow(m_autoRunCheckBox);
connect(m_binaryChooser, &PathChooser::browsingFinished, this, &CMakeToolItemConfigWidget::onBinaryPathEditingFinished); connect(m_binaryChooser, &PathChooser::browsingFinished, this, &CMakeToolItemConfigWidget::onBinaryPathEditingFinished);
@@ -517,22 +504,20 @@ void CMakeToolItemConfigWidget::load(const CMakeToolTreeItem *item)
class CMakeToolConfigWidget : public Core::IOptionsPageWidget class CMakeToolConfigWidget : public Core::IOptionsPageWidget
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeToolConfigWidget)
public: public:
CMakeToolConfigWidget() CMakeToolConfigWidget()
{ {
m_addButton = new QPushButton(tr("Add"), this); m_addButton = new QPushButton(Tr::tr("Add"), this);
m_cloneButton = new QPushButton(tr("Clone"), this); m_cloneButton = new QPushButton(Tr::tr("Clone"), this);
m_cloneButton->setEnabled(false); m_cloneButton->setEnabled(false);
m_delButton = new QPushButton(tr("Remove"), this); m_delButton = new QPushButton(Tr::tr("Remove"), this);
m_delButton->setEnabled(false); m_delButton->setEnabled(false);
m_makeDefButton = new QPushButton(tr("Make Default"), this); m_makeDefButton = new QPushButton(Tr::tr("Make Default"), this);
m_makeDefButton->setEnabled(false); m_makeDefButton->setEnabled(false);
m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new kit or when no value is set.")); m_makeDefButton->setToolTip(Tr::tr("Set as the default CMake Tool to use when creating a new kit or when no value is set."));
m_container = new DetailsWidget(this); m_container = new DetailsWidget(this);
m_container->setState(DetailsWidget::NoSummary); m_container->setState(DetailsWidget::NoSummary);
@@ -613,7 +598,7 @@ void CMakeToolConfigWidget::cloneCMakeTool()
if (!m_currentItem) if (!m_currentItem)
return; return;
QModelIndex newItem = m_model.addCMakeTool(tr("Clone of %1").arg(m_currentItem->m_name), QModelIndex newItem = m_model.addCMakeTool(Tr::tr("Clone of %1").arg(m_currentItem->m_name),
m_currentItem->m_executable, m_currentItem->m_executable,
m_currentItem->m_qchFile, m_currentItem->m_qchFile,
m_currentItem->m_isAutoRun, m_currentItem->m_isAutoRun,
@@ -624,7 +609,7 @@ void CMakeToolConfigWidget::cloneCMakeTool()
void CMakeToolConfigWidget::addCMakeTool() void CMakeToolConfigWidget::addCMakeTool()
{ {
QModelIndex newItem = m_model.addCMakeTool(m_model.uniqueDisplayName(tr("New CMake")), QModelIndex newItem = m_model.addCMakeTool(m_model.uniqueDisplayName(Tr::tr("New CMake")),
FilePath(), FilePath(),
FilePath(), FilePath(),
true, true,
@@ -681,7 +666,7 @@ void CMakeToolConfigWidget::currentCMakeToolChanged(const QModelIndex &newCurren
CMakeSettingsPage::CMakeSettingsPage() CMakeSettingsPage::CMakeSettingsPage()
{ {
setId(Constants::Settings::TOOLS_ID); setId(Constants::Settings::TOOLS_ID);
setDisplayName(tr("Tools")); setDisplayName(Tr::Tr::tr("Tools"));
setDisplayCategory("CMake"); setDisplayCategory("CMake");
setCategory(Constants::Settings::CATEGORY); setCategory(Constants::Settings::CATEGORY);
setWidgetCreator([] { return new CMakeToolConfigWidget; }); setWidgetCreator([] { return new CMakeToolConfigWidget; });

31
src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
View File

@@ -1,9 +1,11 @@
// Copyright (C) 2018 The Qt Company Ltd. // Copyright (C) 2018 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "cmakeprojectconstants.h"
#include "cmakespecificsettings.h" #include "cmakespecificsettings.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectmanagertr.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -11,8 +13,7 @@
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
CMakeSpecificSettings::CMakeSpecificSettings() CMakeSpecificSettings::CMakeSpecificSettings()
{ {
@@ -25,10 +26,10 @@ CMakeSpecificSettings::CMakeSpecificSettings()
registerAspect(&afterAddFileSetting); registerAspect(&afterAddFileSetting);
afterAddFileSetting.setSettingsKey("ProjectPopupSetting"); afterAddFileSetting.setSettingsKey("ProjectPopupSetting");
afterAddFileSetting.setDefaultValue(AfterAddFileAction::AskUser); afterAddFileSetting.setDefaultValue(AfterAddFileAction::AskUser);
afterAddFileSetting.addOption(tr("Ask about copying file paths")); afterAddFileSetting.addOption(::CMakeProjectManager::Tr::tr("Ask about copying file paths"));
afterAddFileSetting.addOption(tr("Do not copy file paths")); afterAddFileSetting.addOption(::CMakeProjectManager::Tr::tr("Do not copy file paths"));
afterAddFileSetting.addOption(tr("Copy file paths")); afterAddFileSetting.addOption(::CMakeProjectManager::Tr::tr("Copy file paths"));
afterAddFileSetting.setToolTip(tr("Determines whether file paths are copied " afterAddFileSetting.setToolTip(::CMakeProjectManager::Tr::tr("Determines whether file paths are copied "
"to the clipboard for pasting to the CMakeLists.txt file when you " "to the clipboard for pasting to the CMakeLists.txt file when you "
"add new files to CMake projects.")); "add new files to CMake projects."));
@@ -41,21 +42,22 @@ CMakeSpecificSettings::CMakeSpecificSettings()
registerAspect(&packageManagerAutoSetup); registerAspect(&packageManagerAutoSetup);
packageManagerAutoSetup.setSettingsKey("PackageManagerAutoSetup"); packageManagerAutoSetup.setSettingsKey("PackageManagerAutoSetup");
packageManagerAutoSetup.setDefaultValue(false); packageManagerAutoSetup.setDefaultValue(false);
packageManagerAutoSetup.setLabelText(tr("Package manager auto setup")); packageManagerAutoSetup.setLabelText(::CMakeProjectManager::Tr::tr("Package manager auto setup"));
packageManagerAutoSetup.setToolTip(tr("Add the CMAKE_PROJECT_INCLUDE_BEFORE variable " packageManagerAutoSetup.setToolTip(::CMakeProjectManager::Tr::tr("Add the CMAKE_PROJECT_INCLUDE_BEFORE variable "
"pointing to a CMake script that will install dependencies from the conanfile.txt, " "pointing to a CMake script that will install dependencies from the conanfile.txt, "
"conanfile.py, or vcpkg.json file from the project source directory.")); "conanfile.py, or vcpkg.json file from the project source directory."));
registerAspect(&askBeforeReConfigureInitialParams); registerAspect(&askBeforeReConfigureInitialParams);
askBeforeReConfigureInitialParams.setSettingsKey("AskReConfigureInitialParams"); askBeforeReConfigureInitialParams.setSettingsKey("AskReConfigureInitialParams");
askBeforeReConfigureInitialParams.setDefaultValue(true); askBeforeReConfigureInitialParams.setDefaultValue(true);
askBeforeReConfigureInitialParams.setLabelText(tr("Ask before re-configuring with " askBeforeReConfigureInitialParams.setLabelText(::CMakeProjectManager::Tr::tr("Ask before re-configuring with "
"initial parameters")); "initial parameters"));
registerAspect(&showSourceSubFolders); registerAspect(&showSourceSubFolders);
showSourceSubFolders.setSettingsKey("ShowSourceSubFolders"); showSourceSubFolders.setSettingsKey("ShowSourceSubFolders");
showSourceSubFolders.setDefaultValue(true); showSourceSubFolders.setDefaultValue(true);
showSourceSubFolders.setLabelText(tr("Show subfolders inside source group folders")); showSourceSubFolders.setLabelText(
::CMakeProjectManager::Tr::tr("Show subfolders inside source group folders"));
} }
// CMakeSpecificSettingsPage // CMakeSpecificSettingsPage
@@ -63,7 +65,7 @@ CMakeSpecificSettings::CMakeSpecificSettings()
CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *settings) CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *settings)
{ {
setId(Constants::Settings::GENERAL_ID); setId(Constants::Settings::GENERAL_ID);
setDisplayName(tr("General")); setDisplayName(::CMakeProjectManager::Tr::tr("General"));
setDisplayCategory("CMake"); setDisplayCategory("CMake");
setCategory(Constants::Settings::CATEGORY); setCategory(Constants::Settings::CATEGORY);
setCategoryIconPath(Constants::Icons::SETTINGS_CATEGORY); setCategoryIconPath(Constants::Icons::SETTINGS_CATEGORY);
@@ -74,7 +76,7 @@ CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *sett
using namespace Layouting; using namespace Layouting;
Column { Column {
Group { Group {
title(::CMakeProjectManager::Internal::CMakeSpecificSettings::tr("Adding Files")), title(::CMakeProjectManager::Tr::tr("Adding Files")),
Column { s.afterAddFileSetting } Column { s.afterAddFileSetting }
}, },
s.packageManagerAutoSetup, s.packageManagerAutoSetup,
@@ -85,5 +87,4 @@ CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *sett
}); });
} }
} // Internal } // CMakeProjectManager::Internal
} // CMakeProjectManager

8
src/plugins/cmakeprojectmanager/cmakespecificsettings.h
View File

@@ -7,8 +7,7 @@
#include <utils/aspects.h> #include <utils/aspects.h>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
enum AfterAddFileAction : int { enum AfterAddFileAction : int {
AskUser, AskUser,
@@ -18,8 +17,6 @@ enum AfterAddFileAction : int {
class CMakeSpecificSettings final : public Utils::AspectContainer class CMakeSpecificSettings final : public Utils::AspectContainer
{ {
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeSpecificSettings)
public: public:
CMakeSpecificSettings(); CMakeSpecificSettings();
@@ -36,5 +33,4 @@ public:
explicit CMakeSpecificSettingsPage(CMakeSpecificSettings *settings); explicit CMakeSpecificSettingsPage(CMakeSpecificSettings *settings);
}; };
} // Internal } // CMakeProjectManager::Internal
} // CMakeProjectManager

3
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -3,6 +3,7 @@
#include "cmaketool.h" #include "cmaketool.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketoolmanager.h" #include "cmaketoolmanager.h"
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
@@ -294,7 +295,7 @@ CMakeTool::Version CMakeTool::version() const
QString CMakeTool::versionDisplay() const QString CMakeTool::versionDisplay() const
{ {
if (!isValid()) if (!isValid())
return CMakeToolManager::tr("Version not parseable"); return Tr::tr("Version not parseable");
const Version &version = m_introspection->m_version; const Version &version = m_introspection->m_version;
if (version.fullVersion.isEmpty()) if (version.fullVersion.isEmpty())

23
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -3,6 +3,7 @@
#include "cmaketoolmanager.h" #include "cmaketoolmanager.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketoolsettingsaccessor.h" #include "cmaketoolsettingsaccessor.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -19,10 +20,6 @@ using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager {
// --------------------------------------------------------------------
// CMakeToolManagerPrivate:
// --------------------------------------------------------------------
class CMakeToolManagerPrivate class CMakeToolManagerPrivate
{ {
public: public:
@@ -30,12 +27,8 @@ public:
std::vector<std::unique_ptr<CMakeTool>> m_cmakeTools; std::vector<std::unique_ptr<CMakeTool>> m_cmakeTools;
Internal::CMakeToolSettingsAccessor m_accessor; Internal::CMakeToolSettingsAccessor m_accessor;
}; };
static CMakeToolManagerPrivate *d = nullptr; static CMakeToolManagerPrivate *d = nullptr;
// --------------------------------------------------------------------
// CMakeToolManager:
// --------------------------------------------------------------------
CMakeToolManager *CMakeToolManager::m_instance = nullptr; CMakeToolManager *CMakeToolManager::m_instance = nullptr;
CMakeToolManager::CMakeToolManager() CMakeToolManager::CMakeToolManager()
@@ -163,14 +156,14 @@ QList<Id> CMakeToolManager::autoDetectCMakeForDevice(const FilePaths &searchPath
QString *logMessage) QString *logMessage)
{ {
QList<Id> result; QList<Id> result;
QStringList messages{tr("Searching CMake binaries...")}; QStringList messages{Tr::tr("Searching CMake binaries...")};
for (const FilePath &path : searchPaths) { for (const FilePath &path : searchPaths) {
const FilePath cmake = path.pathAppended("cmake").withExecutableSuffix(); const FilePath cmake = path.pathAppended("cmake").withExecutableSuffix();
if (cmake.isExecutableFile()) { if (cmake.isExecutableFile()) {
const Id currentId = registerCMakeByPath(cmake, detectionSource); const Id currentId = registerCMakeByPath(cmake, detectionSource);
if (currentId.isValid()) if (currentId.isValid())
result.push_back(currentId); result.push_back(currentId);
messages.append(tr("Found \"%1\"").arg(cmake.toUserOutput())); messages.append(Tr::tr("Found \"%1\"").arg(cmake.toUserOutput()));
} }
} }
if (logMessage) if (logMessage)
@@ -200,12 +193,12 @@ Id CMakeToolManager::registerCMakeByPath(const FilePath &cmakePath, const QStrin
void CMakeToolManager::removeDetectedCMake(const QString &detectionSource, QString *logMessage) void CMakeToolManager::removeDetectedCMake(const QString &detectionSource, QString *logMessage)
{ {
QStringList logMessages{tr("Removing CMake entries...")}; QStringList logMessages{Tr::tr("Removing CMake entries...")};
while (true) { while (true) {
auto toRemove = Utils::take(d->m_cmakeTools, Utils::equal(&CMakeTool::detectionSource, detectionSource)); auto toRemove = Utils::take(d->m_cmakeTools, Utils::equal(&CMakeTool::detectionSource, detectionSource));
if (!toRemove.has_value()) if (!toRemove.has_value())
break; break;
logMessages.append(tr("Removed \"%1\"").arg((*toRemove)->displayName())); logMessages.append(Tr::tr("Removed \"%1\"").arg((*toRemove)->displayName()));
emit m_instance->cmakeRemoved((*toRemove)->id()); emit m_instance->cmakeRemoved((*toRemove)->id());
} }
@@ -218,7 +211,7 @@ void CMakeToolManager::removeDetectedCMake(const QString &detectionSource, QStri
void CMakeToolManager::listDetectedCMake(const QString &detectionSource, QString *logMessage) void CMakeToolManager::listDetectedCMake(const QString &detectionSource, QString *logMessage)
{ {
QTC_ASSERT(logMessage, return); QTC_ASSERT(logMessage, return);
QStringList logMessages{tr("CMake:")}; QStringList logMessages{Tr::tr("CMake:")};
for (const auto &tool : qAsConst(d->m_cmakeTools)) { for (const auto &tool : qAsConst(d->m_cmakeTools)) {
if (tool->detectionSource() == detectionSource) if (tool->detectionSource() == detectionSource)
logMessages.append(tool->displayName()); logMessages.append(tool->displayName());
@@ -257,4 +250,4 @@ void CMakeToolManager::ensureDefaultCMakeToolIsValid()
emit m_instance->defaultCMakeChanged(); emit m_instance->defaultCMakeChanged();
} }
} // namespace CMakeProjectManager } // CMakeProjectManager

9
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -3,15 +3,15 @@
#include "cmaketoolsettingsaccessor.h" #include "cmaketoolsettingsaccessor.h"
#include "cmakeprojectmanagertr.h"
#include "cmaketool.h" #include "cmaketool.h"
#include "cmaketoolmanager.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <app/app_version.h> #include <app/app_version.h>
#include <utils/environment.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/environment.h>
#include <QDebug> #include <QDebug>
@@ -83,8 +83,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
for (const FilePath &command : qAsConst(suspects)) { for (const FilePath &command : qAsConst(suspects)) {
auto item = std::make_unique<CMakeTool>(CMakeTool::AutoDetection, CMakeTool::createId()); auto item = std::make_unique<CMakeTool>(CMakeTool::AutoDetection, CMakeTool::createId());
item->setFilePath(command); item->setFilePath(command);
item->setDisplayName(::CMakeProjectManager::CMakeToolManager::tr("System CMake at %1") item->setDisplayName(Tr::tr("System CMake at %1").arg(command.toUserOutput()));
.arg(command.toUserOutput()));
found.emplace_back(std::move(item)); found.emplace_back(std::move(item));
} }
@@ -145,7 +144,7 @@ mergeTools(std::vector<std::unique_ptr<CMakeTool>> &sdkTools,
CMakeToolSettingsAccessor::CMakeToolSettingsAccessor() : CMakeToolSettingsAccessor::CMakeToolSettingsAccessor() :
UpgradingSettingsAccessor("QtCreatorCMakeTools", UpgradingSettingsAccessor("QtCreatorCMakeTools",
QCoreApplication::translate("CMakeProjectManager::CMakeToolManager", "CMake"), Tr::tr("CMake"),
Core::Constants::IDE_DISPLAY_NAME) Core::Constants::IDE_DISPLAY_NAME)
{ {
setBaseFilePath(Core::ICore::userResourcePath(CMAKE_TOOL_FILENAME)); setBaseFilePath(Core::ICore::userResourcePath(CMAKE_TOOL_FILENAME));

27
src/plugins/cmakeprojectmanager/configmodel.cpp
View File

@@ -3,6 +3,8 @@
#include "configmodel.h" #include "configmodel.h"
#include "cmakeprojectmanagertr.h"
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -11,8 +13,7 @@
#include <QFont> #include <QFont>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
// DataItem // DataItem
@@ -104,7 +105,7 @@ CMakeConfigItem ConfigModel::DataItem::toCMakeConfigItem() const
ConfigModel::ConfigModel(QObject *parent) : Utils::TreeModel<>(parent) ConfigModel::ConfigModel(QObject *parent) : Utils::TreeModel<>(parent)
{ {
setHeader({tr("Key"), tr("Value")}); setHeader({Tr::tr("Key"), Tr::tr("Value")});
} }
ConfigModel::~ConfigModel() = default; ConfigModel::~ConfigModel() = default;
@@ -578,9 +579,7 @@ QVariant ConfigModelTreeItem::data(int column, int role) const
: QVariant(); : QVariant();
case Qt::DisplayRole: case Qt::DisplayRole:
if (column == 0) if (column == 0)
return dataItem->key.isEmpty() return dataItem->key.isEmpty() ? Tr::tr("<UNSET>") : dataItem->key;
? ConfigModel::tr("<UNSET>")
: dataItem->key;
return value; return value;
case Qt::EditRole: case Qt::EditRole:
if (column == 0) if (column == 0)
@@ -668,23 +667,22 @@ QString ConfigModelTreeItem::toolTip() const
const QString pattern = "<dt style=\"font-weight:bold\">%1</dt><dd>%2</dd>"; const QString pattern = "<dt style=\"font-weight:bold\">%1</dt><dd>%2</dd>";
if (dataItem->isInitial) { if (dataItem->isInitial) {
if (!dataItem->kitValue.isEmpty()) if (!dataItem->kitValue.isEmpty())
tooltip << pattern.arg(ConfigModel::tr("Kit:")).arg(dataItem->kitValue); tooltip << pattern.arg(Tr::tr("Kit:")).arg(dataItem->kitValue);
tooltip << pattern.arg(ConfigModel::tr("Initial Configuration:")).arg(dataItem->currentValue()); tooltip << pattern.arg(Tr::tr("Initial Configuration:")).arg(dataItem->currentValue());
} else { } else {
if (!dataItem->initialValue.isEmpty()) { if (!dataItem->initialValue.isEmpty()) {
tooltip << pattern.arg(ConfigModel::tr("Initial Configuration:")) tooltip << pattern.arg(Tr::tr("Initial Configuration:"))
.arg(dataItem->initialValue); .arg(dataItem->initialValue);
} }
if (dataItem->inCMakeCache) { if (dataItem->inCMakeCache) {
tooltip << pattern.arg(ConfigModel::tr("Current Configuration:")) tooltip << pattern.arg(Tr::tr("Current Configuration:")).arg(dataItem->currentValue());
.arg(dataItem->currentValue());
} else { } else {
tooltip << pattern.arg(ConfigModel::tr("Not in CMakeCache.txt")).arg(QString()); tooltip << pattern.arg(Tr::tr("Not in CMakeCache.txt")).arg(QString());
} }
} }
tooltip << pattern.arg(ConfigModel::tr("Type:")).arg(dataItem->typeDisplay()); tooltip << pattern.arg(Tr::tr("Type:")).arg(dataItem->typeDisplay());
return "<dl style=\"white-space:pre\">" + tooltip.join(QString()) + "</dl>"; return "<dl style=\"white-space:pre\">" + tooltip.join(QString()) + "</dl>";
} }
@@ -695,5 +693,4 @@ QString ConfigModelTreeItem::currentValue() const
return dataItem->isUserChanged ? dataItem->newValue : dataItem->value; return dataItem->isUserChanged ? dataItem->newValue : dataItem->value;
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

8
src/plugins/cmakeprojectmanager/configmodel.h
View File

@@ -7,10 +7,7 @@
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <QString> namespace CMakeProjectManager::Internal {
namespace CMakeProjectManager {
namespace Internal {
class ConfigModelTreeItem; class ConfigModelTreeItem;
@@ -136,5 +133,4 @@ public:
ConfigModel::InternalDataItem *dataItem; ConfigModel::InternalDataItem *dataItem;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

28
src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
View File

@@ -4,15 +4,17 @@
#include "configmodelitemdelegate.h" #include "configmodelitemdelegate.h"
#include "configmodel.h" #include "configmodel.h"
#include "cmakeprojectmanagertr.h"
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <QCheckBox> #include <QCheckBox>
namespace CMakeProjectManager { using namespace Utils;
namespace Internal {
ConfigModelItemDelegate::ConfigModelItemDelegate(const Utils::FilePath &base, QObject* parent) namespace CMakeProjectManager::Internal {
ConfigModelItemDelegate::ConfigModelItemDelegate(const FilePath &base, QObject* parent)
: QStyledItemDelegate(parent) : QStyledItemDelegate(parent)
, m_base(base) , m_base(base)
{ } { }
@@ -24,17 +26,17 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti
if (index.column() == 1) { if (index.column() == 1) {
ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index); ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index);
if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
auto edit = new Utils::PathChooser(parent); auto edit = new PathChooser(parent);
edit->setAttribute(Qt::WA_MacSmallSize); edit->setAttribute(Qt::WA_MacSmallSize);
edit->setFocusPolicy(Qt::StrongFocus); edit->setFocusPolicy(Qt::StrongFocus);
edit->setBaseDirectory(m_base); edit->setBaseDirectory(m_base);
edit->setAutoFillBackground(true); edit->setAutoFillBackground(true);
if (data.type == ConfigModel::DataItem::FILE) { if (data.type == ConfigModel::DataItem::FILE) {
edit->setExpectedKind(Utils::PathChooser::File); edit->setExpectedKind(PathChooser::File);
edit->setPromptDialogTitle(tr("Select a file for %1").arg(data.key)); edit->setPromptDialogTitle(Tr::tr("Select a file for %1").arg(data.key));
} else { } else {
edit->setExpectedKind(Utils::PathChooser::Directory); edit->setExpectedKind(PathChooser::Directory);
edit->setPromptDialogTitle(tr("Select a directory for %1").arg(data.key)); edit->setPromptDialogTitle(Tr::tr("Select a directory for %1").arg(data.key));
} }
return edit; return edit;
} else if (!data.values.isEmpty()) { } else if (!data.values.isEmpty()) {
@@ -64,8 +66,8 @@ void ConfigModelItemDelegate::setEditorData(QWidget *editor, const QModelIndex &
if (index.column() == 1) { if (index.column() == 1) {
ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index); ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index);
if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
auto edit = static_cast<Utils::PathChooser *>(editor); auto edit = static_cast<PathChooser *>(editor);
edit->setFilePath(Utils::FilePath::fromUserInput(data.value)); edit->setFilePath(FilePath::fromUserInput(data.value));
return; return;
} else if (!data.values.isEmpty()) { } else if (!data.values.isEmpty()) {
auto edit = static_cast<QComboBox *>(editor); auto edit = static_cast<QComboBox *>(editor);
@@ -91,7 +93,7 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
if (index.column() == 1) { if (index.column() == 1) {
ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index); ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index);
if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) { if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
auto edit = static_cast<Utils::PathChooser *>(editor); auto edit = static_cast<PathChooser *>(editor);
if (edit->rawFilePath().toString() != data.value) if (edit->rawFilePath().toString() != data.value)
model->setData(index, edit->filePath().toString(), Qt::EditRole); model->setData(index, edit->filePath().toString(), Qt::EditRole);
return; return;
@@ -133,6 +135,4 @@ QSize ConfigModelItemDelegate::sizeHint(const QStyleOptionViewItem &option,
return QSize(100, height); return QSize(100, height);
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

8
src/plugins/cmakeprojectmanager/configmodelitemdelegate.h
View File

@@ -3,13 +3,12 @@
#pragma once #pragma once
#include <utils/fileutils.h> #include <utils/filepath.h>
#include <QComboBox> #include <QComboBox>
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class ConfigModelItemDelegate : public QStyledItemDelegate class ConfigModelItemDelegate : public QStyledItemDelegate
{ {
@@ -29,5 +28,4 @@ private:
Utils::FilePath m_base; Utils::FilePath m_base;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

22
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -3,6 +3,7 @@
#include "fileapidataextractor.h" #include "fileapidataextractor.h"
#include "cmakeprojectmanagertr.h"
#include "cmakeprojectplugin.h" #include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h" #include "cmakespecificsettings.h"
#include "fileapiparser.h" #include "fileapiparser.h"
@@ -22,13 +23,10 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace {
using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal;
using namespace CMakeProjectManager::Internal::FileApiDetails; using namespace CMakeProjectManager::Internal::FileApiDetails;
namespace CMakeProjectManager::Internal {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Helpers: // Helpers:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -601,14 +599,12 @@ void addCompileGroups(ProjectNode *targetRoot,
addCMakeVFolder(targetRoot, addCMakeVFolder(targetRoot,
buildDirectory, buildDirectory,
100, 100,
QCoreApplication::translate("CMakeProjectManager::Internal::FileApi", Tr::tr("<Build Directory>"),
"<Build Directory>"),
std::move(buildFileNodes)); std::move(buildFileNodes));
addCMakeVFolder(targetRoot, addCMakeVFolder(targetRoot,
Utils::FilePath(), Utils::FilePath(),
10, 10,
QCoreApplication::translate("CMakeProjectManager::Internal::FileApi", Tr::tr("<Other Locations>"),
"<Other Locations>"),
std::move(otherFileNodes)); std::move(otherFileNodes));
} }
@@ -730,11 +726,6 @@ void setupLocationInfoForTargets(CMakeProjectNode *rootNode, const QList<CMakeBu
} }
} }
} // namespace
namespace CMakeProjectManager {
namespace Internal {
using namespace FileApiDetails; using namespace FileApiDetails;
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -777,5 +768,4 @@ FileApiQtcData extractData(FileApiData &input,
return result; return result;
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

8
src/plugins/cmakeprojectmanager/fileapidataextractor.h
View File

@@ -8,7 +8,7 @@
#include <projectexplorer/rawprojectpart.h> #include <projectexplorer/rawprojectpart.h>
#include <utils/fileutils.h> #include <utils/filepath.h>
#include <QList> #include <QList>
#include <QSet> #include <QSet>
@@ -17,8 +17,7 @@
#include <memory> #include <memory>
#include <optional> #include <optional>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class FileApiData; class FileApiData;
@@ -53,5 +52,4 @@ FileApiQtcData extractData(FileApiData &data,
const Utils::FilePath &sourceDirectory, const Utils::FilePath &sourceDirectory,
const Utils::FilePath &buildDirectory); const Utils::FilePath &buildDirectory);
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

73
src/plugins/cmakeprojectmanager/fileapiparser.cpp
View File

@@ -3,6 +3,8 @@
#include "fileapiparser.h" #include "fileapiparser.h"
#include "cmakeprojectmanagertr.h"
#include <app/app_version.h> #include <app/app_version.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <projectexplorer/rawprojectpart.h> #include <projectexplorer/rawprojectpart.h>
@@ -15,11 +17,11 @@
#include <QJsonObject> #include <QJsonObject>
#include <QLoggingCategory> #include <QLoggingCategory>
namespace CMakeProjectManager { using namespace Utils;
namespace Internal {
namespace CMakeProjectManager::Internal {
using namespace FileApiDetails; using namespace FileApiDetails;
using namespace Utils;
const char CMAKE_RELATIVE_REPLY_PATH[] = ".cmake/api/v1/reply"; const char CMAKE_RELATIVE_REPLY_PATH[] = ".cmake/api/v1/reply";
const char CMAKE_RELATIVE_QUERY_PATH[] = ".cmake/api/v1/query"; const char CMAKE_RELATIVE_QUERY_PATH[] = ".cmake/api/v1/query";
@@ -40,9 +42,8 @@ static FilePath cmakeReplyDirectory(const FilePath &buildDirectory)
static void reportFileApiSetupFailure() static void reportFileApiSetupFailure()
{ {
Core::MessageManager::writeFlashing( Core::MessageManager::writeFlashing(
QCoreApplication::translate("CMakeProjectManager::Internal", Tr::tr("Failed to set up CMake file API support. %1 cannot "
"Failed to set up CMake file API support. %1 cannot " "extract project information.")
"extract project information.")
.arg(Core::Constants::IDE_DISPLAY_NAME)); .arg(Core::Constants::IDE_DISPLAY_NAME));
} }
@@ -99,8 +100,7 @@ std::vector<int> indexList(const QJsonValue &v)
static ReplyFileContents readReplyFile(const FilePath &filePath, QString &errorMessage) static ReplyFileContents readReplyFile(const FilePath &filePath, QString &errorMessage)
{ {
const QJsonDocument document = readJsonFile(filePath); const QJsonDocument document = readJsonFile(filePath);
static const QString msg = QCoreApplication::translate("CMakeProjectManager::Internal", static const QString msg = Tr::tr("Invalid reply file created by CMake.");
"Invalid reply file created by CMake.");
ReplyFileContents result; ReplyFileContents result;
if (document.isNull() || document.isEmpty() || !document.isObject()) { if (document.isNull() || document.isEmpty() || !document.isObject()) {
@@ -171,8 +171,7 @@ static CMakeConfig readCacheFile(const FilePath &cacheFile, QString &errorMessag
const QJsonObject root = doc.object(); const QJsonObject root = doc.object();
if (!checkJsonObject(root, "cache", 2)) { if (!checkJsonObject(root, "cache", 2)) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr("Invalid cache file generated by CMake.");
"Invalid cache file generated by CMake.");
return {}; return {};
} }
@@ -217,8 +216,7 @@ static std::vector<CMakeFileInfo> readCMakeFilesFile(const FilePath &cmakeFilesF
const QJsonObject root = doc.object(); const QJsonObject root = doc.object();
if (!checkJsonObject(root, "cmakeFiles", 1)) { if (!checkJsonObject(root, "cmakeFiles", 1)) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr( "Invalid cmakeFiles file generated by CMake.");
"Invalid cmakeFiles file generated by CMake.");
return {}; return {};
} }
@@ -247,8 +245,7 @@ static std::vector<CMakeFileInfo> readCMakeFilesFile(const FilePath &cmakeFilesF
std::vector<Directory> extractDirectories(const QJsonArray &directories, QString &errorMessage) std::vector<Directory> extractDirectories(const QJsonArray &directories, QString &errorMessage)
{ {
if (directories.isEmpty()) { if (directories.isEmpty()) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: No directories."); "Invalid codemodel file generated by CMake: No directories.");
return {}; return {};
} }
@@ -257,8 +254,7 @@ std::vector<Directory> extractDirectories(const QJsonArray &directories, QString
for (const QJsonValue &v : directories) { for (const QJsonValue &v : directories) {
const QJsonObject obj = v.toObject(); const QJsonObject obj = v.toObject();
if (obj.isEmpty()) { if (obj.isEmpty()) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: Empty directory object."); "Invalid codemodel file generated by CMake: Empty directory object.");
continue; continue;
} }
@@ -279,8 +275,7 @@ std::vector<Directory> extractDirectories(const QJsonArray &directories, QString
static std::vector<Project> extractProjects(const QJsonArray &projects, QString &errorMessage) static std::vector<Project> extractProjects(const QJsonArray &projects, QString &errorMessage)
{ {
if (projects.isEmpty()) { if (projects.isEmpty()) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: No projects."); "Invalid codemodel file generated by CMake: No projects.");
return {}; return {};
} }
@@ -290,8 +285,7 @@ static std::vector<Project> extractProjects(const QJsonArray &projects, QString
const QJsonObject obj = v.toObject(); const QJsonObject obj = v.toObject();
if (obj.isEmpty()) { if (obj.isEmpty()) {
qCDebug(cmakeFileApi) << "Empty project skipped!"; qCDebug(cmakeFileApi) << "Empty project skipped!";
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: Empty project object."); "Invalid codemodel file generated by CMake: Empty project object.");
continue; continue;
} }
@@ -304,8 +298,7 @@ static std::vector<Project> extractProjects(const QJsonArray &projects, QString
if (project.directories.empty()) { if (project.directories.empty()) {
qCDebug(cmakeFileApi) << "Invalid project skipped!"; qCDebug(cmakeFileApi) << "Invalid project skipped!";
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: Broken project data."); "Invalid codemodel file generated by CMake: Broken project data.");
continue; continue;
} }
@@ -322,8 +315,7 @@ static std::vector<Target> extractTargets(const QJsonArray &targets, QString &er
for (const QJsonValue &v : targets) { for (const QJsonValue &v : targets) {
const QJsonObject obj = v.toObject(); const QJsonObject obj = v.toObject();
if (obj.isEmpty()) { if (obj.isEmpty()) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: Empty target object."); "Invalid codemodel file generated by CMake: Empty target object.");
continue; continue;
} }
@@ -336,8 +328,7 @@ static std::vector<Target> extractTargets(const QJsonArray &targets, QString &er
if (target.name.isEmpty() || target.id.isEmpty() || target.jsonFile.isEmpty() if (target.name.isEmpty() || target.id.isEmpty() || target.jsonFile.isEmpty()
|| target.directory == -1 || target.project == -1) { || target.directory == -1 || target.project == -1) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: Broken target data."); "Invalid codemodel file generated by CMake: Broken target data.");
continue; continue;
} }
@@ -437,8 +428,7 @@ static std::vector<Configuration> extractConfigurations(const QJsonArray &config
QString &errorMessage) QString &errorMessage)
{ {
if (configs.isEmpty()) { if (configs.isEmpty()) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: No configurations."); "Invalid codemodel file generated by CMake: No configurations.");
return {}; return {};
} }
@@ -447,8 +437,7 @@ static std::vector<Configuration> extractConfigurations(const QJsonArray &config
for (const QJsonValue &v : configs) { for (const QJsonValue &v : configs) {
const QJsonObject obj = v.toObject(); const QJsonObject obj = v.toObject();
if (obj.isEmpty()) { if (obj.isEmpty()) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid codemodel file generated by CMake: Empty configuration object."); "Invalid codemodel file generated by CMake: Empty configuration object.");
continue; continue;
} }
@@ -460,10 +449,8 @@ static std::vector<Configuration> extractConfigurations(const QJsonArray &config
config.targets = extractTargets(obj.value("targets").toArray(), errorMessage); config.targets = extractTargets(obj.value("targets").toArray(), errorMessage);
if (!validateIndexes(config)) { if (!validateIndexes(config)) {
errorMessage errorMessage = Tr::tr("Invalid codemodel file generated by CMake: Broken "
= QCoreApplication::translate("CMakeProjectManager::Internal", "indexes in directories, projects, or targets.");
"Invalid codemodel file generated by CMake: Broken "
"indexes in directories, projects, or targets.");
return {}; return {};
} }
@@ -479,8 +466,7 @@ static std::vector<Configuration> readCodemodelFile(const FilePath &codemodelFil
const QJsonObject root = doc.object(); const QJsonObject root = doc.object();
if (!checkJsonObject(root, "codemodel", 2)) { if (!checkJsonObject(root, "codemodel", 2)) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr("Invalid codemodel file generated by CMake.");
"Invalid codemodel file generated by CMake.");
return {}; return {};
} }
@@ -507,8 +493,7 @@ static TargetDetails extractTargetDetails(const QJsonObject &root, QString &erro
t.type = root.value("type").toString(); t.type = root.value("type").toString();
if (t.name.isEmpty() || t.id.isEmpty() || t.type.isEmpty()) { if (t.name.isEmpty() || t.id.isEmpty() || t.type.isEmpty()) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr("Invalid target file: Information is missing.");
"Invalid target file: Information is missing.");
return {}; return {};
} }
@@ -776,8 +761,7 @@ static TargetDetails readTargetFile(const FilePath &targetFile, QString &errorMe
TargetDetails result = extractTargetDetails(root, errorMessage); TargetDetails result = extractTargetDetails(root, errorMessage);
if (errorMessage.isEmpty() && !validateTargetDetails(result)) { if (errorMessage.isEmpty() && !validateTargetDetails(result)) {
errorMessage = QCoreApplication::translate( errorMessage = Tr::tr(
"CMakeProjectManager::Internal",
"Invalid target file generated by CMake: Broken indexes in target details."); "Invalid target file generated by CMake: Broken indexes in target details.");
} }
return result; return result;
@@ -854,7 +838,7 @@ FileApiData FileApiParser::parseData(QFutureInterface<std::shared_ptr<FileApiQtc
const auto cancelCheck = [&fi, &errorMessage]() -> bool { const auto cancelCheck = [&fi, &errorMessage]() -> bool {
if (fi.isCanceled()) { if (fi.isCanceled()) {
errorMessage = FileApiParser::tr("CMake parsing was cancelled."); errorMessage = Tr::tr("CMake parsing was cancelled.");
return true; return true;
} }
return false; return false;
@@ -888,12 +872,12 @@ FileApiData FileApiParser::parseData(QFutureInterface<std::shared_ptr<FileApiQtc
buildTypes << cfg.name; buildTypes << cfg.name;
if (result.replyFile.isMultiConfig) { if (result.replyFile.isMultiConfig) {
errorMessage = tr("No \"%1\" CMake configuration found. Available configurations: \"%2\".\n" errorMessage = Tr::tr("No \"%1\" CMake configuration found. Available configurations: \"%2\".\n"
"Make sure that CMAKE_CONFIGURATION_TYPES variable contains the \"Build type\" field.") "Make sure that CMAKE_CONFIGURATION_TYPES variable contains the \"Build type\" field.")
.arg(cmakeBuildType) .arg(cmakeBuildType)
.arg(buildTypes.join(", ")); .arg(buildTypes.join(", "));
} else { } else {
errorMessage = tr("No \"%1\" CMake configuration found. Available configuration: \"%2\".\n" errorMessage = Tr::tr("No \"%1\" CMake configuration found. Available configuration: \"%2\".\n"
"Make sure that CMAKE_BUILD_TYPE variable matches the \"Build type\" field.") "Make sure that CMAKE_BUILD_TYPE variable matches the \"Build type\" field.")
.arg(cmakeBuildType) .arg(cmakeBuildType)
.arg(buildTypes.join(", ")); .arg(buildTypes.join(", "));
@@ -941,5 +925,4 @@ FilePaths FileApiParser::cmakeQueryFilePaths(const FilePath &buildDirectory)
}); });
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

7
src/plugins/cmakeprojectmanager/fileapiparser.h
View File

@@ -21,8 +21,7 @@
#include <vector> #include <vector>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
namespace FileApiDetails { namespace FileApiDetails {
@@ -218,7 +217,6 @@ public:
class FileApiParser class FileApiParser
{ {
Q_DECLARE_TR_FUNCTIONS(FileApiParser)
public: public:
static FileApiData parseData(QFutureInterface<std::shared_ptr<FileApiQtcData>> &fi, static FileApiData parseData(QFutureInterface<std::shared_ptr<FileApiQtcData>> &fi,
const Utils::FilePath &replyFilePath, const Utils::FilePath &replyFilePath,
@@ -233,5 +231,4 @@ public:
static Utils::FilePath scanForCMakeReplyFile(const Utils::FilePath &buildDirectory); static Utils::FilePath scanForCMakeReplyFile(const Utils::FilePath &buildDirectory);
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

13
src/plugins/cmakeprojectmanager/fileapireader.cpp
View File

@@ -4,6 +4,7 @@
#include "fileapireader.h" #include "fileapireader.h"
#include "cmakeprocess.h" #include "cmakeprocess.h"
#include "cmakeprojectmanagertr.h"
#include "fileapidataextractor.h" #include "fileapidataextractor.h"
#include "fileapiparser.h" #include "fileapiparser.h"
@@ -20,8 +21,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
static Q_LOGGING_CATEGORY(cmakeFileApiMode, "qtc.cmake.fileApiMode", QtWarningMsg); static Q_LOGGING_CATEGORY(cmakeFileApiMode, "qtc.cmake.fileApiMode", QtWarningMsg);
@@ -180,7 +180,7 @@ QList<CMakeBuildTarget> FileApiReader::takeBuildTargets(QString &errorMessage){
CMakeConfig FileApiReader::takeParsedConfiguration(QString &errorMessage) CMakeConfig FileApiReader::takeParsedConfiguration(QString &errorMessage)
{ {
if (m_lastCMakeExitCode != 0) if (m_lastCMakeExitCode != 0)
errorMessage = tr("CMake returned error code: %1").arg(m_lastCMakeExitCode); errorMessage = Tr::tr("CMake returned error code: %1").arg(m_lastCMakeExitCode);
return std::exchange(m_cache, {}); return std::exchange(m_cache, {});
} }
@@ -283,7 +283,7 @@ void FileApiReader::makeBackupConfiguration(bool store)
replyPrev.removeRecursively(); replyPrev.removeRecursively();
QTC_CHECK(!replyPrev.exists()); QTC_CHECK(!replyPrev.exists());
if (!reply.renameFile(replyPrev)) if (!reply.renameFile(replyPrev))
Core::MessageManager::writeFlashing(tr("Failed to rename %1 to %2.") Core::MessageManager::writeFlashing(Tr::tr("Failed to rename %1 to %2.")
.arg(reply.toString(), replyPrev.toString())); .arg(reply.toString(), replyPrev.toString()));
} }
@@ -294,7 +294,7 @@ void FileApiReader::makeBackupConfiguration(bool store)
if (cmakeCacheTxt.exists()) if (cmakeCacheTxt.exists())
if (!FileUtils::copyIfDifferent(cmakeCacheTxt, cmakeCacheTxtPrev)) if (!FileUtils::copyIfDifferent(cmakeCacheTxt, cmakeCacheTxtPrev))
Core::MessageManager::writeFlashing(tr("Failed to copy %1 to %2.") Core::MessageManager::writeFlashing(Tr::tr("Failed to copy %1 to %2.")
.arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString())); .arg(cmakeCacheTxt.toString(), cmakeCacheTxtPrev.toString()));
} }
@@ -383,5 +383,4 @@ void FileApiReader::replyDirectoryHasChanged(const QString &directory) const
emit dirty(); emit dirty();
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

10
src/plugins/cmakeprojectmanager/fileapireader.h
View File

@@ -20,12 +20,9 @@
#include <memory> #include <memory>
#include <optional> #include <optional>
namespace ProjectExplorer { namespace ProjectExplorer { class ProjectNode; }
class ProjectNode;
}
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
class CMakeProcess; class CMakeProcess;
class FileApiQtcData; class FileApiQtcData;
@@ -103,5 +100,4 @@ private:
QDateTime m_lastReplyTimestamp; QDateTime m_lastReplyTimestamp;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

29
src/plugins/cmakeprojectmanager/presetsparser.cpp
View File

@@ -3,13 +3,13 @@
#include "presetsparser.h" #include "presetsparser.h"
#include <QCoreApplication> #include "cmakeprojectmanagertr.h"
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
bool parseVersion(const QJsonValue &jsonValue, int &version) bool parseVersion(const QJsonValue &jsonValue, int &version)
{ {
@@ -284,9 +284,7 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
{ {
const std::optional<QByteArray> jsonContents = jsonFile.fileContents(); const std::optional<QByteArray> jsonContents = jsonFile.fileContents();
if (!jsonContents) { if (!jsonContents) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr("Failed to read %1 file").arg(jsonFile.fileName());
"Failed to read %1 file")
.arg(jsonFile.fileName());
return false; return false;
} }
@@ -302,18 +300,14 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
} }
if (!jsonDoc.isObject()) { if (!jsonDoc.isObject()) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr( "Invalid %1 file").arg(jsonFile.fileName());
"Invalid %1 file")
.arg(jsonFile.fileName());
return false; return false;
} }
QJsonObject root = jsonDoc.object(); QJsonObject root = jsonDoc.object();
if (!parseVersion(root.value("version"), m_presetsData.version)) { if (!parseVersion(root.value("version"), m_presetsData.version)) {
errorMessage = QCoreApplication::translate("CMakeProjectManager::Internal", errorMessage = Tr::tr("Invalid \"version\" in %1 file").arg(jsonFile.fileName());
"Invalid \"version\" in %1 file")
.arg(jsonFile.fileName());
return false; return false;
} }
@@ -324,18 +318,14 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
// optional // optional
if (!parseConfigurePresets(root.value("configurePresets"), m_presetsData.configurePresets)) { if (!parseConfigurePresets(root.value("configurePresets"), m_presetsData.configurePresets)) {
errorMessage errorMessage
= QCoreApplication::translate("CMakeProjectManager::Internal", = Tr::tr("Invalid \"configurePresets\" section in %1 file").arg(jsonFile.fileName());
"Invalid \"configurePresets\" section in %1 file")
.arg(jsonFile.fileName());
return false; return false;
} }
// optional // optional
if (!parseBuildPresets(root.value("buildPresets"), m_presetsData.buildPresets)) { if (!parseBuildPresets(root.value("buildPresets"), m_presetsData.buildPresets)) {
errorMessage errorMessage
= QCoreApplication::translate("CMakeProjectManager::Internal", = Tr::tr("Invalid \"buildPresets\" section in %1 file").arg(jsonFile.fileName());
"Invalid \"buildPresets\" section in %1 file")
.arg(jsonFile.fileName());
return false; return false;
} }
@@ -411,5 +401,4 @@ void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other)
nativeToolOptions = other.nativeToolOptions; nativeToolOptions = other.nativeToolOptions;
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

11
src/plugins/cmakeprojectmanager/presetsparser.h
View File

@@ -3,16 +3,14 @@
#pragma once #pragma once
#include <utils/filepath.h>
#include "cmakeconfigitem.h" #include "cmakeconfigitem.h"
#include <utils/filepath.h>
#include <QHash> #include <QHash>
#include <QString>
#include <QVersionNumber> #include <QVersionNumber>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
namespace PresetsDetails { namespace PresetsDetails {
@@ -109,5 +107,4 @@ public:
const PresetsData &presetsData() const; const PresetsData &presetsData() const;
}; };
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

19
src/plugins/cmakeprojectmanager/projecttreehelper.cpp
View File

@@ -3,6 +3,8 @@
#include "projecttreehelper.h" #include "projecttreehelper.h"
#include "cmakeprojectmanagertr.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
@@ -11,8 +13,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath, std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
int priority, int priority,
@@ -77,18 +78,17 @@ void addCMakeInputs(FolderNode *root,
addCMakeVFolder(cmakeVFolder.get(), addCMakeVFolder(cmakeVFolder.get(),
buildDir, buildDir,
100, 100,
QCoreApplication::translate("CMakeProjectManager::Internal::ProjectTreeHelper", Tr::tr("<Build Directory>"),
"<Build Directory>"),
removeKnownNodes(knownFiles, std::move(buildInputs))); removeKnownNodes(knownFiles, std::move(buildInputs)));
addCMakeVFolder(cmakeVFolder.get(), addCMakeVFolder(cmakeVFolder.get(),
Utils::FilePath(), Utils::FilePath(),
10, 10,
QCoreApplication::translate("CMakeProjectManager::Internal::ProjectTreeHelper", Tr::tr("<Other Locations>"),
"<Other Locations>"),
removeKnownNodes(knownFiles, std::move(rootInputs))); removeKnownNodes(knownFiles, std::move(rootInputs)));
root->addNode(std::move(cmakeVFolder)); root->addNode(std::move(cmakeVFolder));
} }
QHash<Utils::FilePath, ProjectNode *> addCMakeLists( QHash<Utils::FilePath, ProjectNode *> addCMakeLists(
CMakeProjectNode *root, std::vector<std::unique_ptr<FileNode>> &&cmakeLists) CMakeProjectNode *root, std::vector<std::unique_ptr<FileNode>> &&cmakeLists)
{ {
@@ -177,9 +177,7 @@ void addFileSystemNodes(ProjectNode *root, const std::shared_ptr<FolderNode> &fo
auto fileSystemNode = cloneFolderNode<VirtualFolderNode>(folderNode.get()); auto fileSystemNode = cloneFolderNode<VirtualFolderNode>(folderNode.get());
// just before special nodes like "CMake Modules" // just before special nodes like "CMake Modules"
fileSystemNode->setPriority(Node::DefaultPriority - 6); fileSystemNode->setPriority(Node::DefaultPriority - 6);
fileSystemNode->setDisplayName( fileSystemNode->setDisplayName(Tr::tr("<File System>"));
QCoreApplication::translate("CMakeProjectManager::Internal::ProjectTreeHelper",
"<File System>"));
fileSystemNode->setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN)); fileSystemNode->setIcon(DirectoryIcon(ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN));
if (!fileSystemNode->isEmpty()) { if (!fileSystemNode->isEmpty()) {
@@ -192,5 +190,4 @@ void addFileSystemNodes(ProjectNode *root, const std::shared_ptr<FolderNode> &fo
} }
} }
} // namespace Internal } // CMakeProjectManager::Internal
} // namespace CMakeProjectManager

9
src/plugins/cmakeprojectmanager/projecttreehelper.h
View File

@@ -3,12 +3,11 @@
#include "cmakeprojectnodes.h" #include "cmakeprojectnodes.h"
#include <utils/fileutils.h> #include <utils/filepath.h>
#include <memory> #include <memory>
namespace CMakeProjectManager { namespace CMakeProjectManager::Internal {
namespace Internal {
std::unique_ptr<ProjectExplorer::FolderNode> createCMakeVFolder(const Utils::FilePath &basePath, std::unique_ptr<ProjectExplorer::FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
int priority, int priority,
@@ -44,5 +43,5 @@ CMakeTargetNode *createTargetNode(
void addFileSystemNodes(ProjectExplorer::ProjectNode *root, void addFileSystemNodes(ProjectExplorer::ProjectNode *root,
const std::shared_ptr<ProjectExplorer::FolderNode> &folderNode); const std::shared_ptr<ProjectExplorer::FolderNode> &folderNode);
} // namespace Internal
} // namespace CMakeProjectManager } // CMakeProjectManager::Internal