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

iOS: Tr::tr

Browse Source 
Change-Id: I547af218546927622414999e5b9019ab62916e7e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2022-12-20 13:39:23 +01:00
parent 8f2d48e8a3
commit 6a1a6d85b8
45 changed files with 365 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55609,7 +55609,7 @@ monitor reset</source>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<name>::Ios</name>
<message>
<source>Base arguments:</source>
<translation>Základní argumenty:</translation>
@@ -55634,16 +55634,6 @@ monitor reset</source>
<source>Configuration is faulty. Check the Issues output pane for details.</source>
<translation>Nastavení je chybové. Zkontrolujte tabulku s potížemi kvůli podrobnostem.</translation>
</message>
</context>
<context>
<name>IosDeployStepWidget</name>
<message>
<source>Form</source>
<translation>Formulář</translation>
</message>
</context>
<context>
<name>IosRunConfiguration</name>
<message>
<source>Form</source>
<translation>Formulář</translation>
@@ -55656,9 +55646,6 @@ monitor reset</source>
<source>Executable:</source>
<translation>Spustitelný soubor:</translation>
</message>
</context>
<context>
<name>IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>Nastavení iOS</translation>
@@ -56680,29 +56667,16 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<name>::Ios</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>Sestavení iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</context>
<context>
<name>::Ios</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Could not find device specific debug symbols at %1. Debugging initialization will be slow until you open the Organizer window of Xcode with the device connected to have the symbols generated.</source>
<translation>Symboly pro ladění zvláštní pro zařízení se nepodařilo najít v %1. Spuštění ladění bude pomalé, dokud neotevřete okno organizéru Xcode s připojeným zařízením, abyste měli symboly vytvořeny.</translation>
@@ -56719,23 +56693,14 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<source>Run failed unexpectedly.</source>
<translation>Spuštění se neočekávaně nezdařilo.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy to iOS</source>
<translation>Poslat na iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfigurationFactory</name>
<message>
<source>Deploy on iOS</source>
<translation>Poslat na iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Poslat na %1</translation>
@@ -56760,34 +56725,18 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<source>The Info.plist might be incorrect.</source>
<translation>Info.plist může být nesprávný.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepFactory</name>
<message>
<source>Deploy to iOS device or emulator</source>
<translation>Nasadit na zařízení nebo emulátor iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepWidget</name>
<message>
<source>&lt;b&gt;Deploy to %1&lt;/b&gt;</source>
<translation>&lt;b&gt;Poslat na %1&lt;/b&gt;</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>Zařízení iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Název zařízení</translation>
@@ -56825,9 +56774,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<source>Do you want to see how to set it up for development?</source>
<translation>Chcete vidět, jak je nastavit, aby se dalo použít pro vývoj?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>ABI(s) verze Qt se nepodařilo určit.</translation>
@@ -56837,9 +56783,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Spustit na %1</translation>
@@ -56880,16 +56823,10 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<source>%1 is not connected.</source>
<translation>%1 není připojeno.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfigurationWidget</name>
<message>
<source>iOS run settings</source>
<translation>Nastavení spuštění na iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunControl</name>
<message>
<source>Starting remote process.</source>
<translation>Spouští se vzdálený proces.</translation>
@@ -56898,9 +56835,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<source>Run ended unexpectedly.</source>
<translation>Spuštění skončilo neočekávaně.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Run failed. The settings in the Organizer window of Xcode might be incorrect.</source>
<translation>Spuštění se nezdařilo. Nastavení v okně organizéru Xcode může být nesprávné.</translation>
@@ -56909,30 +56843,14 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
<source>The device is locked, please unlock.</source>
<translation>Zařízení je zamknuto. Odemkněte je, prosím.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS Configurations</source>
<translation>Nastavení iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>Simulátor iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>Simulátor iOS</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>Subprocess Error %1</source>
<translation>Chyba podprocesu %1</translation>

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

@@ -18904,7 +18904,7 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<name>::Ios</name>
<message>
<source>Create Simulator</source>
<translation>Opret simulator</translation>
@@ -18925,9 +18925,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>None</source>
<translation>Ingen</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildSettingsWidget</name>
<message>
<source>Reset</source>
<translation>Nulstil</translation>
@@ -18952,10 +18949,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<source>None</source>
<translation>Ingen</translation>
</message>
<message>
<source>Development team is not selected.</source>
<translation>Udviklerteam er ikke valgt.</translation>
@@ -18996,9 +18989,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>Provisioning profile expired. Expiration date: %1</source>
<translation>Provisioneringsprofil udløbet. Udløbsdato: %1</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<message>
<source>Base arguments:</source>
<translation>Basisargumenter:</translation>
@@ -19015,24 +19005,15 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>xcodebuild</source>
<translation>xcodebuild</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>iOS-byg</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 Simulator</source>
<translation>%1-simulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation>Program kører ikke.</translation>
@@ -19045,16 +19026,10 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>The dSYM %1 seems to be outdated, it might confuse the debugger.</source>
<translation>dSYM&apos;en %1 ser ud til at være gammel, det vil måske forvirre fejlretteren.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy on iOS</source>
<translation>Udsend på iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Udsend til %1</translation>
@@ -19083,27 +19058,14 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>The provisioning profile &quot;%1&quot; (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source>
<translation>Provisioneringsprofilen &quot;%1&quot; (%2) brugt til at signere programmet dækker ikke enheden %3 (%4). Udsendelse til den vil mislykkes.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepFactory</name>
<message>
<source>Deploy to iOS device or emulator</source>
<translation>Udsend til iOS-enhed eller emulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>iOS-enhed</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Enhedsnavn</translation>
@@ -19141,9 +19103,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>Do you want to see how to set it up for development?</source>
<translation>Vil du se hvordan den sættes op til udvikling?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosPresetBuildStep</name>
<message>
<source>Reset to Default</source>
<translation>Nulstil til standard</translation>
@@ -19156,16 +19115,10 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>Arguments:</source>
<translation>Argumenter:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmlProfilerSupport</name>
<message>
<source>Could not get necessary ports for the profiler connection.</source>
<translation>Kunne ikke få nødvendige porte for profilering-forbindelsen.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Kunne ikke detektere ABI&apos;erne brugt af Qt versionen.</translation>
@@ -19175,9 +19128,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Kør på %1</translation>
@@ -19218,24 +19168,14 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>%1 is not connected.</source>
<translation>%1 er ikke forbundet.</translation>
</message>
<message>
<source>Device type:</source>
<translation>Enhedstype:</translation>
</message>
<message>
<source>Executable:</source>
<translation>Eksekverbar:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<message>
<source>Starting remote process.</source>
<translation>Starter fjern-process.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation>Kunne ikke finde %1.</translation>
@@ -19264,16 +19204,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>Run ended with error.</source>
<translation>Kørsel sluttede med fejl.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>iOS-konfiguration</translation>
@@ -19310,10 +19240,6 @@ Id&apos;er skal begynde med et lille bogstav.</translation>
<source>Reset contents and settings of simulator devices.</source>
<translation>Nulstil indhold og indstillinger af simulatorenheder.</translation>
</message>
<message>
<source>Reset</source>
<translation>Nulstil</translation>
</message>
<message>
<source>Screenshot directory:</source>
<translation>Skærmbilledmappe:</translation>
@@ -19444,23 +19370,10 @@ Fejl: %2</translation>
<source>simulator screenshot</source>
<translation>simulator skærmbillede</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>iOS-simulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>iOS-simulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorInfoModel</name>
<message>
<source>UDID: %1</source>
<translation>UDID: %1</translation>
@@ -19477,9 +19390,6 @@ Fejl: %2</translation>
<source>Current State</source>
<translation>Aktuelle tilstand</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Simulator Operation Status</source>
<translation>Simulatorhandlingsstatus</translation>
@@ -19508,9 +19418,6 @@ Fejl: %5</translation>
<source>Done.</source>
<translation>Færdig.</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>iOS tool error %1</source>
<translation>iOS-værktøjsfejl %1</translation>

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

@@ -29393,7 +29393,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<name>::Ios</name>
<message>
<source>Base arguments:</source>
<translation>Basisargumente:</translation>
@@ -29631,14 +29631,11 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<name>::Ios</name>
<message>
<source>%1 Simulator</source>
<translation>%1 Simulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation>Anwendung läuft nicht.</translation>
@@ -29651,9 +29648,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
<source>The dSYM %1 seems to be outdated, it might confuse the debugger.</source>
<translation>Der dSYM %1 scheint veraltet zu sein, dies kann den Debugger stören.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Deployment auf %1</translation>
@@ -29690,9 +29684,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
<source>Deploy to iOS device</source>
<translation>Deployment auf iOS-Gerät</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS Device</source>
<translation>iOS-Gerät</translation>
@@ -29713,13 +29704,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
<source>CPU Architecture:</source>
<translation>CPU-Architektur:</translation>
</message>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Gerätename</translation>
@@ -29757,9 +29741,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
<source>Do you want to see how to set it up for development?</source>
<translation>Möchten Sie sehen, wie man es für die Entwicklung einrichtet?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Die von der Qt-Version verwendeten ABIs konnten nicht bestimmt werden.</translation>
@@ -29769,9 +29750,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Auf %1 ausführen</translation>
@@ -29816,16 +29794,10 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation>
<source>Device type:</source>
<translation>Gerätetyp:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>iOS-Simulator</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>iOS tool error %1</source>
<translation>Fehler vom iOS-Tool %1</translation>
@@ -30214,7 +30186,7 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<name>::Ios</name>
<message>
<source>Could not find %1.</source>
<translation>%1 konnte nicht gefunden werden.</translation>
@@ -38966,7 +38938,7 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</tr
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<name>::Ios</name>
<message>
<source>Create Simulator</source>
<translation>Simulator erstellen</translation>
@@ -38975,21 +38947,10 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</tr
<source>Simulator name:</source>
<translation>Name des Simulators:</translation>
</message>
<message>
<source>Device type:</source>
<translation>Gerätetyp:</translation>
</message>
<message>
<source>OS version:</source>
<translation>Betriebssystemversion:</translation>
</message>
<message>
<source>None</source>
<translation>Keiner</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>iOS-Konfiguration</translation>
@@ -39026,10 +38987,6 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</tr
<source>Reset contents and settings of simulator devices.</source>
<translation>Inhalte und Einstellungen von Simulator-Geräten zurücksetzen.</translation>
</message>
<message>
<source>Reset</source>
<translation>Zurücksetzen</translation>
</message>
<message>
<source>Screenshot directory:</source>
<translation>Screenshot-Verzeichnis:</translation>
@@ -39160,13 +39117,6 @@ Fehler: %2</translation>
<source>simulator screenshot</source>
<translation>Simulator Screenshot</translation>
</message>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Simulator Operation Status</source>
<translation>Simulator-Betriebszustand</translation>
@@ -40281,21 +40231,15 @@ Ablaufdatum: %3</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<name>::Ios</name>
<message>
<source>Starting remote process.</source>
<translation>Starte entfernten Prozess.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmlProfilerSupport</name>
<message>
<source>Could not get necessary ports for the profiler connection.</source>
<translation>Auf die für die Profiler-Verbindung notwendigen Ports konnte nicht zugegriffen werden.</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorInfoModel</name>
<message>
<source>UDID: %1</source>
<translation>UDID: %1</translation>
@@ -43723,7 +43667,7 @@ You might find further explanations in the Application Output view.</source>
</message>
</context>
<context>
<name>Ios::Internal</name>
<name>::Ios</name>
<message>
<source>Deploy on iOS</source>
<translation>Deployment auf iOS</translation>
@@ -53792,7 +53736,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmakeBuildConfiguration</name>
<name>::Ios</name>
<message>
<source>iOS Settings</source>
<translation type="unfinished">iOS-Einstellungen</translation>
@@ -53861,9 +53805,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
<source>Provisioning profile expired. Expiration date: %1</source>
<translation type="unfinished">Das Provisioning-Profil ist abgelaufen. Ablaufdatum: %1</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDsymBuildStep</name>
<message>
<source>Command:</source>
<translation type="unfinished"></translation>

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

@@ -53068,7 +53068,7 @@ réinitialisation du moniteur</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<name>::Ios</name>
<message>
<source>Base arguments:</source>
<translation>Arguments de base :</translation>
@@ -53093,16 +53093,6 @@ réinitialisation du moniteur</translation>
<source>Configuration is faulty. Check the Issues output pane for details.</source>
<translation>La configuration est défectueuse. Veuillez vérifier la vue des problèmes pour les détails.</translation>
</message>
</context>
<context>
<name>IosDeployStepWidget</name>
<message>
<source>Form</source>
<translation>Formulaire</translation>
</message>
</context>
<context>
<name>IosRunConfiguration</name>
<message>
<source>Form</source>
<translation>Formulaire</translation>
@@ -53115,9 +53105,6 @@ réinitialisation du moniteur</translation>
<source>Executable:</source>
<translation>Exécutable :</translation>
</message>
</context>
<context>
<name>IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>Configuration iOS</translation>
@@ -54113,29 +54100,16 @@ réinitialisation du moniteur</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<name>::Ios</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>Compilation iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</context>
<context>
<name>::Ios</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Could not get debug server file descriptor.</source>
<translation>Impossible de récupérer le fichier de description du serveur de débogage.</translation>
@@ -54148,23 +54122,14 @@ réinitialisation du moniteur</translation>
<source>Run failed unexpectedly.</source>
<translation>L&apos;exécution a échoué de façon inattendu.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy to iOS</source>
<translation>Déploiement sur iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfigurationFactory</name>
<message>
<source>Deploy on iOS</source>
<translation>Déploiement sur iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Déploiement sur %1</translation>
@@ -54189,34 +54154,18 @@ réinitialisation du moniteur</translation>
<source>The Info.plist might be incorrect.</source>
<translation>Le fichier Info.plist est peut-être incorrecte.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepFactory</name>
<message>
<source>Deploy to iOS device or emulator</source>
<translation>Déploiement sur un périphérique iOS ou un émulateur</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepWidget</name>
<message>
<source>&lt;b&gt;Deploy to %1&lt;/b&gt;</source>
<translation>&lt;b&gt;Déploiement sur %1&lt;/b&gt;</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>Périphérique iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Nom du périphérique</translation>
@@ -54250,9 +54199,6 @@ réinitialisation du moniteur</translation>
<source>Do you want to see how to set it up for development?</source>
<translation>Voulez-vous voir comment l&apos;activer pour le développement ?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Échec de la détection des ABI utilisées par la version de Qt.</translation>
@@ -54262,23 +54208,14 @@ réinitialisation du moniteur</translation>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Exécuter sur %1</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfigurationWidget</name>
<message>
<source>iOS run settings</source>
<translation>Paramètres d&apos;exécution iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunControl</name>
<message>
<source>Starting remote process.</source>
<translation>Démarrage des processus distants.</translation>
@@ -54287,9 +54224,6 @@ réinitialisation du moniteur</translation>
<source>Run ended unexpectedly.</source>
<translation>L&apos;exécution s&apos;est terminée de façon inattendu.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Run failed. The settings in the Organizer window of Xcode might be incorrect.</source>
<translation>Échec lors de l&apos;exécution. Les paramètres dans le fenêtre Organizer de Xcode sont peut-être incorrecte.</translation>
@@ -54298,30 +54232,14 @@ réinitialisation du moniteur</translation>
<source>The device is locked, please unlock.</source>
<translation>Le périphérique est verouillé, veuillez le dévérouiller.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS Configurations</source>
<translation>Configurations iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>Simulateur iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>Simulateur iOS</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>Subprocess Error %1</source>
<translation>Erreur du sous-processus %1</translation>

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

@@ -4562,7 +4562,7 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<name>::Ios</name>
<message>
<source>Create Simulator</source>
<translation>Stvori simulatora</translation>
@@ -4583,9 +4583,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
<source>None</source>
<translation>Bez</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildSettingsWidget</name>
<message>
<source>Reset</source>
<translation>Resetiraj</translation>
@@ -4610,10 +4607,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
<source>Default</source>
<translation>Standardno</translation>
</message>
<message>
<source>None</source>
<translation>Bez</translation>
</message>
<message>
<source>Development team is not selected.</source>
<translation>Ekipa razvijatelja nije odabrana.</translation>
@@ -4654,9 +4647,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
<source>Provisioning profile expired. Expiration date: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<message>
<source>Base arguments:</source>
<translation>Osnovni argumenti:</translation>
@@ -4673,9 +4663,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
<source>xcodebuild</source>
<translation>xcodebuild</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosPresetBuildStep</name>
<message>
<source>Reset to Default</source>
<translation>Vrati na zadane vrijednosti</translation>
@@ -4688,9 +4675,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
<source>Arguments:</source>
<translation>Argumenti:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>Konfiguracija za iOS</translation>
@@ -4727,10 +4711,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri
<source>Reset contents and settings of simulator devices.</source>
<translation>Resetiraj sadržaj i postavke simulatora uređaja.</translation>
</message>
<message>
<source>Reset</source>
<translation>Resetiraj</translation>
</message>
<message>
<source>Screenshot directory:</source>
<translation>Direktorij za snimke ekrana:</translation>
@@ -4867,9 +4847,6 @@ UDID: %2</translation>
<source>simulator screenshot</source>
<translation>snimka ekrana simulatora</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Simulator Operation Status</source>
<translation>Stanje operacije simulatora</translation>
@@ -25628,15 +25605,12 @@ Would you like to overwrite them?</source>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<name>::Ios</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>iOS gradnja</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 Simulator</source>
<translation>%1 simulator</translation>
@@ -25669,7 +25643,7 @@ Rok upotrebe: %3</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<name>::Ios</name>
<message>
<source>Deploy to %1</source>
<translation>Primijeni na %1</translation>
@@ -25706,20 +25680,10 @@ Rok upotrebe: %3</translation>
<source>Deploy to iOS device or emulator</source>
<translation>Primijeni na iOS ili emulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>iOS uređaj</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Naziv uređaja</translation>
@@ -25757,16 +25721,10 @@ Rok upotrebe: %3</translation>
<source>Do you want to see how to set it up for development?</source>
<translation>Želiš li vidjeti kako se postavlja za razvoj?</translation>
</message>
</context>
<context>
<name>Ios::Internal</name>
<message>
<source>Deploy on iOS</source>
<translation>Primijeni na iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Neuspjelo prepoznavanje ABI-a, korištenog od Qt verzije.</translation>
@@ -25776,9 +25734,6 @@ Rok upotrebe: %3</translation>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Pokreni na %1</translation>
@@ -25819,13 +25774,6 @@ Rok upotrebe: %3</translation>
<source>%1 is not connected.</source>
<translation>%1 nije povezan.</translation>
</message>
<message>
<source>Device type:</source>
<translation>Vrsta uređaja:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation>Nije bilo moguće naći %1.</translation>
@@ -25854,23 +25802,14 @@ Rok upotrebe: %3</translation>
<source>Run ended with error.</source>
<translation>Pokretanje prekinuto s greškom.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<message>
<source>Starting remote process.</source>
<translation>Započinjanje daljinskog procesa.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmlProfilerSupport</name>
<message>
<source>Could not get necessary ports for the profiler connection.</source>
<translation>Nije bilo moguće dobiti potrebne priključke za vezu s programom za profiliranje.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation>Program nije pokrenut.</translation>
@@ -25883,30 +25822,10 @@ Rok upotrebe: %3</translation>
<source>The dSYM %1 seems to be outdated, it might confuse the debugger.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>iOS simulator</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>iOS simulator</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>iOS tool error %1</source>
<translation>Greška iOS alata %1</translation>
@@ -25943,9 +25862,6 @@ Rok upotrebe: %3</translation>
<source>Invalid simulator response. Device Id mismatch. Device Id = %1 Response Id = %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorInfoModel</name>
<message>
<source>UDID: %1</source>
<translation>UDID: %1</translation>

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

@@ -3720,7 +3720,7 @@ Add, modify, and remove document filters, which determine the documentation set
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<name>::Ios</name>
<message>
<source>Base arguments:</source>
<translation>基本引数:</translation>
@@ -3742,16 +3742,10 @@ Add, modify, and remove document filters, which determine the documentation set
<source>xcodebuild</source>
<translation>xcodebuild</translation>
</message>
</context>
<context>
<name>IosDeployStepWidget</name>
<message>
<source>Form</source>
<translation>フォーム</translation>
</message>
</context>
<context>
<name>IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>iOS 設定</translation>
@@ -21608,15 +21602,7 @@ instead of its installation directory when run outside git bash.</source>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>iOS ビルド</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<name>::Ios</name>
<message>
<source>%1 %2</source>
<translation>%1 %2</translation>
@@ -21625,16 +21611,6 @@ instead of its installation directory when run outside git bash.</source>
<source>%1 Simulator</source>
<translation>%1 シミュレータ</translation>
</message>
</context>
<context>
<name>::Ios</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation>アプリケーションが実行されていません。</translation>
@@ -21667,23 +21643,14 @@ instead of its installation directory when run outside git bash.</source>
<source>Run ended.</source>
<translation>実行が終了しました。</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy to iOS</source>
<translation>iOS にデプロイ</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfigurationFactory</name>
<message>
<source>Deploy on iOS</source>
<translation>iOS にデプロイ</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>%1 にデプロイ</translation>
@@ -21720,20 +21687,10 @@ instead of its installation directory when run outside git bash.</source>
<source>Deploy to iOS device</source>
<translation>iOS デバイスにデプロイ</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepFactory</name>
<message>
<source>Deploy to iOS device or emulator</source>
<translation>iOS デバイス、またはエミュレータにデプロイ</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>iOS デバイス</translation>
@@ -21754,9 +21711,6 @@ instead of its installation directory when run outside git bash.</source>
<source>CPU Architecture:</source>
<translation>CPU アーキテクチャ:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>デバイス名</translation>
@@ -21794,9 +21748,6 @@ instead of its installation directory when run outside git bash.</source>
<source>Do you want to see how to set it up for development?</source>
<translation>開発用にデバイスを設定する方法を確認しますか？</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Qt で使用されている ABI の検出に失敗しました。</translation>
@@ -21806,9 +21757,6 @@ instead of its installation directory when run outside git bash.</source>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>%1 で実行</translation>
@@ -21861,31 +21809,14 @@ instead of its installation directory when run outside git bash.</source>
<source>Executable:</source>
<translation>実行ファイル:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfigurationWidget</name>
<message>
<source>iOS run settings</source>
<translation>iOS 実行設定</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunControl</name>
<message>
<source>Starting remote process.</source>
<translation>リモートプロセスを起動します。</translation>
</message>
<message>
<source>Run ended with error.</source>
<translation>エラーが発生しました。</translation>
</message>
<message>
<source>Run ended.</source>
<translation>実行が終了しました。</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation>%1 が見つかりませんでした。</translation>
@@ -21906,31 +21837,10 @@ instead of its installation directory when run outside git bash.</source>
<source>The device is locked, please unlock.</source>
<translation>デバイスがロックされています。ロックを解除してください。</translation>
</message>
<message>
<source>Run ended.</source>
<translation>実行が終了しました。</translation>
</message>
<message>
<source>Run ended with error.</source>
<translation>エラーが発生しました。</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS Configurations</source>
<translation>iOS 設定</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>iOS シミュレータ</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>iOS シミュレータ</translation>
@@ -32297,7 +32207,7 @@ When a problem is detected, the application is interrupted and can be debugged.<
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<name>::Ios</name>
<message>
<source>iOS tool Error %1</source>
<translation>iOS ツールエラー %1</translation>
@@ -33649,7 +33559,7 @@ kill しますか？</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosPresetBuildStep</name>
<name>::Ios</name>
<message>
<source>Reset to Default</source>
<translation>既定に戻す</translation>
@@ -33663,17 +33573,6 @@ kill しますか？</translation>
<translation>引数:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosAnalyzeSupport</name>
<message>
<source>Run ended with error.</source>
<translation>エラーが発生しました。</translation>
</message>
<message>
<source>Run ended.</source>
<translation>実行が終了しました。</translation>
</message>
</context>
<context>
<name>Utils::ProxyCredentialsDialog</name>
<message>
@@ -44271,26 +44170,11 @@ Output:
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<message>
<source>Device type:</source>
<translation>デバイス種類:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>iOS 設定</translation>
</message>
<name>::Ios</name>
<message>
<source>Devices</source>
<translation>デバイス</translation>
</message>
<message>
<source>Ask about devices not in developer mode</source>
<translation>デバイスがデベロッパーモードかどうか確認する</translation>
</message>
<message>
<source>Rename</source>
<translation>名前を変更</translation>
@@ -44307,13 +44191,6 @@ Output:
<source>Start</source>
<translation>開始</translation>
</message>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Unknown</source>
<translation>不明</translation>
@@ -47527,15 +47404,11 @@ Stepping into the module or setting breakpoints by file and line is expected to
</message>
</context>
<context>
<name>Ios::Internal::IosQmakeBuildConfiguration</name>
<name>::Ios</name>
<message>
<source>iOS Settings</source>
<translation>iOS の設定</translation>
</message>
<message>
<source>Reset</source>
<translation>リセット</translation>
</message>
<message>
<source>Automatically manage signing</source>
<translation>署名を自動的に管理する</translation>
@@ -47605,33 +47478,7 @@ Stepping into the module or setting breakpoints by file and line is expected to
</message>
</context>
<context>
<name>Ios::Internal::IosDsymBuildStep</name>
<message>
<source>Command:</source>
<translation>コマンド:</translation>
</message>
<message>
<source>Arguments:</source>
<translation>引数:</translation>
</message>
<message>
<source>Reset to Default</source>
<translation>既定に戻す</translation>
</message>
</context>
<context>
<name>Ios::Internal</name>
<message>
<source>Deploy on iOS</source>
<translation>iOS にデプロイ</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<message>
<source>Starting remote process.</source>
<translation>リモートプロセスを起動します。</translation>
</message>
<name>::Ios</name>
</context>
<context>
<name>LanguageClient::DiagnosticManager</name>

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

@@ -25844,7 +25844,7 @@ Zdalny: %4</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<name>::Ios</name>
<message>
<source>Base arguments:</source>
<translation>Podstawowe argumenty:</translation>
@@ -26631,22 +26631,16 @@ Czy odinstalować istniejący pakiet?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<name>::Ios</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>Wersja iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 Simulator</source>
<translation>Symulator %1</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation>Aplikacja nie jest uruchomiona.</translation>
@@ -26663,23 +26657,14 @@ Czy odinstalować istniejący pakiet?</translation>
<source>The dSYM %1 seems to be outdated, it might confuse the debugger.</source>
<translation>dSYM %1 może być nieaktualny i może spowodować nieprawidłową pracę debuggera.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy to iOS</source>
<translation>Zainstaluj na iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfigurationFactory</name>
<message>
<source>Deploy on iOS</source>
<translation>Zainstaluj na iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Zainstaluj na %1</translation>
@@ -26708,27 +26693,14 @@ Czy odinstalować istniejący pakiet?</translation>
<source>The provisioning profile &quot;%1&quot; (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepFactory</name>
<message>
<source>Deploy to iOS device or emulator</source>
<translation>Zainstaluj na urządzeniu iOS lub emulatorze</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>Urządzenie iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Nazwa urządzenia</translation>
@@ -26766,9 +26738,6 @@ Czy odinstalować istniejący pakiet?</translation>
<source>Do you want to see how to set it up for development?</source>
<translation>Czy chcesz zobaczyć jak przełączyć je do trybu deweloperskiego?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Nie można wykryć ABI użytych przez wersję Qt.</translation>
@@ -26778,9 +26747,6 @@ Czy odinstalować istniejący pakiet?</translation>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Uruchom na %1</translation>
@@ -26837,9 +26803,6 @@ Czy odinstalować istniejący pakiet?</translation>
<source>iOS run settings</source>
<translation>Ustawienia uruchamiania iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation>Nie można odnaleźć %1.</translation>
@@ -26872,30 +26835,10 @@ Czy odinstalować istniejący pakiet?</translation>
<source>Run ended with error.</source>
<translation>Praca zakończona błędem.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>Symulator iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>iOS Simulator</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>iOS tool error %1</source>
<translation>Błąd narzędzia iOS %1</translation>
@@ -28626,7 +28569,7 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5.</transl
</message>
</context>
<context>
<name>Ios::Internal::IosPresetBuildStep</name>
<name>::Ios</name>
<message>
<source>Reset to Default</source>
<translation>Przywróć domyślny</translation>
@@ -39549,7 +39492,7 @@ Wiersz: %4, kolumna: %5
</message>
</context>
<context>
<name>Ios::Internal::IosBuildSettingsWidget</name>
<name>::Ios</name>
<message>
<source>Form</source>
<translation>Formularz</translation>
@@ -39622,16 +39565,6 @@ Wiersz: %4, kolumna: %5
<source>Provisioning profile expired. Expiration date: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepWidget</name>
<message>
<source>Form</source>
<translation>Formularz</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>Konfiguracja iOS</translation>
@@ -39668,10 +39601,6 @@ Wiersz: %4, kolumna: %5
<source>Reset contents and settings of simulator devices.</source>
<translation>Resetuje zawartości i ustawienia symulatorów.</translation>
</message>
<message>
<source>Reset</source>
<translation>Reset</translation>
</message>
<message>
<source>Screenshot directory:</source>
<translation>Katalog ze zrzutami ekranu:</translation>
@@ -40869,7 +40798,7 @@ Termin wygaśnięcia: %3</translation>
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<name>::Ios</name>
<message>
<source>Create Simulator</source>
<translation>Utwórz symulator</translation>
@@ -40878,21 +40807,10 @@ Termin wygaśnięcia: %3</translation>
<source>Simulator name:</source>
<translation>Nazwa symulatora:</translation>
</message>
<message>
<source>Device type:</source>
<translation>Typ urządzenia:</translation>
</message>
<message>
<source>OS version:</source>
<translation>Wersja OS:</translation>
</message>
<message>
<source>None</source>
<translation>Brak</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Simulator Operation Status</source>
<translation>Stan operacji symulatora</translation>
@@ -41108,21 +41026,15 @@ Błąd: %5</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<name>::Ios</name>
<message>
<source>Starting remote process.</source>
<translation>Uruchamianie zdalnego procesu.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmlProfilerSupport</name>
<message>
<source>Could not get necessary ports for the profiler connection.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorInfoModel</name>
<message>
<source>UDID: %1</source>
<translation>UDID: %1</translation>

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

@@ -23846,14 +23846,11 @@ Ids must begin with a lowercase letter.</source>
</message>
</context>
<context>
<name>Ios::Internal</name>
<name>::Ios</name>
<message>
<source>Deploy on iOS</source>
<translation>Развернуть на iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<message>
<source>Create Simulator</source>
<translation>Создание эмулятора</translation>
@@ -23874,9 +23871,6 @@ Ids must begin with a lowercase letter.</source>
<source>None</source>
<translation>Нет</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildConfiguration</name>
<message>
<source>Reset</source>
<translation>Сбросить</translation>
@@ -23901,10 +23895,6 @@ Ids must begin with a lowercase letter.</source>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<source>None</source>
<translation>Нет</translation>
</message>
<message>
<source>Development team is not selected.</source>
<translation>Команда разработчиков не выбрана.</translation>
@@ -23945,9 +23935,6 @@ Ids must begin with a lowercase letter.</source>
<source>Provisioning profile expired. Expiration date: %1</source>
<translation>Провизионный профиль истёк %1</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<message>
<source>Base arguments:</source>
<translation>Базовые параметры:</translation>
@@ -23969,16 +23956,10 @@ Ids must begin with a lowercase letter.</source>
<source>Reset Defaults</source>
<translation>По умолчанию</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 Simulator</source>
<translation>Эмулятор %1</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation>Приложение не запущено.</translation>
@@ -23991,9 +23972,6 @@ Ids must begin with a lowercase letter.</source>
<source>The dSYM %1 seems to be outdated, it might confuse the debugger.</source>
<translation>Видимо dSYM %1 устарел, он может смутить отладчик.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Развернуть на %1</translation>
@@ -24030,9 +24008,6 @@ Ids must begin with a lowercase letter.</source>
<source>Deploy to iOS device or emulator</source>
<translation>Развёртывание на устройство или эмулятор iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS Device</source>
<translation>Устройство iOS</translation>
@@ -24053,13 +24028,6 @@ Ids must begin with a lowercase letter.</source>
<source>CPU Architecture:</source>
<translation>Архитектура ЦПУ:</translation>
</message>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Название устройства</translation>
@@ -24097,9 +24065,6 @@ Ids must begin with a lowercase letter.</source>
<source>Do you want to see how to set it up for development?</source>
<translation>Желаете узнать, как перевести его в режим разработки?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosPresetBuildStep</name>
<message>
<source>Reset to Default</source>
<translation>По умолчанию</translation>
@@ -24112,16 +24077,10 @@ Ids must begin with a lowercase letter.</source>
<source>Arguments:</source>
<translation>Параметры:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmlProfilerSupport</name>
<message>
<source>Could not get necessary ports for the profiler connection.</source>
<translation>Не удалось получить необходимые порты для подключения профайлера.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Не удалось определить ABI, используемые профилем Qt.</translation>
@@ -24131,9 +24090,6 @@ Ids must begin with a lowercase letter.</source>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Запуск на %1</translation>
@@ -24174,20 +24130,10 @@ Ids must begin with a lowercase letter.</source>
<source>%1 is not connected.</source>
<translation>%1 не подключён.</translation>
</message>
<message>
<source>Device type:</source>
<translation>Тип устройства:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<message>
<source>Starting remote process.</source>
<translation>Запуск внешнего процесса.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation>Не удалось найти %1.</translation>
@@ -24216,9 +24162,6 @@ Ids must begin with a lowercase letter.</source>
<source>Run ended with error.</source>
<translation>Выполнение завершилось с ошибкой.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>Конфигурация iOS</translation>
@@ -24255,10 +24198,6 @@ Ids must begin with a lowercase letter.</source>
<source>Reset contents and settings of simulator devices.</source>
<translation>Сбросить содержимое и настройки эмулируемых устройств.</translation>
</message>
<message>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
<source>Screenshot directory:</source>
<translation>Каталог снимков экрана:</translation>
@@ -24395,20 +24334,10 @@ Error: %2</source>
<source>simulator screenshot</source>
<translation>снимок экрана эмулятора</translation>
</message>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>Эмулятор iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorInfoModel</name>
<message>
<source>UDID: %1</source>
<translation>UDID: %1</translation>
@@ -24425,9 +24354,6 @@ Error: %2</source>
<source>Current State</source>
<translation>Текущее состояние</translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Simulator Operation Status</source>
<translation>Состояние эмулятора</translation>
@@ -24456,9 +24382,6 @@ Error: %5</translation>
<source>Done.</source>
<translation>Готово.</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>iOS tool error %1</source>
<translation>Ошибка %1 утилиты iOS</translation>

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

@@ -35426,7 +35426,7 @@ monitor reset</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<name>::Ios</name>
<message>
<source>Base arguments:</source>
<translation>Базові аргументи:</translation>
@@ -35451,27 +35451,17 @@ monitor reset</translation>
<source>Configuration is faulty. Check the Issues output pane for details.</source>
<translation type="vanished">Конфігурація збійна. Перевірте вид &quot;Проблеми&quot; для деталей.</translation>
</message>
</context>
<context>
<name>IosDeployStepWidget</name>
<message>
<source>Form</source>
<translation>Форма</translation>
</message>
</context>
<context>
<name>IosRunConfiguration</name>
<message>
<source>Form</source>
<translation type="vanished">Форма</translation>
</message>
<message>
<source>Arguments:</source>
<translation type="vanished">Аргументи:</translation>
<translation>Аргументи:</translation>
</message>
<message>
<source>Executable:</source>
<translation type="vanished">Виконуваний модуль:</translation>
<translation>Виконуваний модуль:</translation>
</message>
<message>
<source>iPhone 3.5-inch Retina display</source>
@@ -35509,9 +35499,6 @@ monitor reset</translation>
<source>Device type:</source>
<translation type="vanished">Тип пристрою:</translation>
</message>
</context>
<context>
<name>IosSettingsWidget</name>
<message>
<source>iOS Configuration</source>
<translation>Конфігурація iOS</translation>
@@ -36422,29 +36409,16 @@ Do you want to uninstall the existing package next time?</source>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStepConfigWidget</name>
<name>::Ios</name>
<message>
<source>iOS build</source>
<comment>iOS BuildStep display name.</comment>
<translation>Збірка iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</context>
<context>
<name>::Ios</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Could not find device specific debug symbols at %1. Debugging initialization will be slow until you open the Organizer window of Xcode with the device connected to have the symbols generated.</source>
<translation>Не вдалось знайти специфічних для пристрою символів зневадження в %1. Ініціалізація зневадження буде повільною, поки ви не відкриєте вікно Organizer в Xcode при підключеному пристрої, щоб символи згенерувались.</translation>
@@ -36477,23 +36451,14 @@ Do you want to uninstall the existing package next time?</source>
<source>Run failed unexpectedly.</source>
<translation type="vanished">Несподіваний збій запуску.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy to iOS</source>
<translation>Розгортання на iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployConfigurationFactory</name>
<message>
<source>Deploy on iOS</source>
<translation>Розгортання на iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation>Розгортання на %1</translation>
@@ -36518,34 +36483,22 @@ Do you want to uninstall the existing package next time?</source>
<source>The Info.plist might be incorrect.</source>
<translation>Файл Info.plist може бути неправильним.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepFactory</name>
<message>
<source>The provisioning profile &quot;%1&quot; (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deploy to iOS device or emulator</source>
<translation>Розгортання на пристрій iOS або емулятор</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStepWidget</name>
<message>
<source>&lt;b&gt;Deploy to %1&lt;/b&gt;</source>
<translation type="vanished">&lt;b&gt;Розгортання на %1&lt;/b&gt;</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation>iOS</translation>
</message>
<message>
<source>iOS Device</source>
<translation>Пристрій iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation>Назва пристрою</translation>
@@ -36583,9 +36536,6 @@ Do you want to uninstall the existing package next time?</source>
<source>Do you want to see how to set it up for development?</source>
<translation>Бажаєте дізнатись, як перевести його в режим розробника?</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation>Збій визначення ABI, що використовуються версією Qt.</translation>
@@ -36595,9 +36545,6 @@ Do you want to uninstall the existing package next time?</source>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation>iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation>Запустити на %1</translation>
@@ -36646,43 +36593,18 @@ Do you want to uninstall the existing package next time?</source>
<source>%1 is not connected.</source>
<translation>%1 не підключено.</translation>
</message>
<message>
<source>Device type:</source>
<translation>Тип пристрою:</translation>
</message>
<message>
<source>Executable:</source>
<translation>Виконуваний модуль:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfigurationWidget</name>
<message>
<source>iOS run settings</source>
<translation>Налаштування запуску iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunControl</name>
<message>
<source>Starting remote process.</source>
<translation>Запуск віддаленого процесу.</translation>
</message>
<message>
<source>Run ended with error.</source>
<translation>Виконання закінчилось з помилкою.</translation>
</message>
<message>
<source>Run ended.</source>
<translation>Виконання закінчилось.</translation>
</message>
<message>
<source>Run ended unexpectedly.</source>
<translation type="vanished">Запуск несподівано завершився.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation>Не вдалось знайти %1.</translation>
@@ -36695,30 +36617,14 @@ Do you want to uninstall the existing package next time?</source>
<source>The device is locked, please unlock.</source>
<translation>Пристрій заблоковано, будь ласка, розблокуйте його.</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsPage</name>
<message>
<source>iOS Configurations</source>
<translation>Конфігурації iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation>Симулятор iOS</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulatorFactory</name>
<message>
<source>iOS Simulator</source>
<translation>Симулятор iOS</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>Subprocess Error %1</source>
<translation type="vanished">Помилка підпроцесу %1</translation>
@@ -37778,7 +37684,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</message>
</context>
<context>
<name>Ios::Internal::IosPresetBuildStep</name>
<name>::Ios</name>
<message>
<source>Reset to Default</source>
<translation>Скинути до типового</translation>
@@ -37787,10 +37693,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Command:</source>
<translation>Команда:</translation>
</message>
<message>
<source>Arguments:</source>
<translation>Аргументи:</translation>
</message>
</context>
<context>
<name>PuppetDialog</name>
@@ -38801,15 +38703,7 @@ Do you want to kill it?</source>
</message>
</context>
<context>
<name>Ios::Internal::IosAnalyzeSupport</name>
<message>
<source>Run ended with error.</source>
<translation>Виконання закінчилось з помилкою.</translation>
</message>
<message>
<source>Run ended.</source>
<translation>Виконання закінчилось.</translation>
</message>
<name>::Ios</name>
</context>
<context>
<name>::ProjectExplorer</name>

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

@@ -24090,14 +24090,11 @@ Id必须以小写字母开头。</translation>
</message>
</context>
<context>
<name>Ios::Internal</name>
<name>::Ios</name>
<message>
<source>Deploy on iOS</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::CreateSimulatorDialog</name>
<message>
<source>Create Simulator</source>
<translation type="unfinished"></translation>
@@ -24118,9 +24115,6 @@ Id必须以小写字母开头。</translation>
<source>None</source>
<translation type="unfinished">无</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosBuildStep</name>
<message>
<source>Base arguments:</source>
<translation type="unfinished"></translation>
@@ -24142,16 +24136,10 @@ Id必须以小写字母开头。</translation>
<source>xcodebuild</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosConfigurations</name>
<message>
<source>%1 Simulator</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDebugSupport</name>
<message>
<source>Application not running.</source>
<translation type="unfinished"></translation>
@@ -24164,9 +24152,6 @@ Id必须以小写字母开头。</translation>
<source>The dSYM %1 seems to be outdated, it might confuse the debugger.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeployStep</name>
<message>
<source>Deploy to %1</source>
<translation type="unfinished"></translation>
@@ -24203,13 +24188,6 @@ Id必须以小写字母开头。</translation>
<source>Deploy to iOS device</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>iOS Device</source>
<translation type="unfinished"></translation>
@@ -24230,9 +24208,6 @@ Id必须以小写字母开头。</translation>
<source>CPU Architecture:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDeviceManager</name>
<message>
<source>Device name</source>
<translation type="unfinished"></translation>
@@ -24270,9 +24245,6 @@ Id必须以小写字母开头。</translation>
<source>Do you want to see how to set it up for development?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosDsymBuildStep</name>
<message>
<source>Command:</source>
<translation type="unfinished">命令:</translation>
@@ -24285,9 +24257,6 @@ Id必须以小写字母开头。</translation>
<source>Reset to Default</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmakeBuildConfiguration</name>
<message>
<source>iOS Settings</source>
<translation type="unfinished"></translation>
@@ -24312,10 +24281,6 @@ Id必须以小写字母开头。</translation>
<source>Default</source>
<translation type="unfinished">默认</translation>
</message>
<message>
<source>None</source>
<translation type="unfinished">无</translation>
</message>
<message>
<source>Development team is not selected.</source>
<translation type="unfinished"></translation>
@@ -24356,16 +24321,10 @@ Id必须以小写字母开头。</translation>
<source>Provisioning profile expired. Expiration date: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQmlProfilerSupport</name>
<message>
<source>Could not get necessary ports for the profiler connection.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosQtVersion</name>
<message>
<source>Failed to detect the ABIs used by the Qt version.</source>
<translation type="unfinished">检测Qt版本使用的ABI失败。</translation>
@@ -24375,9 +24334,6 @@ Id必须以小写字母开头。</translation>
<extracomment>Qt Version is meant for Ios</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunConfiguration</name>
<message>
<source>Run on %1</source>
<translation type="unfinished"></translation>
@@ -24418,20 +24374,10 @@ Id必须以小写字母开头。</translation>
<source>%1 is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device type:</source>
<translation type="unfinished">设备类型:</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
<message>
<source>Starting remote process.</source>
<translation type="unfinished">启动远端进程。</translation>
</message>
</context>
<context>
<name>Ios::Internal::IosRunner</name>
<message>
<source>Could not find %1.</source>
<translation type="unfinished"></translation>
@@ -24460,13 +24406,6 @@ Id必须以小写字母开头。</translation>
<source>Run ended with error.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSettingsWidget</name>
<message>
<source>iOS</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>iOS Configuration</source>
<translation type="unfinished"></translation>
@@ -24491,10 +24430,6 @@ Id必须以小写字母开头。</translation>
<source>Delete simulator devices.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished">重置</translation>
</message>
<message>
<source>Reset contents and settings of simulator devices.</source>
<translation type="unfinished"></translation>
@@ -24629,16 +24564,10 @@ Error: %2</source>
<source>simulator screenshot</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::IosSimulator</name>
<message>
<source>iOS Simulator</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorInfoModel</name>
<message>
<source>UDID: %1</source>
<translation type="unfinished"></translation>
@@ -24655,9 +24584,6 @@ Error: %2</source>
<source>Current State</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Internal::SimulatorOperationDialog</name>
<message>
<source>Simulator Operation Status</source>
<translation type="unfinished"></translation>
@@ -24682,9 +24608,6 @@ Error: %5</source>
<source>Done.</source>
<translation type="unfinished">完成。</translation>
</message>
</context>
<context>
<name>Ios::IosToolHandler</name>
<message>
<source>iOS tool error %1</source>
<translation type="unfinished"></translation>
@@ -24721,9 +24644,6 @@ Error: %5</source>
<source>Invalid simulator response. Device Id mismatch. Device Id = %1 Response Id = %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Ios::Relayer</name>
<message>
<source>iOS Debugging connection to creator failed with error %1</source>
<translation type="unfinished"></translation>

13
src/plugins/ios/createsimulatordialog.cpp
View File

@@ -3,6 +3,7 @@
#include "createsimulatordialog.h"
#include "iostr.h"
#include "simulatorcontrol.h"
#include <utils/algorithm.h>
@@ -22,7 +23,7 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent)
: QDialog(parent)
{
resize(320, 160);
setWindowTitle(tr("Create Simulator"));
setWindowTitle(Tr::tr("Create Simulator"));
m_nameEdit = new QLineEdit(this);
m_deviceTypeCombo = new QComboBox(this);
@@ -35,9 +36,9 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent)
Column {
Form {
tr("Simulator name:"), m_nameEdit, br,
tr("Device type:"), m_deviceTypeCombo, br,
tr("OS version:"), m_runtimeCombo, br,
Tr::tr("Simulator name:"), m_nameEdit, br,
Tr::tr("Device type:"), m_deviceTypeCombo, br,
Tr::tr("OS version:"), m_runtimeCombo, br,
},
buttonBox
}.attachTo(this);
@@ -110,7 +111,7 @@ DeviceTypeInfo CreateSimulatorDialog::deviceType() const
void CreateSimulatorDialog::populateDeviceTypes(const QList<DeviceTypeInfo> &deviceTypes)
{
m_deviceTypeCombo->clear();
m_deviceTypeCombo->addItem(tr("None"));
m_deviceTypeCombo->addItem(Tr::tr("None"));
if (deviceTypes.isEmpty())
return;
@@ -146,7 +147,7 @@ void CreateSimulatorDialog::populateDeviceTypes(const QList<DeviceTypeInfo> &dev
void CreateSimulatorDialog::populateRuntimes(const DeviceTypeInfo &deviceType)
{
m_runtimeCombo->clear();
m_runtimeCombo->addItem(tr("None"));
m_runtimeCombo->addItem(Tr::tr("None"));
if (deviceType.name.isEmpty())
return;

2
src/plugins/ios/createsimulatordialog.h
View File

@@ -23,8 +23,6 @@ class RuntimeInfo;
*/
class CreateSimulatorDialog : public QDialog
{
Q_OBJECT
public:
explicit CreateSimulatorDialog(QWidget *parent = nullptr);
~CreateSimulatorDialog() override;

47
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -5,6 +5,7 @@
#include "iosconfigurations.h"
#include "iosconstants.h"
#include "iostr.h"
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/namedwidget.h>
@@ -82,7 +83,7 @@ private:
IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConfiguration,
BoolAspect *autoManagedSigning,
StringAspect *signingIdentifier)
: NamedWidget(IosQmakeBuildConfiguration::tr("iOS Settings"))
: NamedWidget(Tr::tr("iOS Settings"))
, m_autoManagedSigning(autoManagedSigning)
, m_signingIdentifier(signingIdentifier)
, m_isDevice(DeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
@@ -96,7 +97,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
m_qmakeDefaults->setSizePolicy(sizePolicy);
m_qmakeDefaults->setText(IosQmakeBuildConfiguration::tr("Reset"));
m_qmakeDefaults->setText(Tr::tr("Reset"));
m_qmakeDefaults->setEnabled(m_isDevice);
m_signEntityCombo = new QComboBox(container);
@@ -111,7 +112,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
sizePolicy2.setVerticalStretch(0);
m_autoSignCheckbox->setSizePolicy(sizePolicy2);
m_autoSignCheckbox->setChecked(true);
m_autoSignCheckbox->setText(IosQmakeBuildConfiguration::tr("Automatically manage signing"));
m_autoSignCheckbox->setText(Tr::tr("Automatically manage signing"));
m_autoSignCheckbox->setChecked(m_autoManagedSigning->value());
m_autoSignCheckbox->setEnabled(m_isDevice);
@@ -121,7 +122,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
m_warningLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning, container);
m_signEntityLabel->setText(IosQmakeBuildConfiguration::tr("Development team:"));
m_signEntityLabel->setText(Tr::tr("Development team:"));
connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosSigningSettingsWidget::onReset);
@@ -216,8 +217,8 @@ void IosSigningSettingsWidget::onReset()
void IosSigningSettingsWidget::configureSigningUi(bool autoManageSigning)
{
m_signEntityLabel->setText(autoManageSigning
? IosQmakeBuildConfiguration::tr("Development team:")
: IosQmakeBuildConfiguration::tr("Provisioning profile:"));
? Tr::tr("Development team:")
: Tr::tr("Provisioning profile:"));
if (autoManageSigning)
populateDevelopmentTeams();
else
@@ -242,7 +243,7 @@ void IosSigningSettingsWidget::populateDevelopmentTeams()
QSignalBlocker blocker(m_signEntityCombo);
// Populate Team id's
m_signEntityCombo->clear();
m_signEntityCombo->addItem(IosQmakeBuildConfiguration::tr("Default"));
m_signEntityCombo->addItem(Tr::tr("Default"));
const auto teams = IosConfigurations::developmentTeams();
for (auto team : teams) {
m_signEntityCombo->addItem(team->displayName());
@@ -271,7 +272,7 @@ void IosSigningSettingsWidget::populateProvisioningProfiles()
m_signEntityCombo->setItemData(index, profile->details(), Qt::ToolTipRole);
}
} else {
m_signEntityCombo->addItem(IosQmakeBuildConfiguration::tr("None"));
m_signEntityCombo->addItem(Tr::tr("None"));
}
}
// Maintain previous selection.
@@ -302,12 +303,11 @@ void IosSigningSettingsWidget::updateInfoText()
if (identifier.isEmpty()) {
// No signing entity selection.
if (configuringTeams)
addMessage(IosQmakeBuildConfiguration::tr("Development team is not selected."));
addMessage(Tr::tr("Development team is not selected."));
else
addMessage(IosQmakeBuildConfiguration::tr("Provisioning profile is not selected."));
addMessage(Tr::tr("Provisioning profile is not selected."));
addMessage(IosQmakeBuildConfiguration::tr(
"Using default development team and provisioning profile."));
addMessage(Tr::tr("Using default development team and provisioning profile."));
} else {
if (!configuringTeams) {
ProvisioningProfilePtr profile = IosConfigurations::provisioningProfile(identifier);
@@ -315,17 +315,15 @@ void IosSigningSettingsWidget::updateInfoText()
auto team = profile->developmentTeam();
if (team) {
// Display corresponding team information.
addMessage(IosQmakeBuildConfiguration::tr("Development team: %1 (%2)")
addMessage(Tr::tr("Development team: %1 (%2)")
.arg(team->displayName())
.arg(team->identifier()));
addMessage(IosQmakeBuildConfiguration::tr(
"Settings defined here override the QMake environment."));
addMessage(Tr::tr("Settings defined here override the QMake environment."));
} else {
qCDebug(iosSettingsLog) << "Development team not found for profile" << profile;
}
} else {
addMessage(IosQmakeBuildConfiguration::tr(
"Settings defined here override the QMake environment."));
addMessage(Tr::tr("Settings defined here override the QMake environment."));
}
}
@@ -341,24 +339,23 @@ void IosSigningSettingsWidget::updateWarningText()
QString warningText;
bool configuringTeams = m_autoSignCheckbox->isChecked();
if (m_signEntityCombo->count() < 2) {
warningText = IosQmakeBuildConfiguration::tr("%1 not configured. Use Xcode and Apple "
"developer account to configure the "
"provisioning profiles and teams.")
warningText = Tr::tr("%1 not configured. Use Xcode and Apple "
"developer account to configure the "
"provisioning profiles and teams.")
.arg(configuringTeams
? IosQmakeBuildConfiguration::tr("Development teams")
: IosQmakeBuildConfiguration::tr("Provisioning profiles"));
? Tr::tr("Development teams")
: Tr::tr("Provisioning profiles"));
} else {
QString identifier = selectedIdentifier();
if (configuringTeams) {
auto team = IosConfigurations::developmentTeam(identifier);
if (team && !team->hasProvisioningProfile())
warningText = IosQmakeBuildConfiguration::tr(
"No provisioning profile found for the selected team.");
warningText = Tr::tr("No provisioning profile found for the selected team.");
} else {
auto profile = IosConfigurations::provisioningProfile(identifier);
if (profile && QDateTime::currentDateTimeUtc() > profile->expirationDate()) {
warningText
= IosQmakeBuildConfiguration::tr(
= Tr::tr(
"Provisioning profile expired. Expiration date: %1")
.arg(QLocale::system().toString(profile->expirationDate().toLocalTime(),
QLocale::LongFormat));

13
src/plugins/ios/iosbuildconfiguration.h
View File

@@ -2,17 +2,13 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include "qmakeprojectmanager/qmakebuildconfiguration.h"
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
#include <cmakeprojectmanager/cmakebuildconfiguration.h>
#include <utils/aspects.h>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosQmakeBuildConfiguration : public QmakeProjectManager::QmakeBuildConfiguration
{
Q_OBJECT
public:
IosQmakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
@@ -34,8 +30,6 @@ public:
class IosCMakeBuildConfiguration : public CMakeProjectManager::CMakeBuildConfiguration
{
Q_OBJECT
public:
IosCMakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
@@ -55,5 +49,4 @@ public:
IosCMakeBuildConfigurationFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

24
src/plugins/ios/iosbuildstep.cpp
View File

@@ -2,7 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "iosbuildstep.h"
#include "iosconstants.h"
#include "iostr.h"
#include <projectexplorer/abstractprocessstep.h>
#include <projectexplorer/buildconfiguration.h>
@@ -17,7 +19,7 @@
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
@@ -31,8 +33,7 @@ using namespace Core;
using namespace ProjectExplorer;
using namespace Utils;
namespace Ios {
namespace Internal {
namespace Ios::Internal {
const char IOS_BUILD_STEP_ID[] = "Ios.IosBuildStep";
const char BUILD_USE_DEFAULT_ARGS_KEY[] = "Ios.IosBuildStep.XcodeArgumentsUseDefault";
@@ -41,10 +42,8 @@ const char CLEAN_KEY[] = "Ios.IosBuildStep.Clean";
class IosBuildStep final : public AbstractProcessStep
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep)
public:
IosBuildStep(BuildStepList *stepList, Utils::Id id);
IosBuildStep(BuildStepList *stepList, Id id);
private:
QWidget *createConfigWidget() final;
@@ -69,17 +68,17 @@ QWidget *IosBuildStep::createConfigWidget()
{
auto widget = new QWidget;
auto buildArgumentsLabel = new QLabel(tr("Base arguments:"), widget);
auto buildArgumentsLabel = new QLabel(Tr::tr("Base arguments:"), widget);
auto buildArgumentsTextEdit = new QPlainTextEdit(widget);
buildArgumentsTextEdit->setPlainText(ProcessArgs::joinArgs(baseArguments()));
auto resetDefaultsButton = new QPushButton(widget);
resetDefaultsButton->setLayoutDirection(Qt::RightToLeft);
resetDefaultsButton->setText(tr("Reset Defaults"));
resetDefaultsButton->setText(Tr::tr("Reset Defaults"));
resetDefaultsButton->setEnabled(!m_useDefaultArguments);
auto extraArgumentsLabel = new QLabel(tr("Extra arguments:"), widget);
auto extraArgumentsLabel = new QLabel(Tr::tr("Extra arguments:"), widget);
auto extraArgumentsLineEdit = new QLineEdit(widget);
extraArgumentsLineEdit->setText(ProcessArgs::joinArgs(m_extraArguments));
@@ -91,7 +90,7 @@ QWidget *IosBuildStep::createConfigWidget()
gridLayout->addWidget(extraArgumentsLabel, 2, 0, 1, 1);
gridLayout->addWidget(extraArgumentsLineEdit, 2, 1, 1, 1);
setDisplayName(tr("iOS build", "iOS BuildStep display name."));
setDisplayName(Tr::tr("iOS build", "iOS BuildStep display name."));
auto updateDetails = [this] {
ProcessParameters param;
@@ -255,8 +254,7 @@ IosBuildStepFactory::IosBuildStepFactory()
Constants::IOS_SIMULATOR_TYPE});
setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_CLEAN,
ProjectExplorer::Constants::BUILDSTEPS_BUILD});
setDisplayName(IosBuildStep::tr("xcodebuild"));
setDisplayName(Tr::tr("xcodebuild"));
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

6
src/plugins/ios/iosbuildstep.h
View File

@@ -5,8 +5,7 @@
#include <projectexplorer/buildstep.h>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosBuildStepFactory final : public ProjectExplorer::BuildStepFactory
{
@@ -14,5 +13,4 @@ public:
IosBuildStepFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

14
src/plugins/ios/iosconfigurations.cpp
View File

@@ -2,11 +2,13 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "iosconfigurations.h"
#include "iosconstants.h"
#include "iosdevice.h"
#include "iossimulator.h"
#include "simulatorcontrol.h"
#include "iosprobe.h"
#include "iossimulator.h"
#include "iostr.h"
#include "simulatorcontrol.h"
#include <coreplugin/icore.h>
@@ -283,7 +285,7 @@ void IosConfigurations::updateAutomaticKitList()
const auto init = [&](Kit *k) {
k->setAutoDetected(true);
const QString baseDisplayName = isSimulatorDeviceId(pDeviceType)
? tr("%1 Simulator").arg(qtVersion->unexpandedDisplayName())
? Tr::tr("%1 Simulator").arg(qtVersion->unexpandedDisplayName())
: qtVersion->unexpandedDisplayName();
k->setUnexpandedDisplayName(baseDisplayName);
setupKit(k, pDeviceType, platformToolchains, debuggerId, sdk.path, qtVersion);
@@ -616,8 +618,8 @@ QString DevelopmentTeam::displayName() const
QString DevelopmentTeam::details() const
{
return tr("%1 - Free Provisioning Team : %2")
.arg(m_identifier).arg(m_freeTeam ? tr("Yes") : tr("No"));
return Tr::tr("%1 - Free Provisioning Team : %2")
.arg(m_identifier).arg(m_freeTeam ? Tr::tr("Yes") : Tr::tr("No"));
}
QDebug &operator<<(QDebug &stream, DevelopmentTeamPtr team)
@@ -641,7 +643,7 @@ QString ProvisioningProfile::displayName() const
QString ProvisioningProfile::details() const
{
return tr("Team: %1\nApp ID: %2\nExpiration date: %3").arg(m_team->identifier()).arg(m_appID)
return Tr::tr("Team: %1\nApp ID: %2\nExpiration date: %3").arg(m_team->identifier()).arg(m_appID)
.arg(QLocale::system().toString(m_expirationDate.toLocalTime(), QLocale::ShortFormat));
}

13
src/plugins/ios/iosconfigurations.h
View File

@@ -5,7 +5,8 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/toolchain.h>
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <QDateTime>
#include <QObject>
@@ -20,14 +21,12 @@ class QSettings;
class QFileSystemWatcher;
QT_END_NAMESPACE
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class DevelopmentTeam;
class ProvisioningProfile
{
Q_DECLARE_TR_FUNCTIONS(ProvisioningProfile)
public:
std::shared_ptr<DevelopmentTeam> developmentTeam() { return m_team; }
QString identifier() const;
@@ -50,7 +49,6 @@ using ProvisioningProfiles = QList<ProvisioningProfilePtr>;
class DevelopmentTeam
{
Q_DECLARE_TR_FUNCTIONS(DevelopmentTeam)
public:
QString identifier() const;
QString displayName() const;
@@ -121,7 +119,8 @@ private:
ProvisioningProfiles m_provisioningProfiles;
DevelopmentTeams m_developerTeams;
};
QDebug &operator<<(QDebug &stream, std::shared_ptr<ProvisioningProfile> profile);
QDebug &operator<<(QDebug &stream, std::shared_ptr<DevelopmentTeam> team);
} // namespace Internal
} // namespace Ios
} // Ios::Internal

30
src/plugins/ios/iosdeploystep.cpp
View File

@@ -3,13 +3,12 @@
#include "iosdeploystep.h"
#include "iosbuildstep.h"
#include "iosconfigurations.h"
#include "iosconstants.h"
#include "iosdevice.h"
#include "iosrunconfiguration.h"
#include "iossimulator.h"
#include "iostoolhandler.h"
#include "iostr.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -21,20 +20,16 @@
#include <utils/temporaryfile.h>
#include <QDir>
#include <QFile>
#include <QSettings>
using namespace ProjectExplorer;
using namespace Utils;
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosDeployStep final : public BuildStep
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDeployStep)
public:
enum TransferStatus {
NoTransfer,
@@ -92,7 +87,7 @@ void IosDeployStep::updateDisplayNames()
{
IDevice::ConstPtr dev = DeviceKitAspect::device(kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName();
setDisplayName(tr("Deploy to %1").arg(devName));
setDisplayName(Tr::tr("Deploy to %1").arg(devName));
}
bool IosDeployStep::init()
@@ -109,7 +104,7 @@ bool IosDeployStep::init()
} else if (iossimulator()) {
m_deviceType = runConfig->deviceType();
} else {
emit addOutput(tr("Error: no device available, deploy failed."),
emit addOutput(Tr::tr("Error: no device available, deploy failed."),
OutputFormat::ErrorMessage);
return false;
}
@@ -121,14 +116,14 @@ void IosDeployStep::doRun()
QTC_CHECK(m_transferStatus == NoTransfer);
if (m_device.isNull()) {
TaskHub::addTask(
DeploymentTask(Task::Error, tr("Deployment failed. No iOS device found.")));
DeploymentTask(Task::Error, Tr::tr("Deployment failed. No iOS device found.")));
emit finished(!iossimulator().isNull());
cleanup();
return;
}
m_toolHandler = new IosToolHandler(m_deviceType, this);
m_transferStatus = TransferInProgress;
emit progress(0, tr("Transferring application"));
emit progress(0, Tr::tr("Transferring application"));
connect(m_toolHandler, &IosToolHandler::isTransferringApp,
this, &IosDeployStep::handleIsTransferringApp);
connect(m_toolHandler, &IosToolHandler::didTransferApp,
@@ -176,7 +171,7 @@ void IosDeployStep::handleDidTransferApp(IosToolHandler *handler, const QString
m_transferStatus = TransferFailed;
if (!m_expectFail)
TaskHub::addTask(DeploymentTask(Task::Error,
tr("Deployment failed. The settings in the Devices window of Xcode might be incorrect.")));
Tr::tr("Deployment failed. The settings in the Devices window of Xcode might be incorrect.")));
}
emit finished(status == IosToolHandler::Success);
}
@@ -186,7 +181,7 @@ void IosDeployStep::handleFinished(IosToolHandler *handler)
switch (m_transferStatus) {
case TransferInProgress:
m_transferStatus = TransferFailed;
TaskHub::addTask(DeploymentTask(Task::Error, tr("Deployment failed.")));
TaskHub::addTask(DeploymentTask(Task::Error, Tr::tr("Deployment failed.")));
emit finished(false);
break;
case NoTransfer:
@@ -203,7 +198,7 @@ void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
{
Q_UNUSED(handler)
if (msg.contains(QLatin1String("AMDeviceInstallApplication returned -402653103")))
TaskHub::addTask(DeploymentTask(Task::Warning, tr("The Info.plist might be incorrect.")));
TaskHub::addTask(DeploymentTask(Task::Warning, Tr::tr("The Info.plist might be incorrect.")));
emit addOutput(msg, OutputFormat::ErrorMessage);
}
@@ -269,7 +264,7 @@ void IosDeployStep::checkProvisioningProfile()
QString provisioningProfile = provisionPlist.value(QLatin1String("Name")).toString();
QString provisioningUid = provisionPlist.value(QLatin1String("UUID")).toString();
CompileTask task(Task::Warning,
tr("The provisioning profile \"%1\" (%2) used to sign the application "
Tr::tr("The provisioning profile \"%1\" (%2) used to sign the application "
"does not cover the device %3 (%4). Deployment to it will fail.")
.arg(provisioningProfile, provisioningUid, device->displayName(),
targetId));
@@ -291,11 +286,10 @@ IosSimulator::ConstPtr IosDeployStep::iossimulator() const
IosDeployStepFactory::IosDeployStepFactory()
{
registerStep<IosDeployStep>(Constants::IOS_DEPLOY_STEP_ID);
setDisplayName(IosDeployStep::tr("Deploy to iOS device"));
setDisplayName(Tr::tr("Deploy to iOS device"));
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE});
setRepeatable(false);
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

6
src/plugins/ios/iosdeploystep.h
View File

@@ -5,8 +5,7 @@
#include <projectexplorer/buildstep.h>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosDeployStepFactory final : public ProjectExplorer::BuildStepFactory
{
@@ -14,5 +13,4 @@ public:
IosDeployStepFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

50
src/plugins/ios/iosdevice.cpp
View File

@@ -2,14 +2,19 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "iosdevice.h"
#include "iosconfigurations.h"
#include "iosconstants.h"
#include "iossimulator.h"
#include "iostoolhandler.h"
#include "iostr.h"
#include <coreplugin/helpmanager.h>
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/devicesupport/idevicewidget.h>
#include <projectexplorer/kitinformation.h>
#include <utils/portlist.h>
#include <QFormLayout>
@@ -38,9 +43,6 @@
using namespace ProjectExplorer;
static const char kDeviceName[] = "deviceName";
static const char kUniqueDeviceId[] = "uniqueDeviceId";
namespace {
static Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect", QtWarningMsg)
}
@@ -68,8 +70,10 @@ static QString CFStringRef2QString(CFStringRef s)
}
#endif
namespace Ios {
namespace Internal {
namespace Ios::Internal {
const char kDeviceName[] = "deviceName";
const char kUniqueDeviceId[] = "uniqueDeviceId";
class IosDeviceInfoWidget : public IDeviceWidget
{
@@ -84,7 +88,7 @@ IosDevice::IosDevice(CtorHelper)
{
setType(Constants::IOS_DEVICE_TYPE);
setDefaultDisplayName(IosDevice::name());
setDisplayType(tr("iOS"));
setDisplayType(Tr::tr("iOS"));
setMachineType(IDevice::Hardware);
setOsType(Utils::OsTypeMac);
setDeviceState(DeviceDisconnected);
@@ -160,7 +164,7 @@ QString IosDevice::uniqueInternalDeviceId() const
QString IosDevice::name()
{
return QCoreApplication::translate("Ios::Internal::IosDevice", "iOS Device");
return Tr::tr("iOS Device");
}
QString IosDevice::osVersion() const
@@ -195,15 +199,15 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap()
if (translationMap)
return *translationMap;
TranslationMap &tMap = *new TranslationMap;
tMap[kDeviceName] = tr("Device name");
tMap[kDeviceName] = Tr::tr("Device name");
//: Whether the device is in developer mode.
tMap[QLatin1String("developerStatus")] = tr("Developer status");
tMap[QLatin1String("deviceConnected")] = tr("Connected");
tMap[QLatin1String("YES")] = tr("yes");
tMap[QLatin1String("NO")] = tr("no");
tMap[QLatin1String("YES")] = tr("yes");
tMap[QLatin1String("*unknown*")] = tr("unknown");
tMap[QLatin1String("osVersion")] = tr("OS version");
tMap[QLatin1String("developerStatus")] = Tr::tr("Developer status");
tMap[QLatin1String("deviceConnected")] = Tr::tr("Connected");
tMap[QLatin1String("YES")] = Tr::tr("yes");
tMap[QLatin1String("NO")] = Tr::tr("no");
tMap[QLatin1String("YES")] = Tr::tr("yes");
tMap[QLatin1String("*unknown*")] = Tr::tr("unknown");
tMap[QLatin1String("osVersion")] = Tr::tr("OS version");
translationMap = &tMap;
return tMap;
}
@@ -307,8 +311,8 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
if (devStatus == QLatin1String("*off*")) {
if (!shouldIgnore && !IosConfigurations::ignoreAllDevices()) {
QMessageBox mBox;
mBox.setText(tr("An iOS device in user mode has been detected."));
mBox.setInformativeText(tr("Do you want to see how to set it up for development?"));
mBox.setText(Tr::tr("An iOS device in user mode has been detected."));
mBox.setInformativeText(Tr::tr("Do you want to see how to set it up for development?"));
mBox.setStandardButtons(QMessageBox::NoAll | QMessageBox::No | QMessageBox::Yes);
mBox.setDefaultButton(QMessageBox::Yes);
int ret = mBox.exec();
@@ -493,7 +497,6 @@ void IosDeviceManager::monitorAvailableDevices()
#endif
}
IosDeviceManager::IosDeviceManager(QObject *parent) :
QObject(parent)
{
@@ -563,11 +566,10 @@ IosDeviceInfoWidget::IosDeviceInfoWidget(const IDevice::Ptr &device)
formLayout->setContentsMargins(0, 0, 0, 0);
setLayout(formLayout);
formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
formLayout->addRow(IosDevice::tr("Device name:"), new QLabel(iosDevice->deviceName()));
formLayout->addRow(IosDevice::tr("Identifier:"), new QLabel(iosDevice->uniqueInternalDeviceId()));
formLayout->addRow(IosDevice::tr("OS Version:"), new QLabel(iosDevice->osVersion()));
formLayout->addRow(IosDevice::tr("CPU Architecture:"), new QLabel(iosDevice->cpuArchitecture()));
formLayout->addRow(Tr::tr("Device name:"), new QLabel(iosDevice->deviceName()));
formLayout->addRow(Tr::tr("Identifier:"), new QLabel(iosDevice->uniqueInternalDeviceId()));
formLayout->addRow(Tr::tr("OS Version:"), new QLabel(iosDevice->osVersion()));
formLayout->addRow(Tr::tr("CPU Architecture:"), new QLabel(iosDevice->cpuArchitecture()));
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

4
src/plugins/ios/iosdevice.h
View File

@@ -22,8 +22,6 @@ class IosDeviceManager;
class IosDevice final : public ProjectExplorer::IDevice
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDevice)
public:
using Dict = QMap<QString, QString>;
using ConstPtr = QSharedPointer<const IosDevice>;
@@ -69,7 +67,6 @@ public:
class IosDeviceManager : public QObject
{
Q_OBJECT
public:
using TranslationMap = QHash<QString, QString>;
@@ -85,6 +82,7 @@ public:
const Ios::IosToolHandler::Dict &info);
void infoGathererFinished(Ios::IosToolHandler *gatherer);
void monitorAvailableDevices();
private:
void updateUserModeDevices();
IosDeviceManager(QObject *parent = nullptr);

51
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -6,6 +6,7 @@
#include "iosconstants.h"
#include "iosconfigurations.h"
#include "iosrunconfiguration.h"
#include "iostr.h"
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/target.h>
@@ -34,13 +35,39 @@ using namespace Core;
using namespace ProjectExplorer;
using namespace Utils;
namespace Ios {
namespace Internal {
namespace Ios::Internal {
static const char USE_DEFAULT_ARGS_PARTIAL_KEY[] = ".ArgumentsUseDefault";
static const char COMMAND_PARTIAL_KEY[] = ".Command";
static const char ARGUMENTS_PARTIAL_KEY[] = ".Arguments";
static const char CLEAN_PARTIAL_KEY[] = ".Clean";
const char USE_DEFAULT_ARGS_PARTIAL_KEY[] = ".ArgumentsUseDefault";
const char COMMAND_PARTIAL_KEY[] = ".Command";
const char ARGUMENTS_PARTIAL_KEY[] = ".Arguments";
const char CLEAN_PARTIAL_KEY[] = ".Clean";
class IosDsymBuildStep : public AbstractProcessStep
{
public:
IosDsymBuildStep(BuildStepList *parent, Id id);
QWidget *createConfigWidget() override;
void setArguments(const QStringList &args);
QStringList arguments() const;
QStringList defaultArguments() const;
FilePath defaultCommand() const;
FilePath command() const;
void setCommand(const FilePath &command);
bool isDefault() const;
private:
void setupOutputFormatter(OutputFormatter *formatter) override;
QVariantMap toMap() const override;
bool fromMap(const QVariantMap &map) override;
QStringList defaultCleanCmdList() const;
QStringList defaultCmdList() const;
QStringList m_arguments;
FilePath m_command;
bool m_clean;
};
IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
AbstractProcessStep(parent, id),
@@ -180,12 +207,11 @@ QStringList IosDsymBuildStep::arguments() const
return m_arguments;
}
QWidget *IosDsymBuildStep::createConfigWidget()
{
auto widget = new QWidget;
auto commandLabel = new QLabel(tr("Command:"), widget);
auto commandLabel = new QLabel(Tr::tr("Command:"), widget);
auto commandLineEdit = new QLineEdit(widget);
commandLineEdit->setText(command().toString());
@@ -193,9 +219,9 @@ QWidget *IosDsymBuildStep::createConfigWidget()
auto argumentsTextEdit = new QPlainTextEdit(widget);
argumentsTextEdit->setPlainText(Utils::ProcessArgs::joinArgs(arguments()));
auto argumentsLabel = new QLabel(tr("Arguments:"), widget);
auto argumentsLabel = new QLabel(Tr::tr("Arguments:"), widget);
auto resetDefaultsButton = new QPushButton(tr("Reset to Default"), widget);
auto resetDefaultsButton = new QPushButton(Tr::tr("Reset to Default"), widget);
resetDefaultsButton->setLayoutDirection(Qt::RightToLeft);
resetDefaultsButton->setEnabled(!isDefault());
@@ -248,9 +274,7 @@ QWidget *IosDsymBuildStep::createConfigWidget()
return widget;
}
//
// IosDsymBuildStepFactory
//
IosDsymBuildStepFactory::IosDsymBuildStepFactory()
{
@@ -260,5 +284,4 @@ IosDsymBuildStepFactory::IosDsymBuildStepFactory()
setDisplayName("dsymutil");
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

35
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -5,37 +5,7 @@
#include <projectexplorer/abstractprocessstep.h>
namespace Ios {
namespace Internal {
class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
{
Q_OBJECT
public:
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
QWidget *createConfigWidget() override;
void setArguments(const QStringList &args);
QStringList arguments() const;
QStringList defaultArguments() const;
Utils::FilePath defaultCommand() const;
Utils::FilePath command() const;
void setCommand(const Utils::FilePath &command);
bool isDefault() const;
private:
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
QVariantMap toMap() const override;
bool fromMap(const QVariantMap &map) override;
QStringList defaultCleanCmdList() const;
QStringList defaultCmdList() const;
QStringList m_arguments;
Utils::FilePath m_command;
bool m_clean;
};
namespace Ios::Internal {
class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
{
@@ -43,5 +13,4 @@ public:
explicit IosDsymBuildStepFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

3
src/plugins/ios/iosplugin.cpp
View File

@@ -15,6 +15,7 @@
#include "iossettingspage.h"
#include "iossimulator.h"
#include "iostoolhandler.h"
#include "iostr.h"
#include "iosrunconfiguration.h"
#include <projectexplorer/deployconfiguration.h>
@@ -36,7 +37,7 @@ public:
setConfigBaseId("Qt4ProjectManager.IosDeployConfiguration");
addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE);
addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE);
setDefaultDisplayName(QCoreApplication::translate("Ios::Internal", "Deploy on iOS"));
setDefaultDisplayName(Tr::tr("Deploy on iOS"));
addInitialStep(Constants::IOS_DEPLOY_STEP_ID);
}
};

2
src/plugins/ios/iosprobe.cpp
View File

@@ -6,9 +6,7 @@
#include <utils/algorithm.h>
#include <utils/qtcprocess.h>
#include <QDir>
#include <QFileInfo>
#include <QFileInfoList>
#include <QLoggingCategory>
static Q_LOGGING_CATEGORY(probeLog, "qtc.ios.probe", QtWarningMsg)

1
src/plugins/ios/iosprobe.h
View File

@@ -60,4 +60,5 @@ private:
QMap<QString, XcodePlatform> m_platforms;
QStringList m_developerPaths;
};
} // namespace Ios

29
src/plugins/ios/iosqtversion.cpp
View File

@@ -2,12 +2,14 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "iosqtversion.h"
#include "iosconstants.h"
#include "iosconfigurations.h"
#include "iostr.h"
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionmanager.h>
@@ -15,9 +17,26 @@
#include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorer.h>
using namespace Ios::Internal;
using namespace ProjectExplorer;
namespace Ios::Internal {
class IosQtVersion : public QtSupport::QtVersion
{
public:
IosQtVersion();
bool isValid() const override;
QString invalidReason() const override;
Abis detectQtAbis() const override;
QSet<Utils::Id> availableFeatures() const override;
QSet<Utils::Id> targetDeviceTypes() const override;
QString description() const override;
};
IosQtVersion::IosQtVersion() = default;
bool IosQtVersion::isValid() const
@@ -33,7 +52,7 @@ QString IosQtVersion::invalidReason() const
{
QString tmp = QtVersion::invalidReason();
if (tmp.isEmpty() && qtAbis().isEmpty())
return tr("Failed to detect the ABIs used by the Qt version.");
return Tr::tr("Failed to detect the ABIs used by the Qt version.");
return tmp;
}
@@ -53,7 +72,7 @@ Abis IosQtVersion::detectQtAbis() const
QString IosQtVersion::description() const
{
//: Qt Version is meant for Ios
return tr("iOS");
return Tr::tr("iOS");
}
QSet<Utils::Id> IosQtVersion::availableFeatures() const
@@ -83,3 +102,5 @@ IosQtVersionFactory::IosQtVersionFactory()
return setup.platforms.contains("ios");
});
}
} // Ios::Internal

27
src/plugins/ios/iosqtversion.h
View File

@@ -3,31 +3,9 @@
#pragma once
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtversionfactory.h>
#include <QCoreApplication>
namespace Ios {
namespace Internal {
class IosQtVersion : public QtSupport::QtVersion
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosQtVersion)
public:
IosQtVersion();
bool isValid() const override;
QString invalidReason() const override;
ProjectExplorer::Abis detectQtAbis() const override;
QSet<Utils::Id> availableFeatures() const override;
QSet<Utils::Id> targetDeviceTypes() const override;
QString description() const override;
};
namespace Ios::Internal {
class IosQtVersionFactory : public QtSupport::QtVersionFactory
{
@@ -35,5 +13,4 @@ public:
IosQtVersionFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

28
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -2,8 +2,10 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "iosrunconfiguration.h"
#include "iosconstants.h"
#include "iosdevice.h"
#include "iostr.h"
#include "simulatorcontrol.h"
#include <projectexplorer/buildconfiguration.h>
@@ -18,7 +20,7 @@
#include <projectexplorer/target.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <utils/qtcprocess.h>
#include <utils/qtcassert.h>
#include <utils/layoutbuilder.h>
@@ -38,7 +40,7 @@ using namespace Utils;
namespace Ios::Internal {
static const QLatin1String deviceTypeKey("Ios.device_type");
const QLatin1String deviceTypeKey("Ios.device_type");
static QString displayName(const SimulatorInfo &device)
{
@@ -66,8 +68,8 @@ IosRunConfiguration::IosRunConfiguration(Target *target, Id id)
setUpdater([this, target, executableAspect] {
IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName();
setDefaultDisplayName(tr("Run on %1").arg(devName));
setDisplayName(tr("Run %1 on %2").arg(applicationName()).arg(devName));
setDefaultDisplayName(Tr::tr("Run on %1").arg(devName));
setDisplayName(Tr::tr("Run %1 on %2").arg(applicationName()).arg(devName));
executableAspect->setExecutable(localExecutable());
@@ -227,7 +229,7 @@ QString IosRunConfiguration::disabledReason() const
{
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit());
if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE)
return tr("Kit has incorrect device type for running on iOS devices.");
return Tr::tr("Kit has incorrect device type for running on iOS devices.");
IDevice::ConstPtr dev = DeviceKitAspect::device(kit());
QString validDevName;
bool hasConncetedDev = false;
@@ -248,27 +250,27 @@ QString IosRunConfiguration::disabledReason() const
if (dev.isNull()) {
if (!validDevName.isEmpty())
return tr("No device chosen. Select %1.").arg(validDevName); // should not happen
return Tr::tr("No device chosen. Select %1.").arg(validDevName); // should not happen
else if (hasConncetedDev)
return tr("No device chosen. Enable developer mode on a device."); // should not happen
return Tr::tr("No device chosen. Enable developer mode on a device."); // should not happen
else
return tr("No device available.");
return Tr::tr("No device available.");
} else {
switch (dev->deviceState()) {
case IDevice::DeviceReadyToUse:
break;
case IDevice::DeviceConnected:
return tr("To use this device you need to enable developer mode on it.");
return Tr::tr("To use this device you need to enable developer mode on it.");
case IDevice::DeviceDisconnected:
case IDevice::DeviceStateUnknown:
if (!validDevName.isEmpty())
return tr("%1 is not connected. Select %2?")
return Tr::tr("%1 is not connected. Select %2?")
.arg(dev->displayName(), validDevName);
else if (hasConncetedDev)
return tr("%1 is not connected. Enable developer mode on a device?")
return Tr::tr("%1 is not connected. Enable developer mode on a device?")
.arg(dev->displayName());
else
return tr("%1 is not connected.").arg(dev->displayName());
return Tr::tr("%1 is not connected.").arg(dev->displayName());
}
}
return RunConfiguration::disabledReason();
@@ -327,7 +329,7 @@ void IosDeviceTypeAspect::addToLayout(LayoutBuilder &builder)
m_deviceTypeComboBox = new QComboBox;
m_deviceTypeComboBox->setModel(&m_deviceTypeModel);
m_deviceTypeLabel = new QLabel(IosRunConfiguration::tr("Device type:"));
m_deviceTypeLabel = new QLabel(Tr::tr("Device type:"));
builder.addItems({m_deviceTypeLabel, m_deviceTypeComboBox});

8
src/plugins/ios/iosrunconfiguration.h
View File

@@ -14,8 +14,7 @@
#include <QComboBox>
#include <QStandardItemModel>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosRunConfiguration;
@@ -61,7 +60,7 @@ private:
class IosRunConfiguration : public ProjectExplorer::RunConfiguration
{
Q_OBJECT
Q_OBJECT // FIXME: Used in IosDsymBuildStep
public:
IosRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
@@ -84,5 +83,4 @@ public:
IosRunConfigurationFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

42
src/plugins/ios/iosrunner.cpp
View File

@@ -9,6 +9,7 @@
#include "iosrunconfiguration.h"
#include "iossimulator.h"
#include "iostoolhandler.h"
#include "iostr.h"
#include <debugger/debuggerconstants.h>
#include <debugger/debuggerkitinformation.h>
@@ -73,8 +74,6 @@ static void stopRunningRunControl(RunControl *runControl)
class IosRunner : public RunWorker
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosRunner)
public:
IosRunner(RunControl *runControl);
~IosRunner() override;
@@ -194,7 +193,8 @@ void IosRunner::start()
m_cleanExit = false;
m_qmlServerPort = Port();
if (!QFileInfo::exists(m_bundleDir)) {
TaskHub::addTask(DeploymentTask(Task::Warning, tr("Could not find %1.").arg(m_bundleDir)));
TaskHub::addTask(DeploymentTask(Task::Warning,
Tr::tr("Could not find %1.").arg(m_bundleDir)));
reportFailure();
return;
}
@@ -275,7 +275,7 @@ void IosRunner::handleGotServerPorts(IosToolHandler *handler, const QString &bun
if (prerequisiteOk)
reportStarted();
else
reportFailure(tr("Could not get necessary ports for the debugger connection."));
reportFailure(Tr::tr("Could not get necessary ports for the debugger connection."));
}
void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bundlePath,
@@ -293,7 +293,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
if (m_pid > 0) {
prerequisiteOk = true;
} else {
reportFailure(tr("Could not get inferior PID."));
reportFailure(Tr::tr("Could not get inferior PID."));
return;
}
@@ -303,7 +303,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
if (prerequisiteOk)
reportStarted();
else
reportFailure(tr("Could not get necessary ports for the debugger connection."));
reportFailure(Tr::tr("Could not get necessary ports for the debugger connection."));
}
void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
@@ -324,10 +324,10 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
QString res(msg);
QString lockedErr ="Unexpected reply: ELocked (454c6f636b6564) vs OK (4f4b)";
if (msg.contains("AMDeviceStartService returned -402653150")) {
TaskHub::addTask(DeploymentTask(Task::Warning, tr("Run failed. "
TaskHub::addTask(DeploymentTask(Task::Warning, Tr::tr("Run failed. "
"The settings in the Organizer window of Xcode might be incorrect.")));
} else if (res.contains(lockedErr)) {
QString message = tr("The device is locked, please unlock.");
QString message = Tr::tr("The device is locked, please unlock.");
TaskHub::addTask(DeploymentTask(Task::Error, message));
res.replace(lockedErr, message);
}
@@ -350,9 +350,9 @@ void IosRunner::handleFinished(IosToolHandler *handler)
{
if (m_toolHandler == handler) {
if (m_cleanExit)
appendMessage(tr("Run ended."), NormalMessageFormat);
appendMessage(Tr::tr("Run ended."), NormalMessageFormat);
else
appendMessage(tr("Run ended with error."), ErrorMessageFormat);
appendMessage(Tr::tr("Run ended with error."), ErrorMessageFormat);
m_toolHandler = nullptr;
}
handler->deleteLater();
@@ -385,13 +385,12 @@ Port IosRunner::qmlServerPort() const
class IosRunSupport : public IosRunner
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosRunSupport)
public:
explicit IosRunSupport(RunControl *runControl);
~IosRunSupport() override;
void didStartApp(IosToolHandler::OpStatus status);
private:
void start() override;
};
@@ -412,7 +411,7 @@ IosRunSupport::~IosRunSupport()
void IosRunSupport::start()
{
appendMessage(tr("Starting remote process."), NormalMessageFormat);
appendMessage(Tr::tr("Starting remote process."), NormalMessageFormat);
IosRunner::start();
}
@@ -422,7 +421,6 @@ void IosRunSupport::start()
class IosQmlProfilerSupport : public RunWorker
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosQmlProfilerSupport)
public:
IosQmlProfilerSupport(RunControl *runControl);
@@ -462,7 +460,7 @@ void IosQmlProfilerSupport::start()
if (qmlPort.isValid())
reportStarted();
else
reportFailure(tr("Could not get necessary ports for the profiler connection."));
reportFailure(Tr::tr("Could not get necessary ports for the profiler connection."));
}
//
@@ -471,8 +469,6 @@ void IosQmlProfilerSupport::start()
class IosDebugSupport : public DebuggerRunTool
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDebugSupport)
public:
IosDebugSupport(RunControl *runControl);
@@ -498,7 +494,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
void IosDebugSupport::start()
{
if (!m_runner->isAppRunning()) {
reportFailure(tr("Application not running."));
reportFailure(Tr::tr("Application not running."));
return;
}
@@ -520,9 +516,9 @@ void IosDebugSupport::start()
if (deviceSdk.isEmpty()) {
TaskHub::addTask(DeploymentTask(
Task::Warning,
tr("Could not find device specific debug symbols at %1. "
"Debugging initialization will be slow until you open the Organizer window of "
"Xcode with the device connected to have the symbols generated.")
Tr::tr("Could not find device specific debug symbols at %1. "
"Debugging initialization will be slow until you open the Organizer window of "
"Xcode with the device connected to have the symbols generated.")
.arg(symbolsPathCandidates.constFirst().toUserOutput())));
}
setDeviceSymbolsRoot(deviceSdk.toString());
@@ -553,8 +549,8 @@ void IosDebugSupport::start()
if (dsymPath.exists()
&& dsymPath.lastModified() < data->localExecutable.lastModified()) {
TaskHub::addTask(DeploymentTask(Task::Warning,
tr("The dSYM %1 seems to be outdated, it might confuse the debugger.")
.arg(dsymPath.toUserOutput())));
Tr::tr("The dSYM %1 seems to be outdated, it might confuse the debugger.")
.arg(dsymPath.toUserOutput())));
}
}

13
src/plugins/ios/iossettingspage.cpp
View File

@@ -3,23 +3,20 @@
#include "iossettingspage.h"
#include "iossettingswidget.h"
#include "iosconstants.h"
#include "iossettingswidget.h"
#include "iostr.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <QCoreApplication>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
IosSettingsPage::IosSettingsPage()
{
setId(Constants::IOS_SETTINGS_ID);
setDisplayName(IosSettingsWidget::tr("iOS"));
setDisplayName(Tr::tr("iOS"));
setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
setWidgetCreator([] { return new IosSettingsWidget; });
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

6
src/plugins/ios/iossettingspage.h
View File

@@ -5,8 +5,7 @@
#include <coreplugin/dialogs/ioptionspage.h>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosSettingsPage final : public Core::IOptionsPage
{
@@ -14,5 +13,4 @@ public:
IosSettingsPage();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

96
src/plugins/ios/iossettingswidget.cpp
View File

@@ -5,8 +5,8 @@
#include "createsimulatordialog.h"
#include "iosconfigurations.h"
#include "iosconfigurations.h"
#include "iostr.h"
#include "simulatorcontrol.h"
#include "simulatorinfomodel.h"
#include "simulatoroperationdialog.h"
@@ -16,7 +16,6 @@
#include <utils/pathchooser.h>
#include <utils/runextensions.h>
#include <QApplication>
#include <QCheckBox>
#include <QDateTime>
#include <QGroupBox>
@@ -29,11 +28,11 @@
#include <QSortFilterProxyModel>
#include <QTreeView>
static const int simStartWarnCount = 4;
using namespace std::placeholders;
namespace Ios::Internal {
using namespace std::placeholders;
const int simStartWarnCount = 4;
static SimulatorInfoList selectedSimulators(const QTreeView *deviceTreeView)
{
@@ -53,29 +52,29 @@ static void onSimOperation(const SimulatorInfo &simInfo, SimulatorOperationDialo
IosSettingsWidget::IosSettingsWidget()
{
resize(622, 456);
setWindowTitle(tr("iOS Configuration"));
setWindowTitle(Tr::tr("iOS Configuration"));
m_deviceAskCheckBox = new QCheckBox(tr("Ask about devices not in developer mode"));
m_deviceAskCheckBox = new QCheckBox(Tr::tr("Ask about devices not in developer mode"));
m_deviceAskCheckBox->setChecked(!IosConfigurations::ignoreAllDevices());
m_renameButton = new QPushButton(tr("Rename"));
m_renameButton = new QPushButton(Tr::tr("Rename"));
m_renameButton->setEnabled(false);
m_renameButton->setToolTip(tr("Rename a simulator device."));
m_renameButton->setToolTip(Tr::tr("Rename a simulator device."));
m_deleteButton = new QPushButton(tr("Delete"));
m_deleteButton = new QPushButton(Tr::tr("Delete"));
m_deleteButton->setEnabled(false);
m_deleteButton->setToolTip(tr("Delete simulator devices."));
m_deleteButton->setToolTip(Tr::tr("Delete simulator devices."));
m_resetButton = new QPushButton(tr("Reset"));
m_resetButton = new QPushButton(Tr::tr("Reset"));
m_resetButton->setEnabled(false);
m_resetButton->setToolTip(tr("Reset contents and settings of simulator devices."));
m_resetButton->setToolTip(Tr::tr("Reset contents and settings of simulator devices."));
auto createButton = new QPushButton(tr("Create"));
createButton->setToolTip(tr("Create a new simulator device."));
auto createButton = new QPushButton(Tr::tr("Create"));
createButton->setToolTip(Tr::tr("Create a new simulator device."));
m_startButton = new QPushButton(tr("Start"));
m_startButton = new QPushButton(Tr::tr("Start"));
m_startButton->setEnabled(false);
m_startButton->setToolTip(tr("Start simulator devices."));
m_startButton->setToolTip(Tr::tr("Start simulator devices."));
auto proxyModel = new QSortFilterProxyModel(this);
proxyModel->setSourceModel(new SimulatorInfoModel(this));
@@ -92,17 +91,17 @@ IosSettingsWidget::IosSettingsWidget()
m_pathWidget->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_pathWidget->lineEdit()->setReadOnly(true);
m_pathWidget->setFilePath(IosConfigurations::screenshotDir());
m_pathWidget->addButton(tr("Screenshot"), this,
std::bind(&IosSettingsWidget::onScreenshot, this));
m_pathWidget->addButton(Tr::tr("Screenshot"), this,
std::bind(&IosSettingsWidget::onScreenshot, this));
using namespace Utils::Layouting;
Column {
Group {
title(tr("Devices")),
title(Tr::tr("Devices")),
Row { m_deviceAskCheckBox }
},
Group {
title(tr("Simulator")),
title(Tr::tr("Simulator")),
Column {
Row {
m_deviceView,
@@ -117,7 +116,7 @@ IosSettingsWidget::IosSettingsWidget()
},
},
hr,
Row { tr("Screenshot directory:"), m_pathWidget }
Row { Tr::tr("Screenshot directory:"), m_pathWidget }
}
}
}.attachTo(this);
@@ -151,10 +150,11 @@ void IosSettingsWidget::onStart()
return;
if (simulatorInfoList.count() > simStartWarnCount) {
const QString message = tr("You are trying to launch %n simulators simultaneously. This "
"will take significant system resources. Do you really want to "
"continue?", "", simulatorInfoList.count());
const int buttonCode = QMessageBox::warning(this, tr("Simulator Start"), message,
const QString message =
Tr::tr("You are trying to launch %n simulators simultaneously. This "
"will take significant system resources. Do you really want to "
"continue?", "", simulatorInfoList.count());
const int buttonCode = QMessageBox::warning(this, Tr::tr("Simulator Start"), message,
QMessageBox::Ok | QMessageBox::Abort,
QMessageBox::Abort);
@@ -164,19 +164,19 @@ void IosSettingsWidget::onStart()
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Starting %n simulator device(s)...", "", simulatorInfoList.count()),
statusDialog->addMessage(Tr::tr("Starting %n simulator device(s)...", "", simulatorInfoList.count()),
Utils::NormalMessageFormat);
QList<QFuture<void>> futureList;
for (const SimulatorInfo &info : simulatorInfoList) {
if (!info.isShutdown()) {
statusDialog->addMessage(tr("Cannot start simulator (%1, %2) in current state: %3")
statusDialog->addMessage(Tr::tr("Cannot start simulator (%1, %2) in current state: %3")
.arg(info.name).arg(info.runtimeName).arg(info.state),
Utils::StdErrFormat);
} else {
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::startSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog, tr("simulator start"), _1)));
std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator start"), _1)));
}
}
@@ -192,14 +192,14 @@ void IosSettingsWidget::onCreate()
{
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Creating simulator device..."), Utils::NormalMessageFormat);
statusDialog->addMessage(Tr::tr("Creating simulator device..."), Utils::NormalMessageFormat);
const auto onSimulatorCreate = [statusDialog](const QString &name,
const SimulatorControl::ResponseData &response) {
if (response.success) {
statusDialog->addMessage(tr("Simulator device (%1) created.\nUDID: %2")
statusDialog->addMessage(Tr::tr("Simulator device (%1) created.\nUDID: %2")
.arg(name).arg(response.simUdid), Utils::StdOutFormat);
} else {
statusDialog->addMessage(tr("Simulator device (%1) creation failed.\nError: %2").
statusDialog->addMessage(Tr::tr("Simulator device (%1) creation failed.\nError: %2").
arg(name).arg(response.commandOutput),
Utils::StdErrFormat);
}
@@ -227,8 +227,8 @@ void IosSettingsWidget::onReset()
if (simulatorInfoList.isEmpty())
return;
const int userInput = QMessageBox::question(this, tr("Reset"),
tr("Do you really want to reset the contents and settings"
const int userInput = QMessageBox::question(this, Tr::tr("Reset"),
Tr::tr("Do you really want to reset the contents and settings"
" of the %n selected device(s)?", "",
simulatorInfoList.count()));
if (userInput == QMessageBox::No)
@@ -236,13 +236,14 @@ void IosSettingsWidget::onReset()
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Resetting contents and settings..."), Utils::NormalMessageFormat);
statusDialog->addMessage(Tr::tr("Resetting contents and settings..."),
Utils::NormalMessageFormat);
QList<QFuture<void>> futureList;
for (const SimulatorInfo &info : simulatorInfoList) {
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::resetSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog, tr("simulator reset"), _1)));
std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator reset"), _1)));
}
statusDialog->addFutures(futureList);
@@ -260,17 +261,17 @@ void IosSettingsWidget::onRename()
return;
const SimulatorInfo &simInfo = simulatorInfoList.at(0);
const QString newName = QInputDialog::getText(this, tr("Rename %1").arg(simInfo.name),
tr("Enter new name:"));
const QString newName = QInputDialog::getText(this, Tr::tr("Rename %1").arg(simInfo.name),
Tr::tr("Enter new name:"));
if (newName.isEmpty())
return;
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Renaming simulator device..."), Utils::NormalMessageFormat);
statusDialog->addMessage(Tr::tr("Renaming simulator device..."), Utils::NormalMessageFormat);
QFuture<void> f = QFuture<void>(Utils::onResultReady(
SimulatorControl::renameSimulator(simInfo.identifier, newName),
std::bind(onSimOperation, simInfo, statusDialog, tr("simulator rename"), _1)));
std::bind(onSimOperation, simInfo, statusDialog, Tr::tr("simulator rename"), _1)));
statusDialog->addFutures({f});
statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
}
@@ -285,21 +286,22 @@ void IosSettingsWidget::onDelete()
if (simulatorInfoList.isEmpty())
return;
const int userInput = QMessageBox::question(this, tr("Delete Device"),
tr("Do you really want to delete the %n selected "
"device(s)?", "", simulatorInfoList.count()));
const int userInput =
QMessageBox::question(this, Tr::tr("Delete Device"),
Tr::tr("Do you really want to delete the %n selected "
"device(s)?", "", simulatorInfoList.count()));
if (userInput == QMessageBox::No)
return;
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Deleting %n simulator device(s)...", "", simulatorInfoList.count()),
statusDialog->addMessage(Tr::tr("Deleting %n simulator device(s)...", "", simulatorInfoList.count()),
Utils::NormalMessageFormat);
QList<QFuture<void>> futureList;
for (const SimulatorInfo &info : simulatorInfoList) {
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::deleteSimulator(info.identifier),
std::bind(onSimOperation, info, statusDialog, tr("simulator delete"), _1)));
std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator delete"), _1)));
}
statusDialog->addFutures(futureList);
@@ -324,13 +326,13 @@ void IosSettingsWidget::onScreenshot()
QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
statusDialog->setAttribute(Qt::WA_DeleteOnClose);
statusDialog->addMessage(tr("Capturing screenshots from %n device(s)...", "",
simulatorInfoList.count()), Utils::NormalMessageFormat);
statusDialog->addMessage(Tr::tr("Capturing screenshots from %n device(s)...", "",
simulatorInfoList.count()), Utils::NormalMessageFormat);
QList<QFuture<void>> futureList;
for (const SimulatorInfo &info : simulatorInfoList) {
futureList << QFuture<void>(Utils::onResultReady(
SimulatorControl::takeSceenshot(info.identifier, generatePath(info)),
std::bind(onSimOperation, info, statusDialog, tr("simulator screenshot"), _1)));
std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator screenshot"), _1)));
}
statusDialog->addFutures(futureList);

6
src/plugins/ios/iossettingswidget.h
View File

@@ -3,12 +3,8 @@
#pragma once
#include "iosconfigurations.h"
#include <coreplugin/dialogs/ioptionspage.h>
#include <QCoreApplication>
QT_BEGIN_NAMESPACE
class QCheckBox;
class QPushButton;
@@ -21,8 +17,6 @@ namespace Ios::Internal {
class IosSettingsWidget final : public Core::IOptionsPageWidget
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosSettingsWidget)
public:
IosSettingsWidget();
~IosSettingsWidget() final;

26
src/plugins/ios/iossimulator.cpp
View File

@@ -3,23 +3,22 @@
#include "iossimulator.h"
#include "iosconstants.h"
#include "iostoolhandler.h"
#include "iostr.h"
#include <projectexplorer/kitinformation.h>
#include <utils/port.h>
#include <utils/qtcprocess.h>
#include <QCoreApplication>
#include <QMapIterator>
using namespace ProjectExplorer;
namespace Ios {
namespace Internal {
namespace Ios::Internal {
static const QLatin1String iosDeviceTypeDisplayNameKey = QLatin1String("displayName");
static const QLatin1String iosDeviceTypeTypeKey = QLatin1String("type");
static const QLatin1String iosDeviceTypeIdentifierKey = QLatin1String("identifier");
const QLatin1String iosDeviceTypeDisplayNameKey("displayName");
const QLatin1String iosDeviceTypeTypeKey("type");
const QLatin1String iosDeviceTypeIdentifierKey("identifier");
IosSimulator::IosSimulator(Utils::Id id)
: m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
@@ -28,8 +27,8 @@ IosSimulator::IosSimulator(Utils::Id id)
setType(Constants::IOS_SIMULATOR_TYPE);
setMachineType(IDevice::Emulator);
setOsType(Utils::OsTypeMac);
setDefaultDisplayName(tr("iOS Simulator"));
setDisplayType(tr("iOS Simulator"));
setDefaultDisplayName(Tr::tr("iOS Simulator"));
setDisplayType(Tr::tr("iOS Simulator"));
setDeviceState(DeviceReadyToUse);
}
@@ -209,13 +208,12 @@ QDebug operator <<(QDebug debug, const IosDeviceType &deviceType)
// Factory
IosSimulatorFactory::IosSimulatorFactory()
: ProjectExplorer::IDeviceFactory(Constants::IOS_SIMULATOR_TYPE)
: IDeviceFactory(Constants::IOS_SIMULATOR_TYPE)
{
setDisplayName(IosSimulator::tr("iOS Simulator"));
setDisplayName(Tr::tr("iOS Simulator"));
setCombinedIcon(":/ios/images/iosdevicesmall.png",
":/ios/images/iosdevice.png");
setConstructionFunction([] { return ProjectExplorer::IDevice::Ptr(new IosSimulator()); });
setConstructionFunction([] { return IDevice::Ptr(new IosSimulator()); });
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

8
src/plugins/ios/iossimulator.h
View File

@@ -10,8 +10,7 @@
#include <QDebug>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class IosConfigurations;
class IosSimulatorFactory;
@@ -42,8 +41,6 @@ QDebug operator <<(QDebug debug, const IosDeviceType &deviceType);
class IosSimulator final : public ProjectExplorer::IDevice
{
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosSimulator)
public:
using ConstPtr = QSharedPointer<const IosSimulator>;
using Ptr = QSharedPointer<IosSimulator>;
@@ -69,7 +66,6 @@ public:
IosSimulatorFactory();
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal
Q_DECLARE_METATYPE(Ios::Internal::IosDeviceType)

32
src/plugins/ios/iostoolhandler.cpp
View File

@@ -2,23 +2,23 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "iostoolhandler.h"
#include "iosconfigurations.h"
#include "iosconstants.h"
#include "iossimulator.h"
#include "iostr.h"
#include "simulatorcontrol.h"
#include <coreplugin/icore.h>
#include <debugger/debuggerconstants.h>
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <utils/futuresynchronizer.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/runextensions.h>
#include <utils/temporarydirectory.h>
#include <QCoreApplication>
#include <QDir>
#include <QFileInfo>
#include <QFutureWatcher>
@@ -373,7 +373,7 @@ void IosToolHandlerPrivate::toolExited(int code)
void IosDeviceToolHandlerPrivate::subprocessError(QProcess::ProcessError error)
{
if (state != Stopped)
errorMsg(IosToolHandler::tr("iOS tool error %1").arg(error));
errorMsg(Tr::tr("iOS tool error %1").arg(error));
stop(-1);
if (error == QProcess::FailedToStart) {
qCDebug(toolHandlerLog) << "IosToolHandler::finished(" << this << ")";
@@ -807,7 +807,7 @@ void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundle
if (response.success) {
installAppOnSimulator();
} else {
errorMsg(IosToolHandler::tr("Application install on simulator failed. Simulator not running."));
errorMsg(Tr::tr("Application install on simulator failed. Simulator not running."));
didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure);
emit q->finished(q);
}
@@ -833,7 +833,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
Utils::FilePath appBundle = Utils::FilePath::fromString(m_bundlePath);
if (!appBundle.exists()) {
errorMsg(IosToolHandler::tr("Application launch on simulator failed. Invalid bundle path %1")
errorMsg(Tr::tr("Application launch on simulator failed. Invalid bundle path %1")
.arg(m_bundlePath));
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
return;
@@ -845,7 +845,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
if (response.success) {
launchAppOnSimulator(extraArgs);
} else {
errorMsg(IosToolHandler::tr("Application launch on simulator failed. Simulator not running."));
errorMsg(Tr::tr("Application launch on simulator failed. Simulator not running."));
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
}
};
@@ -896,7 +896,7 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
isTransferringApp(m_bundlePath, m_deviceId, 100, 100, "");
didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Success);
} else {
errorMsg(IosToolHandler::tr("Application install on simulator failed. %1")
errorMsg(Tr::tr("Application install on simulator failed. %1")
.arg(response.commandOutput));
didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure);
}
@@ -925,12 +925,12 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
captureConsole = stdoutFile->open() && stderrFile->open();
if (!captureConsole)
errorMsg(IosToolHandler::tr("Cannot capture console output from %1. "
"Error redirecting output to %2.*")
errorMsg(Tr::tr("Cannot capture console output from %1. "
"Error redirecting output to %2.*")
.arg(bundleId).arg(fileTemplate));
} else {
errorMsg(IosToolHandler::tr("Cannot capture console output from %1. "
"Install Xcode 8 or later.").arg(bundleId));
errorMsg(Tr::tr("Cannot capture console output from %1. "
"Install Xcode 8 or later.").arg(bundleId));
}
auto monitorPid = [this](QFutureInterface<void> &fi, qint64 pid) {
@@ -961,8 +961,8 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
stdoutFile, stderrFile));
} else {
m_pid = -1;
errorMsg(IosToolHandler::tr("Application launch on simulator failed. %1")
.arg(response.commandOutput));
errorMsg(Tr::tr("Application launch on simulator failed. %1")
.arg(response.commandOutput));
didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
stop(-1);
emit q->finished(q);
@@ -984,8 +984,8 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::ResponseData &responseData)
{
if (responseData.simUdid.compare(m_deviceId) != 0) {
errorMsg(IosToolHandler::tr("Invalid simulator response. Device Id mismatch. "
"Device Id = %1 Response Id = %2")
errorMsg(Tr::tr("Invalid simulator response. Device Id mismatch. "
"Device Id = %1 Response Id = %2")
.arg(responseData.simUdid)
.arg(m_deviceId));
emit q->finished(q);

6
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -28,8 +28,7 @@ namespace {
static Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator", QtWarningMsg)
}
namespace Ios {
namespace Internal {
namespace Ios::Internal {
const int simulatorStartTimeout = 60000;
@@ -584,5 +583,4 @@ bool SimulatorInfo::operator==(const SimulatorInfo &other) const
&& runtimeName == other.runtimeName;
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

17
src/plugins/ios/simulatorcontrol.h
View File

@@ -1,21 +1,22 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <QObject>
#include <QFuture>
#include <QDebug>
#include <memory>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
class SimulatorControlPrivate;
class SimulatorEntity {
class SimulatorEntity
{
public:
QString name;
QString identifier;
@@ -40,7 +41,8 @@ public:
QString runtimeName;
};
class RuntimeInfo : public SimulatorEntity{
class RuntimeInfo : public SimulatorEntity
{
public:
QString version;
QString build;
@@ -91,8 +93,7 @@ public:
static QFuture<ResponseData> takeSceenshot(const QString &simUdid, const QString &filePath);
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal
Q_DECLARE_METATYPE(Ios::Internal::DeviceTypeInfo)
Q_DECLARE_METATYPE(Ios::Internal::RuntimeInfo)

20
src/plugins/ios/simulatorinfomodel.cpp
View File

@@ -3,13 +3,14 @@
#include "simulatorinfomodel.h"
#include "iostr.h"
#include <utils/algorithm.h>
#include <utils/runextensions.h>
#include <QTimer>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
using namespace std::placeholders;
@@ -17,7 +18,7 @@ const int colCount = 3;
const int nameCol = 0;
const int runtimeCol = 1;
const int stateCol = 2;
static const int deviceUpdateInterval = 1000; // Update simulator state every 1 sec.
const int deviceUpdateInterval = 1000; // Update simulator state every 1 sec.
SimulatorInfoModel::SimulatorInfoModel(QObject *parent) :
QAbstractItemModel(parent)
@@ -50,7 +51,7 @@ QVariant SimulatorInfoModel::data(const QModelIndex &index, int role) const
return "";
}
} else if (role == Qt::ToolTipRole) {
return tr("UDID: %1").arg(simInfo.identifier);
return Tr::tr("UDID: %1").arg(simInfo.identifier);
} else if (role == Qt::UserRole) {
return QVariant::fromValue<SimulatorInfo>(simInfo);
}
@@ -79,13 +80,13 @@ QVariant SimulatorInfoModel::headerData(int section, Qt::Orientation orientation
if (role == Qt::DisplayRole) {
switch (section) {
case nameCol:
return tr("Simulator Name");
return Tr::tr("Simulator Name");
case runtimeCol:
return tr("Runtime");
return Tr::tr("Runtime");
case stateCol:
return tr("Current State");
return Tr::tr("Current State");
default:
return "";
return {};
}
}
@@ -140,5 +141,4 @@ void SimulatorInfoModel::populateSimulators(const SimulatorInfoList &simulatorLi
}
}
} // namespace Internal
} // namespace Ios
} // Ios::Internal

10
src/plugins/ios/simulatorinfomodel.h
View File

@@ -9,16 +9,12 @@
#include <QAbstractListModel>
namespace Ios {
namespace Internal {
namespace Ios::Internal {
using SimulatorInfoList = QList<SimulatorInfo>;
class SimulatorInfoModel : public QAbstractItemModel
{
Q_OBJECT
public:
SimulatorInfoModel(QObject *parent = nullptr);
@@ -34,10 +30,8 @@ private:
void requestSimulatorInfo();
void populateSimulators(const SimulatorInfoList &simulatorList);
private:
Utils::FutureSynchronizer m_fetchFuture;
SimulatorInfoList m_simList;
};
} // namespace Internal
} // namespace Ios
} // Ios::Internal

19
src/plugins/ios/simulatoroperationdialog.cpp
View File

@@ -3,11 +3,12 @@
#include "simulatoroperationdialog.h"
#include "iostr.h"
#include <utils/layoutbuilder.h>
#include <utils/outputformatter.h>
#include <utils/qtcassert.h>
#include <QApplication>
#include <QDialogButtonBox>
#include <QFutureWatcher>
#include <QLoggingCategory>
@@ -15,19 +16,17 @@
#include <QProgressBar>
#include <QPushButton>
namespace {
Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg)
}
namespace Ios::Internal {
static Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg)
SimulatorOperationDialog::SimulatorOperationDialog(QWidget *parent) :
// TODO: Maximize buttong only because of QTBUG-41932
QDialog(parent,Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint)
{
resize(580, 320);
setModal(true);
setWindowTitle(tr("Simulator Operation Status"));
setWindowTitle(Tr::tr("Simulator Operation Status"));
auto messageEdit = new QPlainTextEdit;
messageEdit->setReadOnly(true);
@@ -100,13 +99,13 @@ void SimulatorOperationDialog::addMessage(const SimulatorInfo &siminfo,
{
QTC_CHECK(siminfo.identifier == response.simUdid);
if (response.success) {
addMessage(tr("%1, %2\nOperation %3 completed successfully.").arg(siminfo.name)
addMessage(Tr::tr("%1, %2\nOperation %3 completed successfully.").arg(siminfo.name)
.arg(siminfo.runtimeName).arg(context), Utils::StdOutFormat);
} else {
QString erroMsg = response.commandOutput.trimmed();
QString message = tr("%1, %2\nOperation %3 failed.\nUDID: %4\nError: %5").arg(siminfo.name)
QString message = Tr::tr("%1, %2\nOperation %3 failed.\nUDID: %4\nError: %5").arg(siminfo.name)
.arg(siminfo.runtimeName).arg(context).arg(siminfo.identifier)
.arg(erroMsg.isEmpty() ? tr("Unknown") : erroMsg);
.arg(erroMsg.isEmpty() ? Tr::tr("Unknown") : erroMsg);
addMessage(message, Utils::StdErrFormat);
qCDebug(iosCommon) << message;
}
@@ -118,7 +117,7 @@ void SimulatorOperationDialog::updateInputs()
m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!enableOk);
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk);
if (enableOk) {
addMessage(tr("Done."), Utils::NormalMessageFormat);
addMessage(Tr::tr("Done."), Utils::NormalMessageFormat);
m_progressBar->setMaximum(1); // Stop progress bar.
}
}

2
src/plugins/ios/simulatoroperationdialog.h
View File

@@ -22,7 +22,7 @@ namespace Ios::Internal {
class SimulatorOperationDialog : public QDialog
{
Q_OBJECT
public:
explicit SimulatorOperationDialog(QWidget *parent = nullptr);
~SimulatorOperationDialog() override;