diff options
50 files changed, 751 insertions, 4358 deletions
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index d4274350844..2af0850b712 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -42706,7 +42706,7 @@ Filtr: %2 </message> </context> <context> - <name>AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation>Vytvořit nový AVD</translation> @@ -42731,9 +42731,6 @@ Filtr: %2 <source>Kit:</source> <translation>Sada:</translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> <message> <source>Create a keystore and a cetificate</source> <translation type="obsolete">Vytvořit úložiště pro klíč a certifikát</translation> @@ -42830,9 +42827,6 @@ Filtr: %2 <source>Use Keystore password</source> <translation>Použít heslo pro úložiště klíče</translation> </message> -</context> -<context> - <name>AndroidDeployStepWidget</name> <message> <source>Form</source> <translation>Formulář</translation> @@ -42977,9 +42971,6 @@ The APK will not be usable on any other device.</source> <translation>Zkopíruje místní knihovny Qt na zařízení. Knihovny Qt musíte mít přeloženy pro tuto platformu. Toto APK nelze použít na žádném jiném zařízení.</translation> </message> -</context> -<context> - <name>AndroidPackageCreationWidget</name> <message> <source>Manifest</source> <translation type="obsolete">Manifest</translation> @@ -43149,30 +43140,6 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Ikona programu:</span></p></td></tr></table></body></html></translation> </message> <message> - <source>Select low dpi icon</source> - <translation type="obsolete">Vybrat ikonu s nízkým dpi</translation> - </message> - <message> - <source>Select medium dpi icon</source> - <translation type="obsolete">Vybrat ikonu se středním dpi</translation> - </message> - <message> - <source>Select high dpi icon</source> - <translation type="obsolete">Vybrat ikonu s vysokým dpi</translation> - </message> - <message> - <source>Permissions</source> - <translation type="obsolete">Oprávnění</translation> - </message> - <message> - <source>Add</source> - <translation type="obsolete">Přidat</translation> - </message> - <message> - <source>Remove</source> - <translation type="obsolete">Odstranit</translation> - </message> - <message> <source>Save</source> <translation type="obsolete">Uložit</translation> </message> @@ -43181,10 +43148,6 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Zahodit</translation> </message> <message> - <source>Name:</source> - <translation type="obsolete">Název:</translation> - </message> - <message> <source>android.permission.ACCESS_CHECKIN_PROPERTIES</source> <translation type="obsolete">android.permission.ACCESS_CHECKIN_PROPERTIES</translation> </message> @@ -43776,9 +43739,6 @@ p, li { white-space: pre-wrap; } <source>Automatically check required Qt libraries from compiled application.</source> <translation>Automaticky ověřit požadované knihovny Qt ze sestaveného programu.</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Nastavení pro Android</translation> @@ -43788,10 +43748,6 @@ p, li { white-space: pre-wrap; } <translation>Umístění SDK pro Android:</translation> </message> <message> - <source>Browse</source> - <translation>Procházet</translation> - </message> - <message> <source>Android NDK location:</source> <translation>Umístění NDK pro Android:</translation> </message> @@ -46234,7 +46190,7 @@ Jméno <E-mail> alias <E-mail>.</translation> </message> </context> <context> - <name>Android::Internal::AndroidConfigurations</name> + <name>Android</name> <message> <source>Create AVD error</source> <translation type="obsolete">Chyba při vytváření AVD</translation> @@ -46273,13 +46229,6 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation> </message> </context> <context> - <name>Android</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> <name>QtSupport</name> <message> <source>Android</source> @@ -46323,11 +46272,7 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation> </message> </context> <context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> - <source><span style=" color:#ff0000;">Password is too short</span></source> - <translation><span style=" color:#ff0000;">Heslo je příliš krátké</span></translation> - </message> + <name>Android</name> <message> <source><span style=" color:#ff0000;">Passwords don't match</span></source> <translation><span style=" color:#ff0000;">Heslo neodpovídá</span></translation> @@ -46372,23 +46317,10 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation> <source>Error</source> <translation>Chyba</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>Poslat na zařízení Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation>Poslat na Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployStep default display name</extracomment> @@ -46495,7 +46427,7 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation> </message> </context> <context> - <name>Android::Internal::AndroidDeployStepWidget</name> + <name>Android</name> <message> <source><b>Deploy configurations</b></source> <translation><b>Nastavení nasazení</b></translation> @@ -46521,7 +46453,7 @@ Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation> </message> </context> <context> - <name>Android::Internal::AndroidPackageCreationStep</name> + <name>Android</name> <message> <source>Packaging for Android</source> <translation>Vytvoření balíčku pro Android</translation> @@ -46563,10 +46495,6 @@ Please make sure your application is built successfully and is selected in Appli Ujistěte se, prosím, že váš program je sestaven úspěšně a je vybrán na kartě s programy ('Volba pro spuštění').</translation> </message> <message> - <source>Error</source> - <translation>Chyba</translation> - </message> - <message> <source>Failed to run keytool</source> <translation>Nepodařilo se spustit nástroj klíče</translation> </message> @@ -46603,52 +46531,17 @@ Ujistěte se, prosím, že váš program je sestaven úspěšně a je vybrán na <translation>Soubor s balíčkem byl vytvořen.</translation> </message> <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation>Nasazení balíčku: Spouští se příkaz '%1 %2'.</translation> - </message> - <message> <source>Packaging failed.</source> <translation>Vytvoření balíčku se nezdařilo.</translation> </message> <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation>Chyba při vytváření balíčku: Nepodařilo se spustit příkaz '%1 %2': Důvod %3</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation>Chyba při vytváření balíčku: Příkaz '%1 %2' se nepodařilo provést.</translation> - </message> - <message> - <source>Reason: %1</source> - <translation>Důvod: %1</translation> - </message> - <message> - <source> Reason: %1</source> - <translation>Důvod: %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation>Kód ukončení: %1</translation> - </message> - <message> - <source>Keystore</source> - <translation>Úložiště pro klíč</translation> - </message> - <message> <source>Keystore password:</source> <translation>Heslo pro úložiště klíče:</translation> </message> <message> - <source>Certificate</source> - <translation>Certifikát</translation> - </message> - <message> <source>Certificate password (%1):</source> <translation>Heslo k certifikátu (%1):</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationWidget</name> <message> <source>Invalid package name</source> <translation type="obsolete">Neplatný název balíčku</translation> @@ -46660,22 +46553,10 @@ Please choose a valid package name for your application (e.g. "org.example. Vyberte, prosím, platný název balíčku pro váš program (např. "org.example.myapplication").</translation> </message> <message> - <source>Choose High DPI Icon</source> - <translation type="obsolete">Vybrat ikonu s vysokým dpi</translation> - </message> - <message> <source>png images (*.png)</source> <translation type="obsolete">Soubory s obrázky PNG (*.png)</translation> </message> <message> - <source>Choose Medium DPI Icon</source> - <translation type="obsolete">Vybrat ikonu se středním dpi</translation> - </message> - <message> - <source>Choose Low DPI Icon</source> - <translation type="obsolete">Vybrat ikonu s nízkým dpi</translation> - </message> - <message> <source>< type or choose a permission ></source> <translation type="obsolete">< napište nebo vyberte oprávnění ></translation> </message> @@ -46684,10 +46565,6 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e <translation type="obsolete">Neplatný název balíčku</translation> </message> <message> - <source>PNG images (*.png)</source> - <translation type="obsolete">Soubory s obrázky PNG (*.png)</translation> - </message> - <message> <source>< Type or choose a permission ></source> <translation type="obsolete">< Napište nebo vyberte oprávnění ></translation> </message> @@ -46699,10 +46576,6 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e <source>Select keystore file</source> <translation>Vybrat soubor úložiště klíče</translation> </message> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Soubory úložiště klíče (*.keystore *.jks)</translation> - </message> </context> <context> <name>QmakeProjectManager</name> @@ -46712,7 +46585,7 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e </message> </context> <context> - <name>Android::Internal::AndroidPackageInstallationStep</name> + <name>Android</name> <message> <source>Copy application data</source> <translation>Kopírovat data programu</translation> @@ -46725,9 +46598,6 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e <source>Current target is not an android target</source> <translation type="obsolete">Nynější cíl není cílem Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunConfiguration</name> <message> <source>The .pro file '%1' is currently being parsed.</source> <translation>Soubor .pro '%1' se právě zpracovává.</translation> @@ -46736,9 +46606,6 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e <source>Run on Android device</source> <translation>Spustit na zařízení Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControl</name> <message> <source>Starting remote process ...</source> <translation type="obsolete">Spouští se vzdálený proces...</translation> @@ -46747,9 +46614,6 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e <source>Starting remote process.</source> <translation>Spouští se vzdálený proces.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControlFactory</name> <message> <source>Run on Android device/emulator</source> <translation type="obsolete">Spustit na zařízení/emulátor Android</translation> @@ -46758,9 +46622,6 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e <source>Run on Android device or emulator.</source> <translation type="obsolete">Spustit na zařízení nebo emulátoru Androida.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source> @@ -46865,31 +46726,10 @@ Vyberte, prosím, platný název balíčku pro váš program (např. "org.e '%1' ukončen.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> <message> <source>Android Configurations</source> <translation>Nastavení pro Android</translation> </message> -</context> -<context> - <name>Android::Internal::AVDModel</name> - <message> - <source>AVD Name</source> - <translation type="obsolete">Název AVD</translation> - </message> - <message> - <source>AVD Target</source> - <translation type="obsolete">Cíl AVD</translation> - </message> - <message> - <source>CPU/ABI</source> - <translation type="obsolete">CPU/ABI</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>Android SDK Folder</source> <translation>Složka SDK pro Android</translation> @@ -46994,38 +46834,6 @@ Pro přidání verzí Qt vyberte Volby -> Sestavení a spuštění -> Verz <source>Select OpenJDK path</source> <translation type="obsolete">Vybrat cestu pro OpenJDK</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidTarget</name> - <message> - <source>Error creating Android directory '%1'.</source> - <translation type="obsolete">Chyba při vytváření adresáře Android '%1'.</translation> - </message> - <message> - <source>No Qt for Android SDKs were found. -Please install at least one SDK.</source> - <translation type="obsolete">Nepodařilo se najít žádné Qt pro SDK Android. -Nainstalujte, prosím, alespoň jedno SDK.</translation> - </message> - <message> - <source>Android files have been updated automatically</source> - <translation type="obsolete">Soubory Android byly zaktualizovány automaticky</translation> - </message> - <message> - <source>Can't parse '%1'</source> - <translation type="obsolete">Nelze zpracovat '%1'</translation> - </message> - <message> - <source>Can't open '%1'</source> - <translation type="obsolete">Nelze otevřít '%1'</translation> - </message> - <message> - <source>Error creating Android templates</source> - <translation type="obsolete">Chyba při vytváření předloh Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidTargetFactory</name> <message> <source>Debug</source> <translation type="obsolete">Ladění</translation> @@ -47034,9 +46842,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation> <source>Release</source> <translation type="obsolete">Vydání</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>GCC Android</translation> @@ -47053,9 +46858,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation> <source>Android GCC (%1-%2)</source> <translation type="obsolete">GCC Android (%1-%2)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root: %1</source> <translation type="obsolete">Kořen (root) NDK: %1</translation> @@ -47064,9 +46866,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation> <source>NDK Root:</source> <translation>Kořen (root) NDK:</translation> </message> -</context> -<context> - <name>AutotoolsProjectManager</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -49817,32 +49616,15 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a </message> </context> <context> - <name>Android::Internal::AndroidDeployStepFactory</name> - <message> - <source>Deploy to Android device or emulator</source> - <translation>Nasadit na zařízení nebo emulátor Android.</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> + <name>Android</name> <message> <source>Run on Android</source> <translation>Spustit na Androidu</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation>Zařízení Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManager</name> <message> <source>Error creating Android directory '%1'.</source> <translation>Chyba při vytváření adresáře Android '%1'.</translation> @@ -49897,23 +49679,14 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation> <source>Can't open '%1'</source> <translation>Nelze otevřít '%1'</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationFactory</name> <message> <source>Create Android (.apk) Package</source> <translation>Vytvořit balíček pro Android (*.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationFactory</name> <message> <source>Deploy to device</source> <translation>Nasadit na zařízení</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</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> @@ -49923,9 +49696,6 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation> <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -53606,14 +53376,11 @@ nelze najít v cestě.</translation> </message> </context> <context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> + <name>Android</name> <message> <source>GDB server</source> <translation>Server GDB:</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation>Spravovat...</translation> @@ -55615,14 +55382,11 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> </message> </context> <context> - <name>Android::Internal::AndroidAnalyzeSupport</name> + <name>Android</name> <message> <source>No analyzer tool selected.</source> <translation>Nevybrán žádný nástroj pro rozbor.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Obecné</translation> @@ -55631,16 +55395,10 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> <source>XML Source</source> <translation>Zdroj XML</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation>Editor manifestu pro Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Balíček</translation> @@ -55696,10 +55454,6 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> <translation>SDK cíle:</translation> </message> <message> - <source>Application</source> - <translation>Program</translation> - </message> - <message> <source>Application name:</source> <translation>Název programu:</translation> </message> @@ -55764,14 +55518,6 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> <translation>Oprávnění</translation> </message> <message> - <source>Remove</source> - <translation>Odstranit</translation> - </message> - <message> - <source>Add</source> - <translation>Přidat</translation> - </message> - <message> <source>The structure of the android manifest file is corrupt. Expected a top level 'manifest' node.</source> <translation>Stavba souboru s manifestem pro Android je neplatná. Očekáván uzel 'manifest' na nejhornější úrovni.</translation> </message> @@ -55807,9 +55553,6 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation> <source>Choose High DPI Icon</source> <translation>Vybrat ikonu s vysokým dpi</translation> </message> -</context> -<context> - <name>Android::AndroidPlugin</name> <message> <source>Android Manifest file</source> <translation>Soubor s manifestem pro Android</translation> @@ -56951,78 +56694,15 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen� </message> </context> <context> - <name>Android::Internal::AddNewAVDDialog</name> - <message> - <source>Create new AVD</source> - <translation>Vytvořit nový AVD</translation> - </message> + <name>Android</name> <message> <source>Target API:</source> <translation>Cílové API:</translation> </message> <message> - <source>Name:</source> - <translation>Název:</translation> - </message> - <message> - <source>SD card size:</source> - <translation>Velikost karty SD:</translation> - </message> - <message> - <source> MiB</source> - <translation> MiB</translation> - </message> - <message> <source>ABI:</source> <translation>ABI:</translation> </message> -</context> -<context> - <name>AndroidDeployQtWidget</name> - <message> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <source>Sign package</source> - <translation>Podepsat balíček</translation> - </message> - <message> - <source>Keystore:</source> - <translation>Úložiště pro klíč:</translation> - </message> - <message> - <source>Create</source> - <translation>Vytvoření</translation> - </message> - <message> - <source>Browse</source> - <translation>Procházet</translation> - </message> - <message> - <source>Signing a debug package</source> - <translation>Podepsání balíčku ladění</translation> - </message> - <message> - <source>Certificate alias:</source> - <translation>Alias certifikátu:</translation> - </message> - <message> - <source>Advanced Actions</source> - <translation>Pokročilé činnosti</translation> - </message> - <message> - <source>Clean Temporary Libraries Directory on Device</source> - <translation>Vyprázdnit adresář s dočasnými knihovnami na zařízení</translation> - </message> - <message> - <source>Install Ministro from APK</source> - <translation>Instalovat Ministro z APK</translation> - </message> - <message> - <source>Reset Default Devices</source> - <translation>Nastavit výchozí zařízení znovu</translation> - </message> <message> <source>Open package location after build</source> <translation>Otevřít umístění balíčku, když je sestaven</translation> @@ -57036,10 +56716,6 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen� <translation>Vytvořit AndroidManifest.xml</translation> </message> <message> - <source>Application</source> - <translation>Program</translation> - </message> - <message> <source>Android target SDK:</source> <translation>SDK pro Android:</translation> </message> @@ -57052,36 +56728,6 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen� <translation>Qt už nadále nepoužívá složku "android" v adresáři projektu se zdroji.</translation> </message> <message> - <source>Qt Deployment</source> - <translation>Nasazení Qt</translation> - </message> - <message> - <source>Use the external Ministro application to download and maintain Qt libraries.</source> - <translation>Použít externí program Ministro ke stažení a správě knihoven Qt.</translation> - </message> - <message> - <source>Use Ministro service to install Qt</source> - <translation>Použít službu Ministro k nainstalování Qt</translation> - </message> - <message> - <source>Push local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation>Zkopírovat místní knihovny Qt na zařízení. Knihovny Qt musíte mít přeloženy pro tuto platformu. -Toto APK nelze použít na žádném jiném zařízení.</translation> - </message> - <message> - <source>Deploy local Qt libraries to temporary directory</source> - <translation>Zkopírovat místní knihovny Qt do dočasného adresáře</translation> - </message> - <message> - <source>Creates a standalone APK.</source> - <translation>Vytvoří samostatné APK.</translation> - </message> - <message> - <source>Bundle Qt libraries in APK</source> - <translation>Knihovny Qt zabalit do APK</translation> - </message> - <message> <source>Additional Libraries</source> <translation>Dodatečné knihovny</translation> </message> @@ -57094,18 +56740,10 @@ Toto APK nelze použít na žádném jiném zařízení.</translation> <translation>Vybrat knihovnu k zahrnutí v balíčku.</translation> </message> <message> - <source>Add</source> - <translation>Přidat</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Odstranit nyní vybranou knihovnu ze seznamu.</translation> </message> <message> - <source>Remove</source> - <translation>Odstranit</translation> - </message> - <message> <source>Create...</source> <translation>Vytvořit...</translation> </message> @@ -57114,23 +56752,6 @@ Toto APK nelze použít na žádném jiném zařízení.</translation> <translation>SDK pro sestavení pro Android:</translation> </message> <message> - <source>Uses the external Ministro application to download and maintain Qt libraries.</source> - <translation>Používá externí program Ministro ke stažení a správě knihoven Qt.</translation> - </message> - <message> - <source>Pushes local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation>Zkopíruje místní knihovny Qt na zařízení. Knihovny Qt musíte mít přeloženy pro tuto platformu. -Toto APK nelze použít na žádném jiném zařízení.</translation> - </message> - <message> - <source>Add...</source> - <translation>Přidat...</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> - <message> <source>Select Android Device</source> <translation>Vybrat zařízení Android</translation> </message> @@ -57147,10 +56768,6 @@ Toto APK nelze použít na žádném jiném zařízení.</translation> <translation>Vždy používat toto zařízení pro architekturu %1</translation> </message> <message> - <source>ABI:</source> - <translation>ABI:</translation> - </message> - <message> <source>Compatible devices</source> <translation>Slučitelná zařízení</translation> </message> @@ -57983,19 +57600,11 @@ monitor reset</source> </message> </context> <context> - <name>Android::Internal::AndroidDeployQtStepFactory</name> + <name>Android</name> <message> <source>Deploy to Android device or emulator</source> <translation>Nasadit na zařízení nebo emulátor Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> - <message> - <source>Deploy to Android device</source> - <extracomment>AndroidDeployQtStep default display name</extracomment> - <translation>Poslat na zařízení Android</translation> - </message> <message> <source>Found old folder "android" in source directory. Qt 5.2 does not use that folder by default.</source> <translation>Ve zdrojovém adresáři nalezena stará složka "android". Qt 5.2 tuto složku nepoužívá jako výchozí.</translation> @@ -58005,10 +57614,6 @@ monitor reset</source> <translation>Podle souboru .pro nenastaven žádný archiv Android.</translation> </message> <message> - <source>Warning: Signing a debug package.</source> - <translation>Varování: Podepsání balíčku ladění.</translation> - </message> - <message> <source>Internal Error: Could not find .pro file.</source> <translation>Vnitřní chyba: Nepodařilo se najít soubor .pro.</translation> </message> @@ -58017,34 +57622,6 @@ monitor reset</source> <translation>Vnitřní chyba: Neznámé umístění souboru JSON nasazení Androidu.</translation> </message> <message> - <source>Pulling files necessary for debugging.</source> - <translation>Nahrávají se soubory nezbytné pro ladění.</translation> - </message> - <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation>Nasazení balíčku: Spouští se příkaz '%1 %2'.</translation> - </message> - <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation>Chyba při vytváření balíčku: Nepodařilo se spustit příkaz '%1 %2': Důvod %3</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation>Chyba při vytváření balíčku: Příkaz '%1 %2' se nepodařilo provést.</translation> - </message> - <message> - <source>Reason: %1</source> - <translation>Důvod: %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation>Kód ukončení: %1</translation> - </message> - <message> - <source>Error</source> - <translation>Chyba</translation> - </message> - <message> <source>Failed to run keytool.</source> <translation>Nepodařilo se spustit nástroj klíče.</translation> </message> @@ -58053,45 +57630,6 @@ monitor reset</source> <translation>Neplatné heslo.</translation> </message> <message> - <source>Keystore</source> - <translation>Úložiště pro klíč</translation> - </message> - <message> - <source>Keystore password:</source> - <translation>Heslo pro úložiště klíče:</translation> - </message> - <message> - <source>Certificate</source> - <translation>Certifikát</translation> - </message> - <message> - <source>Certificate password (%1):</source> - <translation>Heslo k certifikátu (%1):</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtWidget</name> - <message> - <source><b>Deploy configurations</b></source> - <translation><b>Nastavení nasazení</b></translation> - </message> - <message> - <source>Qt Android Smart Installer</source> - <translation>Chytrý instalátor pro Qt Android</translation> - </message> - <message> - <source>Android package (*.apk)</source> - <translation>Balíček pro Android (*.apk)</translation> - </message> - <message> - <source>Select keystore file</source> - <translation>Vybrat soubor úložiště klíče</translation> - </message> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Soubory úložiště klíče (*.keystore *.jks)</translation> - </message> - <message> <source>Select additional libraries</source> <translation>Vybrat dodatečné knihovny</translation> </message> @@ -58099,9 +57637,6 @@ monitor reset</source> <source>Libraries (*.so)</source> <translation>Knihovny (*.so)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: Chyba při instalaci SDK 0x%1</translation> @@ -58142,9 +57677,6 @@ monitor reset</source> <source>Android: Unknown error 0x%1</source> <translation>Android: Neznámá chyba 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStepWidget</name> <message> <source><b>Make install</b></source> <translation><b>Make install</b></translation> @@ -58153,9 +57685,6 @@ monitor reset</source> <source>Make install</source> <translation>Make install</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>Qt Creator needs additional settings to enable Android support.You can configure those settings in the Options dialog.</source> <translation>Qt Creator potřebuje dodatečná nastavení pro povolení podpory pro Android. Tato nastavení můžete nastavit v dialogu s volbami.</translation> @@ -58168,9 +57697,6 @@ monitor reset</source> <source>Qt Creator needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>Qt Creator potřebuje dodatečná nastavení pro povolení podpory pro Android. Tato nastavení můžete nastavit v dialogu s volbami.</translation> </message> -</context> -<context> - <name>Android::Internal::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>V tomto projektu nebyl nalezen žádný soubor .pro aplikace.</translation> @@ -58179,9 +57705,6 @@ monitor reset</source> <source>No Application .pro File</source> <translation>Žádný soubor .pro aplikace</translation> </message> -</context> -<context> - <name>Android::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create an AndroidManifest.xml file.</source> <translation>vyberte soubor .pro, pro který chcete vytvořit soubor AndroidManifest.xml.</translation> @@ -58194,9 +57717,6 @@ monitor reset</source> <source>Select a .pro File</source> <translation>Vybrat soubor .pro</translation> </message> -</context> -<context> - <name>Android::Internal::ChooseDirectoryPage</name> <message> <source>The Android package source directory can not be the same as the project directory.</source> <translation>Zdrojový adresář balíčku pro Android nemůže být týž jako projektový adresář.</translation> @@ -58221,9 +57741,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr <source>The Android manifest file will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation>Soubor s manifestem pro Android bude vytvořen v ANDROID_PACKAGE_SOURCE_DIR nastaveném v souboru .pro.</translation> </message> -</context> -<context> - <name>Android::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Manifest Wizard</source> <translation>Vytvořit průvodce manifestem pro Android</translation> @@ -60266,45 +59783,15 @@ Vytvořte, prosím, aplikaci qmldump na stránce pro nastavení verze Qt.</trans </message> </context> <context> - <name>AndroidConfiguration</name> - <message> - <source>Could not run: %1</source> - <translation>Nepodařilo se spustit: %1</translation> - </message> - <message> - <source>No devices found in output of: %1</source> - <translation>Nenalezena žádná zařízení ve výstupu: %1</translation> - </message> -</context> -<context> - <name>AndroidConfig</name> - <message> - <source>Error Creating AVD</source> - <translation>Chyba při vytváření AVD</translation> - </message> - <message> - <source>Cannot create a new AVD. No sufficiently recent Android SDK available. -Please install an SDK of at least API version %1.</source> - <translation>Nelze vytvořit nové AVD. Není dostupné dostačně nedávné SDK pro Android. -Nainstalujte, prosím, jedno SDK s API verze alespoň %1.</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> + <name>Android</name> <message> <source>Configure Android...</source> <translation>Nastavit Android...</translation> </message> -</context> -<context> - <name>Android::Internal::JavaEditorFactory</name> <message> <source>Java Editor</source> <translation>Editor Javy</translation> </message> -</context> -<context> - <name>Android::Internal::JavaFileWizard</name> <message> <source>Creates a Java file with boilerplate code.</source> <translation>Vytvoří soubor Java s kódem se standardním textem.</translation> diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 23ed9c91805..34b1c9bd369 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -2,7 +2,7 @@ <!DOCTYPE TS> <TS version="2.1" language="da"> <context> - <name>AdbCommandsWidget</name> + <name>Android</name> <message> <source>Widget</source> <translation>Widget</translation> @@ -152,7 +152,7 @@ </message> </context> <context> - <name>Android::AndroidBuildApkStep</name> + <name>Android</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> @@ -192,9 +192,6 @@ Minimum API-niveauet krævet af kittet er %1.</translation> <source>Failed to run keytool.</source> <translation>Kunne ikke køre keytool.</translation> </message> -</context> -<context> - <name>Android::AndroidBuildApkWidget</name> <message> <source>Keystore files (*.keystore *.jks)</source> <translation>Keystore-filer (*.keystore *.jks)</translation> @@ -207,9 +204,6 @@ Minimum API-niveauet krævet af kittet er %1.</translation> <source><b>Build Android APK</b></source> <translation><b>Byg Android APK</b></translation> </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> <message> <source>Android Debugger for %1</source> <translation>Android-fejlretter for %1</translation> @@ -218,9 +212,6 @@ Minimum API-niveauet krævet af kittet er %1.</translation> <source>Android for %1 (GCC %2, %3)</source> <translation>Android for %1 (GCC %2, %3)</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>Ukendt Android version. API-niveau: %1</translation> @@ -237,9 +228,6 @@ Minimum API-niveauet krævet af kittet er %1.</translation> <source>Starting Android virtual device failed.</source> <translation>Start af Android virtuel-enhed mislykkedes.</translation> </message> -</context> -<context> - <name>Android::Internal::AddNewAVDDialog</name> <message> <source>Create new AVD</source> <translation>Opret ny AVD</translation> @@ -264,9 +252,6 @@ Minimum API-niveauet krævet af kittet er %1.</translation> <source> MiB</source> <translation> MiB</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> <message> <source>Keystore password is too short.</source> <translation>Keystore adgangskode er for kort.</translation> @@ -296,24 +281,6 @@ Minimum API-niveauet krævet af kittet er %1.</translation> <translation>Keystore-filnavn</translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Keystore-filer (*.keystore *.jks)</translation> - </message> - <message> - <source>Error</source> - <translation>Fejl</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>Udsend til Android-enhed</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> - <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployQtStep default display name</extracomment> <translation>Udsend til Android-enhed</translation> @@ -394,16 +361,10 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>Package deploy: Running command "%1 %2".</source> <translation>Pakkeudsendelse: kører kommandoen "%1 %2".</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStepFactory</name> <message> <source>Deploy to Android device or emulator</source> <translation>Udsend til Android-enhed eller emulator</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtWidget</name> <message> <source><b>Deploy configurations</b></source> <translation><b>Udsend-konfigurationer</b></translation> @@ -416,21 +377,11 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>Android package (*.apk)</source> <translation>Android-pakke (*.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation>Kør på Android</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> - <message> <source>Select Android Device</source> <translation>Vælg Android-enhed</translation> </message> @@ -459,10 +410,6 @@ Vil du afinstallere den eksisterende pakke?</translation> <translation>Genopfrisk enhedsliste</translation> </message> <message> - <source>ABI:</source> - <translation>ABI:</translation> - </message> - <message> <source>Compatible devices</source> <translation>Kompatible enheder</translation> </message> @@ -502,16 +449,10 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>Looking for default device <b>%1</b>.</source> <translation>Kig efter standardenhed <b>%1</b>.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> <message> <source>Android Device</source> <translation>Android-enhed</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> <message> <source>OpenGL enabled</source> <translation>OpenGL aktiveret</translation> @@ -520,9 +461,6 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>OpenGL disabled</source> <translation>OpenGL deaktiveret</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: SDK installationsfejl 0x%1</translation> @@ -563,16 +501,10 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>Android: Unknown error 0x%1</source> <translation>Android: ukendt fejl 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> <message> <source>GDB server</source> <translation>GDB-server</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation>Håndter...</translation> @@ -601,9 +533,6 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>GDB Server for "%1"</source> <translation>GDB-server for "%1"</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Generelt</translation> @@ -612,16 +541,10 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>XML Source</source> <translation>XML-kilde</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation>Android Manifest-redigering</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Pakke</translation> @@ -758,23 +681,14 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>Choose High DPI Icon</source> <translation>Vælg høj-DPI-ikon</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation>Konfigurer Android...</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>%1 needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>%1 har brug for yderligere indstillinger for at aktivere Android-understøttelse. Kan du konfigurere sådanne indstillinger i dialogen Valgmuligheder.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation>Kunne ikke detektere ABI'erne brugt af Qt versionen.</translation> @@ -784,16 +698,10 @@ Vil du afinstallere den eksisterende pakke?</translation> <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>"%1" terminated.</source> <translation>"%1" termineret.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunnerWorker</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>Ingen ledige porte tilgængelige på vært til QML-fejlretning.</translation> @@ -838,9 +746,6 @@ Vil du afinstallere den eksisterende pakke?</translation> <source>"%1" died.</source> <translation>"%1" dødede.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManager</name> <message> <source>The operation requires user interaction. Use the "sdkmanager" command-line tool.</source> <translation>Handlingen kræver indgriben fra brugeren. Brug kommandolinjeværktøjet "sdkmanager".</translation> @@ -853,9 +758,6 @@ Vil du afinstallere den eksisterende pakke?</translation> </translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManagerWidget</name> <message> <source>Android SDK Manager</source> <translation>Android SDK manager</translation> @@ -901,10 +803,6 @@ Vil du afinstallere den eksisterende pakke?</translation> <translation>Native SDK manager...</translation> </message> <message> - <source>Cancel</source> - <translation>Annuller</translation> - </message> - <message> <source>Do you want to accept the Android SDK license?</source> <translation>Vil du acceptere Android SDK-licensen?</translation> </message> @@ -1011,13 +909,6 @@ Cancelling pending operations... Annullerer afventende handlinger... </translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkModel</name> - <message> - <source>Package</source> - <translation>Pakke</translation> - </message> <message> <source>Revision</source> <translation>Revision</translation> @@ -1050,16 +941,6 @@ Annullerer afventende handlinger... <source>Install</source> <translation>Installation</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>JDK path exists.</source> <translation>JDK-sti findes.</translation> @@ -1170,23 +1051,14 @@ Vælg Valgmuligheder > Byg & kør > Qt versioner, for at tilføje Qt v <source>AVD manager UI tool is not available in the installed SDK tools(version %1). Use the command line tool "avdmanager" for advanced AVD management.</source> <translation>AVD manager UI-værktøj er ikke tilgængelig i de installerede SDK-værktøjer (version %1). Brug kommandolinjeværktøjet "avdmanager" for avanceret håndtering af AVD.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root:</source> <translation>NDK-rod:</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>Android GCC</translation> </message> -</context> -<context> - <name>Android::Internal::AvdDialog</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -1201,9 +1073,6 @@ Installer en SDK af mindst API version %1.</translation> <source>Allowed characters are: a-z A-Z 0-9 and . _ -</source> <translation>Tilladte tegn er: a-z A-Z 0-9 og . _ -</translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -1217,16 +1086,10 @@ Installer en SDK af mindst API version %1.</translation> <source>CPU/ABI</source> <translation>CPU/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::JavaEditorFactory</name> <message> <source>Java Editor</source> <translation>Java-redigering</translation> </message> -</context> -<context> - <name>Android::Internal::OptionsDialog</name> <message> <source>SDK Manager Arguments</source> <translation>SDK manager-argumenter</translation> @@ -1243,9 +1106,6 @@ Installer en SDK af mindst API version %1.</translation> <source>Available arguments:</source> <translation>Tilgængelige argumenter:</translation> </message> -</context> -<context> - <name>Android::PasswordInputDialog</name> <message> <source>Incorrect password.</source> <translation>Ukorrekt adgangskode.</translation> @@ -1266,9 +1126,6 @@ Installer en SDK af mindst API version %1.</translation> <source>Enter certificate password</source> <translation>Indtast certifikat-adgangskode</translation> </message> -</context> -<context> - <name>AndroidAvdManager</name> <message> <source>Cannot create AVD. Invalid input.</source> <translation>Kan ikke oprette AVD. Ugyldigt input.</translation> @@ -1285,9 +1142,6 @@ Installer en SDK af mindst API version %1.</translation> <source>Cannot create AVD. Command timed out.</source> <translation>Kan ikke oprette AVD. Kommando fik timeout.</translation> </message> -</context> -<context> - <name>AndroidBuildApkWidget</name> <message> <source>Sign package</source> <translation>Signér pakke</translation> @@ -1309,10 +1163,6 @@ Installer en SDK af mindst API version %1.</translation> <translation>Certifikat alias:</translation> </message> <message> - <source>Application</source> - <translation>Program</translation> - </message> - <message> <source>Android build SDK:</source> <translation>Android-byg SDK:</translation> </message> @@ -1344,16 +1194,10 @@ Installer en SDK af mindst API version %1.</translation> <source>Add debug server</source> <translation>Tilføj fejlret-server</translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>Fejl ved oprettelse af AVD</translation> </message> -</context> -<context> - <name>AndroidConfiguration</name> <message> <source>Could not run: %1</source> <translation>Kunne ikke kører: %1</translation> @@ -1362,9 +1206,6 @@ Installer en SDK af mindst API version %1.</translation> <source>No devices found in output of: %1</source> <translation>Ingen enheder fundet i output af: %1</translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> <message> <source>Create a keystore and a certificate</source> <translation>Opret en keystore og et certifikat</translation> @@ -1398,10 +1239,6 @@ Installer en SDK af mindst API version %1.</translation> <translation>Sprogkode på to bogstaver for denne enhed (f.eks. RO):</translation> </message> <message> - <source>Certificate</source> - <translation>Certifikat</translation> - </message> - <message> <source>Show password</source> <translation>Vis adgangskode</translation> </message> @@ -1430,13 +1267,6 @@ Installer en SDK af mindst API version %1.</translation> <translation>Brug keystore adgangskode</translation> </message> <message> - <source>Keystore</source> - <translation>Keystore</translation> - </message> -</context> -<context> - <name>AndroidDeployQtWidget</name> - <message> <source>Deploy options</source> <translation>Udsend-valgmuligheder</translation> </message> @@ -1456,9 +1286,6 @@ Installer en SDK af mindst API version %1.</translation> <source>Install Ministro from APK</source> <translation>Installer Ministro fra APK</translation> </message> -</context> -<context> - <name>AndroidSdkManager</name> <message> <source>Updating installed packages.</source> <translation>Opdaterer installerede pakker.</translation> @@ -1487,9 +1314,6 @@ Installer en SDK af mindst API version %1.</translation> <source>Failed</source> <translation>Mislykkedes</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Android-konfiguration</translation> @@ -1539,10 +1363,6 @@ Installer en SDK af mindst API version %1.</translation> <translation> Mb</translation> </message> <message> - <source>Remove</source> - <translation>Fjern</translation> - </message> - <message> <source>Add...</source> <translation>Tilføj...</translation> </message> @@ -1564,13 +1384,6 @@ Installer en SDK af mindst API version %1.</translation> </message> </context> <context> - <name>AndroidToolManager</name> - <message> - <source>Could not start process "%1 %2"</source> - <translation>Kunne ikke starte processen "%1 %2"</translation> - </message> -</context> -<context> <name>Application</name> <message> <source>Failed to load core: %1</source> @@ -2406,7 +2219,7 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <translation>Autogen</translation> @@ -28394,7 +28207,7 @@ Udløbsdato: %3</translation> </message> </context> <context> - <name>QmakeAndroidSupport::Internal::ChooseDirectoryPage</name> + <name>Android</name> <message> <source>Android package source directory:</source> <translation>Android-pakke kildemappe:</translation> @@ -28423,9 +28236,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <source>The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation>Android-skabelon-filerne vil blive oprettet i ANDROID_PACKAGE_SOURCE_DIR sæt i .pro-filen.</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation>Vælg .pro-filen til hvilke du vil oprette Android-skabelon-filerne.</translation> @@ -28438,9 +28248,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <source>Select a .pro File</source> <translation>Vælg en .pro-fil</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation>Opret Android-skabelon-filer-assistent</translation> @@ -28469,9 +28276,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <source>Could not update the .pro file %1.</source> <translation>Kunne ikke opdatere .pro-filen %1.</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>Ingen program .pro-fil fundet i dette projekt.</translation> @@ -28480,13 +28284,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <source>No Application .pro File</source> <translation>Ingen program .pro-fil</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStep</name> - <message> - <source>Found old folder "android" in source directory. Qt 5.2 does not use that folder by default.</source> - <translation>Fandt gammel "android"-mappe i kildemappe. Qt 5.2 bruger ikke den mappe som standard.</translation> - </message> <message> <source>Android build SDK not defined. Check Android settings.</source> <translation>Android-byg SDK ikke defineret. Tjek Android-indstillinger.</translation> @@ -28496,24 +28293,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <translation>Ingen program .pro-fil fundet, bygger ikke en APK.</translation> </message> <message> - <source>Starting: "%1" %2</source> - <translation>Starter: "%1" %2</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStepFactory</name> - <message> - <source>Build Android APK</source> - <translation>Byg Android APK</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> <source>Create Templates</source> <translation>Opret skabeloner</translation> </message> @@ -28530,18 +28309,10 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <translation>Vælg bibliotek som skal inkluderes i pakke.</translation> </message> <message> - <source>Add...</source> - <translation>Tilføj...</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Fjern aktuelt valgt bibliotek fra liste.</translation> </message> <message> - <source>Remove</source> - <translation>Fjern</translation> - </message> - <message> <source>Select additional libraries</source> <translation>Vælg yderligere biblioteker</translation> </message> @@ -28549,10 +28320,6 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta <source>Libraries (*.so)</source> <translation>Biblioteker (*.so)</translation> </message> - <message> - <source><b>Build Android APK</b></source> - <translation><b>Byg Android APK</b></translation> - </message> </context> <context> <name>QmakeProjectManager</name> @@ -42462,7 +42229,7 @@ Spordataene er tabt.</translation> </message> </context> <context> - <name>Android::Internal::AndroidAvdManager</name> + <name>Android</name> <message> <source>AVD Start Error</source> <translation>Fejl ved start af AVD</translation> @@ -42475,9 +42242,6 @@ Spordataene er tabt.</translation> <source>Install the missing emulator tool (%1) to the installed Android SDK.</source> <translation>Installer det manglende emulatorværktøj (%1) til det installerede Android SDK.</translation> </message> -</context> -<context> - <name>Android::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>Kopiér programdata</translation> @@ -42486,23 +42250,14 @@ Spordataene er tabt.</translation> <source>Removing directory %1</source> <translation>Fjerner mappen %1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStepWidget</name> <message> <source>Make install</source> <translation>Make install</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationFactory</name> <message> <source>Deploy to device</source> <translation>Udsend til enhed</translation> </message> -</context> -<context> - <name>Android::AndroidRunConfiguration</name> <message> <source>Activity manager start options:</source> <translation>Aktivitetshåndteringer start-valgmuligheder:</translation> diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index d1ef5e2ff29..12fcd683b25 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -17983,7 +17983,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -18611,7 +18611,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>AndroidCreateKeystoreCertificate</name> + <name>Android</name> <message> <source>Keystore</source> <translation>Keystore</translation> @@ -18680,9 +18680,6 @@ should a repository require SSH-authentication (see documentation on SSH and the <source>Use Keystore password</source> <translation>Keystore-Passwort verwenden</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Android-Konfiguration</translation> @@ -18926,7 +18923,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> + <name>Android</name> <message> <source>Keystore password is too short.</source> <translation>Das Keystore-Passwort ist zu kurz.</translation> @@ -18963,16 +18960,10 @@ should a repository require SSH-authentication (see documentation on SSH and the <source>Error</source> <translation>Fehler</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>"%1" terminated.</source> <translation>"%1" beendet.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>Select JDK Path</source> <translation>Pfad zum JDK auswählen</translation> @@ -19154,10 +19145,6 @@ manuellen Herunterladen im Browser des System zu öffnen.</translation> <translation>Fehlende Android-SDK-Pakete</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> <source>Android settings are OK.</source> <translation>Android-Einstellungen sind korrekt.</translation> </message> @@ -19720,22 +19707,15 @@ gehören nicht zu den verifizierten Remotes in %3. Anderes Verzeichnis angeben?< </message> </context> <context> - <name>Android::Internal::AndroidDevice</name> + <name>Android</name> <message> <source>Run on Android</source> <translation>Ausführung auf Android-Gerät</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> <source>Android Device</source> <translation>Android-Gerät</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>NDK is not configured in Devices > Android.</source> <translation>In Geräte > Android ist kein NDK konfiguriert.</translation> @@ -20085,7 +20065,7 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio </message> </context> <context> - <name>Android::Internal::AvdModel</name> + <name>Android</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -22824,7 +22804,7 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind.</translation> </message> </context> <context> - <name>Android::Internal::AndroidManifestEditor</name> + <name>Android</name> <message> <source>General</source> <translation>Allgemein</translation> @@ -22833,9 +22813,6 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind.</translation> <source>XML Source</source> <translation>XML-Quelle</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Paket</translation> @@ -22933,10 +22910,6 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind.</translation> <translation>Standard-Features für Qt-Module einschließen.</translation> </message> <message> - <source>Remove</source> - <translation>Entfernen</translation> - </message> - <message> <source>Add</source> <translation>Hinzufügen</translation> </message> @@ -23206,7 +23179,7 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind.</translation> </message> </context> <context> - <name>Android::Internal::AndroidErrorMessage</name> + <name>Android</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: Bei der SDK-Installation trat Fehler 0x%1 auf</translation> @@ -23393,7 +23366,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. </message> </context> <context> - <name>Android::Internal::AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translatorcomment>Android Virtual Device</translatorcomment> @@ -23427,9 +23400,6 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. <source>Overwrite existing AVD name</source> <translation>Bestehenden AVD-Namen überschreiben</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> <message> <source>Select Android Device</source> <translation>Android-Gerät auswählen</translation> @@ -23495,10 +23465,6 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. <translation><html><head/><body><p><a href="aaa"><span style=" text-decoration: underline; color:#0057ae;">Mein Gerät fehlt</span></a></p></body></html></translation> </message> <message> - <source>Cancel</source> - <translation>Abbrechen</translation> - </message> - <message> <source>This can be later reset in deployment settings in the Projects mode.</source> <translation>Dies kann später in den Deploymenteinstellungen im Projektmodus zurückgesetzt werden.</translation> </message> @@ -23803,7 +23769,7 @@ benötigt wird, was meist die Geschwindigkeit erhöht.</translation> </message> </context> <context> - <name>Android::Internal::AndroidDeployQtStep</name> + <name>Android</name> <message> <source>No Android arch set by the .pro file.</source> <translation>Die .pro-Datei setzt keine Android-Architektur.</translation> @@ -23913,9 +23879,6 @@ Möchten Sie das vorhandene Paket deinstallieren?</translation> <source>Package deploy: Running command "%1".</source> <translation>Paket-Deployment: Führe Kommando "%1" aus.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>%1 needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>%1 benötigt zusätzliche Einstellungen, um die Android-Unterstützung zu aktivieren. Sie können diese im Einstellungsdialog konfigurieren.</translation> @@ -25913,7 +25876,7 @@ Bitte erstellen Sie die Anwendung qmldump auf der Einstellungsseite der Qt-Versi </message> </context> <context> - <name>AndroidConfiguration</name> + <name>Android</name> <message> <source>Could not run: %1</source> <translation>Keine Ausführung möglich: %1</translation> @@ -25922,16 +25885,10 @@ Bitte erstellen Sie die Anwendung qmldump auf der Einstellungsseite der Qt-Versi <source>No devices found in output of: %1</source> <translation>In der Ausgabe von %1 konnten keine Geräte festgestellt werden</translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>Fehler beim Erstellen des AVD</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation>Android konfigurieren...</translation> @@ -26980,7 +26937,7 @@ wirklich löschen?</translation> </message> </context> <context> - <name>Android::Internal::AvdDialog</name> + <name>Android</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -27839,7 +27796,7 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.</translati </message> </context> <context> - <name>Android::AndroidBuildApkStep</name> + <name>Android</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> @@ -27888,16 +27845,9 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation> <translation>Starte: "%1" %2</translation> </message> <message> - <source>Error</source> - <translation>Fehler</translation> - </message> - <message> <source>Failed to run keytool.</source> <translation>keytool konnte nicht ausgeführt werden.</translation> </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> <message> <source>Custom Android Debugger (%1, NDK %2)</source> <translation>Benutzerdefinierter Android-Debugger (%1, NDK %2)</translation> @@ -27910,9 +27860,6 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation> <source>Android %1 Clang %2</source> <translation>Android %1 Clang %2</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>Unbekannte Android-Version. API-Level: %1</translation> @@ -31456,7 +31403,7 @@ Senden selbst auch Zeit benötigt.</translation> </message> </context> <context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> + <name>Android</name> <message> <source>OpenGL enabled</source> <translation>OpenGL aktiviert</translation> @@ -36211,7 +36158,7 @@ Siehe auch die Einstellungen für Google Test.</translation> </message> </context> <context> - <name>AdbCommandsWidget</name> + <name>Android</name> <message> <source>Widget</source> <translation>Widget</translation> @@ -37080,7 +37027,7 @@ Fehler: %5</translation> </message> </context> <context> - <name>AndroidAvdManager</name> + <name>Android</name> <message> <source>Cannot create AVD. Invalid input.</source> <translation>AVD kann nicht erstellt werden. Ungültige Eingabe.</translation> @@ -37093,22 +37040,11 @@ Fehler: %5</translation> <source>Cannot create AVD. Command timed out.</source> <translation>AVD kann nicht erstellt werden. Zeitüberschreitung des Kommandos.</translation> </message> -</context> -<context> - <name>Android::PasswordInputDialog</name> <message> <source>Incorrect password.</source> <translation>Ungültiges Passwort.</translation> </message> <message> - <source>Keystore</source> - <translation>Keystore</translation> - </message> - <message> - <source>Certificate</source> - <translation>Zertifikat</translation> - </message> - <message> <source>Enter keystore password</source> <translation>Geben Sie das Keystore-Passwort ein</translation> </message> @@ -37116,9 +37052,6 @@ Fehler: %5</translation> <source>Enter certificate password</source> <translation>Geben Sie das Zertifikatspasswort ein</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunnerWorker</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>Auf dem Host sind nicht genügend freie Ports für das QML-Debuggen vorhanden.</translation> @@ -39760,7 +39693,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.</translation> </message> </context> <context> - <name>Android::Internal::AndroidSdkManagerWidget</name> + <name>Android</name> <message> <source>Android SDK Manager</source> <translation>Android SDK-Manager</translation> @@ -39798,10 +39731,6 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.</translation> <translation>Erweiterte Optionen...</translation> </message> <message> - <source>Cancel</source> - <translation>Abbrechen</translation> - </message> - <message> <source>Do you want to accept the Android SDK license?</source> <translation>Wollen Sie die Android SDK-Lizenz akzeptieren?</translation> </message> @@ -39908,9 +39837,6 @@ Cancelling pending operations... Breche ausstehende Operationen ab... </translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManager</name> <message> <source>The operation requires user interaction. Use the "sdkmanager" command-line tool.</source> <translation>Die Operation benötigt Benutzereingaben. Benutzen Sie das Kommandozeilenwerkzeug "sdkmanager".</translation> @@ -39923,9 +39849,6 @@ Breche ausstehende Operationen ab... </translation> </message> -</context> -<context> - <name>AndroidSdkManager</name> <message> <source>Updating installed packages.</source> <translation>Aktualisiere installierte Pakete.</translation> @@ -39954,9 +39877,6 @@ Breche ausstehende Operationen ab... <source>Failed</source> <translation>Fehlgeschlagen</translation> </message> -</context> -<context> - <name>Android::Internal::OptionsDialog</name> <message> <source>SDK Manager Arguments</source> <translation>SDK-Manager-Argumente</translation> @@ -39973,22 +39893,11 @@ Breche ausstehende Operationen ab... <source>Available arguments:</source> <translation>Verfügbare Argumente:</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkModel</name> - <message> - <source>Package</source> - <translation>Paket</translation> - </message> <message> <source>Revision</source> <translation>Revision</translation> </message> <message> - <source>API</source> - <translation>API</translation> - </message> - <message> <source>Operation</source> <translation>Operation</translation> </message> @@ -40203,7 +40112,7 @@ Breche ausstehende Operationen ab... </message> </context> <context> - <name>Android::AndroidPackageInstallationStep</name> + <name>Android</name> <message> <source>Copy application data</source> <translation>Anwendungsdaten kopieren</translation> @@ -40681,7 +40590,7 @@ Die Trace-Daten sind verloren.</translation> </message> </context> <context> - <name>Android::Internal::AndroidAvdManager</name> + <name>Android</name> <message> <source>AVD Start Error</source> <translation>Fehler beim Start von AVD</translation> @@ -40694,9 +40603,6 @@ Die Trace-Daten sind verloren.</translation> <source>Install the missing emulator tool (%1) to the installed Android SDK.</source> <translation>Installieren Sie den fehlenden Emulator (%1) im installierten Android-SDK.</translation> </message> -</context> -<context> - <name>Android::AndroidRunConfiguration</name> <message> <source>Clean Environment</source> <translation>Saubere Umgebung</translation> @@ -41634,7 +41540,7 @@ Speichern fehlgeschlagen.</translation> </message> </context> <context> - <name>Android::Internal::AndroidBuildApkWidget</name> + <name>Android</name> <message> <source>Create Templates</source> <translation>Vorlagen erstellen</translation> @@ -41648,18 +41554,10 @@ Speichern fehlgeschlagen.</translation> <translation>Liste aller zusätzlichen Bibliotheken, die in das Paket aufgenommen und beim Start geladen werden.</translation> </message> <message> - <source>Add...</source> - <translation>Hinzufügen...</translation> - </message> - <message> <source>Select library to include in package.</source> <translation>Wählen Sie eine Bibliothek zur Aufnahme in das Paket aus.</translation> </message> <message> - <source>Remove</source> - <translation>Entfernen</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Ausgewählte Bibliothek aus Liste entfernen.</translation> </message> @@ -41668,10 +41566,6 @@ Speichern fehlgeschlagen.</translation> <translation>Zusätzliche Bibliotheken auswählen</translation> </message> <message> - <source>Application</source> - <translation>Anwendung</translation> - </message> - <message> <source>Android build SDK:</source> <translation>Android-Build-SDK:</translation> </message> @@ -41684,10 +41578,6 @@ Speichern fehlgeschlagen.</translation> <translation>Keystore:</translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Keystore-Dateien (*.keystore *.jks)</translation> - </message> - <message> <source>Select Keystore File</source> <translation>Keystore-Datei auswählen</translation> </message> @@ -41740,13 +41630,6 @@ Speichern fehlgeschlagen.</translation> <translation>Dies ist nützlich für Apps, die SSL benutzen. Der Pfad kann in Extras > Einstellungen > Geräte > Android festgelegt werden.</translation> </message> <message> - <source>Build Android APK</source> - <translation>Android-APK erstellen</translation> - </message> -</context> -<context> - <name>Android::NoApplicationProFilePage</name> - <message> <source>No application .pro file found in this project.</source> <translation>Die .pro-Datei der Anwendung konnte in diesem Projekt nicht gefunden werden.</translation> </message> @@ -41754,9 +41637,6 @@ Speichern fehlgeschlagen.</translation> <source>No Application .pro File</source> <translation>Keine .pro-Datei der Anwendung</translation> </message> -</context> -<context> - <name>Android::ChooseDirectoryPage</name> <message> <source>Android package source directory:</source> <translation>Quellverzeichnis des Android-Pakets:</translation> @@ -41785,9 +41665,6 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni <source>The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation>Die Android-Vorlagendateien werden im in der .pro-Datei angegebenen ANDROID_PACKAGE_SOURCE_DIR angelegt.</translation> </message> -</context> -<context> - <name>Android::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation>Assistent zum Erzeugen von Android-Vorlagendateien</translation> @@ -42916,13 +42793,6 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni </message> </context> <context> - <name>Android::Internal</name> - <message> - <source>Deploy to Android Device</source> - <translation>Deployment auf Android-Gerät</translation> - </message> -</context> -<context> <name>ClangDiagnosticConfig</name> <message> <source>Project: %1 (based on %2)</source> @@ -44348,14 +44218,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e </message> </context> <context> - <name>Android::Internal::AndroidSdkDownloader</name> - <message> - <source>Cancel</source> - <translation>Abbrechen</translation> - </message> -</context> -<context> - <name>Android::ChooseProfilePage</name> + <name>Android</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation>Wählen Sie die .pro-Datei, für die Sie die Android-Vorlagendateien erstellen wollen.</translation> @@ -44493,7 +44356,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autotools Manager</source> <translation>Autotools-Verwaltung</translation> @@ -48272,7 +48135,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e </message> </context> <context> - <name>Android::Internal::AndroidManifestEditorIconContainerWidget</name> + <name>Android</name> <message> <source>Low DPI icon</source> <translation>Symbol mit geringer Auflösung</translation> @@ -48297,33 +48160,12 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e <source>Select high DPI icon.</source> <translation>Symbol für hohe Auflösung auswählen.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidServiceWidget</name> - <message> - <source>Add</source> - <translation>Hinzufügen</translation> - </message> - <message> - <source>Remove</source> - <translation>Entfernen</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidToolChain</name> <message> <source>Android Clang</source> <translation>Android Clang</translation> </message> </context> <context> - <name>Android::Internal::SplashIconContainerWidget</name> - <message> - <source>Splash screen</source> - <translation>Startbildschirm</translation> - </message> -</context> -<context> <name>CatchTreeItem</name> <message> <source>parameterized</source> diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index a04e2d9c68a..b0f6629fdf9 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -44717,7 +44717,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -45791,7 +45791,7 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un </message> </context> <context> - <name>AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation>Créer un nouvel AVD</translation> @@ -45809,13 +45809,6 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un <translation>Taille de la carte SD :</translation> </message> <message> - <source> MiB</source> - <translation>Mio</translation> - </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> - <message> <source>Create a keystore and a certificate</source> <translation>Crée un classeur de clés et un certificat</translation> </message> @@ -45896,9 +45889,6 @@ Les modèles de code C++ et QML ont besoin d'une version de Qt et d'un <source>Use Keystore password</source> <translation>Utilise le mot de passe du trousseau de clés</translation> </message> -</context> -<context> - <name>AndroidDeployStepWidget</name> <message> <source>Form</source> <translation>Formulaire</translation> @@ -45945,14 +45935,6 @@ Cette option est utile lorsque vous voulez essayer votre applications sur les p� <translation type="obsolete">Choisir l'APK</translation> </message> <message> - <source>Qt Deployment</source> - <translation>Déploiement Qt</translation> - </message> - <message> - <source>Use the external Ministro application to download and maintain Qt libraries.</source> - <translation>Utiliser l'application Ministro externe pour télécharger et maintenant les bibliothèques Qt.</translation> - </message> - <message> <source>Use Ministro service to install Qt</source> <translation>Utiliser le service Ministro pour installer Qt</translation> </message> @@ -45990,9 +45972,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <source>Reset Default Devices</source> <translation>Restaurer les périphériques par défaut</translation> </message> -</context> -<context> - <name>AndroidPackageCreationWidget</name> <message> <source>Manifest</source> <translation type="obsolete">Fichier manifest</translation> @@ -46044,30 +46023,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <translation type="obsolete"><b>Icône de l'application :</b></translation> </message> <message> - <source>Select low dpi icon</source> - <translation type="obsolete">Sélectionner une icône basse résolution</translation> - </message> - <message> - <source>Select medium dpi icon</source> - <translation type="obsolete">Sélectionner une icône moyenne résolution</translation> - </message> - <message> - <source>Select high dpi icon</source> - <translation type="obsolete">Sélectionner une icône haute résolution</translation> - </message> - <message> - <source>Permissions</source> - <translation type="obsolete">Permissions</translation> - </message> - <message> - <source>Add</source> - <translation type="obsolete">Ajouter</translation> - </message> - <message> - <source>Remove</source> - <translation type="obsolete">Supprimer</translation> - </message> - <message> <source>Save</source> <translation type="obsolete">Enregistrer</translation> </message> @@ -46076,10 +46031,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <translation type="obsolete">Abandonner</translation> </message> <message> - <source>Name:</source> - <translation type="obsolete">Nom :</translation> - </message> - <message> <source>Libraries</source> <translation>Bibliothèques</translation> </message> @@ -46134,13 +46085,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <translation>Alias de certificat :</translation> </message> <message> - <source>Signing a debug package</source> - <translation>Authentification un paquet Debug</translation> - </message> -</context> -<context> - <name>AndroidSettingsWidget</name> - <message> <source>Android Configuration</source> <translation>Configuration Android</translation> </message> @@ -46149,10 +46093,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <translation>Emplacement du SDK Android :</translation> </message> <message> - <source>Browse</source> - <translation>Parcourir</translation> - </message> - <message> <source>Android NDK location:</source> <translation>Emplacement du NDK Android :</translation> </message> @@ -47000,7 +46940,7 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl </message> </context> <context> - <name>Android::Internal::AndroidConfigurations</name> + <name>Android</name> <message> <source>Could not run: %1</source> <translation>Impossible de démarrer : %1</translation> @@ -47027,20 +46967,6 @@ Veuillez installer un SDK supérieur à la version %1.</translation> <source>Android for %1 (GCC %2, Qt %3)</source> <translation>Android pour %1 (GCC %2, Qt %3)</translation> </message> -</context> -<context> - <name>Android</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> - <source><span style=" color:#ff0000;">Password is too short</span></source> - <translation><span style=" color:#ff0000;">Le mot de passe est trop court</span></translation> - </message> <message> <source><span style=" color:#ff0000;">Passwords don't match</span></source> <translation><span style=" color:#ff0000;">Les mots de passe ne correspondent pas</span></translation> @@ -47085,23 +47011,10 @@ Veuillez installer un SDK supérieur à la version %1.</translation> <source>Error</source> <translation>Erreur</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>Déployer sur périphérique Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation>Déployer sur Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployStep default display name</extracomment> @@ -47128,10 +47041,6 @@ Veuillez installer un SDK supérieur à la version %1.</translation> <translation>adb s'est terminé en retournant %1.</translation> </message> <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation>Déployement de paquet : exécution de la commande "%1 %2".</translation> - </message> - <message> <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> <translatorcomment>?</translatorcomment> <translation>Erreur de paquetage : impossible de lancer la commande "%1 %2". Raison : %3</translation> @@ -47176,16 +47085,6 @@ Veuillez installer un SDK supérieur à la version %1.</translation> <source>Pulling files necessary for debugging.</source> <translation>Envoie des fichiers nécessaires au débogage.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepFactory</name> - <message> - <source>Deploy to Android device or emulator</source> - <translation>Déploiement sur un périphérique Android ou un émulateur</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepWidget</name> <message> <source><b>Deploy configurations</b></source> <translation><b>Configurations de déploiement</b></translation> @@ -47198,27 +47097,14 @@ Veuillez installer un SDK supérieur à la version %1.</translation> <source>Android package (*.apk)</source> <translation>Paquet Android (*.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation>Exécuter sur Android</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation>Périphérique Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManager</name> <message> <source>Error creating Android directory '%1'.</source> <translation>Error lors de la création du répertoire Android "%1".</translation> @@ -47270,16 +47156,10 @@ Veuillez installer au moins un SDK. </translation> <source>Can't open '%1'</source> <translation>Impossible d'ouvrir "%1"</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationFactory</name> <message> <source>Create Android (.apk) Package</source> <translation>Créer un paquet Android (.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationStep</name> <message> <source>Packaging for Android</source> <translation>Paquetage pour Android</translation> @@ -47307,10 +47187,6 @@ Please make sure your application is built successfully and is selected in Appli Veuillez vous assurer que votre application est compilée et sélectionnée dans l'onglet Application ("Option d'exécution").</translation> </message> <message> - <source>Error</source> - <translation>Erreur</translation> - </message> - <message> <source>Failed to run keytool</source> <translation>Échec d'exécution de keytool</translation> </message> @@ -47355,44 +47231,13 @@ Veuillez vous assurer que votre application est compilée et sélectionnée dans <translation>Échec lors de la création du paquet.</translation> </message> <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation>Erreur de paquetage : impossible de lancer la commande "%1 %2". Raison : %3</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation>Erreur de paquetage : la commande "%1 %2" a échoué.</translation> - </message> - <message> - <source>Reason: %1</source> - <translation>Raison : %1</translation> - </message> - <message> - <source> Reason: %1</source> - <translation>Raison : %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation>Code de sortie : %1</translation> - </message> - <message> - <source>Keystore</source> - <translation>Trousseau de clés</translation> - </message> - <message> <source>Keystore password:</source> <translation>Mot de passe du trousseau de clés :</translation> </message> <message> - <source>Certificate</source> - <translation>Certificat</translation> - </message> - <message> <source>Certificate password (%1):</source> <translation>Mot de passe du certificat (%1) :</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationWidget</name> <message> <source>Invalid Package Name</source> <translation type="obsolete">Nom de paquet invalide</translation> @@ -47404,22 +47249,6 @@ Please choose a valid package name for your application (e.g. "org.example. Veuillez choisir un nom de paquet valide pour votre application (par exemple "org.exemple.monapplication").</translation> </message> <message> - <source>Choose High DPI Icon</source> - <translation type="obsolete">Choisir une icône haute résolution</translation> - </message> - <message> - <source>PNG images (*.png)</source> - <translation type="obsolete">Images PNG (*.png)</translation> - </message> - <message> - <source>Choose Medium DPI Icon</source> - <translation type="obsolete">Choisir une icône moyenne résolution</translation> - </message> - <message> - <source>Choose Low DPI Icon</source> - <translation type="obsolete">Choisir une icône basse résolution</translation> - </message> - <message> <source>< Type or choose a permission ></source> <translation type="obsolete">< Tapez ou sélectionnez une permission ></translation> </message> @@ -47432,19 +47261,9 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <translation>Sélectionner un fichier de trousseau de clés</translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Fichiers de trousseau de clés (*.keystore *.jks)</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationFactory</name> - <message> <source>Deploy to device</source> <translation>Déployer sur le périphérique</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>Copie des données de l'application</translation> @@ -47453,9 +47272,6 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <source>Removing directory %1</source> <translation>Supprimer le répertoire %1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation>Échec de la détection de l'ABI utilisée par la version de Qt.</translation> @@ -47465,9 +47281,6 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunConfiguration</name> <message> <source>The .pro file '%1' is currently being parsed.</source> <translation>Le fichier de projet "%1" est en cours d'analyse.</translation> @@ -47476,23 +47289,14 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <source>Run on Android device</source> <translation>Exécuter sur le périphérique Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControl</name> <message> <source>Starting remote process.</source> <translation>Démarrage des processus distants.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControlFactory</name> <message> <source>Run on Android device or emulator.</source> <translation type="obsolete">Exécuter sur un périphérique Android ou un émulateur.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>Aucun port libre n'est disponible sur l'hôte pour le débogage.QML.</translation> @@ -47550,16 +47354,10 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu "%1" tué.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> <message> <source>Android Configurations</source> <translation>Configurations Android </translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -47573,9 +47371,6 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <source>CPU/ABI</source> <translation>CPU/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>Android SDK Folder</source> <translation>Dossier du SDK Android</translation> @@ -47632,9 +47427,6 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <source>Select OpenJDK Path</source> <translation>Sélectionner le chemin d'OpenJDK</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>GCC Android</translation> @@ -47647,9 +47439,6 @@ Veuillez choisir un nom de paquet valide pour votre application (par exemple &qu <source>Android GCC (%1-%2)</source> <translation type="obsolete">GCC Android (%1 %2)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root:</source> <translation>Racine du NDK :</translation> @@ -52450,21 +52239,15 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra </message> </context> <context> - <name>Android::Internal::AndroidAnalyzeSupport</name> + <name>Android</name> <message> <source>No analyzer tool selected.</source> <translation>Pas d'outil d'analyse sélectionné.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> <message> <source>GDB server</source> <translation>Serveur GDB</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation>Gérer...</translation> @@ -52493,9 +52276,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra <source>GDB Server for "%1"</source> <translation>Le serveur GDB pour "%1"</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Général</translation> @@ -52504,16 +52284,10 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra <source>XML Source</source> <translation>Source XML</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation>Éditeur de manifest Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Paquet</translation> @@ -52563,10 +52337,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra <translation>SDK cible :</translation> </message> <message> - <source>Application</source> - <translation>Application</translation> - </message> - <message> <source>Application name:</source> <translation>Nom de l'application :</translation> </message> @@ -52627,14 +52397,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra <translation>Permissions</translation> </message> <message> - <source>Remove</source> - <translation>Supprimer</translation> - </message> - <message> - <source>Add</source> - <translation>Ajouter</translation> - </message> - <message> <source>The structure of the android manifest file is corrupt. Expected a top level 'manifest' node.</source> <translation>La structure du fichier manifest Android est corrompue. Un nœud de premier niveau "manifest" est attendu.</translation> </message> @@ -52670,9 +52432,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.</tra <source>Choose High DPI Icon</source> <translation>Choisir une icône haute résolution</translation> </message> -</context> -<context> - <name>Android::AndroidPlugin</name> <message> <source>Android Manifest file</source> <translation>Fichier manifest Android</translation> @@ -55061,24 +54820,12 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un </message> </context> <context> - <name>Android::Internal::AddNewAVDDialog</name> - <message> - <source>Create new AVD</source> - <translation>Créer un nouvel AVD</translation> - </message> + <name>Android</name> <message> <source>Target API:</source> <translation>API cible :</translation> </message> <message> - <source>Name:</source> - <translation>Nom :</translation> - </message> - <message> - <source>SD card size:</source> - <translation>Taille de la carte SD :</translation> - </message> - <message> <source> MiB</source> <translation> Mio</translation> </message> @@ -55086,54 +54833,11 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un <source>ABI:</source> <translation>ABI :</translation> </message> -</context> -<context> - <name>AndroidDeployQtWidget</name> - <message> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> - <source>Sign package</source> - <translation>Authentifier un paquet</translation> - </message> - <message> - <source>Keystore:</source> - <translation>Trousseau de clés :</translation> - </message> - <message> - <source>Create</source> - <translation>Créer</translation> - </message> - <message> - <source>Browse</source> - <translation>Parcourir</translation> - </message> <message> <source>Signing a debug package</source> <translation>Authentifier un paquet Debug</translation> </message> <message> - <source>Certificate alias:</source> - <translation>Alias de certificat :</translation> - </message> - <message> - <source>Advanced Actions</source> - <translation>Actions avancées</translation> - </message> - <message> - <source>Clean Temporary Libraries Directory on Device</source> - <translation>Nettoyer le répertoire temporaire des bibliothèques sur le périphérique</translation> - </message> - <message> - <source>Install Ministro from APK</source> - <translation>Installer Ministro à partir du fichier APK</translation> - </message> - <message> - <source>Reset Default Devices</source> - <translation>Restaurer les périphériques par défaut</translation> - </message> - <message> <source>Open package location after build</source> <translation>Ouvrir l'emplacement du paquet après la compilation</translation> </message> @@ -55146,10 +54850,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un <translation>Créer le fichier AndroidManifest.xml</translation> </message> <message> - <source>Application</source> - <translation>Application</translation> - </message> - <message> <source>Android target SDK:</source> <translation>SDK Android cible :</translation> </message> @@ -55170,28 +54870,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un <translation>Utiliser l'application externe Ministro pour télécharger et mettre à jour les bibliothèques Qt.</translation> </message> <message> - <source>Use Ministro service to install Qt</source> - <translation>Utiliser le service Ministro pour installer Qt</translation> - </message> - <message> - <source>Push local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation>Envoyer les bibliothèques Qt locales sur le périphérique. Vous devez avoir les bibliothèques Qt compilés pour cette plateforme. -Le fichier APL ne sera pas utilisable sur d'autres périphériques.</translation> - </message> - <message> - <source>Deploy local Qt libraries to temporary directory</source> - <translation>Déployer les bibliothèques Qt locales dans un répertoire temporaire</translation> - </message> - <message> - <source>Creates a standalone APK.</source> - <translation>Créer un standalone APK.</translation> - </message> - <message> - <source>Bundle Qt libraries in APK</source> - <translation>Empaqueter les bibliothèques Qt dans le fichier APK</translation> - </message> - <message> <source>Additional Libraries</source> <translation>Bibliothèques supplémentaires</translation> </message> @@ -55204,21 +54882,10 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <translation>Sélectionner la bibliothèque à inclure dans le paquet.</translation> </message> <message> - <source>Add</source> - <translation>Ajouter</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Supprimer de la liste la bibliothèque actuellement sélectionnée.</translation> </message> <message> - <source>Remove</source> - <translation>Supprimer</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> - <message> <source>Select Android Device</source> <translation>Sélectionner un périphérique Android</translation> </message> @@ -55235,10 +54902,6 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques.</transl <translation>Toujours utiliser ce périphérique pour l'architecture %1</translation> </message> <message> - <source>ABI:</source> - <translation>ABI :</translation> - </message> - <message> <source>Compatible devices</source> <translation>Périphériques compatibles</translation> </message> @@ -56016,19 +55679,11 @@ réinitialisation du moniteur</translation> </message> </context> <context> - <name>Android::Internal::AndroidDeployQtStepFactory</name> + <name>Android</name> <message> <source>Deploy to Android device or emulator</source> <translation>Déployer sur un périphérique Android ou un émulateur</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> - <message> - <source>Deploy to Android device</source> - <extracomment>AndroidDeployQtStep default display name</extracomment> - <translation>Déployer sur périphérique Android</translation> - </message> <message> <source>Found old folder "android" in source directory. Qt 5.2 does not use that folder by default.</source> <translation>Un ancien dossier "android" a été trouvé dans le répertoire des sources. Qt 5.2 n'utilise plus ce dossier par défaut.</translation> @@ -56038,38 +55693,6 @@ réinitialisation du moniteur</translation> <translation>Aucun architecture Android n'est définie dans le fichier .pro.</translation> </message> <message> - <source>Warning: Signing a debug package.</source> - <translation>Avertissement : authentification d'un paquet Debug.</translation> - </message> - <message> - <source>Pulling files necessary for debugging.</source> - <translation>Envoie des fichiers nécessaires au débogage.</translation> - </message> - <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation>Déployement de paquet : exécution de la commande "%1 %2".</translation> - </message> - <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation>Erreur de paquetage : impossible de lancer la commande "%1 %2". Raison : %3</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation>Erreur de paquetage : la commande "%1 %2" a échoué.</translation> - </message> - <message> - <source>Reason: %1</source> - <translation>Raison : %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation>Code de sortie : %1</translation> - </message> - <message> - <source>Error</source> - <translation>Erreur</translation> - </message> - <message> <source>Failed to run keytool.</source> <translation>Échec d'exécution de keytool.</translation> </message> @@ -56078,45 +55701,6 @@ réinitialisation du moniteur</translation> <translation>Mot de passe invalide.</translation> </message> <message> - <source>Keystore</source> - <translation>Trousseau de clés</translation> - </message> - <message> - <source>Keystore password:</source> - <translation>Mot de passe du trousseau de clés :</translation> - </message> - <message> - <source>Certificate</source> - <translation>Certificat</translation> - </message> - <message> - <source>Certificate password (%1):</source> - <translation>Mot de passe du certificat (%1) :</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtWidget</name> - <message> - <source><b>Deploy configurations</b></source> - <translation><b>Configurations de déploiement</b></translation> - </message> - <message> - <source>Qt Android Smart Installer</source> - <translation>Qt Android Smart Installer</translation> - </message> - <message> - <source>Android package (*.apk)</source> - <translation>Paquet Android (*.apk)</translation> - </message> - <message> - <source>Select keystore file</source> - <translation>Sélectionner un fichier de trousseau de clés</translation> - </message> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Fichier de trousseau de clés (*.keystore *.jks)</translation> - </message> - <message> <source>Select additional libraries</source> <translation>Sélectionner les bibliothèques supplémentaires</translation> </message> @@ -56124,9 +55708,6 @@ réinitialisation du moniteur</translation> <source>Libraries (*.so)</source> <translation>Bibliothèques (*.so)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android : erreur d'installation du SDK 0x%1</translation> @@ -56167,9 +55748,6 @@ réinitialisation du moniteur</translation> <source>Android: Unknown error 0x%1</source> <translation>Android : errreur inconnue 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStepWidget</name> <message> <source><b>Make install</b></source> <translation><b>Installation de make</b></translation> @@ -56178,9 +55756,6 @@ réinitialisation du moniteur</translation> <source>Make install</source> <translation>Installation de make</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>Qt Creator needs additional settings to enable Android support.You can configure those settings in the Options dialog.</source> <translation>Qt Creator a besoin de paramètres supplémentaires pour activer le support Android. Vous pouvez configurer ces paramètres dans le dialogue Options.</translation> @@ -56189,9 +55764,6 @@ réinitialisation du moniteur</translation> <source>Open Settings</source> <translation>Ouvrir les préférences</translation> </message> -</context> -<context> - <name>Android::Internal::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>Aucun fichier d'application .pro n'a été trouvé dans ce projet.</translation> @@ -56200,9 +55772,6 @@ réinitialisation du moniteur</translation> <source>No Application .pro File</source> <translation>Aucun ficher d'application .pro</translation> </message> -</context> -<context> - <name>Android::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create an AndroidManifest.xml file.</source> <translation>Sélectionner un fichier .pro pour lequel vous souhaitez créer un fichier AndroidManifest.xml.</translation> @@ -56215,9 +55784,6 @@ réinitialisation du moniteur</translation> <source>Select a .pro File</source> <translation>Sélectionner un fichier .pro</translation> </message> -</context> -<context> - <name>Android::Internal::ChooseDirectoryPage</name> <message> <source>Android package source directory:</source> <translation>Répertoire des sources du paquet Android :</translation> @@ -56230,9 +55796,6 @@ réinitialisation du moniteur</translation> <source>The Android manifest file will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation>Le fichier manifest Android sera créé dans le répertoire défini dans le fichier .pro par le paramètre ANDROID_PACKAGE_SOURCE_DIR.</translation> </message> -</context> -<context> - <name>Android::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Manifest Wizard</source> <translation>Créer l'assistant pour le manifest Android</translation> diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index e9ce06e3fe0..6097f03ad6f 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -646,14 +646,11 @@ </message> </context> <context> - <name>AdbCommandsWidget</name> + <name>Android</name> <message> <source>Widget</source> <translation>Programčić</translation> </message> -</context> -<context> - <name>Android::Internal::AddNewAVDDialog</name> <message> <source>Create new AVD</source> <translation>Stvori novi AVD</translation> @@ -678,9 +675,6 @@ <source> MiB</source> <translation> MiB</translation> </message> -</context> -<context> - <name>AndroidBuildApkWidget</name> <message> <source>Sign package</source> <translation>Potpiši paket</translation> @@ -737,9 +731,6 @@ <source>Use Ministro service to install Qt</source> <translation>Koristi Ministro uslugu za instaliranje Qt-a</translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> <message> <source>Create a keystore and a certificate</source> <translation>Stvori spremište ključeva i certifikat</translation> @@ -808,9 +799,6 @@ <source>Keystore</source> <translation>Spremište ključeva</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> <message> <source>Select Android Device</source> <translation>Odaberi Android uređaj</translation> @@ -840,10 +828,6 @@ <translation>Aktualiziraj popis uređaja</translation> </message> <message> - <source>ABI:</source> - <translation>ABI:</translation> - </message> - <message> <source>Compatible devices</source> <translation>Kompatibilni uređaji</translation> </message> @@ -883,9 +867,6 @@ <source>Looking for default device <b>%1</b>.</source> <translation>Traženje zadanog uređaja <b>%1</b>.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManagerWidget</name> <message> <source>Android SDK Manager</source> <translation>Upravljač za Android SDK</translation> @@ -931,10 +912,6 @@ <translation>Izvorni upravljač za SDK …</translation> </message> <message> - <source>Cancel</source> - <translation>Odustani</translation> - </message> - <message> <source>Do you want to accept the Android SDK license?</source> <translation>Želiš li prihvatiti licencu za Android SDK?</translation> </message> @@ -1042,9 +1019,6 @@ Cancelling pending operations... Odustajanje od izvršavanja neriješenih operacija … </translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Android konfiguracija</translation> @@ -13735,7 +13709,7 @@ To clear a variable, put its name on a line with nothing else on it.</source> </message> </context> <context> - <name>AndroidAvdManager</name> + <name>Android</name> <message> <source>Cannot create AVD. Invalid input.</source> <translation type="unfinished"></translation> @@ -13745,16 +13719,9 @@ To clear a variable, put its name on a line with nothing else on it.</source> <translation type="unfinished"></translation> </message> <message> - <source>Could not start process "%1 %2"</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Cannot create AVD. Command timed out.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidAvdManager</name> <message> <source>AVD Start Error</source> <translation type="unfinished"></translation> @@ -13767,9 +13734,6 @@ To clear a variable, put its name on a line with nothing else on it.</source> <source>Install the missing emulator tool (%1) to the installed Android SDK.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::AndroidBuildApkStep</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> @@ -13820,22 +13784,11 @@ The minimum API level required by the kit is %1.</source> <source>Failed to run keytool.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::PasswordInputDialog</name> <message> <source>Incorrect password.</source> <translation type="unfinished"></translation> </message> <message> - <source>Keystore</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Certificate</source> - <translation type="unfinished">Certifikat</translation> - </message> - <message> <source>Enter keystore password</source> <translation type="unfinished"></translation> </message> @@ -13843,13 +13796,6 @@ The minimum API level required by the kit is %1.</source> <source>Enter certificate password</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidBuildApkInnerWidget</name> - <message> - <source>Build Android APK</source> - <translation type="unfinished"></translation> - </message> <message> <source>Keystore files (*.keystore *.jks)</source> <translation type="unfinished"></translation> @@ -13858,17 +13804,6 @@ The minimum API level required by the kit is %1.</source> <source>Select Keystore File</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidBuildApkWidget</name> - <message> - <source>Build Android APK</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Android</source> - <translation type="unfinished"></translation> - </message> <message> <source>Create Templates</source> <translation type="unfinished"></translation> @@ -13882,18 +13817,10 @@ The minimum API level required by the kit is %1.</source> <translation type="unfinished"></translation> </message> <message> - <source>Add...</source> - <translation>Dodaj …</translation> - </message> - <message> <source>Select library to include in package.</source> <translation type="unfinished"></translation> </message> <message> - <source>Remove</source> - <translation>Ukloni</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation type="unfinished"></translation> </message> @@ -13905,9 +13832,6 @@ The minimum API level required by the kit is %1.</source> <source>Libraries (*.so)</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidConfiguration</name> <message> <source>Could not run: %1</source> <translation type="unfinished"></translation> @@ -13916,9 +13840,6 @@ The minimum API level required by the kit is %1.</source> <source>No devices found in output of: %1</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> <message> <source>Android Debugger for %1</source> <translation type="unfinished"></translation> @@ -13927,9 +13848,6 @@ The minimum API level required by the kit is %1.</source> <source>Android for %1 (Clang %2)</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> <message> <source>Keystore password is too short.</source> <translation type="unfinished"></translation> @@ -13959,17 +13877,6 @@ The minimum API level required by the kit is %1.</source> <translation type="unfinished"></translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Error</source> - <translation>Greška</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> - <message> <source>Deploy to Android device or emulator</source> <translation type="unfinished"></translation> </message> @@ -14000,7 +13907,7 @@ The minimum API level required by the kit is %1.</source> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployQtStep default display name</extracomment> - <translation type="unfinished"></translation> + <translation>Implementiraj za Android uređaj</translation> </message> <message> <source>No Android arch set by the .pro file.</source> @@ -14035,10 +13942,6 @@ The minimum API level required by the kit is %1.</source> <translation type="unfinished"></translation> </message> <message> - <source>Starting: "%1" %2</source> - <translation type="unfinished"></translation> - </message> - <message> <source>The process "%1" exited normally.</source> <translation type="unfinished"></translation> </message> @@ -14078,21 +13981,11 @@ Do you want to uninstall the existing package?</source> <source>Package deploy: Running command "%1 %2".</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation type="unfinished"></translation> </message> <message> - <source>Android</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> - <message> <source>OpenGL enabled</source> <translation type="unfinished"></translation> </message> @@ -14100,23 +13993,14 @@ Do you want to uninstall the existing package?</source> <source>OpenGL disabled</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>Greška prilikom stvaranja AVD-a</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> <message> <source>Android Device</source> <translation>Android uređaj</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation type="unfinished"></translation> @@ -14157,16 +14041,10 @@ Do you want to uninstall the existing package?</source> <source>Android: Unknown error 0x%1</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> <message> <source>GDB server</source> <translation>GDB poslužitelj</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation type="unfinished"></translation> @@ -14195,9 +14073,6 @@ Do you want to uninstall the existing package?</source> <source>GDB Server for "%1"</source> <translation>GDB poslužitelj za "%1"</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>Neposznata Android verzija. API razina: %1</translation> @@ -14224,9 +14099,6 @@ Do you want to uninstall the existing package?</source> %1</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Opće</translation> @@ -14235,16 +14107,10 @@ Do you want to uninstall the existing package?</source> <source>XML Source</source> <translation>XML izvor</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation type="unfinished"></translation> @@ -14290,10 +14156,6 @@ Do you want to uninstall the existing package?</source> <translation type="unfinished"></translation> </message> <message> - <source>Application</source> - <translation>Aplikacija</translation> - </message> - <message> <source>Application name:</source> <translation type="unfinished"></translation> </message> @@ -14334,10 +14196,6 @@ Do you want to uninstall the existing package?</source> <translation type="unfinished"></translation> </message> <message> - <source>Remove</source> - <translation>Ukloni</translation> - </message> - <message> <source>Add</source> <translation>Dodaj</translation> </message> @@ -14381,9 +14239,6 @@ Do you want to uninstall the existing package?</source> <source>Choose High DPI Icon</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>Kopiraj podatke aplikacije</translation> @@ -14396,37 +14251,18 @@ Do you want to uninstall the existing package?</source> <source>Deploy to device</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStepWidget</name> <message> <source>Make install</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal</name> - <message> - <source>Deploy to Android device</source> - <translation>Implementiraj za Android uređaj</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>%1 needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation type="unfinished"></translation> @@ -14436,9 +14272,6 @@ Do you want to uninstall the existing package?</source> <extracomment>Qt Version is meant for Android</extracomment> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::AndroidRunConfiguration</name> <message> <source>Activity manager start options:</source> <translation type="unfinished"></translation> @@ -14471,23 +14304,14 @@ Do you want to uninstall the existing package?</source> <source>The project file "%1" could not be parsed.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::AndroidRunEnvironmentAspect</name> <message> <source>Clean Environment</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>"%1" terminated.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunnerWorker</name> <message> <source>No free ports available on host for QML debugging.</source> <translation type="unfinished"></translation> @@ -14532,9 +14356,6 @@ Do you want to uninstall the existing package?</source> <source>"%1" died.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManager</name> <message> <source>The operation requires user interaction. Use the "sdkmanager" command-line tool.</source> <translation type="unfinished"></translation> @@ -14545,9 +14366,6 @@ Do you want to uninstall the existing package?</source> </source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidSdkManager</name> <message> <source>Updating installed packages.</source> <translation type="unfinished"></translation> @@ -14574,9 +14392,6 @@ Do you want to uninstall the existing package?</source> <source>Failed</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::OptionsDialog</name> <message> <source>SDK Manager Arguments</source> <translation type="unfinished"></translation> @@ -14593,13 +14408,6 @@ Do you want to uninstall the existing package?</source> <source>Available arguments:</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkModel</name> - <message> - <source>Package</source> - <translation type="unfinished"></translation> - </message> <message> <source>Revision</source> <translation type="unfinished"></translation> @@ -14632,16 +14440,6 @@ Do you want to uninstall the existing package?</source> <source>Install</source> <translation type="unfinished">Instaliraj</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> - <message> - <source>Android</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -14655,9 +14453,6 @@ Do you want to uninstall the existing package?</source> <source>CPU/ABI</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>JDK path exists.</source> <translation type="unfinished"></translation> @@ -14754,23 +14549,14 @@ Do you want to uninstall the existing package?</source> <source>AVD manager UI tool is not available in the installed SDK tools(version %1). Use the command line tool "avdmanager" for advanced AVD management.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android Clang</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidToolManager</name> <message> <source>Could not start process "%1 %2"</source> <translation>Nije bilo moguće pokrenuti proces "%1 %2"</translation> </message> -</context> -<context> - <name>Android::Internal::AvdDialog</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -14784,9 +14570,6 @@ Install an SDK of at least API version %1.</source> <source>Allowed characters are: a-z A-Z 0-9 and . _ -</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation type="unfinished"></translation> @@ -14795,9 +14578,6 @@ Install an SDK of at least API version %1.</source> <source>No Application .pro File</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation type="unfinished"></translation> @@ -14810,9 +14590,6 @@ Install an SDK of at least API version %1.</source> <source>Select a .pro File</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::ChooseDirectoryPage</name> <message> <source>Android package source directory:</source> <translation type="unfinished"></translation> @@ -14839,9 +14616,6 @@ The files in the Android package source directory are copied to the build direct <source>The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation type="unfinished"></translation> @@ -14870,9 +14644,6 @@ The files in the Android package source directory are copied to the build direct <source>Could not update the project file %1.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::JavaEditorFactory</name> <message> <source>Java Editor</source> <translation type="unfinished"></translation> @@ -15419,7 +15190,7 @@ Check the test environment.</source> </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 080025c14a9..3f12196f92b 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -510,7 +510,7 @@ </message> </context> <context> - <name>Android::Internal::AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation>新しい AVD の作成</translation> @@ -547,9 +547,6 @@ <source>Overwrite existing AVD name</source> <translation>既存の AVD 名を上書きする</translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> <message> <source>Create a keystore and a certificate</source> <translation>キーストアと証明書の作成</translation> @@ -618,9 +615,6 @@ <source>Keystore</source> <translation>キーストア</translation> </message> -</context> -<context> - <name>AndroidDeployQtWidget</name> <message> <source>Form</source> <translation>フォーム</translation> @@ -645,9 +639,6 @@ <source>Uninstall previous package</source> <translation>古いパッケージをアンインストールする</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> <message> <source>Select Android Device</source> <translation>Android デバイスの選択</translation> @@ -661,10 +652,6 @@ <translation>Android 仮想デバイス(AVD)の作成</translation> </message> <message> - <source>ABI:</source> - <translation>ABI:</translation> - </message> - <message> <source>Compatible devices</source> <translation>互換性のあるデバイス</translation> </message> @@ -728,9 +715,6 @@ <source>Always use this device for architecture %1 for this project</source> <translation>このプロジェクトの %1 アーキテクチャでは常にこのデバイスを使用する</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Android 設定</translation> @@ -11272,13 +11256,6 @@ with a password, which you can enter below.</source> <context> <name>Android</name> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> <source>Keystore password is too short.</source> <translation>キーストアパスワードが短すぎます。</translation> </message> @@ -11320,30 +11297,14 @@ with a password, which you can enter below.</source> <source>Error</source> <translation>エラー</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>Android デバイスにデプロイ</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation>Android 上でデプロイ</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStepFactory</name> <message> <source>Deploy to Android device or emulator</source> <translation>Android デバイスまたはエミュレータにデプロイ</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployQtStep default display name</extracomment> @@ -11471,9 +11432,6 @@ Do you want to uninstall the existing package?</source> <source>Pulling files necessary for debugging.</source> <translation>デバッグに必要なファイルを取得しています。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtWidget</name> <message> <source><b>Deploy configurations</b></source> <translation><b>デプロイ設定</b></translation> @@ -11483,34 +11441,13 @@ Do you want to uninstall the existing package?</source> <translation>Qt Android スマートインストーラ</translation> </message> <message> - <source>Android package (*.apk)</source> - <translation>Android パッケージ (*.apk)</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> - <message> <source>Run on Android</source> <translation>Android 上で実行</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> - <source>Android Device</source> - <translation>Android デバイス</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation>Android デバイス</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: SDK のインストールエラー 0x%1</translation> @@ -11551,16 +11488,10 @@ Do you want to uninstall the existing package?</source> <source>Android: Unknown error 0x%1</source> <translation>Android: 未知のエラー 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> <message> <source>GDB server</source> <translation>GDB サーバー</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation>管理...</translation> @@ -11589,9 +11520,6 @@ Do you want to uninstall the existing package?</source> <source>GDB Server for "%1"</source> <translation>"%1" 向け GDB サーバー</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>一般</translation> @@ -11600,16 +11528,10 @@ Do you want to uninstall the existing package?</source> <source>XML Source</source> <translation>XML ソース</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation>Android Manifest エディタ</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>パッケージ</translation> @@ -11699,10 +11621,6 @@ Do you want to uninstall the existing package?</source> <translation>Qt モジュール用の既定の機能を追加する。</translation> </message> <message> - <source>Remove</source> - <translation>削除</translation> - </message> - <message> <source>Add</source> <translation>追加</translation> </message> @@ -11787,13 +11705,6 @@ Do you want to uninstall the existing package?</source> <translation>高 DPI アイコンを選択</translation> </message> <message> - <source>Android Manifest editor</source> - <translation>Android Manifest エディタ</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> - <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation>Qt で使用されている ABI の検出に失敗しました。</translation> </message> @@ -11814,16 +11725,10 @@ Do you want to uninstall the existing package?</source> <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControl</name> <message> <source>Starting remote process.</source> <translation>リモートプロセスを起動します。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>ホストに QML デバッグ用の空きポートがありません。</translation> @@ -11860,16 +11765,10 @@ Do you want to uninstall the existing package?</source> <source>"%1" terminated.</source> <translation>"%1" が終了しました。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> <message> <source>Android Configurations</source> <translation>Android 設定</translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -11899,9 +11798,6 @@ Do you want to uninstall the existing package?</source> <source>CPU/ABI</source> <translation>CPU/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>"%1" does not seem to be an Android SDK top folder.</source> <translation>"%1" は Android SDK の最上位フォルダとは異なるようです。</translation> @@ -12095,10 +11991,6 @@ in the system's browser for manual download.</source> <translation>OpenSSL のビルド済みライブラリを複製する...</translation> </message> <message> - <source>Cancel</source> - <translation>キャンセル</translation> - </message> - <message> <source>OpenSSL prebuilt libraries cloning failed.</source> <translation>OpenSSL のビルド済みライブラリの複製に失敗しました。</translation> </message> @@ -12143,10 +12035,6 @@ in the system's browser for manual download.</source> <translation>Android SDK Tools をダウンロードしてインストールするには: %1?</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> <source>Unsupported GDB</source> <translation>サポート対象外の GDB</translation> </message> @@ -12166,23 +12054,14 @@ in the system's browser for manual download.</source> <source>Select ant Script</source> <translation>ant スクリプトの選択</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>Android GCC</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root:</source> <translation>NDK ルート:</translation> </message> -</context> -<context> - <name>AutotoolsProjectManager</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -33787,7 +33666,7 @@ Qt バージョンオプションページで qmldump アプリケーション� </message> </context> <context> - <name>AndroidConfiguration</name> + <name>Android</name> <message> <source>Could not run: %1</source> <translation>実行できません: %1</translation> @@ -33796,9 +33675,6 @@ Qt バージョンオプションページで qmldump アプリケーション� <source>No devices found in output of: %1</source> <translation>以下のコマンドの出力からデバイスが見つかりません: %1</translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>AVD 作成中のエラー</translation> @@ -33807,23 +33683,14 @@ Qt バージョンオプションページで qmldump アプリケーション� <source>Could not start process "%1 %2"</source> <translation>プロセス "%1 %2" を起動できませんでした</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation>Android の設定...</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>Qt Creator needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>Android サポートを有効にするには Qt Creator に追加の設定が必要です。オプションダイアログからそれらの設定を行うことができます。</translation> </message> -</context> -<context> - <name>Android::Internal::JavaEditorFactory</name> <message> <source>Java Editor</source> <translation>Java エディタ</translation> @@ -35016,7 +34883,7 @@ Are you sure you want to continue?</source> </message> </context> <context> - <name>Android::Internal::AvdDialog</name> + <name>Android</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -35752,11 +35619,7 @@ API バージョンが %1 以上の SDK をインストールしてください� </message> </context> <context> - <name>AndroidBuildApkWidget</name> - <message> - <source>Form</source> - <translation>フォーム</translation> - </message> + <name>Android</name> <message> <source>Sign package</source> <translation>パッケージに署名する</translation> @@ -35778,10 +35641,6 @@ API バージョンが %1 以上の SDK をインストールしてください� <translation>証明書エイリアス:</translation> </message> <message> - <source>Application</source> - <translation>アプリケーション</translation> - </message> - <message> <source>Android build SDK:</source> <translation>Android SDK:</translation> </message> @@ -36295,15 +36154,7 @@ Android 5 ではローカルの Qt ライブラリをデプロイできません </message> </context> <context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget</name> - <message> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <source>Android</source> - <translation>Android</translation> - </message> + <name>Android</name> <message> <source>Create Templates</source> <translation>テンプレートの作成</translation> @@ -36321,18 +36172,10 @@ Android 5 ではローカルの Qt ライブラリをデプロイできません <translation>パッケージに同梱するライブラリを選択します。</translation> </message> <message> - <source>Add...</source> - <translation>追加...</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>現在選択されているライブラリをリストから削除します。</translation> </message> <message> - <source>Remove</source> - <translation>削除</translation> - </message> - <message> <source>Select additional libraries</source> <translation>追加ライブラリの選択</translation> </message> @@ -37570,7 +37413,7 @@ the program.</source> </message> </context> <context> - <name>Android::AndroidBuildApkStep</name> + <name>Android</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> @@ -37581,10 +37424,6 @@ the program.</source> <translation>警告: デバッグ用あるいはプロファイル用パッケージを署名しています。</translation> </message> <message> - <source>Error</source> - <translation>エラー</translation> - </message> - <message> <source>Failed to run keytool.</source> <translation>keytool の実行に失敗しました。</translation> </message> @@ -37593,40 +37432,18 @@ the program.</source> <translation>無効なパスワードです。</translation> </message> <message> - <source>Keystore</source> - <translation>キーストア</translation> - </message> - <message> <source>Keystore password:</source> <translation>キーストアパスワード:</translation> </message> <message> - <source>Certificate</source> - <translation>証明書</translation> - </message> - <message> <source>Certificate password (%1):</source> <translation>証明書のパスワード(%1):</translation> </message> -</context> -<context> - <name>Android::AndroidBuildApkWidget</name> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>キーストアファイル (*.keystore *.jks)</translation> - </message> <message> <source>Select Keystore File</source> <translation>キーストアファイルの選択</translation> </message> <message> - <source><b>Build Android APK</b></source> - <translation><b>Android APK のビルド</b></translation> - </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> - <message> <source>Android Debugger for %1</source> <translation>%1 向け Android デバッガ</translation> </message> @@ -37634,9 +37451,6 @@ the program.</source> <source>Android for %1 (GCC %2, Qt %3)</source> <translation>%1 向け Android (GCC %2, Qt %3)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> <message> <source>OpenGL enabled</source> <translation>OpenGL 有効</translation> @@ -37645,9 +37459,6 @@ the program.</source> <source>OpenGL disabled</source> <translation>OpenGL 無効</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>未知のバージョンの Android です。API レベル: %1</translation> @@ -42972,14 +42783,11 @@ These files are preserved.</source> </message> </context> <context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationFactory</name> + <name>Android</name> <message> <source>Deploy to device</source> <translation>デバイスにデプロイ</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>アプリケーションデータのコピー</translation> @@ -42988,9 +42796,6 @@ These files are preserved.</source> <source>Removing directory %1</source> <translation>ディレクトリ %1 を削除しています</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationStepWidget</name> <message> <source><b>Make install</b></source> <translation><b>Make install</b></translation> @@ -42999,9 +42804,6 @@ These files are preserved.</source> <source>Make install</source> <translation>Make install</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>このプロジェクトにアプリケーション .pro ファイルが見つかりません。</translation> @@ -43010,9 +42812,6 @@ These files are preserved.</source> <source>No Application .pro File</source> <translation>アプリケーション .pro ファイルが見つかりません</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation>Android テンプレートファイルを作成したい .pro ファイルを選択してください。</translation> @@ -43025,9 +42824,6 @@ These files are preserved.</source> <source>Select a .pro File</source> <translation>.pro ファイルの選択</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseDirectoryPage</name> <message> <source>The Android package source directory cannot be the same as the project directory.</source> <translation>Android パッケージソースディレクトリをプロジェクトのディレクトリと同じにすることはできません。</translation> @@ -43056,9 +42852,6 @@ Android パッケージソースディレクトリのファイルはビルドデ <source>Copy the Gradle files to Android directory</source> <translation>Gradle のファイルを Android ディレクトリにコピーする</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation>Android テンプレートファイル作成ウィザード</translation> @@ -43087,32 +42880,11 @@ Android パッケージソースディレクトリのファイルはビルドデ <source>Could not update the .pro file %1.</source> <translation>.pro ファイル %1 を更新できませんでした。</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStepFactory</name> - <message> - <source>Build Android APK</source> - <translation>Android APK のビルド</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStep</name> - <message> - <source>Found old folder "android" in source directory. Qt 5.2 does not use that folder by default.</source> - <translation>ソースディレクトリに古い "android" フォルダを見つけました。Qt 5.2 は既定ではそのフォルダを使用しません。</translation> - </message> <message> <source>No application .pro file found, not building an APK.</source> <translation>アプリケーション .pro ファイルが見つからないため、APK をビルドできません。</translation> </message> <message> - <source>Starting: "%1" %2</source> - <translation>起動中: "%1" %2</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidRunConfiguration</name> - <message> <source>The .pro file "%1" is currently being parsed.</source> <translation>.pro ファイル "%1" を現在解析しています。</translation> </message> @@ -45606,7 +45378,7 @@ Output: </message> </context> <context> - <name>Android::Internal::AndroidSdkManagerWidget</name> + <name>Android</name> <message> <source>Expand All</source> <translation>すべて展開</translation> @@ -45627,14 +45399,6 @@ Output: <source>All</source> <translation>すべて</translation> </message> - <message> - <source>Advanced Options...</source> - <translation type="unfinished">詳細オプション...</translation> - </message> - <message> - <source>Cancel</source> - <translation>キャンセル</translation> - </message> </context> <context> <name>Autotest</name> @@ -46983,180 +46747,11 @@ in "%2". </message> </context> <context> - <name>AndroidAvdManager</name> - <message> - <source>Could not start process "%1 %2"</source> - <translation>プロセス "%1 %2" を起動できませんでした</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidBuildApkStep</name> - <message> - <source>Application</source> - <translation>アプリケーション</translation> - </message> - <message> - <source>Android build SDK:</source> - <translation>Android SDK:</translation> - </message> - <message> - <source>Create Templates</source> - <translation>テンプレートの作成</translation> - </message> - <message> - <source>Keystore:</source> - <translation>キーストア:</translation> - </message> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>キーストアファイル (*.keystore *.jks)</translation> - </message> - <message> - <source>Select Keystore File</source> - <translation>キーストアファイルの選択</translation> - </message> - <message> - <source>Create...</source> - <translation>作成...</translation> - </message> - <message> - <source>Sign package</source> - <translation>パッケージに署名する</translation> - </message> - <message> - <source>Signing a debug package</source> - <translation>デバッグパッケージに署名する</translation> - </message> - <message> - <source>Certificate alias:</source> - <translation>証明書エイリアス:</translation> - </message> - <message> - <source>Advanced Actions</source> - <translation>高度なアクション</translation> - </message> - <message> - <source>Open package location after build</source> - <translation>ビルド後にパッケージのパスを開く</translation> - </message> - <message> - <source>Verbose output</source> - <translation>詳細出力</translation> - </message> - <message> - <source>Additional Libraries</source> - <translation>追加ライブラリ</translation> - </message> - <message> - <source>List of extra libraries to include in Android package and load on startup.</source> - <translation>Android のパッケージに同梱され起動時に読み込まれる追加ライブラリのリストです。</translation> - </message> - <message> - <source>Add...</source> - <translation>追加...</translation> - </message> - <message> - <source>Select library to include in package.</source> - <translation>パッケージに同梱するライブラリを選択します。</translation> - </message> - <message> - <source>Select additional libraries</source> - <translation>追加ライブラリの選択</translation> - </message> - <message> - <source>Libraries (*.so)</source> - <translation>ライブラリ (*.so)</translation> - </message> - <message> - <source>Remove</source> - <translation>削除</translation> - </message> - <message> - <source>Remove currently selected library from list.</source> - <translation>現在選択しているライブラリをリストから削除します。</translation> - </message> - <message> - <source>Build Android APK</source> - <translation>Android APK のビルド</translation> - </message> - <message> - <source>Warning: Signing a debug or profile package.</source> - <translation>警告: デバッグ用あるいはプロファイル用パッケージを署名しています。</translation> - </message> - <message> - <source>Starting: "%1" %2</source> - <translation>起動中: "%1" %2</translation> - </message> - <message> - <source>Error</source> - <translation>エラー</translation> - </message> - <message> - <source>Failed to run keytool.</source> - <translation>keytool の実行に失敗しました。</translation> - </message> - <message> - <source>Keystore</source> - <translation>キーストア</translation> - </message> - <message> - <source>Certificate</source> - <translation>証明書</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorIconWidget</name> - <message> - <source>Icon scaled up.</source> - <translation type="unfinished">アイコンをスケールアップ。</translation> - </message> - <message> - <source>Click to select...</source> - <translation type="unfinished">クリックして選択...</translation> - </message> -</context> -<context> - <name>Android::AndroidPackageInstallationStep</name> - <message> - <source>Copy application data</source> - <translation>アプリケーションデータのコピー</translation> - </message> - <message> - <source>Removing directory %1</source> - <translation>ディレクトリ %1 を削除しています</translation> - </message> - <message> - <source>Deploy to device</source> - <translation>デバイスにデプロイ</translation> - </message> -</context> -<context> - <name>Android::AndroidRunConfiguration</name> + <name>Android</name> <message> <source>Clean Environment</source> <translation>環境変数なし</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunnerWorker</name> - <message> - <source>No free ports available on host for QML debugging.</source> - <translation>ホストに QML デバッグ用の空きポートがありません。</translation> - </message> - <message> - <source>"%1" died.</source> - <translation>"%1" は異常終了しました。</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidSdkDownloader</name> - <message> - <source>Cancel</source> - <translation>キャンセル</translation> - </message> -</context> -<context> - <name>AndroidSdkManager</name> <message> <source>Failed.</source> <translation>失敗しました。</translation> @@ -47165,96 +46760,10 @@ in "%2". <source>Failed</source> <translation>失敗</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkModel</name> - <message> - <source>Package</source> - <translation>パッケージ</translation> - </message> - <message> - <source>API</source> - <translation>API</translation> - </message> <message> <source>Install</source> <translation>インストールする</translation> </message> -</context> -<context> - <name>Android::NoApplicationProFilePage</name> - <message> - <source>No application .pro file found in this project.</source> - <translation>このプロジェクトにアプリケーション .pro ファイルが見つかりません。</translation> - </message> - <message> - <source>No Application .pro File</source> - <translation>アプリケーション .pro ファイルが見つかりません</translation> - </message> -</context> -<context> - <name>Android::ChooseProfilePage</name> - <message> - <source>Select the .pro file for which you want to create the Android template files.</source> - <translation>Android テンプレートファイルを作成したい .pro ファイルを選択してください。</translation> - </message> - <message> - <source>.pro file:</source> - <translation>.pro ファイル:</translation> - </message> - <message> - <source>Select a .pro File</source> - <translation>.pro ファイルの選択</translation> - </message> -</context> -<context> - <name>Android::ChooseDirectoryPage</name> - <message> - <source>Android package source directory:</source> - <translation>Android パッケージソースディレクトリ:</translation> - </message> - <message> - <source>The Android package source directory cannot be the same as the project directory.</source> - <translation>Android パッケージソースディレクトリをプロジェクトのディレクトリと同じにすることはできません。</translation> - </message> - <message> - <source>Copy the Gradle files to Android directory</source> - <translation>Gradle のファイルを Android ディレクトリにコピーする</translation> - </message> - <message> - <source>It is highly recommended if you are planning to extend the Java part of your Qt application.</source> - <translation>Qt アプリケーションの Java 部を拡張する際には有効にすることを強く推奨します。</translation> - </message> - <message> - <source>Select the Android package source directory. - -The files in the Android package source directory are copied to the build directory's Android directory and the default files are overwritten.</source> - <translation>Android パッケージソースディレクトリを選択してください。 - -Android パッケージソースディレクトリのファイルはビルドディレクトリの Android ディレクトリに既定のファイルを上書きする形でコピーされます。</translation> - </message> - <message> - <source>The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> - <translation type="vanished">Android テンプレートファイルは .pro ファイルの ANDROID_PACKAGE_SOURCE_DIR 変数に設定されたパスに作成されます。</translation> - </message> -</context> -<context> - <name>Android::CreateAndroidManifestWizard</name> - <message> - <source>Create Android Template Files Wizard</source> - <translation>Android テンプレートファイル作成ウィザード</translation> - </message> - <message> - <source>Project File not Updated</source> - <translation>プロジェクトファイルは未更新です</translation> - </message> -</context> -<context> - <name>JLSSettingsWidget</name> - <message> - <source>Name:</source> - <translation>名前:</translation> - </message> <message> <source>Java:</source> <translation>Java:</translation> @@ -47267,16 +46776,6 @@ Android パッケージソースディレクトリのファイルはビルドデ <source>Path to equinox launcher jar</source> <translation>equinox launcher jarへのパス</translation> </message> -</context> -<context> - <name>Android::Internal::SplashScreenContainerWidget</name> - <message> - <source>Splash screen</source> - <translation>スプラッシュスクリーン</translation> - </message> -</context> -<context> - <name>Android::Internal::SplashScreenWidget</name> <message> <source>Icon scaled up.</source> <translation>アイコンをスケールアップ。</translation> @@ -47544,7 +47043,7 @@ Android パッケージソースディレクトリのファイルはビルドデ </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> </context> <context> <name>BuildConfiguration</name> diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 4d075e89137..5cd55977b44 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -19037,16 +19037,12 @@ Wykluczenia: %3 </message> </context> <context> - <name>AndroidCreateKeystoreCertificate</name> + <name>Android</name> <message> <source>Create a keystore and a certificate</source> <translation type="unfinished"></translation> </message> <message> - <source>Keystore</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Password:</source> <translation>Hasło:</translation> </message> @@ -19106,9 +19102,6 @@ Wykluczenia: %3 <source>Use Keystore password</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Konfiguracja Androida</translation> @@ -20850,7 +20843,7 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation> </message> </context> <context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> + <name>Android</name> <message> <source>Keystore password is too short.</source> <translation type="unfinished"></translation> @@ -20887,41 +20880,18 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation> <source>Error</source> <translation>Błąd</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>Zainstaluj na urządzeniu Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation>Zainstaluj na urządzeniu Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation>Uruchom na androidzie</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation>Urządzenie Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</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> @@ -20931,23 +20901,10 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation> <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>"%1" terminated.</source> <translation>Zakończono "%1".</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -20961,9 +20918,6 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS.</translation> <source>CPU/ABI</source> <translation>CPU/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>"%1" does not seem to be an Android SDK top folder.</source> <translation>"%1" nie wygląda na katalog główny SDK Androida.</translation> @@ -21050,16 +21004,10 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.</ <source>Select ant Script</source> <translation>Wybierz skrypt "ant"</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>Android GCC</translation> </message> -</context> -<context> - <name>AutotoolsProjectManager</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -22704,7 +22652,7 @@ poinstruuje Qt Creatora o URI.</translation> </message> </context> <context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> + <name>Android</name> <message> <source>NDK Root:</source> <translation>Korzeń NDK:</translation> @@ -24644,14 +24592,11 @@ Więcej informacji w dokumentacji "Checking Code Syntax".</translation </message> </context> <context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> + <name>Android</name> <message> <source>GDB server</source> <translation>Serwer GDB</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation>Zarządzaj...</translation> @@ -24680,9 +24625,6 @@ Więcej informacji w dokumentacji "Checking Code Syntax".</translation <source>GDB Server for "%1"</source> <translation>Serwer GDB dla "%1"</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Ogólne</translation> @@ -24691,16 +24633,10 @@ Więcej informacji w dokumentacji "Checking Code Syntax".</translation <source>XML Source</source> <translation>Źródło XML</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation>Edytor plików manifest Androida</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Pakiet</translation> @@ -24802,10 +24738,6 @@ Więcej informacji w dokumentacji "Checking Code Syntax".</translation <translation>Ustaw domyślne funkcjonalności dla modułów Qt.</translation> </message> <message> - <source>Remove</source> - <translation>Usuń</translation> - </message> - <message> <source>Add</source> <translation>Dodaj</translation> </message> @@ -26229,7 +26161,7 @@ Zdalny: %4</translation> </message> </context> <context> - <name>Android::Internal::AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation>Utwórz nowe AVD</translation> @@ -26254,9 +26186,6 @@ Zdalny: %4</translation> <source>ABI:</source> <translation>ABI:</translation> </message> -</context> -<context> - <name>AndroidDeployQtWidget</name> <message> <source>Form</source> <translation>Formularz</translation> @@ -26281,9 +26210,6 @@ Zdalny: %4</translation> <source>Uninstall previous package</source> <translation>Odinstaluj poprzedni pakiet</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> <message> <source>Select Android Device</source> <translation>Wybierz urządzenie z Androidem</translation> @@ -26297,10 +26223,6 @@ Zdalny: %4</translation> <translation>Utwórz wirtualne urządzenie Android</translation> </message> <message> - <source>ABI:</source> - <translation>ABI:</translation> - </message> - <message> <source>Compatible devices</source> <translation>Kompatybilne urządzenia</translation> </message> @@ -26996,14 +26918,11 @@ Zdalny: %4</translation> </message> </context> <context> - <name>Android::Internal::AndroidDeployQtStepFactory</name> + <name>Android</name> <message> <source>Deploy to Android device or emulator</source> <translation>Zainstaluj na urządzeniu lub emulatorze Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployQtStep default display name</extracomment> @@ -27085,9 +27004,6 @@ Czy odinstalować istniejący pakiet?</translation> <source>Pulling files necessary for debugging.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtWidget</name> <message> <source><b>Deploy configurations</b></source> <translation><b>Konfiguracje instalacji</b></translation> @@ -27100,9 +27016,6 @@ Czy odinstalować istniejący pakiet?</translation> <source>Android package (*.apk)</source> <translation>Pakiet androida (*.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: błąd instalacji SDK 0x%1</translation> @@ -27143,9 +27056,6 @@ Czy odinstalować istniejący pakiet?</translation> <source>Android: Unknown error 0x%1</source> <translation>Android: nieznany błąd 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>Qt Creator needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>Qt Creator wymaga dodatkowych ustawień do obsługi Androida. Można je skonfigurować w dialogu z opcjami.</translation> @@ -28481,7 +28391,7 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt.</translation> </message> </context> <context> - <name>AndroidConfiguration</name> + <name>Android</name> <message> <source>Could not run: %1</source> <translation>Nie można uruchomić: %1</translation> @@ -28490,23 +28400,14 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt.</translation> <source>No devices found in output of: %1</source> <translation>Brak urządzeń na wyjściu %1</translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>Błąd w trakcie tworzenia AVD</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation>Konfiguruj Androida...</translation> </message> -</context> -<context> - <name>Android::Internal::JavaEditorFactory</name> <message> <source>Java Editor</source> <translation>Edytor Java</translation> @@ -29294,11 +29195,7 @@ Czy przerwać ją?</translation> </message> </context> <context> - <name>AndroidBuildApkWidget</name> - <message> - <source>Form</source> - <translation>Formularz</translation> - </message> + <name>Android</name> <message> <source>Sign package</source> <translation>Podpisz pakiet</translation> @@ -29321,10 +29218,6 @@ Czy przerwać ją?</translation> <translation>Alias certyfikatu:</translation> </message> <message> - <source>Application</source> - <translation>Aplikacja</translation> - </message> - <message> <source>Android build SDK:</source> <translation>Wersja Android SDK:</translation> </message> @@ -29382,10 +29275,6 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5.</transl <translation>Używaj Gradle (Ant jest przestarzały)</translation> </message> <message> - <source>Gradle builds are forced from Android SDK tools version 25.3.0 onwards as Ant scripts are no longer available.</source> - <translation>Narzędzia Android SDK, począwszy od wersji 25.3.0, wymagają użycia Gradle, ponieważ skrypty Ant są już niedostępne.</translation> - </message> - <message> <source>Packages debug server with the APK to enable debugging. For the signed APK this option is unchecked by default.</source> <translation type="unfinished"></translation> </message> @@ -29421,15 +29310,7 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5.</transl </message> </context> <context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget</name> - <message> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <source>Android</source> - <translation>Android</translation> - </message> + <name>Android</name> <message> <source>Create Templates</source> <translation>Utwórz szablony</translation> @@ -29447,18 +29328,10 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5.</transl <translation>Wybierz bibliotekę, którą dołączyć do pakietu.</translation> </message> <message> - <source>Add...</source> - <translation>Dodaj...</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Usuń zaznaczoną bibliotekę z listy.</translation> </message> <message> - <source>Remove</source> - <translation>Usuń</translation> - </message> - <message> <source>Select additional libraries</source> <translation>Wybierz dodatkowe biblioteki</translation> </message> @@ -29919,7 +29792,7 @@ Czy kontynuować instalację?</translation> </message> </context> <context> - <name>Android::AndroidBuildApkStep</name> + <name>Android</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> @@ -29947,32 +29820,14 @@ The minimum API level required by the kit is %1.</source> <translation>Nie można podpisać pakietu. Nie istnieje alias certyfikatu %1.</translation> </message> <message> - <source>Error</source> - <translation>Błąd</translation> - </message> - <message> <source>Failed to run keytool.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::AndroidBuildApkWidget</name> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Pliki z magazynami kluczy (*.keystore *.jks)</translation> - </message> <message> <source>Select Keystore File</source> <translation>Wybierz plik z magazynem kluczy</translation> </message> <message> - <source><b>Build Android APK</b></source> - <translation><b>Zbuduj Android APK</b></translation> - </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> - <message> <source>Android Debugger for %1</source> <translation>Debugger Androida dla %1</translation> </message> @@ -29980,9 +29835,6 @@ The minimum API level required by the kit is %1.</source> <source>Android for %1 (GCC %2, %3)</source> <translation>Android dla %1 (GCC %2, %3)</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>Nieznana wersja Androida. Poziom API: %1</translation> @@ -29999,9 +29851,6 @@ The minimum API level required by the kit is %1.</source> <source>Starting Android virtual device failed.</source> <translation>Nie można uruchomić wirtualnego urządzenia Android.</translation> </message> -</context> -<context> - <name>Android::Internal::AvdDialog</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -32920,14 +32769,11 @@ do projektu "%2".</translation> </message> </context> <context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationFactory</name> + <name>Android</name> <message> <source>Deploy to device</source> <translation>Zainstaluj na urządzeniu</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>Skopiuj dane aplikacji</translation> @@ -32936,9 +32782,6 @@ do projektu "%2".</translation> <source>Removing directory %1</source> <translation>Usuwanie katalogu %1</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationStepWidget</name> <message> <source><b>Make install</b></source> <translation type="unfinished"></translation> @@ -32947,9 +32790,6 @@ do projektu "%2".</translation> <source>Make install</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>Brak pliku .pro aplikacji w tym projekcie.</translation> @@ -32958,9 +32798,6 @@ do projektu "%2".</translation> <source>No Application .pro File</source> <translation>Brak pliku .pro aplikacji</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation>Wybierz plik .pro dla którego utworzyć pliki szablonu Android.</translation> @@ -32973,9 +32810,6 @@ do projektu "%2".</translation> <source>Select a .pro File</source> <translation>Wybierz plik .pro</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseDirectoryPage</name> <message> <source>The Android package source directory cannot be the same as the project directory.</source> <translation>Katalog ze źródłami pakietu Android nie może być taki sam jak katalog projektu.</translation> @@ -33004,9 +32838,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan <source>Copy the Gradle files to Android directory</source> <translation>Skopiuj pliki Gradle do katalogu Android</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation>Tworzenie kreatora plików szablonowych Androida</translation> @@ -33035,20 +32866,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan <source>Could not update the .pro file %1.</source> <translation>Nie można uaktualnić pliku .pro %1.</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStepFactory</name> - <message> - <source>Build Android APK</source> - <translation>Zbuduj Android APK</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStep</name> - <message> - <source>Found old folder "android" in source directory. Qt 5.2 does not use that folder by default.</source> - <translation>Odnaleziono folder "android" w katalogu źródłowym. Qt 5.2 domyślnie nie używa tego katalogu.</translation> - </message> <message> <source>Android build SDK not defined. Check Android settings.</source> <translation type="unfinished"></translation> @@ -33058,13 +32875,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan <translation>Brak pliku .pro aplikacji, budowanie APK wstrzymane.</translation> </message> <message> - <source>Starting: "%1" %2</source> - <translation>Uruchamianie "%1" %2</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidRunConfiguration</name> - <message> <source>The .pro file "%1" is currently being parsed.</source> <translation>Trwa parsowanie pliku .pro "%1".</translation> </message> @@ -33575,7 +33385,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan </message> </context> <context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> + <name>Android</name> <message> <source>OpenGL enabled</source> <translation>OpenGL odblokowany</translation> @@ -39596,7 +39406,7 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc </message> </context> <context> - <name>Android::Internal::AndroidRunnerWorker</name> + <name>Android</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>Brak wolnych portów w hoście do debugowania QML.</translation> @@ -41232,7 +41042,7 @@ Błąd: %2</translation> </message> </context> <context> - <name>AndroidAvdManager</name> + <name>Android</name> <message> <source>Cannot create AVD. Invalid input.</source> <translation>Nie można utworzyć AVD. Niepoprawne wejście.</translation> @@ -41249,9 +41059,6 @@ Błąd: %2</translation> <source>Cannot create AVD. Command timed out.</source> <translation>Nie można utworzyć AVD. Przekroczono limit czasu oczekiwania.</translation> </message> -</context> -<context> - <name>Android::PasswordInputDialog</name> <message> <source>Incorrect password.</source> <translation>Niepoprawne hasło.</translation> @@ -41261,10 +41068,6 @@ Błąd: %2</translation> <translation>Magazyn kluczy</translation> </message> <message> - <source>Certificate</source> - <translation>Certyfikat</translation> - </message> - <message> <source>Enter keystore password</source> <translation>Podaj hasło magazynu kluczy</translation> </message> @@ -41274,13 +41077,6 @@ Błąd: %2</translation> </message> </context> <context> - <name>AndroidToolManager</name> - <message> - <source>Could not start process "%1 %2"</source> - <translation>Nie można uruchomić procesu "%1 %2"</translation> - </message> -</context> -<context> <name>QtTestTreeItem</name> <message> <source>inherited</source> @@ -42116,18 +41912,11 @@ Termin wygaśnięcia: %3</translation> </message> </context> <context> - <name>AdbCommandsWidget</name> + <name>Android</name> <message> <source>Widget</source> <translation>Widżet</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunConfigurationWidget</name> - <message> - <source>Form</source> - <translation>Formularz</translation> - </message> <message> <source>Activity manager start options:</source> <translation type="unfinished"></translation> diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index d262e9e999a..1e5357c56a2 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -184,7 +184,7 @@ </message> </context> <context> - <name>AdbCommandsWidget</name> + <name>Android</name> <message> <source>Widget</source> <translation></translation> @@ -499,7 +499,7 @@ </message> </context> <context> - <name>Android::AndroidBuildApkStep</name> + <name>Android</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> @@ -555,9 +555,6 @@ The minimum API level required by the kit is %1.</source> <source>Failed to run keytool.</source> <translation>Не удалось запустить keytool.</translation> </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> <message> <source>Custom Android Debugger (%1, NDK %2)</source> <translation>Особый отладчик Android (%1, NDK %2)</translation> @@ -570,9 +567,6 @@ The minimum API level required by the kit is %1.</source> <source>Android %1 Clang %2</source> <translation>Android %1 Clang %2</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>Версия Android неизвестна. API Level: %1</translation> @@ -595,9 +589,6 @@ The minimum API level required by the kit is %1.</source> <translation>Не удалось установить пакет для Android. %1</translation> </message> -</context> -<context> - <name>Android::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>Копирование данных приложения</translation> @@ -610,16 +601,10 @@ The minimum API level required by the kit is %1.</source> <source>Deploy to device</source> <translation>Установка на устройство</translation> </message> -</context> -<context> - <name>Android::AndroidPackageInstallationStepWidget</name> <message> <source><b>Make install:</b> Copy App Files to %1</source> <translation><b>Make install:</b> Копирование файлов приложения в %1</translation> </message> -</context> -<context> - <name>Android::AndroidRunConfiguration</name> <message> <source>Activity manager start options:</source> <translation>Параметры запуска менеджера действий:</translation> @@ -642,9 +627,6 @@ Qt Creator использует: am start -n <имя_пакета>/<д� <source>Clean Environment</source> <translation>Чистая среда</translation> </message> -</context> -<context> - <name>Android::ChooseDirectoryPage</name> <message> <source>Android package source directory:</source> <translation>Исходный каталог пакета Android:</translation> @@ -673,9 +655,6 @@ The files in the Android package source directory are copied to the build direct <source>The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation>Шаблонные файлы для Android будут созданы в каталоге, заданном ANDROID_PACKAGE_SOURCE_DIR в файле .pro.</translation> </message> -</context> -<context> - <name>Android::ChooseProfilePage</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation>Выберите файл .pro, для которого следует создать шаблоны для Android.</translation> @@ -688,9 +667,6 @@ The files in the Android package source directory are copied to the build direct <source>Select a .pro File</source> <translation>Выбор файла .pro</translation> </message> -</context> -<context> - <name>Android::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation>Мастер создания шаблонов для Android</translation> @@ -703,16 +679,6 @@ The files in the Android package source directory are copied to the build direct <source>Could not update the project file %1.</source> <translation>Не удалось обновить файл проекта %1.</translation> </message> -</context> -<context> - <name>Android::Internal</name> - <message> - <source>Deploy to Android Device</source> - <translation>Развёртывание на устройство Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AddNewAVDDialog</name> <message> <source>Create new AVD</source> <translation>Создание AVD</translation> @@ -745,9 +711,6 @@ The files in the Android package source directory are copied to the build direct <source>Overwrite existing AVD name</source> <translation>Перезаписать существующее имя AVD</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidAvdManager</name> <message> <source>AVD Start Error</source> <translation>Ошибка запуска AVD</translation> @@ -760,9 +723,6 @@ The files in the Android package source directory are copied to the build direct <source>Install the missing emulator tool (%1) to the installed Android SDK.</source> <translation>Установите утилиту эмуляции (%1) в установленный Android SDK.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidBuildApkWidget</name> <message> <source>Create Templates</source> <translation>Создать шаблоны</translation> @@ -784,10 +744,6 @@ The files in the Android package source directory are copied to the build direct <translation>Выбор библиотеки для включения в пакет.</translation> </message> <message> - <source>Remove</source> - <translation>Убрать</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Удаление выбранной библиотеки из списка.</translation> </message> @@ -880,13 +836,6 @@ The files in the Android package source directory are copied to the build direct <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты > Параметры > Устройства > Android.</translation> </message> <message> - <source>Build Android APK</source> - <translation>Сборка Android APK</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> <source>Keystore password is too short.</source> <translation>Пароль связки ключей слишком короткий.</translation> </message> @@ -915,17 +864,6 @@ The files in the Android package source directory are copied to the build direct <translation>Имя файла связки ключей</translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Файлы связки ключей (*.keystore *.jks)</translation> - </message> - <message> - <source>Error</source> - <translation>Ошибка</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> - <message> <source>No Android arch set by the .pro file.</source> <translation>Архитектура Android не прописана в файле .pro.</translation> </message> @@ -1034,24 +972,14 @@ Do you want to uninstall the existing package?</source> <source>Package deploy: Running command "%1".</source> <translation>Развёртывание пакета: выполняется команда «%1».</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation>Запуск на Android</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> <source>Android Device</source> <translation>Устройство Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> <message> <source>Select Android Device</source> <translation>Выбор устройства Android</translation> @@ -1128,9 +1056,6 @@ Do you want to uninstall the existing package?</source> <source>Always use this device for architecture %1 for this project</source> <translation>Всегда использовать это устройство для архитектуры %1 в этом проекте</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> <message> <source>OpenGL enabled</source> <translation>OpenGL включён</translation> @@ -1139,9 +1064,6 @@ Do you want to uninstall the existing package?</source> <source>OpenGL disabled</source> <translation>OpenGL выключен</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: ошибка установки SDK 0x%1</translation> @@ -1182,9 +1104,6 @@ Do you want to uninstall the existing package?</source> <source>Android: Unknown error 0x%1</source> <translation>Android: неизвестная ошибка 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Основное</translation> @@ -1193,9 +1112,6 @@ Do you want to uninstall the existing package?</source> <source>XML Source</source> <translation>Исходник XML</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorIconContainerWidget</name> <message> <source>Master icon</source> <translation>Основной значок</translation> @@ -1228,9 +1144,6 @@ Do you want to uninstall the existing package?</source> <source>Select high DPI icon.</source> <translation>Выбрать значок высокого разрешения.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorIconWidget</name> <message> <source>Icon scaled up.</source> <translation>Значок увеличен.</translation> @@ -1239,9 +1152,6 @@ Do you want to uninstall the existing package?</source> <source>Click to select...</source> <translation>Щёлкните для выбора...</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Пакет</translation> @@ -1299,10 +1209,6 @@ Do you want to uninstall the existing package?</source> <translation>Задаёт целевой SDK. Следует выбирать последнюю протестированную версию. Предотвращает включение системой режима совместимости для приложения.</translation> </message> <message> - <source>Application</source> - <translation>Приложение</translation> - </message> - <message> <source>Application name:</source> <translation>Имя приложения:</translation> </message> @@ -1386,9 +1292,6 @@ Do you want to uninstall the existing package?</source> <source>Android Manifest editor</source> <translation>Редактор Android Manifest</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPlugin</name> <message> <source>Would you like to configure Android options? This will ensure Android kits can be usable and all essential packages are installed. To do it later, select Options > Devices > Android.</source> <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Параметры > Устройства > Android.</translation> @@ -1397,23 +1300,14 @@ Do you want to uninstall the existing package?</source> <source>Configure Android</source> <translation>Настроить Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation>Настроить Android...</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>%1 needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>Для включения поддержки Android в %1 требуются дополнительные настройки в диалоге Параметры.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>NDK is not configured in Devices > Android.</source> <translation>NDK не настроен в Устройства > Android.</translation> @@ -1431,16 +1325,10 @@ Do you want to uninstall the existing package?</source> <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>"%1" terminated.</source> <translation>«%1» завершён.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunnerWorker</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>Нет свободных портов на компьютере для отладки QML.</translation> @@ -1493,9 +1381,6 @@ Do you want to uninstall the existing package?</source> <source>"%1" died.</source> <translation>«%1» аварийно завершился.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkDownloader</name> <message> <source>Encountered SSL errors, download is aborted.</source> <translation>Возникла ошибка SSL, загрузка прервана.</translation> @@ -1509,10 +1394,6 @@ Do you want to uninstall the existing package?</source> <translation>Загрузка пакета SDK Tools...</translation> </message> <message> - <source>Cancel</source> - <translation>Отмена</translation> - </message> - <message> <source>Could not create the SDK folder %1.</source> <translation>Не удалось создать каталог SDK %1.</translation> </message> @@ -1536,9 +1417,6 @@ Do you want to uninstall the existing package?</source> <source>Writing and verifying the integrity of the downloaded file has failed.</source> <translation>Не удалось записать и проверить целостность загруженных файлов.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManager</name> <message> <source>The operation requires user interaction. Use the "sdkmanager" command-line tool.</source> <translation>Операция требует вмешательства пользователя. Используйте «sdkmanager» в командной строке.</translation> @@ -1551,9 +1429,6 @@ Do you want to uninstall the existing package?</source> </translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkManagerWidget</name> <message> <source>Android SDK Manager</source> <translation>Android SDK Manager</translation> @@ -1591,10 +1466,6 @@ Do you want to uninstall the existing package?</source> <translation>Дополнительно...</translation> </message> <message> - <source>Cancel</source> - <translation>Отмена</translation> - </message> - <message> <source>Do you want to accept the Android SDK license?</source> <translation>Принимаете условия лицензии Android SDK?</translation> </message> @@ -1704,13 +1575,6 @@ Cancelling pending operations... Отмена ожидающих операций... </translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSdkModel</name> - <message> - <source>Package</source> - <translation>Пакет</translation> - </message> <message> <source>Revision</source> <translation>Ревизия</translation> @@ -1743,20 +1607,6 @@ Cancelling pending operations... <source>Install</source> <translation>Установить</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidServiceWidget</name> - <message> - <source>Add</source> - <translation>Добавить</translation> - </message> - <message> - <source>Remove</source> - <translation>Удалить</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidServiceWidget::AndroidServiceModel</name> <message> <source>The name of the class implementing the service.</source> <translation>Имя класса, реализующего сервис.</translation> @@ -1823,9 +1673,6 @@ Prefix with : if the process is private, use a lowercase name if the process is <source>The service arguments must be set for a service not run in an external library</source> <translation>Необходимо задать параметры сервиса, не работающего во внешней библиотеке</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>Select JDK Path</source> <translation>Выбор размещения JDK</translation> @@ -1847,10 +1694,6 @@ Prefix with : if the process is private, use a lowercase name if the process is <translation>Клонирование собранных библиотек OpenSSL...</translation> </message> <message> - <source>Cancel</source> - <translation>Отмена</translation> - </message> - <message> <source>Remove Android Virtual Device</source> <translation>Удаление виртуального устройства Android</translation> </message> @@ -1971,10 +1814,6 @@ Prefix with : if the process is private, use a lowercase name if the process is <translation>Загрузить и установить инструменты Android SDK в %1?</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> - <message> <source>Android settings are OK.</source> <translation>Настройки Android в порядке.</translation> </message> @@ -2024,16 +1863,10 @@ in the system's browser for manual download.</source> <source>Android SDK installation is missing necessary packages. Do you want to install the missing packages?</source> <translation>В установленном Android SDK отсутствует ряд необходимых пакетов. Доустановить их?</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChain</name> <message> <source>Android Clang</source> <translation>Android Clang</translation> </message> -</context> -<context> - <name>Android::Internal::AvdDialog</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -2048,19 +1881,12 @@ Install an SDK of at least API version %1.</source> <source>Allowed characters are: a-z A-Z 0-9 and . _ -</source> <translation>Допустимы символы: a-z A-Z 0-9 . _ -</translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> <translation>Название AVD</translation> </message> <message> - <source>API</source> - <translation>API</translation> - </message> - <message> <source>Device Type</source> <translation>Тип устройства</translation> </message> @@ -2076,9 +1902,6 @@ Install an SDK of at least API version %1.</source> <source>CPU/ABI</source> <translation>Процессор/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::OptionsDialog</name> <message> <source>SDK Manager Arguments</source> <translation>Параметры SDK Manager</translation> @@ -2095,13 +1918,6 @@ Install an SDK of at least API version %1.</source> <source>Available arguments:</source> <translation>Доступные параметры:</translation> </message> -</context> -<context> - <name>Android::Internal::SplashIconContainerWidget</name> - <message> - <source>Splash screen</source> - <translation>Заставка</translation> - </message> <message> <source>Select splash screen image</source> <translation>Выбор картинки для заставки</translation> @@ -2168,9 +1984,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>Low DPI splash screen</source> <translation>Заставка низкого разрешения</translation> </message> -</context> -<context> - <name>Android::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>Не найден файл .pro приложения в этом проекте.</translation> @@ -2179,9 +1992,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>No Application .pro File</source> <translation>Нет файла .pro приложения</translation> </message> -</context> -<context> - <name>Android::PasswordInputDialog</name> <message> <source>Incorrect password.</source> <translation>Неверный пароль.</translation> @@ -2202,9 +2012,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>Enter certificate password</source> <translation>Введите пароль сертификата</translation> </message> -</context> -<context> - <name>AndroidAvdManager</name> <message> <source>Cannot create AVD. Invalid input.</source> <translation>Не удалось создать AVD. Неверный ввод.</translation> @@ -2217,16 +2024,10 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>Cannot create AVD. Command timed out.</source> <translation>Не удалось создать AVD. Время ожидания команды истекло.</translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>Ошибка создания AVD</translation> </message> -</context> -<context> - <name>AndroidConfiguration</name> <message> <source>Could not run: %1</source> <translation>Невозможно запустить: %1</translation> @@ -2235,13 +2036,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>No devices found in output of: %1</source> <translation>Устройства не обнаружены в выводе %1</translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> - <message> - <source>Keystore</source> - <translation>Связка ключей</translation> - </message> <message> <source>Password:</source> <translation>Пароль:</translation> @@ -2255,10 +2049,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <translation>Отображать пароль</translation> </message> <message> - <source>Certificate</source> - <translation>Сертификат</translation> - </message> - <message> <source>Alias name:</source> <translation>Имя алиаса:</translation> </message> @@ -2306,9 +2096,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>Use Keystore password</source> <translation>Пароль для связки ключей</translation> </message> -</context> -<context> - <name>AndroidSdkManager</name> <message> <source>Updating installed packages.</source> <translation>Обновление установленных пакетов.</translation> @@ -2337,9 +2124,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <source>Failed</source> <translation>Ошибка</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Конфигурация Android</translation> @@ -2361,10 +2145,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <translation> МБ</translation> </message> <message> - <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> <source>Automatically create kits for Android tool chains</source> <translation>Автоматически создавать комплекты для инструментариев Android</translation> </message> @@ -2377,10 +2157,6 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source> <translation>Запустить...</translation> </message> <message> - <source>Add...</source> - <translation>Добавить...</translation> - </message> - <message> <source>Java Settings</source> <translation>Настройки Java</translation> </message> @@ -3543,7 +3319,7 @@ Warning: this is an experimental feature and might lead to failing to execute th </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 65c04d2d502..8ab54dce9bf 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -26069,7 +26069,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -27568,31 +27568,12 @@ Do you want to kill it?</source> </message> </context> <context> - <name>AddNewAVDDialog</name> - <message> - <source>Create new AVD</source> - <translation type="vanished">Створити новий AVD</translation> - </message> - <message> - <source>Name:</source> - <translation type="vanished">Назва:</translation> - </message> + <name>Android</name> <message> <source>Kit:</source> <translation type="vanished">Комплект:</translation> </message> <message> - <source>SD card size:</source> - <translation type="vanished">Розмір карти SD:</translation> - </message> - <message> - <source> MiB</source> - <translation type="vanished"> Мб</translation> - </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> - <message> <source>Create a keystore and a certificate</source> <translation>Створення сховища ключів та сертифіката</translation> </message> @@ -27672,82 +27653,11 @@ Do you want to kill it?</source> <source>Use Keystore password</source> <translation>Пароль для сховища ключів</translation> </message> -</context> -<context> - <name>AndroidDeployStepWidget</name> - <message> - <source>Form</source> - <translation type="vanished">Форма</translation> - </message> - <message> - <source>Qt Deployment</source> - <translation type="vanished">Розгортання Qt</translation> - </message> - <message> - <source>Use the external Ministro application to download and maintain Qt libraries.</source> - <translation type="vanished">Використовувати зовнішню програму Ministro для завантаження та підтримки бібліотек Qt.</translation> - </message> - <message> - <source>Use Ministro service to install Qt</source> - <translation type="vanished">Використовувати службу Ministro для встановлення Qt</translation> - </message> - <message> - <source>Push local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation type="vanished">Надсилати локальні бібліотеки Qt до пристрою. Ви повинні мати бібліотеки Qt скомпільовані для цієї платформи. -Файл APK не можна буде використовувати на жодному іншому пристрої.</translation> - </message> - <message> - <source>Deploy local Qt libraries to temporary directory</source> - <translation type="vanished">Розгортати локальні бібліотеки Qt до тимчасової теки</translation> - </message> - <message> - <source>Creates a standalone APK.</source> - <translation type="vanished">Створює автономний APK.</translation> - </message> - <message> - <source>Bundle Qt libraries in APK</source> - <translation type="vanished">Вкладати бібліотеки Qt до APK</translation> - </message> - <message> - <source>Advanced Actions</source> - <translation type="vanished">Розширені дії</translation> - </message> - <message> - <source>Clean Temporary Libraries Directory on Device</source> - <translation type="vanished">Очистити теку тимчасових -бібліотек на пристрої</translation> - </message> - <message> - <source>Install Ministro from APK</source> - <translation type="vanished">Встановити Ministro з APK</translation> - </message> - <message> - <source>Reset Default Devices</source> - <translation type="vanished">Скинути типові пристрої</translation> - </message> - <message> - <source>Uses the external Ministro application to download and maintain Qt libraries.</source> - <translation type="vanished">Використовувати зовнішню програму Ministro для завантаження та підтримки бібліотек Qt.</translation> - </message> - <message> - <source>Pushes local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation type="vanished">Надсилати локальні бібліотеки Qt до пристрою. Ви повинні мати бібліотеки Qt скомпільовані для цієї платформи. -Файл APK не можна буде використовувати на жодному іншому пристрої.</translation> - </message> -</context> -<context> - <name>AndroidPackageCreationWidget</name> <message> <source><b>Android target SDK:</b></source> <translation type="vanished"><b>SDK для Android:</b></translation> </message> <message> - <source>Application</source> - <translation type="vanished">Програма</translation> - </message> - <message> <source>Libraries</source> <translation type="vanished">Бібліотеки</translation> </message> @@ -27778,14 +27688,6 @@ The APK will not be usable on any other device.</source> <translation type="vanished">Вгору</translation> </message> <message> - <source>Sign package</source> - <translation type="vanished">Підпис пакунка</translation> - </message> - <message> - <source>Keystore:</source> - <translation type="vanished">Сховище ключів:</translation> - </message> - <message> <source>Create</source> <translation type="vanished">Створити</translation> </message> @@ -27798,20 +27700,9 @@ The APK will not be usable on any other device.</source> <translation type="vanished">Відкрити розташування пакунка після завершення</translation> </message> <message> - <source>Certificate alias:</source> - <translation type="vanished">Псевдонім сертифіката:</translation> - </message> - <message> - <source>Signing a debug package</source> - <translation type="vanished">Підписання зневаджувального пакунка</translation> - </message> - <message> <source>Automatically check required Qt libraries from compiled application.</source> <translation type="vanished">Автоматично перевіряти необхідні бібліотеки Qt із скомпільованої програми.</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Конфігурація Android</translation> @@ -27821,10 +27712,6 @@ The APK will not be usable on any other device.</source> <translation>Розташування Android SDK:</translation> </message> <message> - <source>Browse</source> - <translation type="vanished">Огляд</translation> - </message> - <message> <source>Android NDK location:</source> <translation>Розташування Android NDK:</translation> </message> @@ -27853,10 +27740,6 @@ The APK will not be usable on any other device.</source> <translation type="vanished">Запустити управління AVD для Android</translation> </message> <message> - <source>Add</source> - <translation type="vanished">Додати</translation> - </message> - <message> <source>Remove</source> <translation>Видалити</translation> </message> @@ -28725,19 +28608,7 @@ The APK will not be usable on any other device.</source> </message> </context> <context> - <name>Android::Internal::AndroidConfigurations</name> - <message> - <source>Could not run: %1</source> - <translation type="vanished">Не вдалось запустити: %1</translation> - </message> - <message> - <source>No devices found in output of: %1</source> - <translation type="vanished">Не знайдено пристроїв у виведенні: %1</translation> - </message> - <message> - <source>Error Creating AVD</source> - <translation type="vanished">Помилка створення AVD</translation> - </message> + <name>Android</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Please install an SDK of at least API version %1.</source> @@ -28745,28 +28616,6 @@ Please install an SDK of at least API version %1.</source> Будь ласка, встановіть SDK з версією API не нижче %1.</translation> </message> <message> - <source>Android Debugger for %1</source> - <translation type="vanished">Зневаджувач Android для "%1"</translation> - </message> - <message> - <source>Android for %1 (GCC %2, Qt %3)</source> - <translation type="vanished">Android для %1 (GCC %2, Qt %3)</translation> - </message> -</context> -<context> - <name>Android</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> - <source><span style=" color:#ff0000;">Password is too short</span></source> - <translation type="vanished"><span style=" color:#ff0000;">Пароль закороткий</span></translation> - </message> - <message> <source><span style=" color:#ff0000;">Passwords don't match</span></source> <translation type="vanished"><span style=" color:#ff0000;">Паролі не співпадають</span></translation> </message> @@ -28810,28 +28659,10 @@ Please install an SDK of at least API version %1.</source> <source>Error</source> <translation>Помилка</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>Розгортання на пристрій Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation>Розгортання на пристрій Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStep</name> - <message> - <source>Deploy to Android device</source> - <extracomment>AndroidDeployStep default display name</extracomment> - <translation type="vanished">Розгортання на пристрій Android</translation> - </message> <message> <source>Please wait, searching for a suitable device for target:%1.</source> <translation type="vanished">Будь ласка, зачекайте, триває пошук відповідного пристрою для цілі: %1.</translation> @@ -28869,14 +28700,6 @@ Please install an SDK of at least API version %1.</source> <translation type="vanished"> Причина: %1</translation> </message> <message> - <source>Reason: %1</source> - <translation type="vanished">Причина: %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation type="vanished">Код завершення: %1</translation> - </message> - <message> <source>Deploy Qt libraries. This may take some time, please wait.</source> <translation type="vanished">Розгортання бібліотек Qt. Це може зайняти деякий час, будь ласка, почекайте.</translation> </message> @@ -28889,52 +28712,13 @@ Please install an SDK of at least API version %1.</source> <translation type="vanished">Збій встановлення пакунка.</translation> </message> <message> - <source>Pulling files necessary for debugging.</source> - <translation type="vanished">Стягування файлів, що необхідні для зневадження.</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepFactory</name> - <message> - <source>Deploy to Android device or emulator</source> - <translation type="vanished">Розгортання на пристрій Android або емулятор</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepWidget</name> - <message> - <source><b>Deploy configurations</b></source> - <translation type="vanished"><b>Конфігурації розгортання</b></translation> - </message> - <message> - <source>Qt Android Smart Installer</source> - <translation type="vanished">Qt Android Smart Installer</translation> - </message> - <message> - <source>Android package (*.apk)</source> - <translation type="vanished">Пакунок Android (*.apk)</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> - <message> <source>Run on Android</source> <translation>Запустити на Android</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation>Пристрій Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManager</name> <message> <source>Error creating Android directory '%1'.</source> <translation type="vanished">Помилка створення теки '%1' для Android.</translation> @@ -28958,14 +28742,6 @@ Please install at least one SDK.</source> <translation type="vanished">Файли Android були автоматично оновлені.</translation> </message> <message> - <source>Unknown Android version. API Level: %1</source> - <translation type="vanished">Невідома версія Android. Рівень API: %1</translation> - </message> - <message> - <source>Cannot parse "%1".</source> - <translation type="vanished">Неможливо розібрати "%1".</translation> - </message> - <message> <source>Cannot open "%1".</source> <translation type="vanished">Неможливо відкрити "%1".</translation> </message> @@ -28974,10 +28750,6 @@ Please install at least one SDK.</source> <translation type="vanished">Невідома версія Android.</translation> </message> <message> - <source>Error creating Android templates.</source> - <translation type="vanished">Помилка створення шаблонів Android.</translation> - </message> - <message> <source>Cannot parse '%1'.</source> <translation type="vanished">Неможливо розібрати '%1'.</translation> </message> @@ -28986,10 +28758,6 @@ Please install at least one SDK.</source> <translation type="vanished">Неможливо відкрити '%1'.</translation> </message> <message> - <source>Starting Android virtual device failed.</source> - <translation type="vanished">Збій запуску віртуального пристрою Android.</translation> - </message> - <message> <source>Android files have been updated automatically</source> <translation type="vanished">Файли Android були автоматично оновлені</translation> </message> @@ -29005,16 +28773,10 @@ Please install at least one SDK.</source> <source>Can't open '%1'</source> <translation type="vanished">Неможливо відкрити '%1'</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationFactory</name> <message> <source>Create Android (.apk) Package</source> <translation type="vanished">Створити пакунок Android (.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationStep</name> <message> <source>Packaging for Android</source> <translation type="vanished">Пакування для Android</translation> @@ -29042,10 +28804,6 @@ Please make sure your application is built successfully and is selected in Appli Будь ласка, переконайтесь, що ваша програма була успішно зібрана та вибрана у вкладці Програма ('Параметри запуску').</translation> </message> <message> - <source>Error</source> - <translation type="vanished">Помилка</translation> - </message> - <message> <source>Failed to run keytool</source> <translation type="vanished">Збій запуску keytool</translation> </message> @@ -29092,53 +28850,6 @@ Please make sure your application is built successfully and is selected in Appli <translation type="vanished">Пакунок створено.</translation> </message> <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation type="vanished">Розгортання пакунка: Виконання команди '%1 %2'.</translation> - </message> - <message> - <source>Packaging failed.</source> - <translation type="vanished">Збій пакування.</translation> - </message> - <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation type="vanished">Помилка пакування: Не вдалось запустити команду '%1 %2'. Причина: %3</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation type="vanished">Помилка пакування: Збій команди '%1 %2'.</translation> - </message> - <message> - <source>Reason: %1</source> - <translation type="vanished">Причина: %1</translation> - </message> - <message> - <source> Reason: %1</source> - <translation type="vanished"> Причина: %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation type="vanished">Код завершення: %1</translation> - </message> - <message> - <source>Keystore</source> - <translation type="vanished">Сховище ключів</translation> - </message> - <message> - <source>Keystore password:</source> - <translation type="vanished">Пароль до сховища ключів:</translation> - </message> - <message> - <source>Certificate</source> - <translation type="vanished">Сертифікат</translation> - </message> - <message> - <source>Certificate password (%1):</source> - <translation type="vanished">Пароль сертифіката (%1):</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationWidget</name> - <message> <source><b>Package configurations</b></source> <translation type="vanished"><b>Конфігурації пакування</b></translation> </message> @@ -29147,31 +28858,6 @@ Please make sure your application is built successfully and is selected in Appli <translation type="vanished">Виберіть файл сховища ключів</translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation type="vanished">Файли сховищ ключів (*.keystore *.jks)</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationFactory</name> - <message> - <source>Deploy to device</source> - <translation type="vanished">Розгортання на пристрій</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStep</name> - <message> - <source>Copy application data</source> - <translation type="vanished">Копіювання даних програми</translation> - </message> - <message> - <source>Removing directory %1</source> - <translation type="vanished">Видалення теки %1</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> - <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation>Збій визначення ABI, що використовуються версією Qt.</translation> </message> @@ -29180,31 +28866,18 @@ Please make sure your application is built successfully and is selected in Appli <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunConfiguration</name> <message> <source>The .pro file '%1' is currently being parsed.</source> <translation type="vanished">Здійснюється розбір файлу .pro '%1'.</translation> </message> <message> - <source>The .pro file "%1" is currently being parsed.</source> - <translation type="vanished">Здійснюється розбір файлу .pro "%1".</translation> - </message> - <message> <source>Run on Android device</source> <translation type="vanished">Запустити на пристрої Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControl</name> <message> <source>Starting remote process.</source> <translation>Запуск віддаленого процесу.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source>No free ports available on host for QML debugging.</source> <translation>Немає вільних портів на вузлі для зневадження QML.</translation> @@ -29273,16 +28946,10 @@ Please make sure your application is built successfully and is selected in Appli '%1' завершився.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> <message> <source>Android Configurations</source> <translation>Конфігурації Android</translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -29296,9 +28963,6 @@ Please make sure your application is built successfully and is selected in Appli <source>CPU/ABI</source> <translation>CPU/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>"%1" does not seem to be an Android SDK top folder.</source> <translation>"%1" не схожа на кореневу теку Android SDK.</translation> @@ -29397,16 +29061,10 @@ To add the Qt versions, select Options > Build & Run > Qt Versions.</s <source>Select OpenJDK Path</source> <translation type="vanished">Виберіть шлях до OpenJDK</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>Android GCC</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root:</source> <translation>Корінь NDK:</translation> @@ -33521,14 +33179,11 @@ cannot be found in the path.</source> </message> </context> <context> - <name>Android::Internal::AndroidGdbServerKitInformation</name> + <name>Android</name> <message> <source>GDB server</source> <translation>Сервер GDB</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidGdbServerKitInformationWidget</name> <message> <source>Manage...</source> <translation>Управління...</translation> @@ -35249,14 +34904,11 @@ Partial names can be used if they are unambiguous.</source> </message> </context> <context> - <name>Android::Internal::AndroidAnalyzeSupport</name> + <name>Android</name> <message> <source>No analyzer tool selected.</source> <translation type="vanished">Інструмент для аналізу не обрано.</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditor</name> <message> <source>General</source> <translation>Загальне</translation> @@ -35265,16 +34917,10 @@ Partial names can be used if they are unambiguous.</source> <source>XML Source</source> <translation>Код XML</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorFactory</name> <message> <source>Android Manifest editor</source> <translation>Редактор Android Manifest</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManifestEditorWidget</name> <message> <source>Package</source> <translation>Пакунок</translation> @@ -35412,10 +35058,6 @@ Partial names can be used if they are unambiguous.</source> <translation>Включати типові можливості для модулів Qt.</translation> </message> <message> - <source>Remove</source> - <translation>Видалити</translation> - </message> - <message> <source>Add</source> <translation>Додати</translation> </message> @@ -35455,9 +35097,6 @@ Partial names can be used if they are unambiguous.</source> <source>Choose High DPI Icon</source> <translation>Виберіть піктограму з високою DPI</translation> </message> -</context> -<context> - <name>Android::AndroidPlugin</name> <message> <source>Android Manifest file</source> <translation type="vanished">Файл Android Manifest</translation> @@ -36531,7 +36170,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d </message> </context> <context> - <name>Android::Internal::AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation>Створити новий AVD</translation> @@ -36556,42 +36195,11 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <source>ABI:</source> <translation>ABI:</translation> </message> -</context> -<context> - <name>AndroidDeployQtWidget</name> <message> <source>Form</source> <translation>Форма</translation> </message> <message> - <source>Sign package</source> - <translation type="vanished">Підпис пакунка</translation> - </message> - <message> - <source>Keystore:</source> - <translation type="vanished">Сховище ключів:</translation> - </message> - <message> - <source>Create</source> - <translation type="vanished">Створити</translation> - </message> - <message> - <source>Browse</source> - <translation type="vanished">Огляд</translation> - </message> - <message> - <source>Signing a debug package</source> - <translation type="vanished">Підписання зневаджувального пакунка</translation> - </message> - <message> - <source>Certificate alias:</source> - <translation type="vanished">Псевдонім сертифіката:</translation> - </message> - <message> - <source>Advanced Actions</source> - <translation type="vanished">Розширені дії</translation> - </message> - <message> <source>Clean Temporary Libraries Directory on Device</source> <translation>Очистити теку тимчасових бібліотек на пристрої</translation> @@ -36605,22 +36213,10 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <translation>Скинути типові пристрої</translation> </message> <message> - <source>Open package location after build</source> - <translation type="vanished">Відкрити розташування пакунка після збірки</translation> - </message> - <message> - <source>Verbose output</source> - <translation type="vanished">Розширене виведення</translation> - </message> - <message> <source>Create AndroidManifest.xml</source> <translation type="vanished">Створити AndroidManifest.xml</translation> </message> <message> - <source>Application</source> - <translation type="vanished">Програма</translation> - </message> - <message> <source>Input file for androiddeployqt:</source> <translation type="vanished">Вхідний файл для androiddeployqt:</translation> </message> @@ -36629,82 +36225,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d <translation type="vanished">Qt більше не використовує підтеку "android" з теки коду проекту.</translation> </message> <message> - <source>Qt Deployment</source> - <translation type="vanished">Розгортання Qt</translation> - </message> - <message> - <source>Use the external Ministro application to download and maintain Qt libraries.</source> - <translation type="vanished">Використовувати зовнішню програму Ministro для завантаження та підтримки бібліотек Qt.</translation> - </message> - <message> - <source>Use Ministro service to install Qt</source> - <translation type="vanished">Використовувати службу Ministro для встановлення Qt</translation> - </message> - <message> - <source>Push local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation type="vanished">Надсилати локальні бібліотеки Qt до пристрою. Ви повинні мати бібліотеки Qt скомпільовані для цієї платформи. -Файл APK не можна буде використовувати на жодному іншому пристрої.</translation> - </message> - <message> - <source>Deploy local Qt libraries to temporary directory</source> - <translation type="vanished">Розгортати локальні бібліотеки Qt до тимчасової теки</translation> - </message> - <message> - <source>Creates a standalone APK.</source> - <translation type="vanished">Створює автономний APK.</translation> - </message> - <message> - <source>Bundle Qt libraries in APK</source> - <translation type="vanished">Вкладати бібліотеки Qt до APK</translation> - </message> - <message> - <source>Additional Libraries</source> - <translation type="vanished">Додаткові бібліотеки</translation> - </message> - <message> - <source>List of extra libraries to include in Android package and load on startup.</source> - <translation type="vanished">Список додаткових бібліотек для включення до пакунка Android та завантаження під час запуску.</translation> - </message> - <message> - <source>Select library to include in package.</source> - <translation type="vanished">Виберіть бібліотеку для включення до пакунку.</translation> - </message> - <message> - <source>Add</source> - <translation type="vanished">Додати</translation> - </message> - <message> - <source>Remove currently selected library from list.</source> - <translation type="vanished">Видалити виділену бібліотеку зі списку.</translation> - </message> - <message> - <source>Remove</source> - <translation type="vanished">Видалити</translation> - </message> - <message> - <source>Create...</source> - <translation type="vanished">Створити...</translation> - </message> - <message> - <source>Android build SDK:</source> - <translation type="vanished">Android SDK для збірки:</translation> - </message> - <message> - <source>Uses the external Ministro application to download and maintain Qt libraries.</source> - <translation type="vanished">Використовувати зовнішню програму Ministro для завантаження та підтримки бібліотек Qt.</translation> - </message> - <message> - <source>Pushes local Qt libraries to device. You must have Qt libraries compiled for that platform. -The APK will not be usable on any other device.</source> - <translation type="vanished">Надсилати локальні бібліотеки Qt до пристрою. Ви повинні мати бібліотеки Qt скомпільовані для цієї платформи. -Файл APK не можна буде використовувати на жодному іншому пристрої.</translation> - </message> - <message> - <source>Add...</source> - <translation type="vanished">Додати...</translation> - </message> - <message> <source>Uses the external Ministro application to download and maintain Qt libraries.<br/><br/>Ministro is a third-party tool which provides the open source Qt libraries on demand. These libraries are compatible with the default open source binary package and will not always be up-to-date.</source> <translation type="vanished">Використовувати зовнішню програму Ministro для завантаження та підтримки бібліотек Qt.<br/><br/>Ministro є стороннім засобом, що надає бібліотеки з відкритим кодом Qt на вимогу. Ці бібліотеки є сумісними з типовим двійковим пакунком (для відкритого коду), однак не завжди останньої версії.</translation> </message> @@ -36716,9 +36236,6 @@ The APK will not be usable on any other device.</source> <source>Uninstall previous package</source> <translation>Деінсталювати попередній пакунок</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceDialog</name> <message> <source>Select Android Device</source> <translation>Вибір пристрою Android</translation> @@ -36736,10 +36253,6 @@ The APK will not be usable on any other device.</source> <translation type="vanished">Завжди використовувати цей пристрій для архітектури %1</translation> </message> <message> - <source>ABI:</source> - <translation>ABI:</translation> - </message> - <message> <source>Compatible devices</source> <translation>Сумісні пристрої</translation> </message> @@ -37685,14 +37198,11 @@ monitor reset</translation> </message> </context> <context> - <name>Android::Internal::AndroidDeployQtStepFactory</name> + <name>Android</name> <message> <source>Deploy to Android device or emulator</source> <translation>Розгортання на пристрій Android або емулятор</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployQtStep default display name</extracomment> @@ -37779,10 +37289,6 @@ Do you want to uninstall the existing package next time?</source> Бажаєте деінсталювати існуючий пакунок наступного разу?</translation> </message> <message> - <source>Warning: Signing a debug package.</source> - <translation type="vanished">Попередження: Підписання зневаджувального пакунка.</translation> - </message> - <message> <source>Internal Error: Could not find .pro file.</source> <translation type="vanished">Внутрішня помилка: не вдалось знайти файл .pro.</translation> </message> @@ -37795,18 +37301,6 @@ Do you want to uninstall the existing package next time?</source> <translation>Стягування файлів, що необхідні для зневадження.</translation> </message> <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation type="vanished">Розгортання пакунка: Виконання команди '%1 %2'.</translation> - </message> - <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation type="vanished">Помилка пакування: Не вдалось запустити команду '%1 %2'. Причина: %3</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation type="vanished">Помилка пакування: Збій команди '%1 %2'.</translation> - </message> - <message> <source>Reason: %1</source> <translation>Причина: %1</translation> </message> @@ -37815,37 +37309,6 @@ Do you want to uninstall the existing package next time?</source> <translation>Код завершення: %1</translation> </message> <message> - <source>Error</source> - <translation type="vanished">Помилка</translation> - </message> - <message> - <source>Failed to run keytool.</source> - <translation type="vanished">Збій запуску keytool.</translation> - </message> - <message> - <source>Invalid password.</source> - <translation type="vanished">Неправильний пароль.</translation> - </message> - <message> - <source>Keystore</source> - <translation type="vanished">Сховище ключів</translation> - </message> - <message> - <source>Keystore password:</source> - <translation type="vanished">Пароль до сховища ключів:</translation> - </message> - <message> - <source>Certificate</source> - <translation type="vanished">Сертифікат</translation> - </message> - <message> - <source>Certificate password (%1):</source> - <translation type="vanished">Пароль сертифіката (%1):</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployQtWidget</name> - <message> <source><b>Deploy configurations</b></source> <translation><b>Конфігурації розгортання</b></translation> </message> @@ -37858,25 +37321,6 @@ Do you want to uninstall the existing package next time?</source> <translation>Пакунок Android (*.apk)</translation> </message> <message> - <source>Select keystore file</source> - <translation type="vanished">Виберіть файл сховища ключів</translation> - </message> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation type="vanished">Файли сховищ ключів (*.keystore *.jks)</translation> - </message> - <message> - <source>Select additional libraries</source> - <translation type="vanished">Виберіть додаткові бібліотеки</translation> - </message> - <message> - <source>Libraries (*.so)</source> - <translation type="vanished">Бібліотеки (*.so)</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidErrorMessage</name> - <message> <source>Android: SDK installation error 0x%1</source> <translation>Android: помилка встановлення SDK 0x%1</translation> </message> @@ -37916,20 +37360,6 @@ Do you want to uninstall the existing package next time?</source> <source>Android: Unknown error 0x%1</source> <translation>Android: невідома помилка 0x%1</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStepWidget</name> - <message> - <source><b>Make install</b></source> - <translation type="vanished"><b>Make install</b></translation> - </message> - <message> - <source>Make install</source> - <translation type="vanished">Make install</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKitWidget</name> <message> <source>Qt Creator needs additional settings to enable Android support.You can configure those settings in the Options dialog.</source> <translation type="vanished">Qt Creator потребує додаткових налаштувань, щоб увімкнути підтримку Android. Ви можете їх встановити в діалозі Опції.</translation> @@ -37942,62 +37372,18 @@ Do you want to uninstall the existing package next time?</source> <source>Qt Creator needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source> <translation>Qt Creator потребує додаткових налаштувань, щоб увімкнути підтримку Android. Ви можете їх встановити в діалозі Опції.</translation> </message> -</context> -<context> - <name>Android::Internal::NoApplicationProFilePage</name> - <message> - <source>No application .pro file found in this project.</source> - <translation type="vanished">Не знайдено файл .pro програми в цьому проекті.</translation> - </message> - <message> - <source>No Application .pro File</source> - <translation type="vanished">Немає файлу .pro програми</translation> - </message> -</context> -<context> - <name>Android::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create an AndroidManifest.xml file.</source> <translation type="vanished">Виберіть файл .pro, для якого Ви бажаєте створити файл AndroidManifest.xml.</translation> </message> <message> - <source>.pro file:</source> - <translation type="vanished">Файл .pro:</translation> - </message> - <message> - <source>Select a .pro File</source> - <translation type="vanished">Виберіть файл .pro</translation> - </message> -</context> -<context> - <name>Android::Internal::ChooseDirectoryPage</name> - <message> <source>The Android package source directory can not be the same as the project directory.</source> <translation type="vanished">Тека джерел пакунка Android не може збігатись з текою проекту.</translation> </message> <message> - <source>The Android package source directory cannot be the same as the project directory.</source> - <translation type="vanished">Тека джерел пакунка Android не може збігатись з текою проекту.</translation> - </message> - <message> - <source>Android package source directory:</source> - <translation type="vanished">Тека джерел пакунка Android:</translation> - </message> - <message> - <source>Select the Android package source directory. - -The files in the Android package source directory are copied to the build directory's Android directory and the default files are overwritten.</source> - <translation type="vanished">Оберіть теку джерел пакунка Android. - -Файли в теці джерел пакунка Android будуть скопійовані до теки Android в теці збірки, а типові файли будуть перезаписані.</translation> - </message> - <message> <source>The Android manifest file will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.</source> <translation type="vanished">Файл маніфесту Android буде створено в теці, на яку вказує ANDROID_PACKAGE_SOURCE_DIR задана в файлі .pro.</translation> </message> -</context> -<context> - <name>Android::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Manifest Wizard</source> <translation type="vanished">Майстер створення маніфесту Android</translation> @@ -38019,21 +37405,9 @@ The files in the Android package source directory are copied to the build direct <translation type="vanished">Не вдалось видалити файл %1.</translation> </message> <message> - <source>File Creation Error</source> - <translation type="vanished">Помилка створення файлу</translation> - </message> - <message> <source>Could not create file %1.</source> <translation type="vanished">Не вдалось створити файл %1.</translation> </message> - <message> - <source>Project File not Updated</source> - <translation type="vanished">Файл проекту не оновлено</translation> - </message> - <message> - <source>Could not update the .pro file %1.</source> - <translation type="vanished">Не вдалось оновити файл .pro %1.</translation> - </message> </context> <context> <name>BareMetal::Internal::BareMetalDevice</name> @@ -39932,7 +39306,7 @@ Please build the qmldump application on the Qt version options page.</source> </message> </context> <context> - <name>AndroidConfiguration</name> + <name>Android</name> <message> <source>Could not run: %1</source> <translation>Не вдалось запустити: %1</translation> @@ -39941,40 +39315,22 @@ Please build the qmldump application on the Qt version options page.</source> <source>No devices found in output of: %1</source> <translation>Не знайдено пристроїв у виведенні: %1</translation> </message> -</context> -<context> - <name>AndroidConfig</name> <message> <source>Error Creating AVD</source> <translation>Помилка створення AVD</translation> </message> <message> - <source>Cannot create a new AVD. No sufficiently recent Android SDK available. -Please install an SDK of at least API version %1.</source> - <translation type="vanished">Неможливо створити новий AVD. Відсутній достатньо свіжий Android SDK. -Будь ласка, встановіть SDK з версією API не нижче %1.</translation> - </message> - <message> <source>Could not start process "%1 %2"</source> <translation>Не вдалось запустити процес "%1 %2"</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> <translation>Налаштувати Android...</translation> </message> -</context> -<context> - <name>Android::Internal::JavaEditorFactory</name> <message> <source>Java Editor</source> <translation>Редактор Java</translation> </message> -</context> -<context> - <name>Android::Internal::JavaFileWizard</name> <message> <source>Creates a Java file with boilerplate code.</source> <translation type="vanished">Створює файл Java з шаблонним кодом.</translation> @@ -41657,7 +41013,7 @@ Are you sure you want to continue?</source> </message> </context> <context> - <name>Android::Internal::AvdDialog</name> + <name>Android</name> <message> <source>Cannot create a new AVD. No sufficiently recent Android SDK available. Install an SDK of at least API version %1.</source> @@ -43057,11 +42413,7 @@ Install an SDK of at least API version %1.</source> </message> </context> <context> - <name>AndroidBuildApkWidget</name> - <message> - <source>Form</source> - <translation>Форма</translation> - </message> + <name>Android</name> <message> <source>Sign package</source> <translation>Підпис пакунка</translation> @@ -43087,10 +42439,6 @@ Install an SDK of at least API version %1.</source> <translation type="vanished">Підписання APK при вживанні "Розгортати локальні бібліотеки Qt" не дозволяється</translation> </message> <message> - <source>Application</source> - <translation>Програма</translation> - </message> - <message> <source>Android build SDK:</source> <translation>Android SDK для збірки:</translation> </message> @@ -43216,24 +42564,12 @@ Deploying local Qt libraries is incompatible with Android 5.</source> </message> </context> <context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget</name> - <message> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <source>Android</source> - <translation>Android</translation> - </message> + <name>Android</name> <message> <source>Create Templates</source> <translation>Створити шаблони</translation> </message> <message> - <source>Input file for androiddeployqt:</source> - <translation type="vanished">Вхідний файл для androiddeployqt:</translation> - </message> - <message> <source>Additional Libraries</source> <translation>Додаткові бібліотеки</translation> </message> @@ -43246,18 +42582,10 @@ Deploying local Qt libraries is incompatible with Android 5.</source> <translation>Виберіть бібліотеку для включення до пакунку.</translation> </message> <message> - <source>Add...</source> - <translation>Додати...</translation> - </message> - <message> <source>Remove currently selected library from list.</source> <translation>Видалити виділену бібліотеку зі списку.</translation> </message> <message> - <source>Remove</source> - <translation>Видалити</translation> - </message> - <message> <source>Select additional libraries</source> <translation>Виберіть додаткові бібліотеки</translation> </message> @@ -43431,25 +42759,17 @@ Deploying local Qt libraries is incompatible with Android 5.</source> </message> </context> <context> - <name>Android::AndroidBuildApkStep</name> + <name>Android</name> <message> <source>Build Android APK</source> <extracomment>AndroidBuildApkStep default display name</extracomment> <translation>Збірка APK Android</translation> </message> <message> - <source>Warning: Signing a debug package.</source> - <translation type="vanished">Попередження: Підписання зневаджувального пакунка.</translation> - </message> - <message> <source>Warning: Signing a debug or profile package.</source> <translation>Попередження: Підписання пакунка для зневадження або профілювання.</translation> </message> <message> - <source>Error</source> - <translation>Помилка</translation> - </message> - <message> <source>Failed to run keytool.</source> <translation>Збій запуску keytool.</translation> </message> @@ -43458,40 +42778,18 @@ Deploying local Qt libraries is incompatible with Android 5.</source> <translation>Неправильний пароль.</translation> </message> <message> - <source>Keystore</source> - <translation>Сховище ключів</translation> - </message> - <message> <source>Keystore password:</source> <translation>Пароль до сховища ключів:</translation> </message> <message> - <source>Certificate</source> - <translation>Сертифікат</translation> - </message> - <message> <source>Certificate password (%1):</source> <translation>Пароль сертифіката (%1):</translation> </message> -</context> -<context> - <name>Android::AndroidBuildApkWidget</name> - <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>Файли сховищ ключів (*.keystore *.jks)</translation> - </message> <message> <source>Select Keystore File</source> <translation>Виберіть файл сховища ключів</translation> </message> <message> - <source><b>Build Android APK</b></source> - <translation><b>Збірка APK Android</b></translation> - </message> -</context> -<context> - <name>Android::AndroidConfigurations</name> - <message> <source>Android Debugger for %1</source> <translation>Зневаджувач Android для "%1"</translation> </message> @@ -43499,9 +42797,6 @@ Deploying local Qt libraries is incompatible with Android 5.</source> <source>Android for %1 (GCC %2, Qt %3)</source> <translation>Android для %1 (GCC %2, Qt %3)</translation> </message> -</context> -<context> - <name>Android::AndroidManager</name> <message> <source>Unknown Android version. API Level: %1</source> <translation>Невідома версія Android. Рівень API: %1</translation> @@ -45984,14 +45279,11 @@ to project "%2".</source> </message> </context> <context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationFactory</name> + <name>Android</name> <message> <source>Deploy to device</source> <translation>Розгортання на пристрій</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>Копіювання даних програми</translation> @@ -46000,9 +45292,6 @@ to project "%2".</source> <source>Removing directory %1</source> <translation>Видалення теки %1</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::AndroidPackageInstallationStepWidget</name> <message> <source><b>Make install</b></source> <translation><b>Make install</b></translation> @@ -46011,9 +45300,6 @@ to project "%2".</source> <source>Make install</source> <translation>Make install</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::NoApplicationProFilePage</name> <message> <source>No application .pro file found in this project.</source> <translation>Не знайдено файл .pro програми в цьому проекті.</translation> @@ -46022,9 +45308,6 @@ to project "%2".</source> <source>No Application .pro File</source> <translation>Немає файлу .pro програми</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseProFilePage</name> <message> <source>Select the .pro file for which you want to create the Android template files.</source> <translation>Виберіть файл .pro, для якого Ви бажаєте створити файли шаблонів Android.</translation> @@ -46037,9 +45320,6 @@ to project "%2".</source> <source>Select a .pro File</source> <translation>Виберіть файл .pro</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::ChooseDirectoryPage</name> <message> <source>The Android package source directory cannot be the same as the project directory.</source> <translation>Тека джерел пакунка Android не може збігатись з текою проекту.</translation> @@ -46072,9 +45352,6 @@ The files in the Android package source directory are copied to the build direct <source>It is highly recommended if you are plannig to extend the Java part of your Qt application.</source> <translation type="vanished">Настійливо рекомендовано, якщо ви плануєте розширювати Java-частину вашої програми Qt.</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::CreateAndroidManifestWizard</name> <message> <source>Create Android Template Files Wizard</source> <translation>Майстер створення файлів шаблонів Android</translation> @@ -46103,40 +45380,11 @@ The files in the Android package source directory are copied to the build direct <source>Could not update the .pro file %1.</source> <translation>Не вдалось оновити файл .pro %1.</translation> </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStepFactory</name> - <message> - <source>Build Android APK</source> - <translation>Збірка APK Android</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkStep</name> - <message> - <source>Found old folder "android" in source directory. Qt 5.2 does not use that folder by default.</source> - <translation>Знайдено стару теку "android" серед кодів. Qt 5.2 типово не використовує цю теку.</translation> - </message> - <message> - <source>Internal Error: Could not find .pro file.</source> - <translation type="vanished">Внутрішня помилка: не вдалось знайти файл .pro.</translation> - </message> - <message> - <source>Internal Error: Unknown Android deployment JSON file location.</source> - <translation type="vanished">Внутрішня помилка: невідоме розташування JSON-файлу розгортання Android.</translation> - </message> <message> <source>No application .pro file found, not building an APK.</source> <translation>Не знайдено файл .pro програми, не будуємо APK.</translation> </message> <message> - <source>Starting: "%1" %2</source> - <translation>Запуск: "%1" %2</translation> - </message> -</context> -<context> - <name>QmakeAndroidSupport::Internal::QmakeAndroidRunConfiguration</name> - <message> <source>The .pro file "%1" is currently being parsed.</source> <translation>Здійснюється розбір файлу .pro "%1".</translation> </message> @@ -48149,7 +47397,7 @@ Setting breakpoints by file name and line number may fail.</source> </message> </context> <context> - <name>Android::Internal::AndroidDeviceModelDelegate</name> + <name>Android</name> <message> <source>OpenGL enabled</source> <translation>OpenGL увімкнено</translation> diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 5317dd6902f..1b3cc3f8eb3 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -40796,7 +40796,7 @@ Filter: %2 </message> </context> <context> - <name>AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation>创建新AVD</translation> @@ -40817,9 +40817,6 @@ Filter: %2 <source> MiB</source> <translation> MiB</translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> <message> <source>Create a keystore and a certificate</source> <translation>创建一个密钥存储库和一个证书</translation> @@ -40897,9 +40894,6 @@ Filter: %2 <source>>AA; </source> <translation>>AA; </translation> </message> -</context> -<context> - <name>AndroidDeployStepWidget</name> <message> <source>Form</source> <translation>界面</translation> @@ -40944,9 +40938,6 @@ This option is useful when you want to try your application on devices which don <source>Choose APK</source> <translation>选择APK</translation> </message> -</context> -<context> - <name>AndroidPackageCreationWidget</name> <message> <source>Manifest</source> <translation>Manifest</translation> @@ -41030,10 +41021,6 @@ This option is useful when you want to try your application on devices which don <translation>丢弃</translation> </message> <message> - <source>Name:</source> - <translation>名称:</translation> - </message> - <message> <source>Libraries</source> <translation>库</translation> </message> @@ -41087,9 +41074,6 @@ This option is useful when you want to try your application on devices which don <source>Certificate alias:</source> <translation>证书别名:</translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation>Android配置</translation> @@ -41099,10 +41083,6 @@ This option is useful when you want to try your application on devices which don <translation>Android SDK的路径:</translation> </message> <message> - <source>Browse</source> - <translation>浏览</translation> - </message> - <message> <source>Android NDK location:</source> <translation>Android NDK的路径:</translation> </message> @@ -41154,14 +41134,6 @@ This option is useful when you want to try your application on devices which don <source>Start Android AVD Manager</source> <translation>启动Android AVD管理器</translation> </message> - <message> - <source>Add</source> - <translation>添加</translation> - </message> - <message> - <source>Remove</source> - <translation>删除</translation> - </message> </context> <context> <name>ClearCase</name> @@ -43692,7 +43664,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Android::Internal::AndroidConfigurations</name> + <name>Android</name> <message> <source>Error Creating AVD</source> <translation>创建AVD错误</translation> @@ -43703,20 +43675,6 @@ Please install an SDK of at least API version %1.</source> <translation>无法创建一个新的AVD。没有足够新的Android SDK。 请安装API版本至少为 %1的 SDK。</translation> </message> -</context> -<context> - <name>Android</name> - <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> - <source><span style=" color:#ff0000;">Password is too short</span></source> - <translation><span style=" color:#ff0000;">密码太短</span></translation> - </message> <message> <source><span style=" color:#ff0000;">Passwords don't match</span></source> <translation><span style=" color:#ff0000;">密码不匹配</span></translation> @@ -43737,23 +43695,10 @@ Please install an SDK of at least API version %1.</source> <source>Error</source> <translation>错误</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation>部署到Android设备</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation>部署到Android设备</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployStep default display name</extracomment> @@ -43772,14 +43717,6 @@ Please install an SDK of at least API version %1.</source> <translation>包部署: 运行命令 '%1 %2'。</translation> </message> <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation>打包错误:无法执行命令'%1 %2'。原因'%3'</translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation>打包错误:命令'%1 %2'失败.。</translation> - </message> - <message> <source> Reason: %1</source> <translation>原因： %1</translation> </message> @@ -43811,16 +43748,10 @@ Please install an SDK of at least API version %1.</source> <source>Pulling files necessary for debugging.</source> <translation>正在读取调试需要的文件。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepFactory</name> <message> <source>Deploy to Android device or emulator</source> <translation>部署到Android设备或模拟器</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepWidget</name> <message> <source><b>Deploy configurations</b></source> <translation><b>Deploy 配置</b></translation> @@ -43833,27 +43764,14 @@ Please install an SDK of at least API version %1.</source> <source>Android package (*.apk)</source> <translation>Android包 (*.apk)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation>在Android上运行</translation> </message> <message> - <source>Android</source> - <translation>Android</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation>Android设备</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManager</name> <message> <source>Error creating Android directory '%1'.</source> <translation>创建Android目录 '%1'失败。</translation> @@ -43884,16 +43802,10 @@ Please install at least one SDK.</source> <source>Can't open '%1'</source> <translation>无法打开 '%1'</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationFactory</name> <message> <source>Create Android (.apk) Package</source> <translation>创建Android (.apk)包</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationStep</name> <message> <source>Packaging for Android</source> <translation>正在为Android打包</translation> @@ -43913,10 +43825,6 @@ Please make sure your application is built successfully and is selected in Appli 请确保您的程序构建成功，并且在“应用程序”标签("运行选项")中选中。</translation> </message> <message> - <source>Error</source> - <translation>错误</translation> - </message> - <message> <source>Failed to run keytool</source> <translation>运行keytool失败</translation> </message> @@ -43953,10 +43861,6 @@ Please make sure your application is built successfully and is selected in Appli <translation>包创建完成。</translation> </message> <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation>部署包: 运行命令 '%1 %2'。</translation> - </message> - <message> <source>Packaging failed.</source> <translation>打包失败。</translation> </message> @@ -43969,32 +43873,13 @@ Please make sure your application is built successfully and is selected in Appli <translation>打包错误:命令'%1 %2'失败。</translation> </message> <message> - <source> Reason: %1</source> - <translation>原因 %1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation>退出代码: %1</translation> - </message> - <message> - <source>Keystore</source> - <translation>密钥存储库</translation> - </message> - <message> <source>Keystore password:</source> <translation>密钥存储库的密码:</translation> </message> <message> - <source>Certificate</source> - <translation>证书</translation> - </message> - <message> <source>Certificate password (%1):</source> <translation>证书的密码(%1):</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationWidget</name> <message> <source>Invalid Package Name</source> <translation>非法的包名</translation> @@ -44034,26 +43919,13 @@ Please choose a valid package name for your application (e.g. "org.example. <translation>选择密钥存储库文件</translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation>密钥存储库文件 (*.keystore *.jks)</translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationFactory</name> - <message> <source>Deploy to device</source> <translation>部署到设备</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation>复制应用程序的数据</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation>检测Qt版本使用的ABI失败。</translation> @@ -44063,30 +43935,18 @@ Please choose a valid package name for your application (e.g. "org.example. <extracomment>Qt Version is meant for Android</extracomment> <translation>Android</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunConfiguration</name> <message> <source>Run on Android device</source> <translation>在Android设备上运行</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControl</name> <message> <source>Starting remote process.</source> <translation>启动远端进程。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControlFactory</name> <message> <source>Run on Android device or emulator.</source> <translation>在Android设备或模拟器上运行。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source> @@ -44131,16 +43991,10 @@ Please choose a valid package name for your application (e.g. "org.example. '%1' 被杀死。</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> <message> <source>Android Configurations</source> <translation>Android配置</translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -44154,9 +44008,6 @@ Please choose a valid package name for your application (e.g. "org.example. <source>CPU/ABI</source> <translation>CPU/ABI</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>Android SDK Folder</source> <translation>Android SDK的目录</translation> @@ -44193,9 +44044,6 @@ Please choose a valid package name for your application (e.g. "org.example. <source>Select OpenJDK Path</source> <translation>选择OpenJDK的路径</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation>Android GCC</translation> @@ -44208,16 +44056,10 @@ Please choose a valid package name for your application (e.g. "org.example. <source>Android GCC (%1-%2)</source> <translation>Android GCC (%1-%2)</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root:</source> <translation>NDK根目录:</translation> </message> -</context> -<context> - <name>AutotoolsProjectManager</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 179f6d3a3d3..7e2757f30ce 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -27968,7 +27968,7 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>AutotoolsProjectManager</name> + <name>Android</name> <message> <source>Autogen</source> <comment>Display name for AutotoolsProjectManager::AutogenStep id.</comment> @@ -28907,7 +28907,7 @@ references to elements in other files, loops, etc.)</source> </message> </context> <context> - <name>AddNewAVDDialog</name> + <name>Android</name> <message> <source>Create new AVD</source> <translation type="unfinished"></translation> @@ -28928,9 +28928,6 @@ references to elements in other files, loops, etc.)</source> <source> MiB</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidCreateKeystoreCertificate</name> <message> <source>Create a keystore and a certificate</source> <translation type="unfinished"></translation> @@ -29007,9 +29004,6 @@ references to elements in other files, loops, etc.)</source> <source>>AA; </source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidDeployStepWidget</name> <message> <source>Form</source> <translation type="unfinished">表單</translation> @@ -29052,9 +29046,6 @@ This option is useful when you want to try your application on devices which don <source>Choose APK</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidPackageCreationWidget</name> <message> <source>Manifest</source> <translation type="unfinished"></translation> @@ -29135,10 +29126,6 @@ This option is useful when you want to try your application on devices which don <translation type="unfinished">丟棄</translation> </message> <message> - <source>Name:</source> - <translation type="unfinished">名稱：</translation> - </message> - <message> <source>Libraries</source> <translation type="unfinished">函式庫</translation> </message> @@ -29191,9 +29178,6 @@ This option is useful when you want to try your application on devices which don <source>Certificate alias:</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>AndroidSettingsWidget</name> <message> <source>Android Configuration</source> <translation type="unfinished"></translation> @@ -29203,10 +29187,6 @@ This option is useful when you want to try your application on devices which don <translation type="unfinished"></translation> </message> <message> - <source>Browse</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Android NDK location:</source> <translation type="unfinished"></translation> </message> @@ -29258,14 +29238,6 @@ This option is useful when you want to try your application on devices which don <source>Start Android AVD Manager</source> <translation type="unfinished"></translation> </message> - <message> - <source>Add</source> - <translation type="unfinished">新增</translation> - </message> - <message> - <source>Remove</source> - <translation type="unfinished">移除</translation> - </message> </context> <context> <name>ClearCase</name> @@ -30037,7 +30009,7 @@ This option is useful when you want to try your application on devices which don </message> </context> <context> - <name>Android::Internal::AndroidConfigurations</name> + <name>Android</name> <message> <source>Error Creating AVD</source> <translation type="unfinished"></translation> @@ -30047,20 +30019,6 @@ This option is useful when you want to try your application on devices which don Please install an SDK of at least API version %1.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android</name> - <message> - <source>Android</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidCreateKeystoreCertificate</name> - <message> - <source><span style=" color:#ff0000;">Password is too short</span></source> - <translation type="unfinished"></translation> - </message> <message> <source><span style=" color:#ff0000;">Passwords don't match</span></source> <translation type="unfinished"></translation> @@ -30081,23 +30039,10 @@ Please install an SDK of at least API version %1.</source> <source>Error</source> <translation type="unfinished">錯誤</translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfiguration</name> - <message> - <source>Deploy to Android device</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeployConfigurationFactory</name> <message> <source>Deploy on Android</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStep</name> <message> <source>Deploy to Android device</source> <extracomment>AndroidDeployStep default display name</extracomment> @@ -30155,16 +30100,10 @@ Please install an SDK of at least API version %1.</source> <source>Pulling files necessary for debugging.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepFactory</name> <message> <source>Deploy to Android device or emulator</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDeployStepWidget</name> <message> <source><b>Deploy configurations</b></source> <translation type="unfinished"></translation> @@ -30177,27 +30116,14 @@ Please install an SDK of at least API version %1.</source> <source>Android package (*.apk)</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidDevice</name> <message> <source>Run on Android</source> <translation type="unfinished"></translation> </message> <message> - <source>Android</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidDeviceFactory</name> - <message> <source>Android Device</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidManager</name> <message> <source>Error creating Android directory '%1'.</source> <translation type="unfinished"></translation> @@ -30227,16 +30153,10 @@ Please install at least one SDK.</source> <source>Can't open '%1'</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationFactory</name> <message> <source>Create Android (.apk) Package</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationStep</name> <message> <source>Packaging for Android</source> <translation type="unfinished"></translation> @@ -30255,10 +30175,6 @@ Please make sure your application is built successfully and is selected in Appli <translation type="unfinished"></translation> </message> <message> - <source>Error</source> - <translation type="unfinished">錯誤</translation> - </message> - <message> <source>Failed to run keytool</source> <translation type="unfinished"></translation> </message> @@ -30295,48 +30211,17 @@ Please make sure your application is built successfully and is selected in Appli <translation type="unfinished">套件已建立。</translation> </message> <message> - <source>Package deploy: Running command '%1 %2'.</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Packaging failed.</source> <translation type="unfinished">打包失敗。</translation> </message> <message> - <source>Packaging error: Could not start command '%1 %2'. Reason: %3</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Packaging Error: Command '%1 %2' failed.</source> - <translation type="unfinished">打包錯誤：指令 '%1' 失敗。 {1 %2'?}</translation> - </message> - <message> - <source> Reason: %1</source> - <translation type="unfinished">原因：%1</translation> - </message> - <message> - <source>Exit code: %1</source> - <translation type="unfinished">離開代碼：%1</translation> - </message> - <message> - <source>Keystore</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Keystore password:</source> <translation type="unfinished"></translation> </message> <message> - <source>Certificate</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Certificate password (%1):</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageCreationWidget</name> <message> <source>Invalid Package Name</source> <translation type="unfinished"></translation> @@ -30375,26 +30260,13 @@ Please choose a valid package name for your application (e.g. "org.example. <translation type="unfinished"></translation> </message> <message> - <source>Keystore files (*.keystore *.jks)</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationFactory</name> - <message> <source>Deploy to device</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidPackageInstallationStep</name> <message> <source>Copy application data</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidQtVersion</name> <message> <source>Failed to detect the ABIs used by the Qt version.</source> <translation type="unfinished"></translation> @@ -30404,30 +30276,18 @@ Please choose a valid package name for your application (e.g. "org.example. <extracomment>Qt Version is meant for Android</extracomment> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunConfiguration</name> <message> <source>Run on Android device</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControl</name> <message> <source>Starting remote process.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunControlFactory</name> <message> <source>Run on Android device or emulator.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidRunner</name> <message> <source> @@ -30468,16 +30328,10 @@ Please choose a valid package name for your application (e.g. "org.example. '%1' killed.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsPage</name> <message> <source>Android Configurations</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AvdModel</name> <message> <source>AVD Name</source> <extracomment>AVD - Android Virtual Device</extracomment> @@ -30491,9 +30345,6 @@ Please choose a valid package name for your application (e.g. "org.example. <source>CPU/ABI</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidSettingsWidget</name> <message> <source>Android SDK Folder</source> <translation type="unfinished"></translation> @@ -30530,9 +30381,6 @@ Please choose a valid package name for your application (e.g. "org.example. <source>Select OpenJDK Path</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainFactory</name> <message> <source>Android GCC</source> <translation type="unfinished"></translation> @@ -30545,9 +30393,6 @@ Please choose a valid package name for your application (e.g. "org.example. <source>Android GCC (%1-%2)</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Android::Internal::AndroidToolChainConfigWidget</name> <message> <source>NDK Root:</source> <translation type="unfinished"></translation> diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 2e998efd499..7fdc9960c6d 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "androidavdmanager.h" - +#include "androidtr.h" #include "avdmanageroutputparser.h" #include <coreplugin/icore.h> @@ -72,8 +72,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA if (!result.isValid()) { qCDebug(avdManagerLog) << "AVD Create failed. Invalid CreateAvdInfo" << result.name << result.systemImage->displayText() << result.systemImage->apiLevel(); - result.error = QApplication::translate("AndroidAvdManager", - "Cannot create AVD. Invalid input."); + result.error = Tr::tr("Cannot create AVD. Invalid input."); return result; } @@ -99,8 +98,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA proc.setCommand({avdManagerTool, arguments}); proc.start(); if (!proc.waitForStarted()) { - result.error = QApplication::translate("AndroidAvdManager", - "Could not start process \"%1 %2\"") + result.error = Tr::tr("Could not start process \"%1 %2\"") .arg(avdManagerTool.toString(), arguments.join(' ')); return result; } @@ -131,10 +129,8 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA break; // For a sane input and command, process should finish before timeout. - if (checkForTimeout(start, avdCreateTimeoutMs)) { - result.error = QApplication::translate("AndroidAvdManager", - "Cannot create AVD. Command timed out."); - } + if (checkForTimeout(start, avdCreateTimeoutMs)) + result.error = Tr::tr("Cannot create AVD. Command timed out."); } result.error = errorOutput; @@ -244,11 +240,10 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const if (!emulator.exists()) { QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulator] { QMessageBox::critical(Core::ICore::dialogParent(), - AndroidAvdManager::tr("Emulator Tool Is Missing"), - AndroidAvdManager::tr( - "Install the missing emulator tool (%1) to the" - " installed Android SDK.") - .arg(emulator.displayName())); + Tr::tr("Emulator Tool Is Missing"), + Tr::tr("Install the missing emulator tool (%1) to the" + " installed Android SDK.") + .arg(emulator.displayName())); }); return false; } @@ -263,9 +258,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const if (avdProcess->exitCode()) { const QString errorOutput = QString::fromLatin1(avdProcess->readAllStandardOutput()); QMetaObject::invokeMethod(Core::ICore::mainWindow(), [errorOutput] { - const QString title - = QCoreApplication::translate("Android::Internal::AndroidAvdManager", - "AVD Start Error"); + const QString title = Tr::tr("AVD Start Error"); QMessageBox::critical(Core::ICore::dialogParent(), title, errorOutput); }); } diff --git a/src/plugins/android/androidavdmanager.h b/src/plugins/android/androidavdmanager.h index 670016ed7f3..44a8454e65f 100644 --- a/src/plugins/android/androidavdmanager.h +++ b/src/plugins/android/androidavdmanager.h @@ -11,8 +11,6 @@ namespace Android::Internal { class AndroidAvdManager { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidAvdManager) - public: AndroidAvdManager(const AndroidConfig& config = AndroidConfigurations::currentConfig()); ~AndroidAvdManager(); diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 47ac8a746b3..918a4e39770 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -3,7 +3,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "androidbuildapkstep.h" - #include "androidconfigurations.h" #include "androidconstants.h" #include "androidcreatekeystorecertificate.h" @@ -11,9 +10,9 @@ #include "androidmanager.h" #include "androidqtversion.h" #include "androidsdkmanager.h" +#include "androidtr.h" #include "certificatesmodel.h" #include "createandroidmanifestwizard.h" - #include "javaparser.h" #include <coreplugin/fileutils.h> @@ -76,8 +75,6 @@ const char VerboseOutputKey[] = "VerboseOutput"; class PasswordInputDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidBuildApkStep) - public: enum Context{ KeystorePassword = 1, @@ -95,7 +92,7 @@ private: std::function<bool (const QString &)> verifyCallback = [](const QString &) { return true; }; QLabel *inputContextlabel = new QLabel(this); QLineEdit *inputEdit = new QLineEdit(this); - Utils::InfoLabel *warningLabel = new Utils::InfoLabel(tr("Incorrect password."), + Utils::InfoLabel *warningLabel = new Utils::InfoLabel(::Android::Tr::tr("Incorrect password."), Utils::InfoLabel::Warning, this); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); @@ -105,8 +102,6 @@ private: class AndroidBuildApkWidget : public QWidget { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidBuildApkStep) - public: explicit AndroidBuildApkWidget(AndroidBuildApkStep *step); @@ -162,7 +157,7 @@ QWidget *AndroidBuildApkWidget::createApplicationGroup() filteredSdkPlatforms(minApiSupported)); targets.removeDuplicates(); - auto group = new QGroupBox(tr("Application"), this); + auto group = new QGroupBox(Tr::tr("Application"), this); auto targetSDKComboBox = new QComboBox(); targetSDKComboBox->addItems(targets); @@ -175,17 +170,17 @@ QWidget *AndroidBuildApkWidget::createApplicationGroup() }); auto formLayout = new QFormLayout(group); - formLayout->addRow(tr("Android build platform SDK:"), targetSDKComboBox); + formLayout->addRow(Tr::tr("Android build platform SDK:"), targetSDKComboBox); - auto createAndroidTemplatesButton = new QPushButton(tr("Create Templates")); + auto createAndroidTemplatesButton = new QPushButton(Tr::tr("Create Templates")); createAndroidTemplatesButton->setToolTip( - tr("Create an Android package for Custom Java code, assets, and Gradle configurations.")); + Tr::tr("Create an Android package for Custom Java code, assets, and Gradle configurations.")); connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] { CreateAndroidManifestWizard wizard(m_step->buildSystem()); wizard.exec(); }); - formLayout->addRow(tr("Android customization:"), createAndroidTemplatesButton); + formLayout->addRow(Tr::tr("Android customization:"), createAndroidTemplatesButton); return group; } @@ -196,9 +191,9 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup() sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); - auto group = new QGroupBox(tr("Application Signature"), this); + auto group = new QGroupBox(Tr::tr("Application Signature"), this); - auto keystoreLocationLabel = new QLabel(tr("Keystore:"), group); + auto keystoreLocationLabel = new QLabel(Tr::tr("Keystore:"), group); keystoreLocationLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); auto keystoreLocationChooser = new PathChooser(group); @@ -206,8 +201,8 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup() keystoreLocationChooser->lineEdit()->setReadOnly(true); keystoreLocationChooser->setFilePath(m_step->keystorePath()); keystoreLocationChooser->setInitialBrowsePathBackup(FileUtils::homePath()); - keystoreLocationChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)")); - keystoreLocationChooser->setPromptDialogTitle(tr("Select Keystore File")); + keystoreLocationChooser->setPromptDialogFilter(Tr::tr("Keystore files (*.keystore *.jks)")); + keystoreLocationChooser->setPromptDialogTitle(Tr::tr("Select Keystore File")); connect(keystoreLocationChooser, &PathChooser::textChanged, this, [this, keystoreLocationChooser] { const FilePath file = keystoreLocationChooser->rawFilePath(); m_step->setKeystorePath(file); @@ -216,7 +211,7 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup() setCertificates(); }); - auto keystoreCreateButton = new QPushButton(tr("Create..."), group); + auto keystoreCreateButton = new QPushButton(Tr::tr("Create..."), group); connect(keystoreCreateButton, &QAbstractButton::clicked, this, [this, keystoreLocationChooser] { AndroidCreateKeystoreCertificate d; if (d.exec() != QDialog::Accepted) @@ -229,14 +224,14 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup() setCertificates(); }); - m_signPackageCheckBox = new QCheckBox(tr("Sign package"), group); + m_signPackageCheckBox = new QCheckBox(Tr::tr("Sign package"), group); m_signPackageCheckBox->setChecked(m_step->signPackage()); - m_signingDebugWarningLabel = new Utils::InfoLabel(tr("Signing a debug package"), + m_signingDebugWarningLabel = new Utils::InfoLabel(Tr::tr("Signing a debug package"), Utils::InfoLabel::Warning, group); m_signingDebugWarningLabel->hide(); - auto certificateAliasLabel = new QLabel(tr("Certificate alias:"), group); + auto certificateAliasLabel = new QLabel(Tr::tr("Certificate alias:"), group); certificateAliasLabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); m_certificatesAliasComboBox = new QComboBox(group); @@ -267,28 +262,28 @@ QWidget *AndroidBuildApkWidget::createSignPackageGroup() QWidget *AndroidBuildApkWidget::createAdvancedGroup() { - auto group = new QGroupBox(tr("Advanced Actions"), this); + auto group = new QGroupBox(Tr::tr("Advanced Actions"), this); - auto openPackageLocationCheckBox = new QCheckBox(tr("Open package location after build"), group); + auto openPackageLocationCheckBox = new QCheckBox(Tr::tr("Open package location after build"), group); openPackageLocationCheckBox->setChecked(m_step->openPackageLocation()); connect(openPackageLocationCheckBox, &QAbstractButton::toggled, this, [this](bool checked) { m_step->setOpenPackageLocation(checked); }); - m_addDebuggerCheckBox = new QCheckBox(tr("Add debug server"), group); + m_addDebuggerCheckBox = new QCheckBox(Tr::tr("Add debug server"), group); m_addDebuggerCheckBox->setEnabled(false); - m_addDebuggerCheckBox->setToolTip(tr("Packages debug server with " + m_addDebuggerCheckBox->setToolTip(Tr::tr("Packages debug server with " "the APK to enable debugging. For the signed APK this option is unchecked by default.")); m_addDebuggerCheckBox->setChecked(m_step->addDebugger()); connect(m_addDebuggerCheckBox, &QAbstractButton::toggled, m_step, &AndroidBuildApkStep::setAddDebugger); - auto verboseOutputCheckBox = new QCheckBox(tr("Verbose output"), group); + auto verboseOutputCheckBox = new QCheckBox(Tr::tr("Verbose output"), group); verboseOutputCheckBox->setChecked(m_step->verboseOutput()); auto vbox = new QVBoxLayout(group); QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(m_step->kit()); if (version && version->qtVersion() >= QVersionNumber(5, 14)) { - auto buildAAB = new QCheckBox(tr("Build Android App Bundle (*.aab)"), group); + auto buildAAB = new QCheckBox(Tr::tr("Build Android App Bundle (*.aab)"), group); buildAAB->setChecked(m_step->buildAAB()); connect(buildAAB, &QAbstractButton::toggled, m_step, &AndroidBuildApkStep::setBuildAAB); vbox->addWidget(buildAAB); @@ -305,7 +300,7 @@ QWidget *AndroidBuildApkWidget::createAdvancedGroup() QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup() { - auto group = new QGroupBox(tr("Additional Libraries")); + auto group = new QGroupBox(Tr::tr("Additional Libraries")); group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); auto libsModel = new AndroidExtraLibraryListModel(m_step->buildSystem(), this); @@ -317,32 +312,32 @@ QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup() auto libsView = new QListView; libsView->setSelectionMode(QAbstractItemView::ExtendedSelection); - libsView->setToolTip(tr("List of extra libraries to include in Android package and load on startup.")); + libsView->setToolTip(Tr::tr("List of extra libraries to include in Android package and load on startup.")); libsView->setModel(libsModel); auto addLibButton = new QPushButton; - addLibButton->setText(tr("Add...")); - addLibButton->setToolTip(tr("Select library to include in package.")); + addLibButton->setText(Tr::tr("Add...")); + addLibButton->setToolTip(Tr::tr("Select library to include in package.")); addLibButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); connect(addLibButton, &QAbstractButton::clicked, this, [this, libsModel] { QStringList fileNames = QFileDialog::getOpenFileNames(this, - tr("Select additional libraries"), + Tr::tr("Select additional libraries"), QDir::homePath(), - tr("Libraries (*.so)")); + Tr::tr("Libraries (*.so)")); if (!fileNames.isEmpty()) libsModel->addEntries(fileNames); }); auto removeLibButton = new QPushButton; - removeLibButton->setText(tr("Remove")); - removeLibButton->setToolTip(tr("Remove currently selected library from list.")); + removeLibButton->setText(Tr::tr("Remove")); + removeLibButton->setToolTip(Tr::tr("Remove currently selected library from list.")); connect(removeLibButton, &QAbstractButton::clicked, this, [libsModel, libsView] { QModelIndexList removeList = libsView->selectionModel()->selectedIndexes(); libsModel->removeEntries(removeList); }); - m_openSslCheckBox = new QCheckBox(tr("Include prebuilt OpenSSL libraries")); - m_openSslCheckBox->setToolTip(tr("This is useful for apps that use SSL operations. The path " + m_openSslCheckBox = new QCheckBox(Tr::tr("Include prebuilt OpenSSL libraries")); + m_openSslCheckBox->setToolTip(Tr::tr("This is useful for apps that use SSL operations. The path " "can be defined in Edit > Preferences > Devices > Android.")); connect(m_openSslCheckBox, &QAbstractButton::clicked, this, &AndroidBuildApkWidget::onOpenSslCheckBoxChanged); @@ -461,13 +456,13 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Utils::Id id) sdkManager()->latestAndroidSdkPlatform())) { setImmutable(true); - setDisplayName(tr("Build Android APK")); + setDisplayName(Tr::tr("Build Android APK")); } bool AndroidBuildApkStep::init() { if (!AbstractProcessStep::init()) { - reportWarningOrError(tr("\"%1\" step failed initialization.").arg(displayName()), + reportWarningOrError(Tr::tr("\"%1\" step failed initialization.").arg(displayName()), Task::Error); return false; } @@ -476,18 +471,18 @@ bool AndroidBuildApkStep::init() qCDebug(buildapkstepLog) << "Signing enabled"; // check keystore and certificate passwords if (!verifyKeystorePassword() || !verifyCertificatePassword()) { - reportWarningOrError(tr("Keystore/Certificate password verification failed."), + reportWarningOrError(Tr::tr("Keystore/Certificate password verification failed."), Task::Error); return false; } if (buildType() != BuildConfiguration::Release) - reportWarningOrError(tr("Warning: Signing a debug or profile package."), Task::Warning); + reportWarningOrError(Tr::tr("Warning: Signing a debug or profile package."), Task::Warning); } QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit()); if (!version) { - reportWarningOrError(tr("The Qt version for kit %1 is invalid.").arg(kit()->displayName()), + reportWarningOrError(Tr::tr("The Qt version for kit %1 is invalid.").arg(kit()->displayName()), Task::Error); return false; } @@ -497,18 +492,18 @@ bool AndroidBuildApkStep::init() && AndroidConfigurations::currentConfig().preCmdlineSdkToolsInstalled()) { if (!version->sourcePath().pathAppended("src/3rdparty/gradle").exists()) { const QString error - = tr("The installed SDK tools version (%1) does not include Gradle " - "scripts. The minimum Qt version required for Gradle build to work " - "is %2") - .arg(sdkToolsVersion.toString()) - .arg("5.9.0/5.6.3"); + = Tr::tr("The installed SDK tools version (%1) does not include Gradle " + "scripts. The minimum Qt version required for Gradle build to work " + "is %2") + .arg(sdkToolsVersion.toString()) + .arg("5.9.0/5.6.3"); reportWarningOrError(error, Task::Error); return false; } } else if (version->qtVersion() < QVersionNumber(5, 4, 0)) { - const QString error = tr("The minimum Qt version required for Gradle build to work is %1. " - "It is recommended to install the latest Qt version.") - .arg("5.4.0"); + const QString error = Tr::tr("The minimum Qt version required for Gradle build to work is %1. " + "It is recommended to install the latest Qt version.") + .arg("5.4.0"); reportWarningOrError(error, Task::Error); return false; } @@ -516,9 +511,9 @@ bool AndroidBuildApkStep::init() const int minSDKForKit = AndroidManager::minimumSDK(kit()); if (AndroidManager::minimumSDK(target()) < minSDKForKit) { const QString error - = tr("The API level set for the APK is less than the minimum required by the kit." - "\nThe minimum API level required by the kit is %1.") - .arg(minSDKForKit); + = Tr::tr("The API level set for the APK is less than the minimum required by the kit." + "\nThe minimum API level required by the kit is %1.") + .arg(minSDKForKit); reportWarningOrError(error, Task::Error); return false; } @@ -542,14 +537,14 @@ bool AndroidBuildApkStep::init() m_inputFile = AndroidQtVersion::androidDeploymentSettings(target()); if (m_inputFile.isEmpty()) { m_skipBuilding = true; - reportWarningOrError(tr("No valid input file for \"%1\".").arg(target()->activeBuildKey()), + reportWarningOrError(Tr::tr("No valid input file for \"%1\".").arg(target()->activeBuildKey()), Task::Warning); return true; } m_skipBuilding = false; if (m_buildTargetSdk.isEmpty()) { - reportWarningOrError(tr("Android build SDK version is not defined. Check Android settings.") + reportWarningOrError(Tr::tr("Android build SDK version is not defined. Check Android settings.") , Task::Error); return false; } @@ -642,7 +637,7 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta bool AndroidBuildApkStep::verifyKeystorePassword() { if (!m_keystorePath.exists()) { - reportWarningOrError(tr("Cannot sign the package. Invalid keystore path (%1).") + reportWarningOrError(Tr::tr("Cannot sign the package. Invalid keystore path (%1).") .arg(m_keystorePath.toString()), Task::Error); return false; } @@ -662,7 +657,7 @@ bool AndroidBuildApkStep::verifyCertificatePassword() { if (!AndroidManager::checkCertificateExists(m_keystorePath.toString(), m_keystorePasswd, m_certificateAlias)) { - reportWarningOrError(tr("Cannot sign the package. Certificate alias %1 does not exist.") + reportWarningOrError(Tr::tr("Cannot sign the package. Certificate alias %1 does not exist.") .arg(m_certificateAlias), Task::Error); return false; } @@ -704,7 +699,7 @@ static bool copyFileIfNewer(const FilePath &sourceFilePath, void AndroidBuildApkStep::doRun() { if (m_skipBuilding) { - reportWarningOrError(tr("Android deploy settings file not found, not building an APK."), + reportWarningOrError(Tr::tr("Android deploy settings file not found, not building an APK."), Task::Error); emit finished(true); return; @@ -716,7 +711,7 @@ void AndroidBuildApkStep::doRun() QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit()); if (!version) { - reportWarningOrError(tr("The Qt version for kit %1 is invalid.") + reportWarningOrError(Tr::tr("The Qt version for kit %1 is invalid.") .arg(kit()->displayName()), Task::Error); return false; } @@ -727,8 +722,8 @@ void AndroidBuildApkStep::doRun() FilePath androidLibsDir = androidBuildDir / "libs" / abi; if (!androidLibsDir.exists()) { if (!androidLibsDir.ensureWritableDir()) { - reportWarningOrError(tr("The Android build folder %1 was not found and could " - "not be created.").arg(androidLibsDir.toUserOutput()), + reportWarningOrError(Tr::tr("The Android build folder %1 was not found and could " + "not be created.").arg(androidLibsDir.toUserOutput()), Task::Error); return false; } else if (version->qtVersion() >= QVersionNumber(6, 0, 0) @@ -743,7 +738,7 @@ void AndroidBuildApkStep::doRun() continue; if (!from.copyFile(to)) { - reportWarningOrError(tr("Cannot copy the target's lib file %1 to the " + reportWarningOrError(Tr::tr("Cannot copy the target's lib file %1 to the " "Android build folder %2.") .arg(fileName, androidLibsDir.toUserOutput()), Task::Error); @@ -774,7 +769,7 @@ void AndroidBuildApkStep::doRun() for (const FilePath &target : targets) { if (!copyFileIfNewer(target, androidLibsDir.pathAppended(target.fileName()))) { reportWarningOrError( - tr("Cannot copy file \"%1\" to Android build libs folder \"%2\".") + Tr::tr("Cannot copy file \"%1\" to Android build libs folder \"%2\".") .arg(target.toUserOutput()).arg(androidLibsDir.toUserOutput()), Task::Error); return false; @@ -799,7 +794,7 @@ void AndroidBuildApkStep::doRun() const FilePath destination = androidLibsDir.pathAppended(target.fileName()); if (!copyFileIfNewer(target, destination)) { reportWarningOrError( - tr("Cannot copy file \"%1\" to Android build libs folder \"%2\".") + Tr::tr("Cannot copy file \"%1\" to Android build libs folder \"%2\".") .arg(target.toUserOutput()).arg(androidLibsDir.toUserOutput()), Task::Error); return false; @@ -831,7 +826,7 @@ void AndroidBuildApkStep::doRun() QFile f{m_inputFile.toString()}; if (!f.open(QIODevice::WriteOnly)) { - reportWarningOrError(tr("Cannot open androiddeployqt input file \"%1\" for writing.") + reportWarningOrError(Tr::tr("Cannot open androiddeployqt input file \"%1\" for writing.") .arg(m_inputFile.toUserOutput()), Task::Error); return false; } @@ -840,7 +835,7 @@ void AndroidBuildApkStep::doRun() }; if (!setup()) { - reportWarningOrError(tr("Cannot set up \"%1\", not building an APK.").arg(displayName()), + reportWarningOrError(Tr::tr("Cannot set up \"%1\", not building an APK.").arg(displayName()), Task::Error); emit finished(false); return; @@ -858,7 +853,7 @@ void AndroidBuildApkStep::reportWarningOrError(const QString &message, Task::Tas void AndroidBuildApkStep::processStarted() { - emit addOutput(tr("Starting: \"%1\" %2") + emit addOutput(Tr::tr("Starting: \"%1\" %2") .arg(m_command.toUserOutput(), m_argumentsPasswordConcealed), BuildStep::OutputFormat::NormalMessage); } @@ -1026,7 +1021,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates() keytoolProc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), params}); keytoolProc.runBlocking(EventLoopMode::On); if (keytoolProc.result() > ProcessResult::FinishedWithError) - QMessageBox::critical(nullptr, tr("Error"), tr("Failed to run keytool.")); + QMessageBox::critical(nullptr, Tr::tr("Error"), Tr::tr("Failed to run keytool.")); else model = new CertificatesModel(keytoolProc.cleanedStdOut(), this); @@ -1067,13 +1062,13 @@ PasswordInputDialog::PasswordInputDialog(PasswordInputDialog::Context context, connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - setWindowTitle(context == KeystorePassword ? tr("Keystore") : tr("Certificate")); + setWindowTitle(context == KeystorePassword ? Tr::tr("Keystore") : Tr::tr("Certificate")); QString contextStr; if (context == KeystorePassword) - contextStr = tr("Enter keystore password"); + contextStr = Tr::tr("Enter keystore password"); else - contextStr = tr("Enter certificate password"); + contextStr = Tr::tr("Enter certificate password"); contextStr += extraContextStr.isEmpty() ? QStringLiteral(":") : QStringLiteral(" (%1):").arg(extraContextStr); @@ -1099,7 +1094,7 @@ AndroidBuildApkStepFactory::AndroidBuildApkStepFactory() registerStep<AndroidBuildApkStep>(Constants::ANDROID_BUILD_APK_ID); setSupportedDeviceType(Constants::ANDROID_DEVICE_TYPE); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); - setDisplayName(AndroidBuildApkStep::tr("Build Android APK")); + setDisplayName(Tr::tr("Build Android APK")); setRepeatable(false); } diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 4612f8b9fd6..dd55ccefa07 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -4,10 +4,11 @@ #include "androidconfigurations.h" #include "androidconstants.h" -#include "androidtoolchain.h" #include "androiddevice.h" #include "androidmanager.h" #include "androidqtversion.h" +#include "androidtoolchain.h" +#include "androidtr.h" #include "avddialog.h" #include <coreplugin/icore.h> @@ -658,8 +659,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const adbProc.runBlocking(); if (adbProc.result() != ProcessResult::FinishedWithSuccess) { if (error) - *error = QApplication::translate("AndroidConfiguration", "Could not run: %1") - .arg(cmd.toUserOutput()); + *error = Tr::tr("Could not run: %1").arg(cmd.toUserOutput()); return devices; } QStringList adbDevs = adbProc.allOutput().split('\n', Qt::SkipEmptyParts); @@ -700,9 +700,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const Utils::sort(devices); if (devices.isEmpty() && error) - *error = QApplication::translate("AndroidConfiguration", - "No devices found in output of: %1") - .arg(cmd.toUserOutput()); + *error = Tr::tr("No devices found in output of: %1").arg(cmd.toUserOutput()); return devices; } @@ -1276,7 +1274,7 @@ static QVariant findOrRegisterDebugger(ToolChain *tc, if (existingGdb) return existingGdb->id(); - const QString mainName = AndroidConfigurations::tr("Android Debugger (%1, NDK %2)"); + const QString mainName = Tr::tr("Android Debugger (%1, NDK %2)"); const QString custom = customDebugger ? QString{"Custom "} : QString{}; // debugger not found, register a new one // check lldb @@ -1424,7 +1422,7 @@ void AndroidConfigurations::updateAutomaticKitList() QString versionStr = QLatin1String("Qt %{Qt:Version}"); if (!qt->isAutodetected()) versionStr = QString("%1").arg(qt->displayName()); - k->setUnexpandedDisplayName(tr("Android %1 Clang %2") + k->setUnexpandedDisplayName(Tr::tr("Android %1 Clang %2") .arg(versionStr) .arg(getMultiOrSingleAbiString(abis))); k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString()); diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp index 9a535aa4d8f..962a8cd2346 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.cpp +++ b/src/plugins/android/androidcreatekeystorecertificate.cpp @@ -1,9 +1,9 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidcreatekeystorecertificate.h" - #include "androidconfigurations.h" +#include "androidcreatekeystorecertificate.h" +#include "androidtr.h" #include <utils/infolabel.h> #include <utils/layoutbuilder.h> @@ -25,7 +25,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare : QDialog(parent) { resize(638, 473); - setWindowTitle(tr("Create a keystore and a certificate")); + setWindowTitle(Tr::tr("Create a keystore and a certificate")); m_commonNameLineEdit = new QLineEdit; @@ -44,7 +44,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare m_certificateRetypePassLineEdit = new QLineEdit; m_certificateRetypePassLineEdit->setEchoMode(QLineEdit::Password); - m_certificateShowPassCheckBox = new QCheckBox(tr("Show password")); + m_certificateShowPassCheckBox = new QCheckBox(Tr::tr("Show password")); m_validitySpinBox = new QSpinBox; m_validitySpinBox->setRange(10000, 100000); @@ -59,7 +59,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare m_keySizeSpinBox = new QSpinBox; m_keySizeSpinBox->setRange(2048, 2097152); - m_samePasswordCheckBox = new QCheckBox(tr("Use Keystore password")); + m_samePasswordCheckBox = new QCheckBox(Tr::tr("Use Keystore password")); m_keystorePassLineEdit = new QLineEdit; m_keystorePassLineEdit->setEchoMode(QLineEdit::Password); @@ -72,7 +72,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); m_infoLabel->hide(); - auto keystoreShowPassCheckBox = new QCheckBox(tr("Show password")); + auto keystoreShowPassCheckBox = new QCheckBox(Tr::tr("Show password")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Close|QDialogButtonBox::Save); @@ -80,36 +80,36 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare Column { Group { - title(tr("Keystore")), + title(Tr::tr("Keystore")), Form { - tr("Password:"), m_keystorePassLineEdit, br, - tr("Retype password:"), m_keystoreRetypePassLineEdit, br, + Tr::tr("Password:"), m_keystorePassLineEdit, br, + Tr::tr("Retype password:"), m_keystoreRetypePassLineEdit, br, Span(2, keystoreShowPassCheckBox), br, } }, Group { - title(tr("Certificate")), + title(Tr::tr("Certificate")), Form { - tr("Alias name:"), m_certificateAliasLineEdit, br, - tr("Keysize:"), m_keySizeSpinBox, br, - tr("Validity (days):"), m_validitySpinBox, br, - tr("Password:"), m_certificatePassLineEdit, br, - tr("Retype password:"), m_certificateRetypePassLineEdit, br, + Tr::tr("Alias name:"), m_certificateAliasLineEdit, br, + Tr::tr("Keysize:"), m_keySizeSpinBox, br, + Tr::tr("Validity (days):"), m_validitySpinBox, br, + Tr::tr("Password:"), m_certificatePassLineEdit, br, + Tr::tr("Retype password:"), m_certificateRetypePassLineEdit, br, Span(2, m_samePasswordCheckBox), br, Span(2, m_certificateShowPassCheckBox), br, } }, Group { - title(tr("Certificate Distinguished Names")), + title(Tr::tr("Certificate Distinguished Names")), Form { - tr("First and last name:"), m_commonNameLineEdit, br, - tr("Organizational unit (e.g. Necessitas):"), m_organizationUnitLineEdit, br, - tr("Organization (e.g. KDE):"), m_organizationNameLineEdit, br, - tr("City or locality:"), m_localityNameLineEdit, br, - tr("State or province:"), m_stateNameLineEdit, br, - tr("Two-letter country code for this unit (e.g. RO):"), m_countryLineEdit, + Tr::tr("First and last name:"), m_commonNameLineEdit, br, + Tr::tr("Organizational unit (e.g. Necessitas):"), m_organizationUnitLineEdit, br, + Tr::tr("Organization (e.g. KDE):"), m_organizationNameLineEdit, br, + Tr::tr("City or locality:"), m_localityNameLineEdit, br, + Tr::tr("State or province:"), m_stateNameLineEdit, br, + Tr::tr("Two-letter country code for this unit (e.g. RO):"), m_countryLineEdit, } }, @@ -170,12 +170,12 @@ AndroidCreateKeystoreCertificate::PasswordStatus AndroidCreateKeystoreCertificat { if (m_keystorePassLineEdit->text().length() < 6) { m_infoLabel->show(); - m_infoLabel->setText(tr("Keystore password is too short.")); + m_infoLabel->setText(Tr::tr("Keystore password is too short.")); return Invalid; } if (m_keystorePassLineEdit->text() != m_keystoreRetypePassLineEdit->text()) { m_infoLabel->show(); - m_infoLabel->setText(tr("Keystore passwords do not match.")); + m_infoLabel->setText(Tr::tr("Keystore passwords do not match.")); return NoMatch; } @@ -190,12 +190,12 @@ AndroidCreateKeystoreCertificate::PasswordStatus AndroidCreateKeystoreCertificat if (m_certificatePassLineEdit->text().length() < 6) { m_infoLabel->show(); - m_infoLabel->setText(tr("Certificate password is too short.")); + m_infoLabel->setText(Tr::tr("Certificate password is too short.")); return Invalid; } if (m_certificatePassLineEdit->text() != m_certificateRetypePassLineEdit->text()) { m_infoLabel->show(); - m_infoLabel->setText(tr("Certificate passwords do not match.")); + m_infoLabel->setText(Tr::tr("Certificate passwords do not match.")); return NoMatch; } @@ -207,7 +207,7 @@ bool AndroidCreateKeystoreCertificate::checkCertificateAlias() { if (m_certificateAliasLineEdit->text().length() == 0) { m_infoLabel->show(); - m_infoLabel->setText(tr("Certificate alias is missing.")); + m_infoLabel->setText(Tr::tr("Certificate alias is missing.")); return false; } @@ -219,7 +219,7 @@ bool AndroidCreateKeystoreCertificate::checkCountryCode() { if (!m_countryLineEdit->text().contains(QRegularExpression("[A-Z]{2}"))) { m_infoLabel->show(); - m_infoLabel->setText(tr("Invalid country code.")); + m_infoLabel->setText(Tr::tr("Invalid country code.")); return false; } @@ -244,9 +244,9 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted() if (!validateUserInput()) return; - m_keystoreFilePath = FileUtils::getSaveFilePath(this, tr("Keystore Filename"), + m_keystoreFilePath = FileUtils::getSaveFilePath(this, Tr::tr("Keystore Filename"), FileUtils::homePath() / "android_release.keystore", - tr("Keystore files (*.keystore *.jks)")); + Tr::tr("Keystore files (*.keystore *.jks)")); if (m_keystoreFilePath.isEmpty()) return; QString distinguishedNames(QString::fromLatin1("CN=%1, O=%2, L=%3, C=%4") @@ -277,7 +277,7 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted() genKeyCertProc.runBlocking(EventLoopMode::On); if (genKeyCertProc.result() != ProcessResult::FinishedWithSuccess) { - QMessageBox::critical(this, tr("Error"), + QMessageBox::critical(this, Tr::tr("Error"), genKeyCertProc.exitMessage() + '\n' + genKeyCertProc.allOutput()); return; } diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 128de01afea..70e8ec4c8ad 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -2,16 +2,17 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androiddeployqtstep.h" -#include "certificatesmodel.h" - -#include "javaparser.h" -#include "androidmanager.h" +#include "androidavdmanager.h" #include "androidconstants.h" +#include "androiddeployqtstep.h" +#include "androiddevice.h" #include "androidglobal.h" -#include "androidavdmanager.h" +#include "androidmanager.h" #include "androidqtversion.h" -#include "androiddevice.h" +#include "androidtr.h" +#include "androidtr.h" +#include "certificatesmodel.h" +#include "javaparser.h" #include <coreplugin/fileutils.h> #include <coreplugin/icore.h> @@ -71,7 +72,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Utils::Id id) m_uninstallPreviousPackage = addAspect<BoolAspect>(); m_uninstallPreviousPackage->setSettingsKey(UninstallPreviousPackageKey); - m_uninstallPreviousPackage->setLabel(tr("Uninstall the existing app before deployment"), + m_uninstallPreviousPackage->setLabel(Tr::tr("Uninstall the existing app before deployment"), BoolAspect::LabelPlacement::AtCheckBox); m_uninstallPreviousPackage->setValue(false); @@ -91,7 +92,7 @@ bool AndroidDeployQtStep::init() { QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit()); if (!version) { - reportWarningOrError(tr("The Qt version for kit %1 is invalid.").arg(kit()->displayName()), + reportWarningOrError(Tr::tr("The Qt version for kit %1 is invalid.").arg(kit()->displayName()), Task::Error); return false; } @@ -100,19 +101,19 @@ bool AndroidDeployQtStep::init() m_androidABIs = AndroidManager::applicationAbis(target()); if (m_androidABIs.isEmpty()) { - reportWarningOrError(tr("No Android architecture (ABI) is set by the project."), + reportWarningOrError(Tr::tr("No Android architecture (ABI) is set by the project."), Task::Error); return false; } - emit addOutput(tr("Initializing deployment to Android device/simulator"), + emit addOutput(Tr::tr("Initializing deployment to Android device/simulator"), OutputFormat::NormalMessage); RunConfiguration *rc = target()->activeRunConfiguration(); - QTC_ASSERT(rc, reportWarningOrError(tr("The kit's run configuration is invalid."), Task::Error); + QTC_ASSERT(rc, reportWarningOrError(Tr::tr("The kit's run configuration is invalid."), Task::Error); return false); BuildConfiguration *bc = target()->activeBuildConfiguration(); - QTC_ASSERT(bc, reportWarningOrError(tr("The kit's build configuration is invalid."), + QTC_ASSERT(bc, reportWarningOrError(Tr::tr("The kit's build configuration is invalid."), Task::Error); return false); @@ -123,11 +124,11 @@ bool AndroidDeployQtStep::init() // Try to re-use user-provided information from an earlier step of the same type. BuildStepList *bsl = stepList(); - QTC_ASSERT(bsl, reportWarningOrError(tr("The kit's build steps list is invalid."), Task::Error); + QTC_ASSERT(bsl, reportWarningOrError(Tr::tr("The kit's build steps list is invalid."), Task::Error); return false); auto androidDeployQtStep = bsl->firstOfType<AndroidDeployQtStep>(); QTC_ASSERT(androidDeployQtStep, - reportWarningOrError(tr("The kit's deploy configuration is invalid."), Task::Error); + reportWarningOrError(Tr::tr("The kit's deploy configuration is invalid."), Task::Error); return false); AndroidDeviceInfo info; if (androidDeployQtStep != this) @@ -147,7 +148,7 @@ bool AndroidDeployQtStep::init() const auto dev = static_cast<const AndroidDevice *>(DeviceKitAspect::device(kit()).data()); if (!dev) { - reportWarningOrError(tr("No valid deployment device is set."), Task::Error); + reportWarningOrError(Tr::tr("No valid deployment device is set."), Task::Error); return false; } @@ -156,24 +157,24 @@ bool AndroidDeployQtStep::init() m_deviceInfo = info; // Keep around for later steps if (!info.isValid()) { - reportWarningOrError(tr("The deployment device \"%1\" is invalid.") + reportWarningOrError(Tr::tr("The deployment device \"%1\" is invalid.") .arg(dev->displayName()), Task::Error); return false; } const bool abiListNotEmpty = !selectedAbis.isEmpty() && !dev->supportedAbis().isEmpty(); if (abiListNotEmpty && !dev->canSupportAbis(selectedAbis)) { - const QString error = tr("The deployment device \"%1\" does not support the " - "architectures used by the kit.\n" - "The kit supports \"%2\", but the device uses \"%3\".") - .arg(dev->displayName()).arg(selectedAbis.join(", ")) - .arg(dev->supportedAbis().join(", ")); + const QString error = Tr::tr("The deployment device \"%1\" does not support the " + "architectures used by the kit.\n" + "The kit supports \"%2\", but the device uses \"%3\".") + .arg(dev->displayName()).arg(selectedAbis.join(", ")) + .arg(dev->supportedAbis().join(", ")); reportWarningOrError(error, Task::Error); return false; } if (!dev->canHandleDeployments()) { - reportWarningOrError(tr("The deployment device \"%1\" is disconnected.") + reportWarningOrError(Tr::tr("The deployment device \"%1\" is disconnected.") .arg(dev->displayName()), Task::Error); return false; } @@ -182,10 +183,10 @@ bool AndroidDeployQtStep::init() const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit()); if (qt && qt->supportsMultipleQtAbis() && !selectedAbis.contains(info.cpuAbi.first())) { TaskHub::addTask(DeploymentTask(Task::Warning, - tr("Android: The main ABI of the deployment device (%1) is not selected. The app " - "execution or debugging might not work properly. Add it from Projects > Build > " - "Build Steps > qmake > ABIs.") - .arg(info.cpuAbi.first()))); + Tr::tr("Android: The main ABI of the deployment device (%1) is not selected. The app " + "execution or debugging might not work properly. Add it from Projects > Build > " + "Build Steps > qmake > ABIs.") + .arg(info.cpuAbi.first()))); } m_avdName = info.avdName; @@ -198,7 +199,7 @@ bool AndroidDeployQtStep::init() gatherFilesToPull(); - emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage); + emit addOutput(Tr::tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage); m_uninstallPreviousPackageRun = m_uninstallPreviousPackage->value(); if (m_uninstallPreviousPackageRun) @@ -209,7 +210,7 @@ bool AndroidDeployQtStep::init() const QString buildKey = target()->activeBuildKey(); const ProjectNode *node = target()->project()->findNodeForBuildKey(buildKey); if (!node) { - reportWarningOrError(tr("The deployment step's project node is invalid."), Task::Error); + reportWarningOrError(Tr::tr("The deployment step's project node is invalid."), Task::Error); return false; } m_apkPath = Utils::FilePath::fromString(node->data(Constants::AndroidApk).toString()); @@ -220,13 +221,13 @@ bool AndroidDeployQtStep::init() } else { QString jsonFile = AndroidQtVersion::androidDeploymentSettings(target()).toString(); if (jsonFile.isEmpty()) { - reportWarningOrError(tr("Cannot find the androiddeployqt input JSON file."), + reportWarningOrError(Tr::tr("Cannot find the androiddeployqt input JSON file."), Task::Error); return false; } m_command = version->hostBinPath(); if (m_command.isEmpty()) { - reportWarningOrError(tr("Cannot find the androiddeployqt tool."), Task::Error); + reportWarningOrError(Tr::tr("Cannot find the androiddeployqt tool."), Task::Error); return false; } m_command = m_command.pathAppended("androiddeployqt").withExecutableSuffix(); @@ -289,12 +290,12 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy() if (m_uninstallPreviousPackageRun) { packageName = AndroidManager::packageName(m_manifestName); if (packageName.isEmpty()) { - reportWarningOrError(tr("Cannot find the package name from the Android Manifest " - "file \"%1\".").arg(m_manifestName.toUserOutput()), + reportWarningOrError(Tr::tr("Cannot find the package name from the Android Manifest " + "file \"%1\".").arg(m_manifestName.toUserOutput()), Task::Error); return Failure; } - const QString msg = tr("Uninstalling the previous package \"%1\".").arg(packageName); + const QString msg = Tr::tr("Uninstalling the previous package \"%1\".").arg(packageName); qCDebug(deployStepLog) << msg; emit addOutput(msg, OutputFormat::NormalMessage); runCommand({m_adbPath, @@ -325,7 +326,7 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy() process.start(); - emit addOutput(tr("Starting: \"%1\"").arg(cmd.toUserOutput()), OutputFormat::NormalMessage); + emit addOutput(Tr::tr("Starting: \"%1\"").arg(cmd.toUserOutput()), OutputFormat::NormalMessage); while (!process.waitForFinished(200)) { if (process.state() == QProcess::NotRunning) @@ -341,14 +342,14 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy() const int exitCode = process.exitCode(); if (exitStatus == QProcess::NormalExit && exitCode == 0) { - emit addOutput(tr("The process \"%1\" exited normally.").arg(m_command.toUserOutput()), + emit addOutput(Tr::tr("The process \"%1\" exited normally.").arg(m_command.toUserOutput()), OutputFormat::NormalMessage); } else if (exitStatus == QProcess::NormalExit) { - const QString error = tr("The process \"%1\" exited with code %2.") - .arg(m_command.toUserOutput(), QString::number(exitCode)); + const QString error = Tr::tr("The process \"%1\" exited with code %2.") + .arg(m_command.toUserOutput(), QString::number(exitCode)); reportWarningOrError(error, Task::Error); } else { - const QString error = tr("The process \"%1\" crashed.").arg(m_command.toUserOutput()); + const QString error = Tr::tr("The process \"%1\" crashed.").arg(m_command.toUserOutput()); reportWarningOrError(error, Task::Error); } @@ -356,13 +357,13 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy() if (m_uninstallPreviousPackageRun) { deployError = Failure; // Even re-install failed. Set to Failure. reportWarningOrError( - tr("Installing the app failed even after uninstalling the previous one."), + Tr::tr("Installing the app failed even after uninstalling the previous one."), Task::Error); } } else if (exitCode != 0 || exitStatus != QProcess::NormalExit) { // Set the deployError to Failure when no deployError code was detected // but the adb tool failed otherwise relay the detected deployError. - reportWarningOrError(tr("Installing the app failed with an unknown error."), Task::Error); + reportWarningOrError(Tr::tr("Installing the app failed with an unknown error."), Task::Error); deployError = Failure; } @@ -373,7 +374,7 @@ void AndroidDeployQtStep::slotAskForUninstall(DeployErrorCode errorCode) { Q_ASSERT(errorCode > 0); - QString uninstallMsg = tr("Deployment failed with the following errors:\n\n"); + QString uninstallMsg = Tr::tr("Deployment failed with the following errors:\n\n"); uint errorCodeFlags = errorCode; uint mask = 1; while (errorCodeFlags) { @@ -397,9 +398,9 @@ void AndroidDeployQtStep::slotAskForUninstall(DeployErrorCode errorCode) mask <<= 1; } - uninstallMsg.append(tr("\nUninstalling the installed package may solve the issue.\n" - "Do you want to uninstall the existing package?")); - int button = QMessageBox::critical(nullptr, tr("Install failed"), uninstallMsg, + uninstallMsg.append(Tr::tr("\nUninstalling the installed package may solve the issue.\n" + "Do you want to uninstall the existing package?")); + int button = QMessageBox::critical(nullptr, Tr::tr("Install failed"), uninstallMsg, QMessageBox::Yes, QMessageBox::No); m_askForUninstall = button == QMessageBox::Yes; } @@ -410,7 +411,7 @@ bool AndroidDeployQtStep::runImpl() QString serialNumber = AndroidAvdManager().waitForAvd(m_avdName, cancelChecker()); qCDebug(deployStepLog) << "Deploying to AVD:" << m_avdName << serialNumber; if (serialNumber.isEmpty()) { - reportWarningOrError(tr("The deployment AVD \"%1\" cannot be started.") + reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.") .arg(m_avdName), Task::Error); return false; } @@ -429,7 +430,7 @@ bool AndroidDeployQtStep::runImpl() } if (!m_filesToPull.isEmpty()) - emit addOutput(tr("Pulling files necessary for debugging."), OutputFormat::NormalMessage); + emit addOutput(Tr::tr("Pulling files necessary for debugging."), OutputFormat::NormalMessage); // Note that values are not necessarily unique, e.g. app_process is looked up in several // directories @@ -442,9 +443,9 @@ bool AndroidDeployQtStep::runImpl() AndroidDeviceInfo::adbSelector(m_serialNumber) << "pull" << itr.key() << itr.value()}); if (!QFileInfo::exists(itr.value())) { - const QString error = tr("Package deploy: Failed to pull \"%1\" to \"%2\".") - .arg(itr.key()) - .arg(itr.value()); + const QString error = Tr::tr("Package deploy: Failed to pull \"%1\" to \"%2\".") + .arg(itr.key()) + .arg(itr.value()); reportWarningOrError(error, Task::Error); } } @@ -493,7 +494,7 @@ void AndroidDeployQtStep::runCommand(const CommandLine &command) { QtcProcess buildProc; buildProc.setTimeoutS(2 * 60); - emit addOutput(tr("Package deploy: Running command \"%1\".").arg(command.toUserOutput()), + emit addOutput(Tr::tr("Package deploy: Running command \"%1\".").arg(command.toUserOutput()), OutputFormat::NormalMessage); buildProc.setCommand(command); @@ -506,14 +507,14 @@ QWidget *AndroidDeployQtStep::createConfigWidget() { auto widget = new QWidget; auto installCustomApkButton = new QPushButton(widget); - installCustomApkButton->setText(tr("Install an APK File")); + installCustomApkButton->setText(Tr::tr("Install an APK File")); connect(installCustomApkButton, &QAbstractButton::clicked, this, [this, widget] { const FilePath packagePath = FileUtils::getOpenFilePath(widget, - tr("Qt Android Installer"), + Tr::tr("Qt Android Installer"), FileUtils::homePath(), - tr("Android package (*.apk)")); + Tr::tr("Android package (*.apk)")); if (!packagePath.isEmpty()) AndroidManager::installQASIPackage(target(), packagePath); }); @@ -582,7 +583,7 @@ AndroidDeployQtStepFactory::AndroidDeployQtStepFactory() setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY); setSupportedDeviceType(Constants::ANDROID_DEVICE_TYPE); setRepeatable(false); - setDisplayName(AndroidDeployQtStep::tr("Deploy to Android device")); + setDisplayName(Tr::tr("Deploy to Android device")); } } // Internal diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 4a96b1ccc26..7600c9fd096 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -2,13 +2,13 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androiddevice.h" - #include "androidavdmanager.h" #include "androidconfigurations.h" #include "androidconstants.h" +#include "androiddevice.h" #include "androidmanager.h" #include "androidsignaloperation.h" +#include "androidtr.h" #include "avddialog.h" #include <coreplugin/icore.h> @@ -75,40 +75,40 @@ AndroidDeviceWidget::AndroidDeviceWidget(const IDevice::Ptr &device) if (!dev->isValid()) return; - formLayout->addRow(AndroidDevice::tr("Device name:"), new QLabel(dev->displayName())); - formLayout->addRow(AndroidDevice::tr("Device type:"), new QLabel(dev->deviceTypeName())); + formLayout->addRow(Tr::tr("Device name:"), new QLabel(dev->displayName())); + formLayout->addRow(Tr::tr("Device type:"), new QLabel(dev->deviceTypeName())); const QString serialNumber = dev->serialNumber(); - const QString printableSerialNumber = serialNumber.isEmpty() ? AndroidDevice::tr("Unknown") + const QString printableSerialNumber = serialNumber.isEmpty() ? Tr::tr("Unknown") : serialNumber; - formLayout->addRow(AndroidDevice::tr("Serial number:"), new QLabel(printableSerialNumber)); + formLayout->addRow(Tr::tr("Serial number:"), new QLabel(printableSerialNumber)); const QString abis = dev->supportedAbis().join(", "); - formLayout->addRow(AndroidDevice::tr("CPU architecture:"), new QLabel(abis)); + formLayout->addRow(Tr::tr("CPU architecture:"), new QLabel(abis)); const auto osString = QString("%1 (SDK %2)").arg(dev->androidVersion()).arg(dev->sdkLevel()); - formLayout->addRow(AndroidDevice::tr("OS version:"), new QLabel(osString)); + formLayout->addRow(Tr::tr("OS version:"), new QLabel(osString)); if (dev->machineType() == IDevice::Hardware) { const QString authorizedStr = dev->deviceState() == IDevice::DeviceReadyToUse - ? AndroidDevice::tr("Yes") - : AndroidDevice::tr("No"); - formLayout->addRow(AndroidDevice::tr("Authorized:"), new QLabel(authorizedStr)); + ? Tr::tr("Yes") + : Tr::tr("No"); + formLayout->addRow(Tr::tr("Authorized:"), new QLabel(authorizedStr)); } if (dev->machineType() == IDevice::Emulator) { const QString targetName = dev->androidTargetName(); - formLayout->addRow(AndroidDevice::tr("Android target flavor:"), new QLabel(targetName)); - formLayout->addRow(AndroidDevice::tr("SD card size:"), new QLabel(dev->sdcardSize())); - formLayout->addRow(AndroidDevice::tr("Skin type:"), new QLabel(dev->skinName())); + formLayout->addRow(Tr::tr("Android target flavor:"), new QLabel(targetName)); + formLayout->addRow(Tr::tr("SD card size:"), new QLabel(dev->sdcardSize())); + formLayout->addRow(Tr::tr("Skin type:"), new QLabel(dev->skinName())); const QString openGlStatus = dev->openGLStatus(); - formLayout->addRow(AndroidDevice::tr("OpenGL status:"), new QLabel(openGlStatus)); + formLayout->addRow(Tr::tr("OpenGL status:"), new QLabel(openGlStatus)); } } QString AndroidDeviceWidget::dialogTitle() { - return AndroidDevice::tr("Android Device Manager"); + return Tr::tr("Android Device Manager"); } bool AndroidDeviceWidget::messageDialog(const QString &msg, QMessageBox::Icon icon, QWidget *parent) @@ -152,13 +152,13 @@ AndroidDevice::AndroidDevice() { setupId(IDevice::AutoDetected, Constants::ANDROID_DEVICE_ID); setType(Constants::ANDROID_DEVICE_TYPE); - setDefaultDisplayName(tr("Run on Android")); - setDisplayType(tr("Android")); + setDefaultDisplayName(Tr::tr("Run on Android")); + setDisplayType(Tr::tr("Android")); setMachineType(IDevice::Hardware); setOsType(OsType::OsTypeOtherUnix); setDeviceState(DeviceDisconnected); - addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) { + addDeviceAction({Tr::tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) { Q_UNUSED(parent) AndroidDeviceManager::instance()->updateDeviceState(device); }}); @@ -166,10 +166,10 @@ AndroidDevice::AndroidDevice() void AndroidDevice::addActionsIfNotFound() { - static const QString startAvdAction = tr("Start AVD"); - static const QString eraseAvdAction = tr("Erase AVD"); - static const QString avdArgumentsAction = tr("AVD Arguments"); - static const QString setupWifi = tr("Setup Wi-Fi"); + static const QString startAvdAction = Tr::tr("Start AVD"); + static const QString eraseAvdAction = Tr::tr("Erase AVD"); + static const QString avdArgumentsAction = Tr::tr("AVD Arguments"); + static const QString setupWifi = Tr::tr("Setup Wi-Fi"); bool hasStartAction = false; bool hasEraseAction = false; @@ -351,32 +351,32 @@ QString AndroidDevice::androidVersion() const QString AndroidDevice::deviceTypeName() const { if (machineType() == Emulator) - return tr("Emulator for \"%1\"").arg(avdSettings()->value("hw.device.name").toString()); - return tr("Physical device"); + return Tr::tr("Emulator for \"%1\"").arg(avdSettings()->value("hw.device.name").toString()); + return Tr::tr("Physical device"); } QString AndroidDevice::skinName() const { const QString skin = avdSettings()->value("skin.name").toString(); - return skin.isEmpty() ? tr("None") : skin; + return skin.isEmpty() ? Tr::tr("None") : skin; } QString AndroidDevice::androidTargetName() const { const QString target = avdSettings()->value("tag.display").toString(); - return target.isEmpty() ? tr("Unknown") : target; + return target.isEmpty() ? Tr::tr("Unknown") : target; } QString AndroidDevice::sdcardSize() const { const QString size = avdSettings()->value("sdcard.size").toString(); - return size.isEmpty() ? tr("Unknown") : size; + return size.isEmpty() ? Tr::tr("Unknown") : size; } QString AndroidDevice::openGLStatus() const { const QString openGL = avdSettings()->value("hw.gpu.enabled").toString(); - return openGL.isEmpty() ? tr("Unknown") : openGL; + return openGL.isEmpty() ? Tr::tr("Unknown") : openGL; } IDevice::DeviceInfo AndroidDevice::deviceInformation() const @@ -475,7 +475,7 @@ void AndroidDeviceManager::eraseAvd(const IDevice::Ptr &device, QWidget *parent) const QString name = static_cast<const AndroidDevice *>(device.data())->avdName(); const QString question - = AndroidDevice::tr("Erase the Android AVD \"%1\"?\nThis cannot be undone.").arg(name); + = Tr::tr("Erase the Android AVD \"%1\"?\nThis cannot be undone.").arg(name); if (!AndroidDeviceWidget::questionDialog(question, parent)) return; @@ -494,7 +494,7 @@ void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidge { if (device->deviceState() != IDevice::DeviceReadyToUse) { AndroidDeviceWidget::infoDialog( - AndroidDevice::tr("The device has to be connected with ADB debugging " + Tr::tr("The device has to be connected with ADB debugging " "enabled to use this feature."), parent); return; } @@ -507,7 +507,7 @@ void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidge const SdkToolResult result = AndroidManager::runAdbCommand(args); if (!result.success()) { AndroidDeviceWidget::criticalDialog( - AndroidDevice::tr("Opening connection port %1 failed.").arg(wifiDevicePort), + Tr::tr("Opening connection port %1 failed.").arg(wifiDevicePort), parent); return; } @@ -519,7 +519,7 @@ void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidge const SdkToolResult ipRes = AndroidManager::runAdbCommand(args); if (!ipRes.success()) { AndroidDeviceWidget::criticalDialog( - AndroidDevice::tr("Retrieving the device IP address failed."), parent); + Tr::tr("Retrieving the device IP address failed."), parent); return; } @@ -533,7 +533,7 @@ void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidge } if (!ipRegex.match(ipParts.last()).hasMatch()) { AndroidDeviceWidget::criticalDialog( - AndroidDevice::tr("The retrieved IP address is invalid."), parent); + Tr::tr("The retrieved IP address is invalid."), parent); return; } @@ -543,7 +543,7 @@ void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidge const SdkToolResult connectRes = AndroidManager::runAdbCommand(args); if (!connectRes.success()) { AndroidDeviceWidget::criticalDialog( - AndroidDevice::tr("Connecting to to the device IP \"%1\" failed.").arg(ip), + Tr::tr("Connecting to to the device IP \"%1\" failed.").arg(ip), parent); return; } @@ -559,7 +559,7 @@ void AndroidDeviceManager::handleAvdRemoved() // Remove the device from QtC after it's been removed using avdmanager. DeviceManager::instance()->removeDevice(result.first->id()); } else { - AndroidDeviceWidget::criticalDialog(QObject::tr("An error occurred while removing the " + AndroidDeviceWidget::criticalDialog(Tr::tr("An error occurred while removing the " "Android AVD \"%1\" using avdmanager tool.").arg(name)); } } @@ -577,8 +577,8 @@ void AndroidDeviceManager::setEmulatorArguments(QWidget *parent) "https://developer.android.com/studio/run/emulator-commandline#startup-options"; QInputDialog dialog(parent ? parent : Core::ICore::dialogParent()); - dialog.setWindowTitle(AndroidDevice::tr("Emulator Command-line Startup Options")); - dialog.setLabelText(AndroidDevice::tr("Emulator command-line startup options " + dialog.setWindowTitle(Tr::tr("Emulator Command-line Startup Options")); + dialog.setLabelText(Tr::tr("Emulator command-line startup options " "(<a href=\"%1\">Help Web Page</a>):") .arg(helpUrl)); dialog.setTextValue(m_androidConfig.emulatorArgs()); @@ -844,7 +844,7 @@ AndroidDeviceFactory::AndroidDeviceFactory() : IDeviceFactory(Constants::ANDROID_DEVICE_TYPE), m_androidConfig(AndroidConfigurations::currentConfig()) { - setDisplayName(AndroidDevice::tr("Android Device")); + setDisplayName(Tr::tr("Android Device")); setCombinedIcon(":/android/images/androiddevicesmall.png", ":/android/images/androiddevice.png"); @@ -861,7 +861,7 @@ AndroidDeviceFactory::AndroidDeviceFactory() qPrintable(androidDev->avdName())); } else { AndroidDeviceWidget::criticalDialog( - AndroidDevice::tr("The device info returned from AvdDialog is invalid.")); + Tr::tr("The device info returned from AvdDialog is invalid.")); } return IDevice::Ptr(dev); diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h index 646cea80c1e..e19ffd96d6d 100644 --- a/src/plugins/android/androiddevice.h +++ b/src/plugins/android/androiddevice.h @@ -22,8 +22,6 @@ namespace Internal { class AndroidDevice final : public ProjectExplorer::IDevice { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidDevice) - public: AndroidDevice(); diff --git a/src/plugins/android/androiderrormessage.cpp b/src/plugins/android/androiderrormessage.cpp index 3841d80493e..b1db1e7e0b3 100644 --- a/src/plugins/android/androiderrormessage.cpp +++ b/src/plugins/android/androiderrormessage.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "androiderrormessage.h" +#include "androidtr.h" #include <QObject> @@ -13,34 +14,34 @@ QString AndroidErrorMessage::getMessage(ErrorCode errorCode, const QVariantList Q_UNUSED(parameters) switch (errorCode) { case SDKInstallationError: - return tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16); case NDKInstallationError: - return tr("Android: NDK installation error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: NDK installation error 0x%1").arg(errorCode, 0, 16); case JavaInstallationError: - return tr("Android: Java installation error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: Java installation error 0x%1").arg(errorCode, 0, 16); case AntInstallationError: - return tr("Android: ant installation error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: ant installation error 0x%1").arg(errorCode, 0, 16); case AdbInstallationError: - return tr("Android: adb installation error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: adb installation error 0x%1").arg(errorCode, 0, 16); case DeviceConnectionError: - return tr("Android: Device connection error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: Device connection error 0x%1").arg(errorCode, 0, 16); case DevicePermissionError: - return tr("Android: Device permission error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: Device permission error 0x%1").arg(errorCode, 0, 16); case DeviceAuthorizationError: - return tr("Android: Device authorization error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: Device authorization error 0x%1").arg(errorCode, 0, 16); case DeviceAPILevelError: - return tr("Android: Device API level not supported: error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: Device API level not supported: error 0x%1").arg(errorCode, 0, 16); default: - return tr("Android: Unknown error 0x%1").arg(errorCode, 0, 16); + return Tr::tr("Android: Unknown error 0x%1").arg(errorCode, 0, 16); } } diff --git a/src/plugins/android/androiderrormessage.h b/src/plugins/android/androiderrormessage.h index 5d5b90af4eb..4c7e45b539a 100644 --- a/src/plugins/android/androiderrormessage.h +++ b/src/plugins/android/androiderrormessage.h @@ -11,7 +11,6 @@ namespace Internal { class AndroidErrorMessage { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidErrorMessage) public: enum ErrorCode { UnknownError = 0x3000, diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 3467e71fb42..65440bb502e 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -1,8 +1,6 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidmanager.h" - #include "androidavdmanager.h" #include "androidbuildapkstep.h" #include "androidconfigurations.h" @@ -10,10 +8,12 @@ #include "androiddeployqtstep.h" #include "androiddevice.h" #include "androidglobal.h" +#include "androidmanager.h" #include "androidqtversion.h" #include "androidrunconfiguration.h" #include "androidsdkmanager.h" #include "androidtoolchain.h" +#include "androidtr.h" #include <coreplugin/documentmanager.h> #include <coreplugin/messagemanager.h> @@ -505,13 +505,13 @@ QString AndroidManager::androidNameForApiLevel(int x) case 33: return QLatin1String("Android Tiramisu"); default: - return tr("Unknown Android version. API Level: %1").arg(x); + return Tr::tr("Unknown Android version. API Level: %1").arg(x); } } static void raiseError(const QString &reason) { - QMessageBox::critical(nullptr, AndroidManager::tr("Error creating Android templates."), reason); + QMessageBox::critical(nullptr, Tr::tr("Error creating Android templates."), reason); } static bool openXmlFile(QDomDocument &doc, const FilePath &fileName) @@ -521,7 +521,7 @@ static bool openXmlFile(QDomDocument &doc, const FilePath &fileName) return false; if (!doc.setContent(f.readAll())) { - raiseError(AndroidManager::tr("Cannot parse \"%1\".").arg(fileName.toUserOutput())); + raiseError(Tr::tr("Cannot parse \"%1\".").arg(fileName.toUserOutput())); return false; } return true; @@ -560,7 +560,7 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP if (info.type == IDevice::Emulator) { deviceSerialNumber = AndroidAvdManager().startAvd(info.avdName); if (deviceSerialNumber.isEmpty()) - Core::MessageManager::writeDisrupting(tr("Starting Android virtual device failed.")); + Core::MessageManager::writeDisrupting(Tr::tr("Starting Android virtual device failed.")); } QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber); @@ -568,7 +568,7 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP QString error; if (!runAdbCommandDetached(arguments, &error, true)) Core::MessageManager::writeDisrupting( - tr("Android package installation failed.\n%1").arg(error)); + Tr::tr("Android package installation failed.\n%1").arg(error)); } bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd) diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp index f0d48a5dd32..f45d52b4215 100644 --- a/src/plugins/android/androidmanifesteditor.cpp +++ b/src/plugins/android/androidmanifesteditor.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidmanifesteditor.h" +#include "androidconstants.h" #include "androidmanifestdocument.h" +#include "androidmanifesteditor.h" #include "androidmanifesteditorwidget.h" -#include "androidconstants.h" +#include "androidtr.h" #include <texteditor/texteditorconstants.h> @@ -23,12 +24,12 @@ AndroidManifestEditor::AndroidManifestEditor(AndroidManifestEditorWidget *editor connect(m_actionGroup, &QActionGroup::triggered, this, &AndroidManifestEditor::changeEditorPage); - QAction *generalAction = m_toolBar->addAction(tr("General")); + QAction *generalAction = m_toolBar->addAction(Tr::tr("General")); generalAction->setData(AndroidManifestEditorWidget::General); generalAction->setCheckable(true); m_actionGroup->addAction(generalAction); - QAction *sourceAction = m_toolBar->addAction(tr("XML Source")); + QAction *sourceAction = m_toolBar->addAction(Tr::tr("XML Source")); sourceAction->setData(AndroidManifestEditorWidget::Source); sourceAction->setCheckable(true); m_actionGroup->addAction(sourceAction); diff --git a/src/plugins/android/androidmanifesteditorfactory.cpp b/src/plugins/android/androidmanifesteditorfactory.cpp index 63cb02b4433..9de20831a39 100644 --- a/src/plugins/android/androidmanifesteditorfactory.cpp +++ b/src/plugins/android/androidmanifesteditorfactory.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidmanifesteditorfactory.h" #include "androidconstants.h" -#include "androidmanifesteditorwidget.h" #include "androidmanifesteditor.h" +#include "androidmanifesteditorfactory.h" +#include "androidmanifesteditorwidget.h" +#include "androidtr.h" #include <texteditor/texteditorsettings.h> @@ -18,7 +19,7 @@ AndroidManifestEditorFactory::AndroidManifestEditorFactory() [](Core::IEditor *editor) { return static_cast<AndroidManifestEditor *>(editor)->textEditor(); }) { setId(Constants::ANDROID_MANIFEST_EDITOR_ID); - setDisplayName(AndroidManifestEditorWidget::tr("Android Manifest editor")); + setDisplayName(Tr::tr("Android Manifest editor")); addMimeType(Constants::ANDROID_MANIFEST_MIME_TYPE); setEditorCreator([] { auto androidManifestEditorWidget = new AndroidManifestEditorWidget; diff --git a/src/plugins/android/androidmanifesteditoriconcontainerwidget.cpp b/src/plugins/android/androidmanifesteditoriconcontainerwidget.cpp index 30770980dc3..5b8e4a5a739 100644 --- a/src/plugins/android/androidmanifesteditoriconcontainerwidget.cpp +++ b/src/plugins/android/androidmanifesteditoriconcontainerwidget.cpp @@ -3,6 +3,7 @@ #include "androidmanifesteditoriconcontainerwidget.h" #include "androidmanifesteditoriconwidget.h" +#include "androidtr.h" #include <utils/utilsicons.h> @@ -37,7 +38,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto masterIconButton = new AndroidManifestEditorIconWidget(this, lowDpiIconSize, lowDpiIconSize, - tr("Master icon"), tr("Select master icon.")); + Tr::tr("Master icon"), + Tr::tr("Select master icon.")); masterIconButton->setIcon(QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon())); iconLayout->addWidget(masterIconButton); iconLayout->addStretch(1); @@ -53,8 +55,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto lIconButton = new AndroidManifestEditorIconWidget(this, lowDpiIconSize, lowDpiIconSize, - tr("LDPI icon"), - tr("Select an icon suitable for low-density (ldpi) screens (~120dpi)."), + Tr::tr("LDPI icon"), + Tr::tr("Select an icon suitable for low-density (ldpi) screens (~120dpi)."), textEditorWidget, lowDpiIconPath, iconFileName); @@ -65,8 +67,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto mIconButton = new AndroidManifestEditorIconWidget(this, mediumDpiIconSize, mediumDpiIconSize, - tr("MDPI icon"), - tr("Select an icon for medium-density (mdpi) screens (~160dpi)."), + Tr::tr("MDPI icon"), + Tr::tr("Select an icon for medium-density (mdpi) screens (~160dpi)."), textEditorWidget, mediumDpiIconPath, iconFileName); @@ -77,8 +79,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto hIconButton = new AndroidManifestEditorIconWidget(this, highDpiIconSize, highDpiIconSize, - tr("HDPI icon"), - tr("Select an icon for high-density (hdpi) screens (~240dpi)."), + Tr::tr("HDPI icon"), + Tr::tr("Select an icon for high-density (hdpi) screens (~240dpi)."), textEditorWidget, highDpiIconPath, iconFileName); @@ -89,8 +91,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto xhIconButton = new AndroidManifestEditorIconWidget(this, extraHighDpiIconSize, extraHighDpiIconSize, - tr("XHDPI icon"), - tr("Select an icon for extra-high-density (xhdpi) screens (~320dpi)."), + Tr::tr("XHDPI icon"), + Tr::tr("Select an icon for extra-high-density (xhdpi) screens (~320dpi)."), textEditorWidget, extraHighDpiIconPath, iconFileName); @@ -101,8 +103,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto xxhIconButton = new AndroidManifestEditorIconWidget(this, extraExtraHighDpiIconSize, extraExtraHighDpiIconSize, - tr("XXHDPI icon"), - tr("Select an icon for extra-extra-high-density (xxhdpi) screens (~480dpi)."), + Tr::tr("XXHDPI icon"), + Tr::tr("Select an icon for extra-extra-high-density (xxhdpi) screens (~480dpi)."), textEditorWidget, extraExtraHighDpiIconPath, iconFileName); @@ -113,8 +115,8 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg auto xxxhIconButton = new AndroidManifestEditorIconWidget(this, extraExtraExtraHighDpiIconSize, extraExtraExtraHighDpiIconSize, - tr("XXXHDPI icon"), - tr("Select an icon for extra-extra-extra-high-density (xxxhdpi) screens (~640dpi)."), + Tr::tr("XXXHDPI icon"), + Tr::tr("Select an icon for extra-extra-extra-high-density (xxxhdpi) screens (~640dpi)."), textEditorWidget, extraExtraExtraHighDpiIconPath, iconFileName); diff --git a/src/plugins/android/androidmanifesteditoriconwidget.cpp b/src/plugins/android/androidmanifesteditoriconwidget.cpp index 770baf761a4..037ed684ca3 100644 --- a/src/plugins/android/androidmanifesteditoriconwidget.cpp +++ b/src/plugins/android/androidmanifesteditoriconwidget.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "androidmanifesteditoriconwidget.h" +#include "androidtr.h" #include <texteditor/textdocument.h> #include <texteditor/texteditor.h> @@ -65,10 +66,10 @@ AndroidManifestEditorIconWidget::AndroidManifestEditorIconWidget( m_scaleWarningLabel->setMinimumSize(clearAndWarningSize); m_scaleWarningLabel->setMaximumSize(clearAndWarningSize); m_scaleWarningLabel->setPixmap(Utils::Icons::WARNING.icon().pixmap(clearAndWarningSize)); - m_scaleWarningLabel->setToolTip(tr("Icon scaled up.")); + m_scaleWarningLabel->setToolTip(Tr::tr("Icon scaled up.")); m_scaleWarningLabel->setVisible(false); } - auto label = new QLabel(tr("Click to select..."), parent); + auto label = new QLabel(Tr::tr("Click to select..."), parent); iconLayout->addWidget(iconTitle); iconLayout->setAlignment(iconTitle, Qt::AlignHCenter); iconLayout->addStretch(50); @@ -144,7 +145,7 @@ void AndroidManifestEditorIconWidget::selectIcon() { FilePath file = FileUtils::getOpenFilePath(this, m_iconSelectionText, FileUtils::homePath(), - tr("Images (*.png *.jpg *.jpeg *.webp *.svg)")); + Tr::tr("Images (*.png *.jpg *.jpeg *.webp *.svg)")); // TODO: See SplashContainterWidget if (file.isEmpty()) return; setIconFromPath(file); diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 04bd7446b52..83095383917 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -1,14 +1,15 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidmanifesteditorwidget.h" -#include "androidmanifesteditoriconcontainerwidget.h" -#include "androidmanifesteditor.h" #include "androidconfigurations.h" #include "androidconstants.h" -#include "androidmanifestdocument.h" #include "androidmanager.h" +#include "androidmanifestdocument.h" +#include "androidmanifesteditor.h" +#include "androidmanifesteditoriconcontainerwidget.h" +#include "androidmanifesteditorwidget.h" #include "androidservicewidget.h" +#include "androidtr.h" #include "splashscreencontainerwidget.h" #include <coreplugin/icore.h> @@ -116,15 +117,15 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget() QGroupBox *AndroidManifestEditorWidget::createPermissionsGroupBox(QWidget *parent) { auto permissionsGroupBox = new QGroupBox(parent); - permissionsGroupBox->setTitle(tr("Permissions")); + permissionsGroupBox->setTitle(Tr::tr("Permissions")); auto layout = new QGridLayout(permissionsGroupBox); m_defaultPermissonsCheckBox = new QCheckBox(this); - m_defaultPermissonsCheckBox->setText(tr("Include default permissions for Qt modules.")); + m_defaultPermissonsCheckBox->setText(Tr::tr("Include default permissions for Qt modules.")); layout->addWidget(m_defaultPermissonsCheckBox, 0, 0); m_defaultFeaturesCheckBox = new QCheckBox(this); - m_defaultFeaturesCheckBox->setText(tr("Include default features for Qt modules.")); + m_defaultFeaturesCheckBox->setText(Tr::tr("Include default features for Qt modules.")); layout->addWidget(m_defaultFeaturesCheckBox, 1, 0); m_permissionsComboBox = new QComboBox(permissionsGroupBox); @@ -264,7 +265,7 @@ QGroupBox *AndroidManifestEditorWidget::createPermissionsGroupBox(QWidget *paren layout->addWidget(m_permissionsComboBox, 2, 0); m_addPermissionButton = new QPushButton(permissionsGroupBox); - m_addPermissionButton->setText(tr("Add")); + m_addPermissionButton->setText(Tr::tr("Add")); layout->addWidget(m_addPermissionButton, 2, 1); m_permissionsModel = new PermissionsModel(this); @@ -274,7 +275,7 @@ QGroupBox *AndroidManifestEditorWidget::createPermissionsGroupBox(QWidget *paren layout->addWidget(m_permissionsListView, 3, 0, 3, 1); m_removePermissionButton = new QPushButton(permissionsGroupBox); - m_removePermissionButton->setText(tr("Remove")); + m_removePermissionButton->setText(Tr::tr("Remove")); layout->addWidget(m_removePermissionButton, 3, 1); permissionsGroupBox->setLayout(layout); @@ -297,11 +298,11 @@ QGroupBox *AndroidManifestEditorWidget::createPermissionsGroupBox(QWidget *paren QGroupBox *AndroidManifestEditorWidget::createPackageFormLayout(QWidget *parent) { auto packageGroupBox = new QGroupBox(parent); - packageGroupBox->setTitle(tr("Package")); + packageGroupBox->setTitle(Tr::tr("Package")); auto formLayout = new QFormLayout(); m_packageNameLineEdit = new QLineEdit(packageGroupBox); - m_packageNameLineEdit->setToolTip(tr( + m_packageNameLineEdit->setToolTip(Tr::tr( "<p align=\"justify\">Please choose a valid package name for your application (for " "example, \"org.example.myapplication\").</p><p align=\"justify\">Packages are usually " "defined using a hierarchical naming pattern, with levels in the hierarchy separated " @@ -313,10 +314,10 @@ QGroupBox *AndroidManifestEditorWidget::createPackageFormLayout(QWidget *parent) "conventions for disambiguating package names and rules for naming packages when the " "Internet domain name cannot be directly used as a package name are described in " "section 7.7 of the Java Language Specification.</p>")); - formLayout->addRow(tr("Package name:"), m_packageNameLineEdit); + formLayout->addRow(Tr::tr("Package name:"), m_packageNameLineEdit); m_packageNameWarning = new QLabel; - m_packageNameWarning->setText(tr("The package name is not valid.")); + m_packageNameWarning->setText(Tr::tr("The package name is not valid.")); m_packageNameWarning->setVisible(false); m_packageNameWarningIcon = new QLabel; @@ -332,25 +333,25 @@ QGroupBox *AndroidManifestEditorWidget::createPackageFormLayout(QWidget *parent) formLayout->addRow(QString(), warningRow); m_versionCodeLineEdit = new QLineEdit(packageGroupBox); - formLayout->addRow(tr("Version code:"), m_versionCodeLineEdit); + formLayout->addRow(Tr::tr("Version code:"), m_versionCodeLineEdit); m_versionNameLinedit = new QLineEdit(packageGroupBox); - formLayout->addRow(tr("Version name:"), m_versionNameLinedit); + formLayout->addRow(Tr::tr("Version name:"), m_versionNameLinedit); m_androidMinSdkVersion = new QComboBox(packageGroupBox); m_androidMinSdkVersion->setToolTip( - tr("Sets the minimum required version on which this application can be run.")); - m_androidMinSdkVersion->addItem(tr("Not set"), 0); + Tr::tr("Sets the minimum required version on which this application can be run.")); + m_androidMinSdkVersion->addItem(Tr::tr("Not set"), 0); - formLayout->addRow(tr("Minimum required SDK:"), m_androidMinSdkVersion); + formLayout->addRow(Tr::tr("Minimum required SDK:"), m_androidMinSdkVersion); m_androidTargetSdkVersion = new QComboBox(packageGroupBox); m_androidTargetSdkVersion->setToolTip( - tr("Sets the target SDK. Set this to the highest tested version. " - "This disables compatibility behavior of the system for your application.")); - m_androidTargetSdkVersion->addItem(tr("Not set"), 0); + Tr::tr("Sets the target SDK. Set this to the highest tested version. " + "This disables compatibility behavior of the system for your application.")); + m_androidTargetSdkVersion->addItem(Tr::tr("Not set"), 0); - formLayout->addRow(tr("Target SDK:"), m_androidTargetSdkVersion); + formLayout->addRow(Tr::tr("Target SDK:"), m_androidTargetSdkVersion); packageGroupBox->setLayout(formLayout); @@ -370,17 +371,17 @@ QGroupBox *AndroidManifestEditorWidget::createPackageFormLayout(QWidget *parent) QGroupBox *Android::Internal::AndroidManifestEditorWidget::createApplicationGroupBox(QWidget *parent) { auto applicationGroupBox = new QGroupBox(parent); - applicationGroupBox->setTitle(tr("Application")); + applicationGroupBox->setTitle(Tr::tr("Application")); auto formLayout = new QFormLayout(); m_appNameLineEdit = new QLineEdit(applicationGroupBox); - formLayout->addRow(tr("Application name:"), m_appNameLineEdit); + formLayout->addRow(Tr::tr("Application name:"), m_appNameLineEdit); m_activityNameLineEdit = new QLineEdit(applicationGroupBox); - formLayout->addRow(tr("Activity name:"), m_activityNameLineEdit); + formLayout->addRow(Tr::tr("Activity name:"), m_activityNameLineEdit); m_styleExtractMethod = new QComboBox(applicationGroupBox); - formLayout->addRow(tr("Style extraction:"), m_styleExtractMethod); + formLayout->addRow(Tr::tr("Style extraction:"), m_styleExtractMethod); const QList<QStringList> styleMethodsMap = { {"default", "In most cases this will be the same as \"full\", but it can also be something else " @@ -394,7 +395,7 @@ QGroupBox *Android::Internal::AndroidManifestEditorWidget::createApplicationGrou } m_screenOrientation = new QComboBox(applicationGroupBox); - formLayout->addRow(tr("Screen orientation:"), m_screenOrientation); + formLayout->addRow(Tr::tr("Screen orientation:"), m_screenOrientation); // https://developer.android.com/guide/topics/manifest/activity-element#screen const QList<QStringList> screenOrientationMap = { {"unspecified", "The default value. The system chooses the orientation. The policy it uses, and therefore the " @@ -443,19 +444,19 @@ QGroupBox *Android::Internal::AndroidManifestEditorWidget::createApplicationGrou QGroupBox *AndroidManifestEditorWidget::createAdvancedGroupBox(QWidget *parent) { auto otherGroupBox = new QGroupBox(parent); - otherGroupBox->setTitle(tr("Advanced")); + otherGroupBox->setTitle(Tr::tr("Advanced")); m_advanvedTabWidget = new QTabWidget(otherGroupBox); auto formLayout = new QFormLayout(); m_iconButtons = new AndroidManifestEditorIconContainerWidget(otherGroupBox, m_textEditorWidget); - m_advanvedTabWidget->addTab(m_iconButtons, tr("Application icon")); + m_advanvedTabWidget->addTab(m_iconButtons, Tr::tr("Application icon")); m_services = new AndroidServiceWidget(otherGroupBox); - m_advanvedTabWidget->addTab(m_services, tr("Android services")); + m_advanvedTabWidget->addTab(m_services, Tr::tr("Android services")); m_splashButtons = new SplashScreenContainerWidget(otherGroupBox, m_textEditorWidget); - m_advanvedTabWidget->addTab(m_splashButtons, tr("Splash screen")); + m_advanvedTabWidget->addTab(m_splashButtons, Tr::tr("Splash screen")); connect(m_services, &AndroidServiceWidget::servicesModified, this, [this] { setDirty(); }); connect(m_services, &AndroidServiceWidget::servicesModified, @@ -556,8 +557,8 @@ bool AndroidManifestEditorWidget::setActivePage(EditorPage page) if (page == Source) { if (!servicesValid(m_services->services())) { - QMessageBox::critical(nullptr, tr("Service Definition Invalid"), - tr("Cannot switch to source when there are invalid services.")); + QMessageBox::critical(nullptr, Tr::tr("Service Definition Invalid"), + Tr::tr("Cannot switch to source when there are invalid services.")); m_advanvedTabWidget->setCurrentIndex(1); return false; } @@ -583,8 +584,8 @@ void AndroidManifestEditorWidget::preSave() { if (activePage() != Source) { if (!servicesValid(m_services->services())) { - QMessageBox::critical(nullptr, tr("Service Definition Invalid"), - tr("Cannot save when there are invalid services.")); + QMessageBox::critical(nullptr, Tr::tr("Service Definition Invalid"), + Tr::tr("Cannot save when there are invalid services.")); return; } syncToEditor(); @@ -644,13 +645,13 @@ bool AndroidManifestEditorWidget::checkDocument(const QDomDocument &doc, QString { QDomElement manifest = doc.documentElement(); if (manifest.tagName() != QLatin1String("manifest")) { - *errorMessage = tr("The structure of the Android manifest file is corrupted. Expected a top level 'manifest' node."); + *errorMessage = Tr::tr("The structure of the Android manifest file is corrupted. Expected a top level 'manifest' node."); *errorLine = -1; *errorColumn = -1; return false; } else if (manifest.firstChildElement(QLatin1String("application")).firstChildElement(QLatin1String("activity")).isNull()) { // missing either application or activity element - *errorMessage = tr("The structure of the Android manifest file is corrupted. Expected an 'application' and 'activity' sub node."); + *errorMessage = Tr::tr("The structure of the Android manifest file is corrupted. Expected an 'application' and 'activity' sub node."); *errorLine = -1; *errorColumn = -1; return false; @@ -699,8 +700,8 @@ void AndroidManifestEditorWidget::updateSdkVersions() } for (int i = minSdk; i <= targetSdk; ++i) { - const QString apiStr = tr("API %1: %2").arg(i) - .arg(AndroidManager::androidNameForApiLevel(i)); + const QString apiStr = Tr::tr("API %1: %2").arg(i) + .arg(AndroidManager::androidNameForApiLevel(i)); m_androidMinSdkVersion->addItem(apiStr, i); m_androidTargetSdkVersion->addItem(apiStr, i); } @@ -711,11 +712,11 @@ void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int Utils::InfoBar *infoBar = m_textEditorWidget->textDocument()->infoBar(); QString text; if (line < 0) - text = tr("Could not parse file: \"%1\".").arg(errorMessage); + text = Tr::tr("Could not parse file: \"%1\".").arg(errorMessage); else - text = tr("%2: Could not parse file: \"%1\".").arg(errorMessage).arg(line); + text = Tr::tr("%2: Could not parse file: \"%1\".").arg(errorMessage).arg(line); Utils::InfoBarEntry infoBarEntry(infoBarId, text); - infoBarEntry.addCustomButton(tr("Goto error"), [this] { + infoBarEntry.addCustomButton(Tr::tr("Goto error"), [this] { m_textEditorWidget->gotoLine(m_errorLine, m_errorColumn); }); infoBar->removeInfo(infoBarId); @@ -741,8 +742,8 @@ void AndroidManifestEditorWidget::setInvalidServiceInfo() if (m_textEditorWidget->textDocument()->infoBar()->containsInfo(id)) return; Utils::InfoBarEntry info(id, - tr("Services invalid. " - "Manifest cannot be saved. Correct the service definitions before saving.")); + Tr::tr("Services invalid. " + "Manifest cannot be saved. Correct the service definitions before saving.")); m_textEditorWidget->textDocument()->infoBar()->addInfo(info); } diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 5757fa8a233..0cc5dc5539c 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -1,10 +1,10 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidpackageinstallationstep.h" - #include "androidconstants.h" #include "androidmanager.h" +#include "androidpackageinstallationstep.h" +#include "androidtr.h" #include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/buildconfiguration.h> @@ -39,8 +39,6 @@ namespace Internal { class AndroidPackageInstallationStep final : public AbstractProcessStep { - Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep) - public: AndroidPackageInstallationStep(BuildStepList *bsl, Id id); @@ -58,11 +56,11 @@ private: AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Id id) : AbstractProcessStep(bsl, id) { - setDisplayName(tr("Copy application data")); + setDisplayName(Tr::tr("Copy application data")); setWidgetExpandedByDefault(false); setImmutable(true); setSummaryUpdater([this] { - return tr("<b>Make install:</b> Copy App Files to %1") + return Tr::tr("<b>Make install:</b> Copy App Files to %1") .arg(QDir::toNativeSeparators(nativeAndroidBuildPath())); }); setUseEnglishOutput(); @@ -71,13 +69,13 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs bool AndroidPackageInstallationStep::init() { if (!AbstractProcessStep::init()) { - reportWarningOrError(tr("\"%1\" step failed initialization.").arg(displayName()), + reportWarningOrError(Tr::tr("\"%1\" step failed initialization.").arg(displayName()), Task::TaskType::Error); return false; } ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit()); - QTC_ASSERT(tc, reportWarningOrError(tr("\"%1\" step has an invalid C++ toolchain.") + QTC_ASSERT(tc, reportWarningOrError(Tr::tr("\"%1\" step has an invalid C++ toolchain.") .arg(displayName()), Task::TaskType::Error); return false); @@ -128,10 +126,10 @@ void AndroidPackageInstallationStep::doRun() for (const QString &dir : qAsConst(m_androidDirsToClean)) { FilePath androidDir = FilePath::fromString(dir); if (!dir.isEmpty() && androidDir.exists()) { - emit addOutput(tr("Removing directory %1").arg(dir), OutputFormat::NormalMessage); + emit addOutput(Tr::tr("Removing directory %1").arg(dir), OutputFormat::NormalMessage); if (!androidDir.removeRecursively(&error)) { - reportWarningOrError(tr("Failed to clean \"%1\" from the previous build, with " - "error:\n%2").arg(androidDir.toUserOutput()).arg(error), + reportWarningOrError(Tr::tr("Failed to clean \"%1\" from the previous build, with " + "error:\n%2").arg(androidDir.toUserOutput()).arg(error), Task::TaskType::Error); emit finished(false); return; @@ -183,7 +181,7 @@ AndroidPackageInstallationFactory::AndroidPackageInstallationFactory() setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); setSupportedDeviceType(Android::Constants::ANDROID_DEVICE_TYPE); setRepeatable(false); - setDisplayName(AndroidPackageInstallationStep::tr("Deploy to device")); + setDisplayName(Tr::tr("Deploy to device")); } } // namespace Internal diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 2a7a048ed1c..f3f92a5e56a 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -1,8 +1,6 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidplugin.h" - #include "androidconfigurations.h" #include "androidconstants.h" #include "androiddebugsupport.h" @@ -11,6 +9,7 @@ #include "androidmanager.h" #include "androidmanifesteditorfactory.h" #include "androidpackageinstallationstep.h" +#include "androidplugin.h" #include "androidpotentialkit.h" #include "androidqmlpreviewworker.h" #include "androidqmltoolingsupport.h" @@ -19,6 +18,7 @@ #include "androidruncontrol.h" #include "androidsettingswidget.h" #include "androidtoolchain.h" +#include "androidtr.h" #include "javaeditor.h" #include "javalanguageserver.h" @@ -58,8 +58,7 @@ public: { setConfigBaseId("Qt4ProjectManager.AndroidDeployConfiguration2"); addSupportedTargetDeviceType(Constants::ANDROID_DEVICE_TYPE); - setDefaultDisplayName(QCoreApplication::translate("Android::Internal", - "Deploy to Android Device")); + setDefaultDisplayName(Tr::tr("Deploy to Android Device")); addInitialStep(Constants::ANDROID_DEPLOY_QT_ID); } }; @@ -133,7 +132,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa this, &AndroidPlugin::kitsRestored); LanguageClient::LanguageClientSettings::registerClientType({Android::Constants::JLS_SETTINGS_ID, - tr("Java Language Server"), + Tr::tr("Java Language Server"), []() { return new JLSSettings; }}); return true; @@ -169,12 +168,12 @@ void AndroidPlugin::askUserAboutAndroidSetup() return; Utils::InfoBarEntry - info(kSetupAndroidSetting, - tr("Would you like to configure Android options? This will ensure " - "Android kits can be usable and all essential packages are installed. " - "To do it later, select Edit > Preferences > Devices > Android."), - Utils::InfoBarEntry::GlobalSuppression::Enabled); - info.addCustomButton(tr("Configure Android"), [this] { + info(kSetupAndroidSetting, + Tr::tr("Would you like to configure Android options? This will ensure " + "Android kits can be usable and all essential packages are installed. " + "To do it later, select Edit > Preferences > Devices > Android."), + Utils::InfoBarEntry::GlobalSuppression::Enabled); + info.addCustomButton(Tr::tr("Configure Android"), [this] { Core::ICore::infoBar()->removeInfo(kSetupAndroidSetting); Core::ICore::infoBar()->globallySuppressInfo(kSetupAndroidSetting); QTimer::singleShot(0, this, [this] { d->potentialKit.executeFromMenu(); }); diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index 09564f76625..d17ca19e8b3 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -1,9 +1,10 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidpotentialkit.h" -#include "androidconstants.h" #include "androidconfigurations.h" +#include "androidconstants.h" +#include "androidpotentialkit.h" +#include "androidtr.h" #include <app/app_version.h> @@ -27,7 +28,7 @@ using namespace Android::Internal; QString AndroidPotentialKit::displayName() const { - return tr("Configure Android..."); + return Tr::tr("Configure Android..."); } void AndroidPotentialKit::executeFromMenu() @@ -68,8 +69,8 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent) auto layout = new QGridLayout(mainWidget); layout->setContentsMargins(0, 0, 0, 0); auto label = new QLabel; - label->setText(tr("%1 needs additional settings to enable Android support." - " You can configure those settings in the Options dialog.") + label->setText(Tr::tr("%1 needs additional settings to enable Android support." + " You can configure those settings in the Options dialog.") .arg(Core::Constants::IDE_DISPLAY_NAME)); label->setWordWrap(true); layout->addWidget(label, 0, 0, 1, 2); diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp index 490ddc71afa..e89f87dfbca 100644 --- a/src/plugins/android/androidqmlpreviewworker.cpp +++ b/src/plugins/android/androidqmlpreviewworker.cpp @@ -1,12 +1,12 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidqmlpreviewworker.h" - #include "androidavdmanager.h" #include "androiddevice.h" #include "androiddeviceinfo.h" #include "androidmanager.h" +#include "androidqmlpreviewworker.h" +#include "androidtr.h" #include <coreplugin/icore.h> @@ -199,7 +199,7 @@ void AndroidQmlPreviewWorker::start() void AndroidQmlPreviewWorker::stop() { if (!isPreviewRunning(m_viewerPid) || stopPreviewApp()) - appendMessage(tr("%1 has been stopped.").arg(apkInfo()->name), NormalMessageFormat); + appendMessage(Tr::tr("%1 has been stopped.").arg(apkInfo()->name), NormalMessageFormat); m_viewerPid = -1; reportStopped(); } @@ -216,29 +216,29 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning() using namespace ProjectExplorer; const IDevice *dev = DeviceKitAspect::device(m_rc->target()->kit()).data(); if (!dev) { - appendMessage(tr("Selected device is invalid."), ErrorMessageFormat); + appendMessage(Tr::tr("Selected device is invalid."), ErrorMessageFormat); return false; } if (dev->deviceState() == IDevice::DeviceDisconnected) { - appendMessage(tr("Selected device is disconnected."), ErrorMessageFormat); + appendMessage(Tr::tr("Selected device is disconnected."), ErrorMessageFormat); return false; } AndroidDeviceInfo devInfoLocal = AndroidDevice::androidDeviceInfoFromIDevice(dev); if (devInfoLocal.isValid()) { if (dev->machineType() == IDevice::Emulator) { - appendMessage(tr("Launching AVD."), NormalMessageFormat); + appendMessage(Tr::tr("Launching AVD."), NormalMessageFormat); devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdName); } if (devInfoLocal.serialNumber.isEmpty()) { - appendMessage(tr("Could not start AVD."), ErrorMessageFormat); + appendMessage(Tr::tr("Could not start AVD."), ErrorMessageFormat); } else { m_serialNumber = devInfoLocal.serialNumber; m_avdAbis = m_androidConfig.getAbis(m_serialNumber); } return !devInfoLocal.serialNumber.isEmpty(); } else { - appendMessage(tr("No valid AVD has been selected."), ErrorMessageFormat); + appendMessage(Tr::tr("No valid AVD has been selected."), ErrorMessageFormat); } return false; } @@ -249,7 +249,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning() bool AndroidQmlPreviewWorker::checkAndInstallPreviewApp() { const QStringList command {"pm", "list", "packages", apkInfo()->appId}; - appendMessage(tr("Checking if %1 app is installed.").arg(apkInfo()->name), NormalMessageFormat); + appendMessage(Tr::tr("Checking if %1 app is installed.").arg(apkInfo()->name), NormalMessageFormat); const SdkToolResult res = runAdbShellCommand(command); if (!res.success()) { appendMessage(res.stdErr(), ErrorMessageFormat); @@ -258,19 +258,19 @@ bool AndroidQmlPreviewWorker::checkAndInstallPreviewApp() if (res.stdOut().isEmpty()) { if (m_avdAbis.isEmpty()) { - appendMessage(tr("ABI of the selected device is unknown. Cannot install APK."), + appendMessage(Tr::tr("ABI of the selected device is unknown. Cannot install APK."), ErrorMessageFormat); return false; } const FilePath apkPath = designViewerApkPath(m_avdAbis.first()); if (!apkPath.exists()) { - appendMessage(tr("Cannot install %1 app for %2 architecture. " - "The appropriate APK was not found in resources folders."). + appendMessage(Tr::tr("Cannot install %1 app for %2 architecture. " + "The appropriate APK was not found in resources folders."). arg(apkInfo()->name, m_avdAbis.first()), ErrorMessageFormat); return false; } - appendMessage(tr("Installing %1 APK.").arg(apkInfo()->name), NormalMessageFormat); + appendMessage(Tr::tr("Installing %1 APK.").arg(apkInfo()->name), NormalMessageFormat); const SdkToolResult res = runAdbCommand({"install", apkPath.toString()}); if (!res.success()) @@ -297,11 +297,11 @@ bool AndroidQmlPreviewWorker::preparePreviewArtefacts() }); if (filesToExport.size() > 1) { - appendMessage(tr("Too many .qmlproject files in your project. Open directly the " - ".qmlproject file you want to work with and then run the preview."), + appendMessage(Tr::tr("Too many .qmlproject files in your project. Open directly the " + ".qmlproject file you want to work with and then run the preview."), ErrorMessageFormat); } else if (filesToExport.size() < 1) { - appendMessage(tr("No .qmlproject file found among project files."), ErrorMessageFormat); + appendMessage(Tr::tr("No .qmlproject file found among project files."), ErrorMessageFormat); } else { const FilePath qmlprojectFile = filesToExport.first(); m_uploadInfo.uploadPackage = m_uploadInfo.projectFolder.resolvePath( @@ -310,7 +310,7 @@ bool AndroidQmlPreviewWorker::preparePreviewArtefacts() return true; } } - appendMessage(tr("Could not gather information on project files."), ErrorMessageFormat); + appendMessage(Tr::tr("Could not gather information on project files."), ErrorMessageFormat); return false; } @@ -332,7 +332,7 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder, rccProcess.setCommand({rccBinary, args}); rccProcess.start(); if (!rccProcess.waitForStarted()) { - appendMessage(tr("Could not create file for %1 \"%2\""). + appendMessage(Tr::tr("Could not create file for %1 \"%2\""). arg(apkInfo()->name, rccProcess.commandLine().toUserOutput()), StdErrFormat); qrcPath.removeFile(); @@ -343,7 +343,7 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder, if (!rccProcess.readDataFromProcess(&stdOut, &stdErr)) { rccProcess.stop(); rccProcess.waitForFinished(); - appendMessage(tr("A timeout occurred running \"%1\""). + appendMessage(Tr::tr("A timeout occurred running \"%1\""). arg(rccProcess.commandLine().toUserOutput()), StdErrFormat); qrcPath.removeFile(); return {}; @@ -355,14 +355,14 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder, appendMessage(QString::fromLocal8Bit(stdErr), StdErrFormat); if (rccProcess.exitStatus() != QProcess::NormalExit) { - appendMessage(tr("Crash while creating file for %1 \"%2\""). + appendMessage(Tr::tr("Crash while creating file for %1 \"%2\""). arg(apkInfo()->name, rccProcess.commandLine().toUserOutput()), StdErrFormat); qrcPath.removeFile(); return {}; } if (rccProcess.exitCode() != 0) { - appendMessage(tr("Creating file for %1 failed. \"%2\" (exit code %3)."). + appendMessage(Tr::tr("Creating file for %1 failed. \"%2\" (exit code %3)."). arg(apkInfo()->name). arg(rccProcess.commandLine().toUserOutput()). arg(rccProcess.exitCode()), @@ -377,7 +377,7 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder, bool AndroidQmlPreviewWorker::uploadPreviewArtefacts() { - appendMessage(tr("Uploading files."), NormalMessageFormat); + appendMessage(Tr::tr("Uploading files."), NormalMessageFormat); const FilePath qresPath = createQmlrcFile(m_uploadInfo.projectFolder, m_uploadInfo.uploadPackage.baseName()); if (!qresPath.exists()) @@ -400,7 +400,7 @@ bool AndroidQmlPreviewWorker::uploadPreviewArtefacts() bool AndroidQmlPreviewWorker::startPreviewApp() { stopPreviewApp(); - appendMessage(tr("Starting %1.").arg(apkInfo()->name), NormalMessageFormat); + appendMessage(Tr::tr("Starting %1.").arg(apkInfo()->name), NormalMessageFormat); const QDir destDir(apkInfo()->uploadDir); const QString qmlrcPath = destDir.filePath(m_uploadInfo.uploadPackage.baseName() + packageSuffix); @@ -414,7 +414,7 @@ bool AndroidQmlPreviewWorker::startPreviewApp() }; const SdkToolResult result = runAdbShellCommand(command); if (result.success()) - appendMessage(tr("%1 is running.").arg(apkInfo()->name), NormalMessageFormat); + appendMessage(Tr::tr("%1 is running.").arg(apkInfo()->name), NormalMessageFormat); else appendMessage(result.stdErr(), ErrorMessageFormat); diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 6a6cc4b0a11..d1aa4946205 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidqtversion.h" -#include "androidconstants.h" #include "androidconfigurations.h" +#include "androidconstants.h" #include "androidmanager.h" +#include "androidqtversion.h" +#include "androidtr.h" #include <utils/algorithm.h> #include <utils/environment.h> @@ -56,12 +57,12 @@ QString AndroidQtVersion::invalidReason() const QString tmp = QtVersion::invalidReason(); if (tmp.isEmpty()) { if (AndroidConfigurations::currentConfig().ndkLocation(this).isEmpty()) - return tr("NDK is not configured in Devices > Android."); + return Tr::tr("NDK is not configured in Devices > Android."); if (AndroidConfigurations::currentConfig().sdkLocation().isEmpty()) - return tr("SDK is not configured in Devices > Android."); + return Tr::tr("SDK is not configured in Devices > Android."); if (qtAbis().isEmpty()) - return tr("Failed to detect the ABIs used by the Qt version. Check the settings in " - "Devices > Android for errors."); + return Tr::tr("Failed to detect the ABIs used by the Qt version. Check the settings in " + "Devices > Android for errors."); } return tmp; } @@ -98,7 +99,7 @@ void AndroidQtVersion::setupQmakeRunEnvironment(Utils::Environment &env) const QString AndroidQtVersion::description() const { //: Qt Version is meant for Android - return tr("Android"); + return Tr::tr("Android"); } const QStringList &AndroidQtVersion::androidAbis() const diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index 00a74c981db..c2cd89b0d5b 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -13,8 +13,6 @@ namespace Internal { class AndroidQtVersion : public QtSupport::QtVersion { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidQtVersion) - public: AndroidQtVersion(); diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index 8e4bc401b61..1edf62b8490 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -1,12 +1,12 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidrunconfiguration.h" - #include "androidconstants.h" #include "androidglobal.h" -#include "androidtoolchain.h" #include "androidmanager.h" +#include "androidrunconfiguration.h" +#include "androidtoolchain.h" +#include "androidtr.h" #include <app/app_version.h> @@ -51,7 +51,7 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id) : RunConfiguration(target, id) { auto envAspect = addAspect<EnvironmentAspect>(); - envAspect->addSupportedBaseEnvironment(tr("Clean Environment"), {}); + envAspect->addSupportedBaseEnvironment(Tr::tr("Clean Environment"), {}); auto extraAppArgsAspect = addAspect<ArgumentsAspect>(macroExpander()); @@ -67,7 +67,7 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id) auto amStartArgsAspect = addAspect<StringAspect>(); amStartArgsAspect->setId(Constants::ANDROID_AM_START_ARGS); amStartArgsAspect->setSettingsKey("Android.AmStartArgsKey"); - amStartArgsAspect->setLabelText(tr("Activity manager start arguments:")); + amStartArgsAspect->setLabelText(Tr::tr("Activity manager start arguments:")); amStartArgsAspect->setDisplayStyle(StringAspect::LineEditDisplay); amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History"); @@ -75,13 +75,13 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id) preStartShellCmdAspect->setDisplayStyle(StringAspect::TextEditDisplay); preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST); preStartShellCmdAspect->setSettingsKey("Android.PreStartShellCmdListKey"); - preStartShellCmdAspect->setLabelText(tr("Pre-launch on-device shell commands:")); + preStartShellCmdAspect->setLabelText(Tr::tr("Pre-launch on-device shell commands:")); auto postStartShellCmdAspect = addAspect<BaseStringListAspect>(); postStartShellCmdAspect->setDisplayStyle(StringAspect::TextEditDisplay); postStartShellCmdAspect->setId(Constants::ANDROID_POSTFINISHSHELLCMDLIST); postStartShellCmdAspect->setSettingsKey("Android.PostStartShellCmdListKey"); - postStartShellCmdAspect->setLabelText(tr("Post-quit on-device shell commands:")); + postStartShellCmdAspect->setLabelText(Tr::tr("Post-quit on-device shell commands:")); setUpdater([this, target] { const BuildTargetInfo bti = buildTargetInfo(); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 5325bd33a35..d0b8c389984 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -2,8 +2,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidrunner.h" - #include "androidavdmanager.h" #include "androidconfigurations.h" #include "androidconstants.h" @@ -11,7 +9,9 @@ #include "androiddevice.h" #include "androidmanager.h" #include "androidrunconfiguration.h" +#include "androidrunner.h" #include "androidrunnerworker.h" +#include "androidtr.h" #include <coreplugin/messagemanager.h> #include <projectexplorer/projectexplorer.h> @@ -107,7 +107,7 @@ void AndroidRunner::stop() { if (m_checkAVDTimer.isActive()) { m_checkAVDTimer.stop(); - appendMessage("\n\n" + tr("\"%1\" terminated.").arg(m_packageName), + appendMessage("\n\n" + Tr::tr("\"%1\" terminated.").arg(m_packageName), Utils::NormalMessageFormat); return; } diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index b232847188c..abbddb843ce 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2018 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidrunnerworker.h" - #include "androidconfigurations.h" #include "androidconstants.h" #include "androidmanager.h" +#include "androidrunnerworker.h" +#include "androidtr.h" #include <debugger/debuggerkitinformation.h> #include <debugger/debuggerrunconfigurationaspect.h> @@ -235,7 +235,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa qCDebug(androidRunWorkerLog) << "QML debugging enabled"; QTcpServer server; QTC_ASSERT(server.listen(QHostAddress::LocalHost), - qDebug() << tr("No free ports available on host for QML debugging.")); + qDebug() << Tr::tr("No free ports available on host for QML debugging.")); m_qmlServer.setScheme(Utils::urlTcpScheme()); m_qmlServer.setHost(server.serverAddress().toString()); m_qmlServer.setPort(server.serverPort()); @@ -537,7 +537,7 @@ void AndroidRunnerWorker::asyncStartHelper() QString packageDir; if (!runAdb({"shell", "run-as", m_packageName, "/system/bin/sh", "-c", "pwd"}, &packageDir)) { - emit remoteProcessFinished(tr("Failed to find application directory.")); + emit remoteProcessFinished(Tr::tr("Failed to find application directory.")); return; } @@ -546,9 +546,9 @@ void AndroidRunnerWorker::asyncStartHelper() runAdb({"shell", "run-as", m_packageName, "chmod", "a+x", packageDir.trimmed()}); if (!QFileInfo::exists(m_debugServerPath)) { - QString msg = tr("Cannot find C++ debug server in NDK installation."); + QString msg = Tr::tr("Cannot find C++ debug server in NDK installation."); if (m_useLldb) - msg += "\n" + tr("The lldb-server binary has not been found."); + msg += "\n" + Tr::tr("The lldb-server binary has not been found."); emit remoteProcessFinished(msg); return; } @@ -558,7 +558,7 @@ void AndroidRunnerWorker::asyncStartHelper() debugServerFile = "./lldb-server"; runAdb({"shell", "run-as", m_packageName, "killall", "lldb-server"}); if (!uploadDebugServer(debugServerFile)) { - emit remoteProcessFinished(tr("Cannot copy C++ debug server.")); + emit remoteProcessFinished(Tr::tr("Cannot copy C++ debug server.")); return; } } else { @@ -576,7 +576,7 @@ void AndroidRunnerWorker::asyncStartHelper() // Kill the previous instances of gdbserver. Do this before copying the gdbserver. runAdb({"shell", "run-as", m_packageName, "killall", "gdbserver"}); if (!uploadDebugServer("./gdbserver")) { - emit remoteProcessFinished(tr("Cannot copy C++ debug server.")); + emit remoteProcessFinished(Tr::tr("Cannot copy C++ debug server.")); return; } } @@ -594,7 +594,7 @@ void AndroidRunnerWorker::asyncStartHelper() QStringList removeForward{{"forward", "--remove", port}}; removeForwardPort(port); if (!runAdb({"forward", port, port})) { - emit remoteProcessFinished(tr("Failed to forward QML debugging ports.")); + emit remoteProcessFinished(Tr::tr("Failed to forward QML debugging ports.")); return; } m_afterFinishAdbCommands.push_back(removeForward.join(' ')); @@ -632,12 +632,12 @@ void AndroidRunnerWorker::asyncStartHelper() QString stdErr; const bool startResult = runAdb(args, nullptr, &stdErr); if (!startResult) { - emit remoteProcessFinished(tr("Failed to start the activity.")); + emit remoteProcessFinished(Tr::tr("Failed to start the activity.")); return; } if (!stdErr.isEmpty()) { - emit remoteErrorOutput(tr("Activity Manager threw the error: %1").arg(stdErr)); + emit remoteErrorOutput(Tr::tr("Activity Manager threw the error: %1").arg(stdErr)); return; } } @@ -658,7 +658,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir, if (!m_debugServerProcess) { qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << lldbServerErr; if (errorStr) - *errorStr = tr("Failed to start debugger server."); + *errorStr = Tr::tr("Failed to start debugger server."); return false; } qCDebug(androidRunWorkerLog) << "Debugger process started"; @@ -677,7 +677,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir, if (!m_debugServerProcess) { qCDebug(androidRunWorkerLog) << "Debugger process failed to start" << gdbServerErr; if (errorStr) - *errorStr = tr("Failed to start debugger server."); + *errorStr = Tr::tr("Failed to start debugger server."); return false; } qCDebug(androidRunWorkerLog) << "Debugger process started"; @@ -689,7 +689,7 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir, if (!runAdb({"forward", port, "localfilesystem:" + gdbServerSocket})) { if (errorStr) - *errorStr = tr("Failed to forward C++ debugging ports."); + *errorStr = Tr::tr("Failed to forward C++ debugging ports."); return false; } m_afterFinishAdbCommands.push_back(removeForward.join(' ')); @@ -725,7 +725,7 @@ void AndroidRunnerWorker::handleJdbWaiting() removeForwardPort(port); if (!runAdb({"forward", port, "jdwp:" + QString::number(m_processPID)})) { - emit remoteProcessFinished(tr("Failed to forward JDB debugging ports.")); + emit remoteProcessFinished(Tr::tr("Failed to forward JDB debugging ports.")); return; } m_afterFinishAdbCommands.push_back(removeForward.join(' ')); @@ -742,7 +742,7 @@ void AndroidRunnerWorker::handleJdbWaiting() jdbProcess->setProcessChannelMode(QProcess::MergedChannels); jdbProcess->start(jdbPath.toString(), jdbArgs); if (!jdbProcess->waitForStarted()) { - emit remoteProcessFinished(tr("Failed to start JDB.")); + emit remoteProcessFinished(Tr::tr("Failed to start JDB.")); return; } m_jdbProcess = std::move(jdbProcess); @@ -783,7 +783,7 @@ void AndroidRunnerWorker::handleJdbSettled() } } } - emit remoteProcessFinished(tr("Cannot attach JDB to the running application.")); + emit remoteProcessFinished(Tr::tr("Cannot attach JDB to the running application.")); } void AndroidRunnerWorker::removeForwardPort(const QString &port) @@ -814,7 +814,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid) << "to:" << pid; m_processPID = pid; if (pid == -1) { - emit remoteProcessFinished(QLatin1String("\n\n") + tr("\"%1\" died.") + emit remoteProcessFinished(QLatin1String("\n\n") + Tr::tr("\"%1\" died.") .arg(m_packageName)); // App died/killed. Reset log, monitor, jdb & gdbserver/lldb-server processes. m_adbLogcatProcess.reset(); diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp index a88e015e6a5..434b79c7c07 100644 --- a/src/plugins/android/androidsdkdownloader.cpp +++ b/src/plugins/android/androidsdkdownloader.cpp @@ -1,9 +1,9 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidsdkdownloader.h" - #include "androidconstants.h" +#include "androidsdkdownloader.h" +#include "androidtr.h" #include <utils/archive.h> #include <utils/filepath.h> @@ -39,14 +39,14 @@ void AndroidSdkDownloader::sslErrors(const QList<QSslError> &sslErrors) { for (const QSslError &error : sslErrors) qCDebug(sdkDownloaderLog, "SSL error: %s\n", qPrintable(error.errorString())); - cancelWithError(tr("Encountered SSL errors, download is aborted.")); + cancelWithError(Tr::tr("Encountered SSL errors, download is aborted.")); } #endif void AndroidSdkDownloader::downloadAndExtractSdk() { if (m_androidConfig.sdkToolsUrl().isEmpty()) { - logError(tr("The SDK Tools download URL is empty.")); + logError(Tr::tr("The SDK Tools download URL is empty.")); return; } @@ -57,7 +57,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk() connect(m_reply, &QNetworkReply::sslErrors, this, &AndroidSdkDownloader::sslErrors); #endif - m_progressDialog = new QProgressDialog(tr("Downloading SDK Tools package..."), tr("Cancel"), + m_progressDialog = new QProgressDialog(Tr::tr("Downloading SDK Tools package..."), Tr::tr("Cancel"), 0, 100, Core::ICore::dialogParent()); m_progressDialog->setWindowModality(Qt::ApplicationModal); m_progressDialog->setWindowTitle(dialogTitle()); @@ -105,7 +105,7 @@ bool AndroidSdkDownloader::verifyFileIntegrity() QString AndroidSdkDownloader::dialogTitle() { - return tr("Download SDK Tools"); + return Tr::tr("Download SDK Tools"); } void AndroidSdkDownloader::cancel() @@ -154,7 +154,7 @@ bool AndroidSdkDownloader::saveToDisk(const FilePath &filename, QIODevice *data) { QFile file(filename.toString()); if (!file.open(QIODevice::WriteOnly)) { - logError(QString(tr("Could not open %1 for writing: %2.")) + logError(QString(Tr::tr("Could not open %1 for writing: %2.")) .arg(filename.toUserOutput(), file.errorString())); return false; } @@ -176,18 +176,18 @@ void AndroidSdkDownloader::downloadFinished(QNetworkReply *reply) { QUrl url = reply->url(); if (reply->error()) { - cancelWithError(QString(tr("Downloading Android SDK Tools from URL %1 has failed: %2.")) + cancelWithError(QString(Tr::tr("Downloading Android SDK Tools from URL %1 has failed: %2.")) .arg(url.toString(), reply->errorString())); } else { if (isHttpRedirect(reply)) { - cancelWithError(QString(tr("Download from %1 was redirected.")).arg(url.toString())); + cancelWithError(QString(Tr::tr("Download from %1 was redirected.")).arg(url.toString())); } else { m_sdkFilename = getSaveFilename(url); if (saveToDisk(m_sdkFilename, reply) && verifyFileIntegrity()) emit sdkPackageWriteFinished(); else cancelWithError( - tr("Writing and verifying the integrity of the downloaded file has failed.")); + Tr::tr("Writing and verifying the integrity of the downloaded file has failed.")); } } diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 0fed77d2312..b82791db07b 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidsdkmanager.h" - #include "androidconfigurations.h" #include "androidconstants.h" #include "androidmanager.h" +#include "androidsdkmanager.h" +#include "androidtr.h" #include "avdmanageroutputparser.h" #include <utils/algorithm.h> @@ -166,9 +166,8 @@ static void sdkManagerCommand(const AndroidConfig &config, const QStringList &ar if (assertionFound) { output.success = false; output.stdOutput = proc.cleanedStdOut(); - output.stdError = QCoreApplication::translate("Android::Internal::AndroidSdkManager", - "The operation requires user interaction. " - "Use the \"sdkmanager\" command-line tool."); + output.stdError = Tr::tr("The operation requires user interaction. " + "Use the \"sdkmanager\" command-line tool."); } else { output.success = proc.result() == ProcessResult::FinishedWithSuccess; } @@ -910,8 +909,7 @@ void AndroidSdkManagerPrivate::updateInstalled(SdkCmdFutureInterface &fi) fi.setProgressValue(0); AndroidSdkManager::OperationOutput result; result.type = AndroidSdkManager::UpdateAll; - result.stdOutput = QCoreApplication::translate("AndroidSdkManager", - "Updating installed packages."); + result.stdOutput = Tr::tr("Updating installed packages."); fi.reportResult(result); QStringList args("--update"); args << m_config.sdkManagerToolArgs(); @@ -921,8 +919,8 @@ void AndroidSdkManagerPrivate::updateInstalled(SdkCmdFutureInterface &fi) qCDebug(sdkManagerLog) << "Update: Operation cancelled before start"; if (result.stdError.isEmpty() && !result.success) - result.stdError = QCoreApplication::translate("AndroidSdkManager", "Failed."); - result.stdOutput = QCoreApplication::translate("AndroidSdkManager", "Done\n\n"); + result.stdError = Tr::tr("Failed."); + result.stdOutput = Tr::tr("Done\n\n"); fi.reportResult(result); fi.setProgressValue(100); } @@ -935,8 +933,8 @@ void AndroidSdkManagerPrivate::update(SdkCmdFutureInterface &fi, const QStringLi double progressQuota = 100.0 / (install.count() + uninstall.count()); int currentProgress = 0; - QString installTag = QCoreApplication::translate("AndroidSdkManager", "Installing"); - QString uninstallTag = QCoreApplication::translate("AndroidSdkManager", "Uninstalling"); + QString installTag = Tr::tr("Installing"); + QString uninstallTag = Tr::tr("Uninstalling"); auto doOperation = [&](const QString& packagePath, const QStringList& args, bool isInstall) { @@ -952,8 +950,8 @@ void AndroidSdkManagerPrivate::update(SdkCmdFutureInterface &fi, const QStringLi currentProgress += progressQuota; fi.setProgressValue(currentProgress); if (result.stdError.isEmpty() && !result.success) - result.stdError = QCoreApplication::translate("AndroidSdkManager", "Failed"); - result.stdOutput = QCoreApplication::translate("AndroidSdkManager", "Done\n\n"); + result.stdError = Tr::tr("AndroidSdkManager", "Failed"); + result.stdOutput = Tr::tr("AndroidSdkManager", "Done\n\n"); fi.reportResult(result); return fi.isCanceled(); }; @@ -1052,10 +1050,8 @@ void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdFutureInterface &fi) m_licenseTextCache.clear(); result.success = licenseCommand.exitStatus() == QProcess::NormalExit; - if (!result.success) { - result.stdError = QCoreApplication::translate("Android::Internal::AndroidSdkManager", - "License command failed.\n\n"); - } + if (!result.success) + result.stdError = Tr::tr("License command failed.\n\n"); fi.reportResult(result); fi.setProgressValue(100); } diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp index c4c8d91f481..d17104e3271 100644 --- a/src/plugins/android/androidsdkmanagerwidget.cpp +++ b/src/plugins/android/androidsdkmanagerwidget.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidsdkmanagerwidget.h" - #include "androidconfigurations.h" #include "androidsdkmanager.h" +#include "androidsdkmanagerwidget.h" #include "androidsdkmodel.h" +#include "androidtr.h" #include <app/app_version.h> @@ -52,7 +52,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config, { QTC_CHECK(sdkManager); - setWindowTitle(tr("Android SDK Manager")); + setWindowTitle(Tr::tr("Android SDK Manager")); resize(664, 396); setModal(true); @@ -62,41 +62,41 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config, packagesView->setIndentation(20); packagesView->header()->setCascadingSectionResizes(false); - auto updateInstalledButton = new QPushButton(tr("Update Installed")); + auto updateInstalledButton = new QPushButton(Tr::tr("Update Installed")); - auto applySelectionButton = new QPushButton(tr("Apply")); + auto applySelectionButton = new QPushButton(Tr::tr("Apply")); applySelectionButton->setEnabled(false); auto channelCheckbox = new QComboBox; - channelCheckbox->addItem(tr("Default")); - channelCheckbox->addItem(tr("Stable")); - channelCheckbox->addItem(tr("Beta")); - channelCheckbox->addItem(tr("Dev")); - channelCheckbox->addItem(tr("Canary")); + channelCheckbox->addItem(Tr::tr("Default")); + channelCheckbox->addItem(Tr::tr("Stable")); + channelCheckbox->addItem(Tr::tr("Beta")); + channelCheckbox->addItem(Tr::tr("Dev")); + channelCheckbox->addItem(Tr::tr("Canary")); - auto obsoleteCheckBox = new QCheckBox(tr("Include obsolete")); + auto obsoleteCheckBox = new QCheckBox(Tr::tr("Include obsolete")); - auto showAvailableRadio = new QRadioButton(tr("Available")); - auto showInstalledRadio = new QRadioButton(tr("Installed")); - auto showAllRadio = new QRadioButton(tr("All")); + auto showAvailableRadio = new QRadioButton(Tr::tr("Available")); + auto showInstalledRadio = new QRadioButton(Tr::tr("Installed")); + auto showAllRadio = new QRadioButton(Tr::tr("All")); showAllRadio->setChecked(true); - auto optionsButton = new QPushButton(tr("Advanced Options...")); + auto optionsButton = new QPushButton(Tr::tr("Advanced Options...")); auto searchField = new FancyLineEdit(m_packagesStack); searchField->setPlaceholderText("Filter"); - auto expandCheck = new QCheckBox(tr("Expand All")); + auto expandCheck = new QCheckBox(Tr::tr("Expand All")); m_outputStack = new QWidget; - auto cancelButton = new QPushButton(tr("Cancel")); + auto cancelButton = new QPushButton(Tr::tr("Cancel")); m_operationProgress = new QProgressBar(m_outputStack); m_outputEdit = new QPlainTextEdit(m_outputStack); m_outputEdit->setReadOnly(true); - m_sdkLicenseLabel = new QLabel(tr("Do you want to accept the Android SDK license?")); + m_sdkLicenseLabel = new QLabel(Tr::tr("Do you want to accept the Android SDK license?")); m_sdkLicenseLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); m_sdkLicenseLabel->hide(); @@ -133,9 +133,9 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config, applySelectionButton, st, Group { - title(tr("Show Packages")), + title(Tr::tr("Show Packages")), Column { - Row { tr("Channel:"), channelCheckbox }, + Row { Tr::tr("Channel:"), channelCheckbox }, obsoleteCheckBox, hr, showAvailableRadio, @@ -280,21 +280,21 @@ void AndroidSdkManagerWidget::installEssentials() m_sdkModel->selectMissingEssentials(); if (!m_sdkModel->missingEssentials().isEmpty()) { QMessageBox::warning(this, - tr("Android SDK Changes"), - tr("%1 cannot find the following essential packages: \"%2\".\n" - "Install them manually after the current operation is done.\n") - .arg(Core::Constants::IDE_DISPLAY_NAME) - .arg(m_sdkModel->missingEssentials().join("\", \""))); + Tr::tr("Android SDK Changes"), + Tr::tr("%1 cannot find the following essential packages: \"%2\".\n" + "Install them manually after the current operation is done.\n") + .arg(Core::Constants::IDE_DISPLAY_NAME) + .arg(m_sdkModel->missingEssentials().join("\", \""))); } - onApplyButton(tr("Android SDK installation is missing necessary packages. " + onApplyButton(Tr::tr("Android SDK installation is missing necessary packages. " "Do you want to install the missing packages?")); } void AndroidSdkManagerWidget::beginLicenseCheck() { - m_formatter->appendMessage(tr("Checking pending licenses...\n"), NormalMessageFormat); - m_formatter->appendMessage(tr("The installation of Android SDK packages may fail if the " - "respective licenses are not accepted.\n"), + m_formatter->appendMessage(Tr::tr("Checking pending licenses...\n"), NormalMessageFormat); + m_formatter->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the " + "respective licenses are not accepted.\n"), LogMessageFormat); addPackageFuture(m_sdkManager->checkPendingLicenses()); } @@ -304,7 +304,7 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage) QTC_ASSERT(m_currentView == PackageListing, return); if (m_sdkManager->isBusy()) { - m_formatter->appendMessage(tr("\nSDK Manager is busy."), StdErrFormat); + m_formatter->appendMessage(Tr::tr("\nSDK Manager is busy."), StdErrFormat); return; } @@ -321,15 +321,15 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage) installPackages << str; } - QString message = tr("%n Android SDK packages shall be updated.", "", packagesToUpdate.count()); + QString message = Tr::tr("%n Android SDK packages shall be updated.", "", packagesToUpdate.count()); if (!extraMessage.isEmpty()) message.prepend(extraMessage + "\n\n"); - QMessageBox messageDlg(QMessageBox::Information, tr("Android SDK Changes"), + QMessageBox messageDlg(QMessageBox::Information, Tr::tr("Android SDK Changes"), message, QMessageBox::Ok | QMessageBox::Cancel, this); QString details; if (!uninstallPackages.isEmpty()) - details = tr("[Packages to be uninstalled:]\n").append(uninstallPackages.join("\n")); + details = Tr::tr("[Packages to be uninstalled:]\n").append(uninstallPackages.join("\n")); if (!installPackages.isEmpty()) { if (!uninstallPackages.isEmpty()) @@ -358,7 +358,7 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage) void AndroidSdkManagerWidget::onUpdatePackages() { if (m_sdkManager->isBusy()) { - m_formatter->appendMessage(tr("\nSDK Manager is busy."), StdErrFormat); + m_formatter->appendMessage(Tr::tr("\nSDK Manager is busy."), StdErrFormat); return; } switchView(Operations); @@ -419,7 +419,7 @@ void AndroidSdkManagerWidget::addPackageFuture(const QFuture<AndroidSdkManager:: } else { qCDebug(androidSdkMgrUiLog) << "Operation canceled/finished before adding to the queue"; if (m_sdkManager->isBusy()) { - m_formatter->appendMessage(tr("SDK Manager is busy. Operation cancelled."), + m_formatter->appendMessage(Tr::tr("SDK Manager is busy. Operation cancelled."), StdErrFormat); } notifyOperationFinished(); @@ -442,11 +442,11 @@ void AndroidSdkManagerWidget::beginExecution() else installSdkPaths << package->sdkStylePath(); } - m_formatter->appendMessage(tr("Installing/Uninstalling selected packages...\n"), + m_formatter->appendMessage(Tr::tr("Installing/Uninstalling selected packages...\n"), NormalMessageFormat); - m_formatter->appendMessage(tr("Closing the %1 dialog will cancel the running and scheduled SDK " + m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK " "operations.\n").arg(HostOsInfo::isMacHost() ? - tr("preferences") : tr("options")), + Tr::tr("preferences") : Tr::tr("options")), LogMessageFormat); addPackageFuture(m_sdkManager->update(installSdkPaths, uninstallSdkPaths)); @@ -454,10 +454,10 @@ void AndroidSdkManagerWidget::beginExecution() void AndroidSdkManagerWidget::beginUpdate() { - m_formatter->appendMessage(tr("Updating installed packages...\n"), NormalMessageFormat); - m_formatter->appendMessage(tr("Closing the %1 dialog will cancel the running and scheduled SDK " + m_formatter->appendMessage(Tr::tr("Updating installed packages...\n"), NormalMessageFormat); + m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK " "operations.\n").arg(HostOsInfo::isMacHost() ? - tr("preferences") : tr("options")), + Tr::tr("preferences") : Tr::tr("options")), LogMessageFormat); addPackageFuture(m_sdkManager->updateAll()); } @@ -471,8 +471,8 @@ void AndroidSdkManagerWidget::beginLicenseWorkflow() void AndroidSdkManagerWidget::notifyOperationFinished() { if (!m_currentOperation || m_currentOperation->isFinished()) { - QMessageBox::information(this, tr("Android SDK Changes"), - tr("Android SDK operations finished."), QMessageBox::Ok); + QMessageBox::information(this, Tr::tr("Android SDK Changes"), + Tr::tr("Android SDK operations finished."), QMessageBox::Ok); m_operationProgress->setValue(0); // Once the update/install is done, let's hide the dialog. hide(); @@ -485,7 +485,7 @@ void AndroidSdkManagerWidget::packageFutureFinished() bool continueWorkflow = true; if (m_currentOperation->isCanceled()) { - m_formatter->appendMessage(tr("Operation cancelled.\n"), StdErrFormat); + m_formatter->appendMessage(Tr::tr("Operation cancelled.\n"), StdErrFormat); continueWorkflow = false; } m_operationProgress->setValue(100); @@ -524,12 +524,12 @@ void AndroidSdkManagerWidget::packageFutureFinished() void AndroidSdkManagerWidget::cancelPendingOperations() { if (!m_sdkManager->isBusy()) { - m_formatter->appendMessage(tr("\nNo pending operations to cancel...\n"), + m_formatter->appendMessage(Tr::tr("\nNo pending operations to cancel...\n"), NormalMessageFormat); switchView(PackageListing); return; } - m_formatter->appendMessage(tr("\nCancelling pending operations...\n"), + m_formatter->appendMessage(Tr::tr("\nCancelling pending operations...\n"), NormalMessageFormat); m_sdkManager->cancelOperatons(); } @@ -632,15 +632,15 @@ OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &a { QTC_CHECK(sdkManager); resize(800, 480); - setWindowTitle(tr("SDK Manager Arguments")); + setWindowTitle(Tr::tr("SDK Manager Arguments")); m_argumentDetailsEdit = new QPlainTextEdit(this); m_argumentDetailsEdit->setReadOnly(true); auto populateOptions = [this](const QString& options) { if (options.isEmpty()) { - m_argumentDetailsEdit->setPlainText(tr("Cannot load available arguments for " - "\"sdkmanager\" command.")); + m_argumentDetailsEdit->setPlainText(Tr::tr("Cannot load available arguments for " + "\"sdkmanager\" command.")); } else { m_argumentDetailsEdit->setPlainText(options); } @@ -657,9 +657,9 @@ OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &a m_argumentsEdit->setText(args.join(" ")); auto gridLayout = new QGridLayout(this); - gridLayout->addWidget(new QLabel(tr("SDK manager arguments:"), this), 0, 0, 1, 1); + gridLayout->addWidget(new QLabel(Tr::tr("SDK manager arguments:"), this), 0, 0, 1, 1); gridLayout->addWidget(m_argumentsEdit, 0, 1, 1, 1); - gridLayout->addWidget(new QLabel(tr("Available arguments:"), this), 1, 0, 1, 2); + gridLayout->addWidget(new QLabel(Tr::tr("Available arguments:"), this), 1, 0, 1, 2); gridLayout->addWidget(m_argumentDetailsEdit, 2, 0, 1, 2); gridLayout->addWidget(dialogButtons, 3, 0, 1, 2); } diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp index 5e2182b4a3a..74e172d0118 100644 --- a/src/plugins/android/androidsdkmodel.cpp +++ b/src/plugins/android/androidsdkmodel.cpp @@ -1,8 +1,10 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidsdkmodel.h" + #include "androidmanager.h" #include "androidsdkmanager.h" +#include "androidsdkmodel.h" +#include "androidtr.h" #include <utils/algorithm.h> #include <utils/qtcassert.h> @@ -44,13 +46,13 @@ QVariant AndroidSdkModel::headerData(int section, Qt::Orientation orientation, i if (role == Qt::DisplayRole) { switch (section) { case packageNameColumn: - data = tr("Package"); + data = Tr::tr("Package"); break; case packageRevisionColumn: - data = tr("Revision"); + data = Tr::tr("Revision"); break; case apiLevelColumn: - data = tr("API"); + data = Tr::tr("API"); break; default: break; @@ -141,7 +143,7 @@ QVariant AndroidSdkModel::data(const QModelIndex &index, int role) const // Top level tools if (index.row() == 0) { return role == Qt::DisplayRole && index.column() == packageNameColumn ? - QVariant(tr("Tools")) : QVariant(); + QVariant(Tr::tr("Tools")) : QVariant(); } // Top level platforms const SdkPlatform *platform = m_sdkPlatforms.at(index.row() - 1); @@ -171,7 +173,7 @@ QVariant AndroidSdkModel::data(const QModelIndex &index, int role) const switch (index.column()) { case packageNameColumn: return p->type() == AndroidSdkPackage::SdkPlatformPackage ? - tr("SDK Platform") : p->displayText(); + Tr::tr("SDK Platform") : p->displayText(); case packageRevisionColumn: return p->revision().toString(); case apiLevelColumn: diff --git a/src/plugins/android/androidservicewidget.cpp b/src/plugins/android/androidservicewidget.cpp index d71d92cbaa5..5e6c685bdcb 100644 --- a/src/plugins/android/androidservicewidget.cpp +++ b/src/plugins/android/androidservicewidget.cpp @@ -3,6 +3,7 @@ #include "androidservicewidget.h" #include "androidservicewidget_p.h" +#include "androidtr.h" #include <utils/utilsicons.h> @@ -182,31 +183,31 @@ QVariant AndroidServiceWidget::AndroidServiceModel::headerData(int section, Qt:: { if (role == Qt::ToolTipRole && orientation == Qt::Horizontal) { if (section == 0) - return tr("The name of the class implementing the service."); + return Tr::tr("The name of the class implementing the service."); else if (section == 1) - return tr("Checked if the service is run in an external process."); + return Tr::tr("Checked if the service is run in an external process."); else if (section == 2) - return tr("The name of the external process.\n" - "Prefix with : if the process is private, use a lowercase name if the process is global."); + return Tr::tr("The name of the external process.\n" + "Prefix with : if the process is private, use a lowercase name if the process is global."); else if (section == 3) - return tr("Checked if the service is in a separate dynamic library."); + return Tr::tr("Checked if the service is in a separate dynamic library."); else if (section == 4) - return tr("The name of the separate dynamic library."); + return Tr::tr("The name of the separate dynamic library."); else if (section == 5) - return tr("The arguments for telling the app to run the service instead of the main activity."); + return Tr::tr("The arguments for telling the app to run the service instead of the main activity."); } else if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { if (section == 0) - return tr("Service class name."); + return Tr::tr("Service class name."); else if (section == 1) - return tr("Run in external process."); + return Tr::tr("Run in external process."); else if (section == 2) - return tr("Process name."); + return Tr::tr("Process name."); else if (section == 3) - return tr("Run in external library."); + return Tr::tr("Run in external library."); else if (section == 4) - return tr("Library name."); + return Tr::tr("Library name."); else if (section == 5) - return tr("Service arguments."); + return Tr::tr("Service arguments."); } return {}; } @@ -225,22 +226,22 @@ QVariant AndroidServiceWidget::AndroidServiceModel::data(const QModelIndex &inde if (index.column() == 0) return m_services[index.row()].className(); else if (index.column() == 1) - return tr("Run in external process."); + return Tr::tr("Run in external process."); else if (index.column() == 2) return m_services[index.row()].externalProcessName(); else if (index.column() == 3) - return tr("Run in external library."); + return Tr::tr("Run in external library."); else if (index.column() == 4) return m_services[index.row()].externalLibraryName(); else if (index.column() == 5) return m_services[index.row()].serviceArguments(); } else if (role == Qt::ToolTipRole) { if (index.column() == 0 && m_services[index.row()].className().isEmpty()) - return tr("The class name must be set."); + return Tr::tr("The class name must be set."); else if (index.column() == 2 && m_services[index.row()].isRunInExternalProcess()) - return tr("The process name must be set for a service run in an external process."); + return Tr::tr("The process name must be set for a service run in an external process."); else if (index.column() == 4 && m_services[index.row()].isRunInExternalLibrary()) - return tr("The library name must be set for a service run in an external library."); + return Tr::tr("The library name must be set for a service run in an external library."); } else if (role == Qt::EditRole) { if (index.column() == 0) return m_services[index.row()].className(); @@ -317,10 +318,10 @@ AndroidServiceWidget::AndroidServiceWidget(QWidget *parent) : QWidget(parent), layout->addWidget(m_tableView, 1); auto buttonLayout = new QGridLayout(); auto addButton = new QPushButton(this); - addButton->setText(tr("Add")); + addButton->setText(Tr::tr("Add")); buttonLayout->addWidget(addButton, 0, 0); m_removeButton = new QPushButton(this); - m_removeButton->setText(tr("Remove")); + m_removeButton->setText(Tr::tr("Remove")); m_removeButton->setEnabled(false); buttonLayout->addWidget(m_removeButton, 1, 0); layout->addLayout(buttonLayout); diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 46effc4995a..148473ce605 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -1,13 +1,13 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidsettingswidget.h" - #include "androidconfigurations.h" #include "androidconstants.h" #include "androidsdkdownloader.h" #include "androidsdkmanager.h" #include "androidsdkmanagerwidget.h" +#include "androidsettingswidget.h" +#include "androidtr.h" #include <projectexplorer/projectexplorerconstants.h> @@ -139,8 +139,6 @@ private: class AndroidSettingsWidget final : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidSettingsWidget) - public: // Todo: This would be so much simpler if it just used Utils::PathChooser!!! AndroidSettingsWidget(); @@ -207,7 +205,7 @@ enum OpenSslValidation { AndroidSettingsWidget::AndroidSettingsWidget() { - setWindowTitle(tr("Android Configuration")); + setWindowTitle(Tr::tr("Android Configuration")); const QIcon downloadIcon = Icons::ONLINE.icon(); @@ -215,20 +213,20 @@ AndroidSettingsWidget::AndroidSettingsWidget() auto downloadSdkToolButton = new QToolButton; downloadSdkToolButton->setIcon(downloadIcon); - downloadSdkToolButton->setToolTip(tr("Open Android SDK download URL in the system's browser.")); + downloadSdkToolButton->setToolTip(Tr::tr("Open Android SDK download URL in the system's browser.")); - auto addCustomNdkButton = new QPushButton(tr("Add...")); - addCustomNdkButton->setToolTip(tr("Add the selected custom NDK. The toolchains " - "and debuggers will be created automatically.")); + auto addCustomNdkButton = new QPushButton(Tr::tr("Add...")); + addCustomNdkButton->setToolTip(Tr::tr("Add the selected custom NDK. The toolchains " + "and debuggers will be created automatically.")); - auto removeCustomNdkButton = new QPushButton(tr("Remove")); + auto removeCustomNdkButton = new QPushButton(Tr::tr("Remove")); removeCustomNdkButton->setEnabled(false); - removeCustomNdkButton->setToolTip(tr("Remove the selected NDK if it has been added manually.")); + removeCustomNdkButton->setToolTip(Tr::tr("Remove the selected NDK if it has been added manually.")); m_makeDefaultNdkButton = new QPushButton; - m_makeDefaultNdkButton->setToolTip(tr("Force a specific NDK installation to be used by all " - "Android kits.<br/>Note that the forced NDK might not " - "be compatible with all registered Qt versions.")); + m_makeDefaultNdkButton->setToolTip(Tr::tr("Force a specific NDK installation to be used by all " + "Android kits.<br/>Note that the forced NDK might not " + "be compatible with all registered Qt versions.")); auto androidDetailsWidget = new DetailsWidget; @@ -243,70 +241,70 @@ AndroidSettingsWidget::AndroidSettingsWidget() auto downloadOpenJdkToolButton = new QToolButton; downloadOpenJdkToolButton->setIcon(downloadIcon); - downloadOpenJdkToolButton->setToolTip(tr("Open JDK download URL in the system's browser.")); + downloadOpenJdkToolButton->setToolTip(Tr::tr("Open JDK download URL in the system's browser.")); - auto sdkToolsAutoDownloadButton = new QPushButton(tr("Set Up SDK")); + auto sdkToolsAutoDownloadButton = new QPushButton(Tr::tr("Set Up SDK")); sdkToolsAutoDownloadButton->setToolTip( - tr("Automatically download Android SDK Tools to selected location.\n\n" - "If the selected path contains no valid SDK Tools, the SDK Tools package is downloaded\n" - "from %1,\n" - "and extracted to the selected path.\n" - "After the SDK Tools are properly set up, you are prompted to install any essential\n" - "packages required for Qt to build for Android.") - .arg(m_androidConfig.sdkToolsUrl().toString())); + Tr::tr("Automatically download Android SDK Tools to selected location.\n\n" + "If the selected path contains no valid SDK Tools, the SDK Tools package is downloaded\n" + "from %1,\n" + "and extracted to the selected path.\n" + "After the SDK Tools are properly set up, you are prompted to install any essential\n" + "packages required for Qt to build for Android.") + .arg(m_androidConfig.sdkToolsUrl().toString())); - auto sdkManagerToolButton = new QPushButton(tr("SDK Manager")); + auto sdkManagerToolButton = new QPushButton(Tr::tr("SDK Manager")); auto downloadNdkToolButton = new QToolButton; - downloadNdkToolButton->setToolTip(tr("Open Android NDK download URL in the system's browser.")); + downloadNdkToolButton->setToolTip(Tr::tr("Open Android NDK download URL in the system's browser.")); - m_createKitCheckBox = new QCheckBox(tr("Automatically create kits for Android tool chains")); + m_createKitCheckBox = new QCheckBox(Tr::tr("Automatically create kits for Android tool chains")); m_createKitCheckBox->setChecked(true); auto openSslDetailsWidget = new DetailsWidget; m_openSslPathChooser = new PathChooser; - m_openSslPathChooser->setToolTip(tr("Select the path of the prebuilt OpenSSL binaries.")); + m_openSslPathChooser->setToolTip(Tr::tr("Select the path of the prebuilt OpenSSL binaries.")); - auto downloadOpenSslPrebuiltLibs = new QPushButton(tr("Download OpenSSL")); + auto downloadOpenSslPrebuiltLibs = new QPushButton(Tr::tr("Download OpenSSL")); downloadOpenSslPrebuiltLibs->setToolTip( - tr("Automatically download OpenSSL prebuilt libraries.\n\n" - "These libraries can be shipped with your application if any SSL operations\n" - "are performed. Find the checkbox under \"Projects > Build > Build Steps >\n" - "Build Android APK > Additional Libraries\".\n" - "If the automatic download fails, Qt Creator proposes to open the download URL\n" - "in the system's browser for manual download.")); + Tr::tr("Automatically download OpenSSL prebuilt libraries.\n\n" + "These libraries can be shipped with your application if any SSL operations\n" + "are performed. Find the checkbox under \"Projects > Build > Build Steps >\n" + "Build Android APK > Additional Libraries\".\n" + "If the automatic download fails, Qt Creator proposes to open the download URL\n" + "in the system's browser for manual download.")); m_sdkManagerWidget = new AndroidSdkManagerWidget(m_androidConfig, &m_sdkManager, this); const QMap<int, QString> androidValidationPoints = { - { SdkPathExistsAndWritableRow, tr("Android SDK path exists and is writable.") }, - { JavaPathExistsAndWritableRow, tr("JDK path exists and is writable.") }, - { SdkToolsInstalledRow, tr("SDK tools installed.") }, - { SdkManagerSuccessfulRow, tr("SDK manager runs.") }, - { PlatformToolsInstalledRow, tr("Platform tools installed.") }, + { SdkPathExistsAndWritableRow, Tr::tr("Android SDK path exists and is writable.") }, + { JavaPathExistsAndWritableRow, Tr::tr("JDK path exists and is writable.") }, + { SdkToolsInstalledRow, Tr::tr("SDK tools installed.") }, + { SdkManagerSuccessfulRow, Tr::tr("SDK manager runs.") }, + { PlatformToolsInstalledRow, Tr::tr("Platform tools installed.") }, { AllEssentialsInstalledRow, - tr( "All essential packages installed for all installed Qt versions.") }, - { BuildToolsInstalledRow, tr("Build tools installed.") }, - { PlatformSdkInstalledRow, tr("Platform SDK installed.") } + Tr::tr( "All essential packages installed for all installed Qt versions.") }, + { BuildToolsInstalledRow, Tr::tr("Build tools installed.") }, + { PlatformSdkInstalledRow, Tr::tr("Platform SDK installed.") } }; - m_androidSummary = new SummaryWidget(androidValidationPoints, tr("Android settings are OK."), - tr("Android settings have errors."), + m_androidSummary = new SummaryWidget(androidValidationPoints, Tr::tr("Android settings are OK."), + Tr::tr("Android settings have errors."), androidDetailsWidget); m_androidProgress = new ProgressIndicator(ProgressIndicatorSize::Medium, this); m_androidProgress->attachToWidget(androidDetailsWidget); m_androidProgress->hide(); const QMap<int, QString> openSslValidationPoints = { - { OpenSslPathExistsRow, tr("OpenSSL path exists.") }, - { OpenSslPriPathExists, tr("QMake include project (openssl.pri) exists.") }, - { OpenSslCmakeListsPathExists, tr("CMake include project (CMakeLists.txt) exists.") } + { OpenSslPathExistsRow, Tr::tr("OpenSSL path exists.") }, + { OpenSslPriPathExists, Tr::tr("QMake include project (openssl.pri) exists.") }, + { OpenSslCmakeListsPathExists, Tr::tr("CMake include project (CMakeLists.txt) exists.") } }; m_openSslSummary = new SummaryWidget(openSslValidationPoints, - tr("OpenSSL Settings are OK."), - tr("OpenSSL settings have errors."), + Tr::tr("OpenSSL Settings are OK."), + Tr::tr("OpenSSL settings have errors."), openSslDetailsWidget); connect(m_openJdkLocationPathChooser, &PathChooser::rawPathChanged, @@ -314,14 +312,14 @@ AndroidSettingsWidget::AndroidSettingsWidget() if (m_androidConfig.openJDKLocation().isEmpty()) m_androidConfig.setOpenJDKLocation(AndroidConfig::getJdkPath()); m_openJdkLocationPathChooser->setFilePath(m_androidConfig.openJDKLocation()); - m_openJdkLocationPathChooser->setPromptDialogTitle(tr("Select JDK Path")); + m_openJdkLocationPathChooser->setPromptDialogTitle(Tr::tr("Select JDK Path")); if (m_androidConfig.sdkLocation().isEmpty()) m_androidConfig.setSdkLocation(AndroidConfig::defaultSdkPath()); m_sdkLocationPathChooser->setFilePath(m_androidConfig.sdkLocation()); - m_sdkLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK Folder")); + m_sdkLocationPathChooser->setPromptDialogTitle(Tr::tr("Select Android SDK Folder")); - m_openSslPathChooser->setPromptDialogTitle(tr("Select OpenSSL Include Project File")); + m_openSslPathChooser->setPromptDialogTitle(Tr::tr("Select OpenSSL Include Project File")); if (m_androidConfig.openSslLocation().isEmpty()) m_androidConfig.setOpenSslLocation(m_androidConfig.sdkLocation() / ("android_openssl")); m_openSslPathChooser->setFilePath(m_androidConfig.openSslLocation()); @@ -334,15 +332,15 @@ AndroidSettingsWidget::AndroidSettingsWidget() Column { Group { - title(tr("Android Settings")), + title(Tr::tr("Android Settings")), Grid { - tr("JDK location:"), + Tr::tr("JDK location:"), m_openJdkLocationPathChooser, empty, downloadOpenJdkToolButton, br, - tr("Android SDK location:"), + Tr::tr("Android SDK location:"), m_sdkLocationPathChooser, sdkToolsAutoDownloadButton, downloadSdkToolButton, @@ -350,7 +348,7 @@ AndroidSettingsWidget::AndroidSettingsWidget() empty, empty, sdkManagerToolButton, br, - Column { tr("Android NDK list:"), st }, + Column { Tr::tr("Android NDK list:"), st }, m_ndkListWidget, Column { addCustomNdkButton, @@ -366,9 +364,9 @@ AndroidSettingsWidget::AndroidSettingsWidget() } }, Group { - title(tr("Android OpenSSL settings (Optional)")), + title(Tr::tr("Android OpenSSL settings (Optional)")), Grid { - tr("OpenSSL binaries location:"), + Tr::tr("OpenSSL binaries location:"), m_openSslPathChooser, downloadOpenSslPrebuiltLibs, br, @@ -437,7 +435,7 @@ AndroidSettingsWidget::AndroidSettingsWidget() const FilePath sdkPath = m_androidConfig.sdkLocation(); if (!sdkPath.createDir()) { QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(), - tr("Failed to create the SDK Tools path %1.") + Tr::tr("Failed to create the SDK Tools path %1.") .arg("\n\"" + sdkPath.toUserOutput() + "\"")); } m_sdkManager.reloadPackages(true); @@ -501,7 +499,7 @@ void AndroidSettingsWidget::addCustomNdkItem() { const QString homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation) .constFirst(); - const QString ndkPath = QFileDialog::getExistingDirectory(this, tr("Select an NDK"), homePath); + const QString ndkPath = QFileDialog::getExistingDirectory(this, Tr::tr("Select an NDK"), homePath); if (m_androidConfig.isValidNdk(ndkPath)) { m_androidConfig.addCustomNdk(ndkPath); @@ -510,12 +508,12 @@ void AndroidSettingsWidget::addCustomNdkItem() } } else if (!ndkPath.isEmpty()) { QMessageBox::warning( - this, - tr("Add Custom NDK"), - tr("The selected path has an invalid NDK. This might mean that the path contains space " - "characters, or that it does not have a \"toolchains\" sub-directory, or that the " - "NDK version could not be retrieved because of a missing \"source.properties\" or " - "\"RELEASE.TXT\" file")); + this, + Tr::tr("Add Custom NDK"), + Tr::tr("The selected path has an invalid NDK. This might mean that the path contains space " + "characters, or that it does not have a \"toolchains\" sub-directory, or that the " + "NDK version could not be retrieved because of a missing \"source.properties\" or " + "\"RELEASE.TXT\" file")); } } @@ -629,12 +627,12 @@ void AndroidSettingsWidget::openOpenJDKDownloadUrl() void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent) { const FilePath openSslPath = m_openSslPathChooser->filePath(); - const QString openSslCloneTitle(tr("OpenSSL Cloning")); + const QString openSslCloneTitle(Tr::tr("OpenSSL Cloning")); if (m_openSslSummary->allRowsOk()) { if (!silent) { QMessageBox::information(this, openSslCloneTitle, - tr("OpenSSL prebuilt libraries repository is already configured.")); + Tr::tr("OpenSSL prebuilt libraries repository is already configured.")); } return; } @@ -646,15 +644,15 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent) QMessageBox::information( this, openSslCloneTitle, - tr("The selected download path (%1) for OpenSSL already exists and the directory is " - "not empty. Select a different path or make sure it is an empty directory.") - .arg(QDir::toNativeSeparators(openSslPath.toString()))); + Tr::tr("The selected download path (%1) for OpenSSL already exists and the directory is " + "not empty. Select a different path or make sure it is an empty directory.") + .arg(QDir::toNativeSeparators(openSslPath.toString()))); return; } QProgressDialog *openSslProgressDialog - = new QProgressDialog(tr("Cloning OpenSSL prebuilt libraries..."), - tr("Cancel"), 0, 0); + = new QProgressDialog(Tr::tr("Cloning OpenSSL prebuilt libraries..."), + Tr::tr("Cancel"), 0, 0); openSslProgressDialog->setWindowModality(Qt::ApplicationModal); openSslProgressDialog->setWindowTitle(openSslCloneTitle); openSslProgressDialog->setFixedSize(openSslProgressDialog->sizeHint()); @@ -670,14 +668,14 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent) auto failDialog = [=](const QString &msgSuffix = {}) { QStringList sl; - sl << tr("OpenSSL prebuilt libraries cloning failed."); + sl << Tr::tr("OpenSSL prebuilt libraries cloning failed."); if (!msgSuffix.isEmpty()) sl << msgSuffix; - sl << tr("Opening OpenSSL URL for manual download."); + sl << Tr::tr("Opening OpenSSL URL for manual download."); QMessageBox msgBox; msgBox.setText(sl.join(" ")); - msgBox.addButton(tr("Cancel"), QMessageBox::RejectRole); - QAbstractButton *openButton = msgBox.addButton(tr("Open Download URL"), QMessageBox::ActionRole); + msgBox.addButton(Tr::tr("Cancel"), QMessageBox::RejectRole); + QAbstractButton *openButton = msgBox.addButton(Tr::tr("Open Download URL"), QMessageBox::ActionRole); msgBox.exec(); if (msgBox.clickedButton() == openButton) @@ -689,7 +687,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent) openSslProgressDialog->close(); if (gitCloner->error() != QProcess::UnknownError) { if (gitCloner->error() == QProcess::FailedToStart) { - failDialog(tr("The Git tool might not be installed properly on your system.")); + failDialog(Tr::tr("The Git tool might not be installed properly on your system.")); return; } else { failDialog(); @@ -720,7 +718,7 @@ void AndroidSettingsWidget::updateUI() const QListWidgetItem *currentItem = m_ndkListWidget->currentItem(); const FilePath currentNdk = FilePath::fromString(currentItem ? currentItem->text() : ""); - const QString infoText = tr("(SDK Version: %1, NDK Version: %2)") + const QString infoText = Tr::tr("(SDK Version: %1, NDK Version: %2)") .arg(m_androidConfig.sdkToolsVersion().toString()) .arg(currentNdk.isEmpty() ? "" : m_androidConfig.ndkVersion(currentNdk).toString()); m_androidSummary->setInfoText(androidSetupOk ? infoText : ""); @@ -741,20 +739,20 @@ void AndroidSettingsWidget::updateUI() } } - m_makeDefaultNdkButton->setText(isDefaultNdkSelected() ? tr("Unset Default") - : tr("Make Default")); + m_makeDefaultNdkButton->setText(isDefaultNdkSelected() ? Tr::tr("Unset Default") + : Tr::tr("Make Default")); } void AndroidSettingsWidget::downloadSdk() { if (m_androidConfig.sdkToolsOk()) { QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(), - tr("The selected path already has a valid SDK Tools package.")); + Tr::tr("The selected path already has a valid SDK Tools package.")); validateSdk(); return; } - const QString message = tr("Download and install Android SDK Tools to %1?") + const QString message = Tr::tr("Download and install Android SDK Tools to %1?") .arg("\n\"" + m_sdkLocationPathChooser->filePath().cleanPath().toUserOutput() + "\""); auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(), @@ -768,7 +766,7 @@ void AndroidSettingsWidget::downloadSdk() AndroidSettingsPage::AndroidSettingsPage() { setId(Constants::ANDROID_SETTINGS_ID); - setDisplayName(AndroidSettingsWidget::tr("Android")); + setDisplayName(Tr::tr("Android")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); setWidgetCreator([] { return new AndroidSettingsWidget; }); } diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 7d3763c2fb8..853c7212f6b 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -1,9 +1,10 @@ // Copyright (C) 2016 BogDan Vatra <[email protected]> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "androidtoolchain.h" -#include "androidconstants.h" #include "androidconfigurations.h" +#include "androidconstants.h" +#include "androidtoolchain.h" +#include "androidtr.h" #include <projectexplorer/kitmanager.h> #include <projectexplorer/toolchainmanager.h> @@ -48,7 +49,7 @@ static ToolChain *findToolChain(FilePath &compilerPath, Id lang, const QString & AndroidToolChain::AndroidToolChain() : ClangToolChain(Constants::ANDROID_TOOLCHAIN_TYPEID) { - setTypeDisplayName(AndroidToolChain::tr("Android Clang")); + setTypeDisplayName(Tr::tr("Android Clang")); } FilePath AndroidToolChain::ndkLocation() const @@ -135,7 +136,7 @@ GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const AndroidToolChainFactory::AndroidToolChainFactory() { - setDisplayName(AndroidToolChain::tr("Android Clang")); + setDisplayName(Tr::tr("Android Clang")); setSupportedToolChainType(Constants::ANDROID_TOOLCHAIN_TYPEID); setSupportedLanguages({ProjectExplorer::Constants::CXX_LANGUAGE_ID}); setToolchainConstructor([] { return new AndroidToolChain; }); diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h index ec042e82e85..10a750c863b 100644 --- a/src/plugins/android/androidtoolchain.h +++ b/src/plugins/android/androidtoolchain.h @@ -14,8 +14,6 @@ using ToolChainList = QList<ProjectExplorer::ToolChain *>; class AndroidToolChain : public ProjectExplorer::ClangToolChain { - Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidToolChain) - public: ~AndroidToolChain() override; diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 1f8c3bd2734..4ea5748f594 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "avddialog.h" - +#include "androidtr.h" #include "androidavdmanager.h" #include "androidconstants.h" #include "androiddevice.h" @@ -43,7 +43,7 @@ AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent) m_sdkManager(m_androidConfig) { resize(800, 0); - setWindowTitle(tr("Create new AVD")); + setWindowTitle(Tr::tr("Create new AVD")); m_abiComboBox = new QComboBox; m_abiComboBox->addItems({ @@ -54,7 +54,7 @@ AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent) }); m_sdcardSizeSpinBox = new QSpinBox; - m_sdcardSizeSpinBox->setSuffix(tr(" MiB")); + m_sdcardSizeSpinBox->setSuffix(Tr::tr(" MiB")); m_sdcardSizeSpinBox->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); m_sdcardSizeSpinBox->setRange(0, 1000000); m_sdcardSizeSpinBox->setValue(512); @@ -73,7 +73,7 @@ AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent) m_deviceDefinitionTypeComboBox = new QComboBox; - m_overwriteCheckBox = new QCheckBox(tr("Overwrite existing AVD name")); + m_overwriteCheckBox = new QCheckBox(Tr::tr("Overwrite existing AVD name")); m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); @@ -84,13 +84,13 @@ AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent) Column { Form { - tr("Name:"), m_nameLineEdit, br, - tr("Device definition:"), + Tr::tr("Name:"), m_nameLineEdit, br, + Tr::tr("Device definition:"), Row { m_deviceDefinitionTypeComboBox, m_deviceDefinitionComboBox }, br, - tr("Architecture (ABI):"), m_abiComboBox, br, - tr("Target API:"), m_targetApiComboBox, br, + Tr::tr("Architecture (ABI):"), m_abiComboBox, br, + Tr::tr("Target API:"), m_targetApiComboBox, br, QString(), m_warningText, br, - tr("SD card size:"), m_sdcardSizeSpinBox, br, + Tr::tr("SD card size:"), m_sdcardSizeSpinBox, br, QString(), m_overwriteCheckBox, }, st, @@ -305,13 +305,13 @@ void AvdDialog::updateApiLevelComboBox() m_targetApiComboBox->setEnabled(false); m_warningText->setVisible(true); m_warningText->setText( - tr("Cannot create a new AVD. No suitable Android system image is installed.<br/>" - "Install a system image for the intended Android version from the SDK Manager.")); + Tr::tr("Cannot create a new AVD. No suitable Android system image is installed.<br/>" + "Install a system image for the intended Android version from the SDK Manager.")); m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); } else if (filteredList.isEmpty()) { m_targetApiComboBox->setEnabled(false); m_warningText->setVisible(true); - m_warningText->setText(tr("Cannot create an AVD for ABI %1.<br/>Install a system " + m_warningText->setText(Tr::tr("Cannot create an AVD for ABI %1.<br/>Install a system " "image for it from the SDK Manager tab first.") .arg(abi())); m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); @@ -330,7 +330,7 @@ bool AvdDialog::eventFilter(QObject *obj, QEvent *event) if (!key.isEmpty() && !m_allowedNameChars.match(key).hasMatch()) { QPoint position = m_nameLineEdit->parentWidget()->mapToGlobal(m_nameLineEdit->geometry().bottomLeft()); position -= Utils::ToolTip::offsetFromPosition(); - Utils::ToolTip::show(position, tr("Allowed characters are: a-z A-Z 0-9 and . _ -"), m_nameLineEdit); + Utils::ToolTip::show(position, Tr::tr("Allowed characters are: a-z A-Z 0-9 and . _ -"), m_nameLineEdit); m_hideTipTimer.start(); } else { m_hideTipTimer.stop(); diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index 30b2aa5c453..930ead0f576 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "androidtr.h" #include "createandroidmanifestwizard.h" #include <android/androidconfigurations.h> @@ -41,8 +42,6 @@ namespace Internal { class NoApplicationProFilePage : public QWizardPage { - Q_DECLARE_TR_FUNCTIONS(Android::NoApplicationProFilePage) - public: NoApplicationProFilePage(CreateAndroidManifestWizard *wizard); }; @@ -52,9 +51,9 @@ NoApplicationProFilePage::NoApplicationProFilePage(CreateAndroidManifestWizard * auto layout = new QVBoxLayout(this); auto label = new QLabel(this); label->setWordWrap(true); - label->setText(tr("No application .pro file found in this project.")); + label->setText(Tr::tr("No application .pro file found in this project.")); layout->addWidget(label); - setTitle(tr("No Application .pro File")); + setTitle(Tr::tr("No Application .pro File")); } @@ -64,8 +63,6 @@ NoApplicationProFilePage::NoApplicationProFilePage(CreateAndroidManifestWizard * class ChooseProFilePage : public QWizardPage { - Q_DECLARE_TR_FUNCTIONS(Android::ChooseProfilePage) - public: explicit ChooseProFilePage(CreateAndroidManifestWizard *wizard); @@ -82,7 +79,7 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard) auto fl = new QFormLayout(this); QLabel *label = new QLabel(this); label->setWordWrap(true); - label->setText(tr("Select the .pro file for which you want to create the Android template files.")); + label->setText(Tr::tr("Select the .pro file for which you want to create the Android template files.")); fl->addRow(label); BuildSystem *buildSystem = wizard->buildSystem(); @@ -99,8 +96,8 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard) nodeSelected(m_comboBox->currentIndex()); connect(m_comboBox, &QComboBox::currentIndexChanged, this, &ChooseProFilePage::nodeSelected); - fl->addRow(tr(".pro file:"), m_comboBox); - setTitle(tr("Select a .pro File")); + fl->addRow(Tr::tr(".pro file:"), m_comboBox); + setTitle(Tr::tr("Select a .pro File")); } void ChooseProFilePage::nodeSelected(int index) @@ -116,8 +113,6 @@ void ChooseProFilePage::nodeSelected(int index) class ChooseDirectoryPage : public QWizardPage { - Q_DECLARE_TR_FUNCTIONS(Android::ChooseDirectoryPage) - public: ChooseDirectoryPage(CreateAndroidManifestWizard *wizard); @@ -144,11 +139,11 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard) m_androidPackageSourceDir = new PathChooser(this); m_androidPackageSourceDir->setExpectedKind(PathChooser::Directory); - m_layout->addRow(tr("Android package source directory:"), m_androidPackageSourceDir); + m_layout->addRow(Tr::tr("Android package source directory:"), m_androidPackageSourceDir); m_sourceDirectoryWarning = - new InfoLabel(tr("The Android package source directory cannot be the same as " - "the project directory."), InfoLabel::Error, this); + new InfoLabel(Tr::tr("The Android package source directory cannot be the same as " + "the project directory."), InfoLabel::Error, this); m_sourceDirectoryWarning->setVisible(false); m_sourceDirectoryWarning->setElideMode(Qt::ElideNone); m_sourceDirectoryWarning->setWordWrap(true); @@ -162,8 +157,8 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard) auto checkBox = new QCheckBox(this); connect(checkBox, &QCheckBox::toggled, wizard, &CreateAndroidManifestWizard::setCopyGradle); checkBox->setChecked(false); - checkBox->setText(tr("Copy the Gradle files to Android directory")); - checkBox->setToolTip(tr("It is highly recommended if you are planning to extend the Java part of your Qt application.")); + checkBox->setText(Tr::tr("Copy the Gradle files to Android directory")); + checkBox->setToolTip(Tr::tr("It is highly recommended if you are planning to extend the Java part of your Qt application.")); m_layout->addRow(checkBox); } } @@ -201,9 +196,9 @@ void ChooseDirectoryPage::initializePage() androidPackageDir = FilePath::fromVariant(node->data(Android::Constants::AndroidPackageSourceDir)); if (androidPackageDir.isEmpty()) { - m_label->setText(tr("Select the Android package source directory.\n\n" - "The files in the Android package source directory are copied to the build directory's " - "Android directory and the default files are overwritten.")); + m_label->setText(Tr::tr("Select the Android package source directory.\n\n" + "The files in the Android package source directory are copied to the build directory's " + "Android directory and the default files are overwritten.")); const FilePath projectPath = bti.projectFilePath.isFile() ? bti.projectFilePath.parentDir() : bti.projectFilePath; @@ -212,8 +207,8 @@ void ChooseDirectoryPage::initializePage() connect(m_androidPackageSourceDir, &PathChooser::rawPathChanged, this, &ChooseDirectoryPage::checkPackageSourceDir); } else { - m_label->setText(tr("The Android template files will be created in the %1 set in the .pro " - "file.").arg(QLatin1String(Constants::ANDROID_PACKAGE_SOURCE_DIR))); + m_label->setText(Tr::tr("The Android template files will be created in the %1 set in the .pro " + "file.").arg(QLatin1String(Constants::ANDROID_PACKAGE_SOURCE_DIR))); m_androidPackageSourceDir->setFilePath(androidPackageDir); m_androidPackageSourceDir->setReadOnly(true); } @@ -228,7 +223,7 @@ void ChooseDirectoryPage::initializePage() CreateAndroidManifestWizard::CreateAndroidManifestWizard(BuildSystem *buildSystem) : m_buildSystem(buildSystem) { - setWindowTitle(tr("Create Android Template Files Wizard")); + setWindowTitle(Tr::tr("Create Android Template Files Wizard")); const QList<BuildTargetInfo> buildTargets = buildSystem->applicationTargets(); QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(buildSystem->kit()); @@ -319,9 +314,9 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles() if (!result) { QMessageBox::warning(this, - tr("Project File not Updated"), - tr("Could not update the project file %1.") - .arg(bti.projectFilePath.toUserOutput())); + Tr::tr("Project File not Updated"), + Tr::tr("Could not update the project file %1.") + .arg(bti.projectFilePath.toUserOutput())); } } } diff --git a/src/plugins/android/createandroidmanifestwizard.h b/src/plugins/android/createandroidmanifestwizard.h index 1436a589056..42deed00446 100644 --- a/src/plugins/android/createandroidmanifestwizard.h +++ b/src/plugins/android/createandroidmanifestwizard.h @@ -15,8 +15,6 @@ namespace Internal { class CreateAndroidManifestWizard : public Utils::Wizard { - Q_DECLARE_TR_FUNCTIONS(Android::CreateAndroidManifestWizard) - public: CreateAndroidManifestWizard(ProjectExplorer::BuildSystem *buildSystem); diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp index 4201f92f33b..40fe85d5bcd 100644 --- a/src/plugins/android/javalanguageserver.cpp +++ b/src/plugins/android/javalanguageserver.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "javalanguageserver.h" - #include "androidconfigurations.h" #include "androidconstants.h" #include "androidmanager.h" +#include "androidtr.h" +#include "javalanguageserver.h" #include <languageclient/client.h> #include <languageclient/languageclientinterface.h> @@ -34,7 +34,6 @@ namespace Internal { class JLSSettingsWidget : public QWidget { - Q_DECLARE_TR_FUNCTIONS(JLSSettingsWidget) public: JLSSettingsWidget(const JLSSettings *settings, QWidget *parent); @@ -56,19 +55,19 @@ JLSSettingsWidget::JLSSettingsWidget(const JLSSettings *settings, QWidget *paren { int row = 0; auto *mainLayout = new QGridLayout; - mainLayout->addWidget(new QLabel(tr("Name:")), row, 0); + mainLayout->addWidget(new QLabel(Tr::tr("Name:")), row, 0); mainLayout->addWidget(m_name, row, 1); auto chooser = new VariableChooser(this); chooser->addSupportedWidget(m_name); - mainLayout->addWidget(new QLabel(tr("Java:")), ++row, 0); + mainLayout->addWidget(new QLabel(Tr::tr("Java:")), ++row, 0); m_java->setExpectedKind(PathChooser::ExistingCommand); m_java->setFilePath(settings->m_executable); mainLayout->addWidget(m_java, row, 1); - mainLayout->addWidget(new QLabel(tr("Java Language Server:")), ++row, 0); + mainLayout->addWidget(new QLabel(Tr::tr("Java Language Server:")), ++row, 0); m_ls->setExpectedKind(PathChooser::File); - m_ls->lineEdit()->setPlaceholderText(tr("Path to equinox launcher jar")); + m_ls->lineEdit()->setPlaceholderText(Tr::tr("Path to equinox launcher jar")); m_ls->setPromptDialogFilter("org.eclipse.equinox.launcher_*.jar"); m_ls->setFilePath(settings->m_languageServer); mainLayout->addWidget(m_ls, row, 1); diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp index fb0acee615e..33092491aec 100644 --- a/src/plugins/android/splashscreencontainerwidget.cpp +++ b/src/plugins/android/splashscreencontainerwidget.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "androidtr.h" #include "splashscreencontainerwidget.h" #include "splashscreenwidget.h" @@ -42,7 +43,7 @@ const char splashscreenFileName[] = "logo"; const char splashscreenPortraitFileName[] = "logo_port"; const char splashscreenLandscapeFileName[] = "logo_land"; const char imageSuffix[] = ".png"; -const QString fileDialogImageFiles = QString(QWidget::tr("Images (*.png *.jpg *.jpeg)")); +const QString fileDialogImageFiles = QString(QWidget::tr("Images (*.png *.jpg *.jpeg)")); // TODO: Implement a centralized images filter string const QSize lowDpiImageSize{200, 320}; const QSize mediumDpiImageSize{320, 480}; const QSize highDpiImageSize{480, 800}; @@ -103,8 +104,8 @@ static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget, auto pageLayout = new QHBoxLayout(page); auto genericWidget= addWidgetToPage(page, displaySize, size, - SplashScreenContainerWidget::tr("Splash screen"), - SplashScreenContainerWidget::tr("Select splash screen image") + Tr::tr("Splash screen"), + Tr::tr("Select splash screen image") + sizeToStr(size), textEditorWidget, path, @@ -114,8 +115,8 @@ static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget, auto portraitWidget = addWidgetToPage(page, displaySize, portraitSize, - SplashScreenContainerWidget::tr("Portrait splash screen"), - SplashScreenContainerWidget::tr("Select portrait splash screen image") + Tr::tr("Portrait splash screen"), + Tr::tr("Select portrait splash screen image") + sizeToStr(portraitSize), textEditorWidget, path, @@ -125,8 +126,8 @@ static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget, auto landscapeWidget = addWidgetToPage(page, landscapeDisplaySize, landscapeSize, - SplashScreenContainerWidget::tr("Landscape splash screen"), - SplashScreenContainerWidget::tr("Select landscape splash screen image") + Tr::tr("Landscape splash screen"), + Tr::tr("Select landscape splash screen image") + sizeToStr(landscapeSize), textEditorWidget, path, @@ -135,7 +136,7 @@ static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget, landscapeWidgetContainer); auto clearButton = new QToolButton(page); - clearButton->setText(SplashScreenContainerWidget::tr("Clear All")); + clearButton->setText(Tr::tr("Clear All")); pageLayout->addWidget(clearButton); pageLayout->setAlignment(clearButton, Qt::AlignVCenter); SplashScreenContainerWidget::connect(clearButton, &QAbstractButton::clicked, @@ -163,12 +164,12 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( QTabWidget *tab = new QTabWidget(this); m_stickyCheck = new QCheckBox(this); - m_stickyCheck->setToolTip(tr("A non-sticky splash screen is hidden automatically when an activity is drawn.\n" - "To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().")); - formLayout->addRow(tr("Sticky splash screen:"), m_stickyCheck); + m_stickyCheck->setToolTip(Tr::tr("A non-sticky splash screen is hidden automatically when an activity is drawn.\n" + "To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().")); + formLayout->addRow(Tr::tr("Sticky splash screen:"), m_stickyCheck); m_imageShowMode = new QComboBox(this); - formLayout->addRow(tr("Image show mode:"), m_imageShowMode); + formLayout->addRow(Tr::tr("Image show mode:"), m_imageShowMode); const QList<QStringList> imageShowModeMethodsMap = { {"center", "Place the object in the center of the screen in both the vertical and horizontal axis,\n" "not changing its size."}, @@ -179,26 +180,26 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( } m_backgroundColor = new QToolButton(this); - m_backgroundColor->setToolTip(tr("Background color of the splash screen.")); - formLayout->addRow(tr("Background color:"), m_backgroundColor); + m_backgroundColor->setToolTip(Tr::tr("Background color of the splash screen.")); + formLayout->addRow(Tr::tr("Background color:"), m_backgroundColor); m_masterImage = new QToolButton(this); - m_masterImage->setToolTip(tr("Select master image to use.")); + m_masterImage->setToolTip(Tr::tr("Select master image to use.")); m_masterImage->setIcon(QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon())); - formLayout->addRow(tr("Master image:"), m_masterImage); + formLayout->addRow(Tr::tr("Master image:"), m_masterImage); m_portraitMasterImage = new QToolButton(this); - m_portraitMasterImage->setToolTip(tr("Select portrait master image to use.")); + m_portraitMasterImage->setToolTip(Tr::tr("Select portrait master image to use.")); m_portraitMasterImage->setIcon(QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon())); - formLayout->addRow(tr("Portrait master image:"), m_portraitMasterImage); + formLayout->addRow(Tr::tr("Portrait master image:"), m_portraitMasterImage); m_landscapeMasterImage = new QToolButton(this); - m_landscapeMasterImage->setToolTip(tr("Select landscape master image to use.")); + m_landscapeMasterImage->setToolTip(Tr::tr("Select landscape master image to use.")); m_landscapeMasterImage->setIcon(QIcon::fromTheme(QLatin1String("document-open"), Utils::Icons::OPENFILE.icon())); - formLayout->addRow(tr("Landscape master image:"), m_landscapeMasterImage); + formLayout->addRow(Tr::tr("Landscape master image:"), m_landscapeMasterImage); auto clearAllButton = new QToolButton(this); - clearAllButton->setText(SplashScreenContainerWidget::tr("Clear All")); + clearAllButton->setText(Tr::tr("Clear All")); auto ldpiPage = createPage(textEditorWidget, m_imageWidgets, m_portraitImageWidgets, m_landscapeImageWidgets, @@ -207,7 +208,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( lowDpiImageSize, lowDpiImageSize.transposed(), lowDpiImagePath); - tab->addTab(ldpiPage, tr("LDPI")); + tab->addTab(ldpiPage, Tr::tr("LDPI")); auto mdpiPage = createPage(textEditorWidget, m_imageWidgets, m_portraitImageWidgets, m_landscapeImageWidgets, mediumDpiScalingRatio, @@ -215,7 +216,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( mediumDpiImageSize, mediumDpiImageSize.transposed(), mediumDpiImagePath); - tab->addTab(mdpiPage, tr("MDPI")); + tab->addTab(mdpiPage, Tr::tr("MDPI")); auto hdpiPage = createPage(textEditorWidget, m_imageWidgets, m_portraitImageWidgets, m_landscapeImageWidgets, highDpiScalingRatio, @@ -223,7 +224,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( highDpiImageSize, highDpiImageSize.transposed(), highDpiImagePath); - tab->addTab(hdpiPage, tr("HDPI")); + tab->addTab(hdpiPage, Tr::tr("HDPI")); auto xHdpiPage = createPage(textEditorWidget, m_imageWidgets, m_portraitImageWidgets, m_landscapeImageWidgets, extraHighDpiScalingRatio, @@ -231,7 +232,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( extraHighDpiImageSize, extraHighDpiImageSize.transposed(), extraHighDpiImagePath); - tab->addTab(xHdpiPage, tr("XHDPI")); + tab->addTab(xHdpiPage, Tr::tr("XHDPI")); auto xxHdpiPage = createPage(textEditorWidget, m_imageWidgets, m_portraitImageWidgets, m_landscapeImageWidgets, extraExtraHighDpiScalingRatio, @@ -239,7 +240,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( extraExtraHighDpiImageSize, extraExtraHighDpiImageSize.transposed(), extraExtraHighDpiImagePath); - tab->addTab(xxHdpiPage, tr("XXHDPI")); + tab->addTab(xxHdpiPage, Tr::tr("XXHDPI")); auto xxxHdpiPage = createPage(textEditorWidget, m_imageWidgets, m_portraitImageWidgets, m_landscapeImageWidgets, extraExtraExtraHighDpiScalingRatio, @@ -247,7 +248,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( extraExtraExtraHighDpiImageSize, extraExtraExtraHighDpiImageSize.transposed(), extraExtraExtraHighDpiImagePath); - tab->addTab(xxxHdpiPage, tr("XXXHDPI")); + tab->addTab(xxxHdpiPage, Tr::tr("XXXHDPI")); formLayout->setContentsMargins(10, 10, 10, 10); formLayout->setSpacing(10); settingsLayout->addLayout(formLayout); @@ -261,11 +262,11 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( auto warningLabel = new QLabel(this); warningLabel->setAlignment(Qt::AlignHCenter); - warningLabel->setText(tr("An image is used for the splashscreen. Qt Creator manages\n" - "splashscreen by using a different method which requires changing\n" - "the manifest file by overriding your settings. Allow override?")); + warningLabel->setText(Tr::tr("An image is used for the splashscreen. Qt Creator manages\n" + "splashscreen by using a different method which requires changing\n" + "the manifest file by overriding your settings. Allow override?")); m_convertSplashscreen = new QToolButton(this); - m_convertSplashscreen->setText(tr("Convert")); + m_convertSplashscreen->setText(Tr::tr("Convert")); noSplashscreenLayout->addStretch(); noSplashscreenLayout->addWidget(warningLabel); noSplashscreenLayout->addWidget(m_convertSplashscreen); @@ -314,7 +315,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( connect(m_backgroundColor, &QToolButton::clicked, this, [this] { const QColor color = QColorDialog::getColor(m_splashScreenBackgroundColor, this, - tr("Select background color")); + Tr::tr("Select background color")); if (color.isValid()) { setBackgroundColor(color); createSplashscreenThemes(); @@ -322,7 +323,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( } }); connect(m_masterImage, &QToolButton::clicked, this, [this] { - const FilePath file = FileUtils::getOpenFilePath(this, tr("Select master image"), + const FilePath file = FileUtils::getOpenFilePath(this, Tr::tr("Select master image"), FileUtils::homePath(), fileDialogImageFiles); if (!file.isEmpty()) { for (auto &&imageWidget : m_imageWidgets) @@ -332,7 +333,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( } }); connect(m_portraitMasterImage, &QToolButton::clicked, this, [this] { - const FilePath file = FileUtils::getOpenFilePath(this, tr("Select portrait master image"), + const FilePath file = FileUtils::getOpenFilePath(this, Tr::tr("Select portrait master image"), FileUtils::homePath(), fileDialogImageFiles); if (!file.isEmpty()) { for (auto &&imageWidget : m_portraitImageWidgets) @@ -342,7 +343,7 @@ SplashScreenContainerWidget::SplashScreenContainerWidget( } }); connect(m_landscapeMasterImage, &QToolButton::clicked, this, [this] { - const FilePath file = FileUtils::getOpenFilePath(this, tr("Select landscape master image"), + const FilePath file = FileUtils::getOpenFilePath(this, Tr::tr("Select landscape master image"), FileUtils::homePath(), fileDialogImageFiles); if (!file.isEmpty()) { for (auto &&imageWidget : m_landscapeImageWidgets) diff --git a/src/plugins/android/splashscreenwidget.cpp b/src/plugins/android/splashscreenwidget.cpp index 35bd714970f..d5a371c970b 100644 --- a/src/plugins/android/splashscreenwidget.cpp +++ b/src/plugins/android/splashscreenwidget.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "androidtr.h" #include "splashscreenwidget.h" #include <texteditor/textdocument.h> @@ -64,10 +65,10 @@ SplashScreenWidget::SplashScreenWidget( m_scaleWarningLabel->setMinimumSize(clearAndWarningSize); m_scaleWarningLabel->setMaximumSize(clearAndWarningSize); m_scaleWarningLabel->setPixmap(Utils::Icons::WARNING.icon().pixmap(clearAndWarningSize)); - m_scaleWarningLabel->setToolTip(tr("Icon scaled up.")); + m_scaleWarningLabel->setToolTip(Tr::tr("Icon scaled up.")); m_scaleWarningLabel->setVisible(false); } - auto label = new QLabel(tr("Click to select..."), parent); + auto label = new QLabel(Tr::tr("Click to select..."), parent); splashLayout->addWidget(splashTitle); splashLayout->setAlignment(splashTitle, Qt::AlignHCenter); splashButtonLayout->setColumnMinimumWidth(0, 16); @@ -166,7 +167,7 @@ void SplashScreenWidget::selectImage() const FilePath file = FileUtils::getOpenFilePath(this, m_imageSelectionText, FileUtils::homePath(), QStringLiteral("%1 (*.png *.jpg *.jpeg)") - .arg(tr("Images"))); + .arg(Tr::tr("Images"))); if (file.isEmpty()) return; setImageFromPath(file, false); |