forked from qt-creator/qt-creator
Tr: Move some line endings at beginning and end out of tr
Change-Id: Ibb0aba4d6e58bfe4684a818a894876c1f8f7df15 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -751,12 +751,8 @@ Vil du afinstallere den eksisterende pakke?</translation>
|
|||||||
<translation>Handlingen kræver indgriben fra brugeren. Brug kommandolinjeværktøjet "sdkmanager".</translation>
|
<translation>Handlingen kræver indgriben fra brugeren. Brug kommandolinjeværktøjet "sdkmanager".</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>License command failed.
|
<source>License command failed.</source>
|
||||||
|
<translation>Licens-kommando mislykkedes.</translation>
|
||||||
</source>
|
|
||||||
<translation>Licens-kommando mislykkedes.
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Manager</source>
|
<source>Android SDK Manager</source>
|
||||||
@@ -807,16 +803,12 @@ Vil du afinstallere den eksisterende pakke?</translation>
|
|||||||
<translation>Vil du acceptere Android SDK-licensen?</translation>
|
<translation>Vil du acceptere Android SDK-licensen?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking pending licenses...
|
<source>Checking pending licenses...</source>
|
||||||
</source>
|
<translation>Tjekker afventende licenser...</translation>
|
||||||
<translation>Tjekker afventende licenser...
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>
|
<source>SDK Manager is busy.</source>
|
||||||
SDK Manager is busy.</source>
|
<translation>SDK manager er optaget.</translation>
|
||||||
<translation>
|
|
||||||
SDK manager er optaget.</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Changes</source>
|
<source>Android SDK Changes</source>
|
||||||
@@ -1295,12 +1287,8 @@ Installer en SDK af mindst API version %1.</translation>
|
|||||||
<translation>Mislykkedes.</translation>
|
<translation>Mislykkedes.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Done
|
<source>Done</source>
|
||||||
|
<translation>Færdig</translation>
|
||||||
</source>
|
|
||||||
<translation>Færdig
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
|
|||||||
@@ -10396,22 +10396,16 @@ Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist.
|
|||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking pending licenses...
|
<source>Checking pending licenses...</source>
|
||||||
</source>
|
<translation>Prüfe auf ausstehende Lizenzen...</translation>
|
||||||
<translation>Prüfe auf ausstehende Lizenzen...
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>The installation of Android SDK packages may fail if the respective licenses are not accepted.
|
<source>The installation of Android SDK packages may fail if the respective licenses are not accepted.</source>
|
||||||
</source>
|
<translation>Die Installation von Android-SDK-Paketen kann fehlschlagen, wenn die entsprechenden Lizenzen nicht akzeptiert werden.</translation>
|
||||||
<translation>Die Installation von Android-SDK-Paketen kann fehlschlagen, wenn die entsprechenden Lizenzen nicht akzeptiert werden.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>
|
<source>SDK Manager is busy.</source>
|
||||||
SDK Manager is busy.</source>
|
<translation>SDK-Manager arbeitet.</translation>
|
||||||
<translation>
|
|
||||||
SDK-Manager arbeitet.</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Changes</source>
|
<source>Android SDK Changes</source>
|
||||||
@@ -10503,12 +10497,8 @@ Breche ausstehende Operationen ab...
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>License command failed.
|
<source>License command failed.</source>
|
||||||
|
<translation>Lizenzkommando fehlgeschlagen.</translation>
|
||||||
</source>
|
|
||||||
<translation>Lizenzkommando fehlgeschlagen.
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Updating installed packages.</source>
|
<source>Updating installed packages.</source>
|
||||||
@@ -10519,12 +10509,8 @@ Breche ausstehende Operationen ab...
|
|||||||
<translation>Fehlgeschlagen.</translation>
|
<translation>Fehlgeschlagen.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Done
|
<source>Done</source>
|
||||||
|
<translation>Fertig</translation>
|
||||||
</source>
|
|
||||||
<translation>Fertig
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
@@ -27607,10 +27593,8 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
|
|||||||
<translation>Lade...</translation>
|
<translation>Lade...</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Running "%1"
|
<source>Running "%1"</source>
|
||||||
</source>
|
<translation>Führe "%1" aus</translation>
|
||||||
<translation>Führe "%1" aus
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Unexpected result: %1</source>
|
<source>Unexpected result: %1</source>
|
||||||
@@ -47127,22 +47111,16 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
|
|||||||
<translation>Überprüfe, ob "%1" funktioniert...</translation>
|
<translation>Überprüfe, ob "%1" funktioniert...</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Failed to start "%1": %2
|
<source>Failed to start "%1": %2</source>
|
||||||
</source>
|
<translation>"%1" konnte nicht gestartet werden: %2</translation>
|
||||||
<translation>"%1" konnte nicht gestartet werden: %2
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" crashed.
|
<source>"%1" crashed.</source>
|
||||||
</source>
|
<translation>"%1" ist abgestürzt.</translation>
|
||||||
<translation>"%1" ist abgestürzt.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" failed with exit code %2: %3
|
<source>"%1" failed with exit code %2: %3</source>
|
||||||
</source>
|
<translation>"%1" ist mit Rückgabewert %2 fehlgeschlagen: %3</translation>
|
||||||
<translation>"%1" ist mit Rückgabewert %2 fehlgeschlagen: %3
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" is functional.
|
<source>"%1" is functional.
|
||||||
@@ -47151,10 +47129,8 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
|
|||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" will be used for deployment, because "%2" and "%3" are not available.
|
<source>"%1" will be used for deployment, because "%2" and "%3" are not available.</source>
|
||||||
</source>
|
<translation>"%1" wird für das Deployment benutzt, da "%2" und "%3" nicht verfügbar sind.</translation>
|
||||||
<translation>"%1" wird für das Deployment benutzt, da "%2" und "%3" nicht verfügbar sind.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking if required commands are available...</source>
|
<source>Checking if required commands are available...</source>
|
||||||
@@ -47177,10 +47153,8 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
|
|||||||
<translation>%1 nicht gefunden.</translation>
|
<translation>%1 nicht gefunden.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Deployment to this device will not work out of the box.
|
<source>Deployment to this device will not work out of the box.</source>
|
||||||
</source>
|
<translation>Deployment auf dieses Gerät wird nicht von Anfang an funktionieren.</translation>
|
||||||
<translation>Deployment auf dieses Gerät wird nicht von Anfang an funktionieren.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking if specified ports are available...</source>
|
<source>Checking if specified ports are available...</source>
|
||||||
@@ -47446,10 +47420,6 @@ Der Kontrollprozess konnte nicht gestartet werden.</translation>
|
|||||||
<source>"%1" failed to start: %2</source>
|
<source>"%1" failed to start: %2</source>
|
||||||
<translation>"%1" konnte nicht gestartet werden: %2</translation>
|
<translation>"%1" konnte nicht gestartet werden: %2</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<source>"%1" crashed.</source>
|
|
||||||
<translation>"%1" ist abgestürzt.</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
<message>
|
||||||
<source>"sftp" binary "%1" does not exist.</source>
|
<source>"sftp" binary "%1" does not exist.</source>
|
||||||
<translation>Ausführbare "sftp"-Datei "%1" existiert nicht.</translation>
|
<translation>Ausführbare "sftp"-Datei "%1" existiert nicht.</translation>
|
||||||
|
|||||||
@@ -9058,22 +9058,16 @@ Installez-les manuellement après que l'opération en cours soit finie.
|
|||||||
<translation>L'installation du SDK Android ne contient pas certains paquets nécessaires. Souhaitez-vous installer les paquets manquants ?</translation>
|
<translation>L'installation du SDK Android ne contient pas certains paquets nécessaires. Souhaitez-vous installer les paquets manquants ?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking pending licenses...
|
<source>Checking pending licenses...</source>
|
||||||
</source>
|
<translation>Vérification des licences en cours…</translation>
|
||||||
<translation>Vérification des licences en cours…
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>The installation of Android SDK packages may fail if the respective licenses are not accepted.
|
<source>The installation of Android SDK packages may fail if the respective licenses are not accepted.</source>
|
||||||
</source>
|
<translation>L'installation des paquets du SDK Android peut échouer si les licences respectives ne sont pas acceptées.</translation>
|
||||||
<translation>L'installation des paquets du SDK Android peut échouer si les licences respectives ne sont pas acceptées.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>
|
<source>SDK Manager is busy.</source>
|
||||||
SDK Manager is busy.</source>
|
<translation>Le gestionnaire de SDK est occupé.</translation>
|
||||||
<translation>
|
|
||||||
Le gestionnaire de SDK est occupé.</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<source>%n Android SDK packages shall be updated.</source>
|
<source>%n Android SDK packages shall be updated.</source>
|
||||||
@@ -10672,12 +10666,8 @@ Les fichiers du répertoire source du paquet Android sont copiés dans le réper
|
|||||||
<translation>Échec.</translation>
|
<translation>Échec.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Done
|
<source>Done</source>
|
||||||
|
<translation>Fini</translation>
|
||||||
</source>
|
|
||||||
<translation>Fini
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
@@ -10700,12 +10690,8 @@ Les fichiers du répertoire source du paquet Android sont copiés dans le réper
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>License command failed.
|
<source>License command failed.</source>
|
||||||
|
<translation>Échec de la commande de licence.</translation>
|
||||||
</source>
|
|
||||||
<translation>Échec de la commande de licence.
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Revision</source>
|
<source>Revision</source>
|
||||||
@@ -27352,10 +27338,8 @@ La recompilation du projet peut aider.</translation>
|
|||||||
<translation>Chargement …</translation>
|
<translation>Chargement …</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Running "%1"
|
<source>Running "%1"</source>
|
||||||
</source>
|
<translation>Exécution de « %1 »</translation>
|
||||||
<translation>Exécution de « %1 »
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Unexpected result: %1</source>
|
<source>Unexpected result: %1</source>
|
||||||
@@ -46947,34 +46931,20 @@ Le processus de contrôle n'a pas pu démarrer.</translation>
|
|||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Failed to start "%1": %2
|
<source>Failed to start "%1": %2</source>
|
||||||
</source>
|
<translation>Échec du démarrage de « %1 » : %2</translation>
|
||||||
<translation>Échec du démarrage de « %1 » : %2
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" crashed.
|
<source>"%1" failed with exit code %2: %3</source>
|
||||||
</source>
|
<translation>« %1 » a échoué avec le code de sortie %2 : %3</translation>
|
||||||
<translation>« %1 » a planté.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" failed with exit code %2: %3
|
<source>"%1" will be used for deployment, because "%2" and "%3" are not available.</source>
|
||||||
</source>
|
<translation>« %1 » sera utilisé pour le déploiement, car « %2 » et « %3 » ne sont pas disponibles.</translation>
|
||||||
<translation>« %1 » a échoué avec le code de sortie %2 : %3
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" will be used for deployment, because "%2" and "%3" are not available.
|
<source>Deployment to this device will not work out of the box.</source>
|
||||||
</source>
|
<translation>Le déploiement vers ce périphérique ne fonctionnera pas directement.</translation>
|
||||||
<translation>« %1 » sera utilisé pour le déploiement, car « %2 » et « %3 » ne sont pas disponibles.
|
|
||||||
</translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>Deployment to this device will not work out of the box.
|
|
||||||
</source>
|
|
||||||
<translation>Le déploiement vers ce périphérique ne fonctionnera pas directement.
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>%1...</source>
|
<source>%1...</source>
|
||||||
|
|||||||
@@ -874,16 +874,12 @@
|
|||||||
<translation>Želiš li prihvatiti licencu za Android SDK?</translation>
|
<translation>Želiš li prihvatiti licencu za Android SDK?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking pending licenses...
|
<source>Checking pending licenses...</source>
|
||||||
</source>
|
<translation>Provjera neriješenih licenca …</translation>
|
||||||
<translation>Provjera neriješenih licenca …
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>
|
<source>SDK Manager is busy.</source>
|
||||||
SDK Manager is busy.</source>
|
<translation>Upravljač za SDK je zauzet.</translation>
|
||||||
<translation>
|
|
||||||
Upravljač za SDK je zauzet.</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Changes</source>
|
<source>Android SDK Changes</source>
|
||||||
@@ -13630,9 +13626,7 @@ Do you want to uninstall the existing package?</source>
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>License command failed.
|
<source>License command failed.</source>
|
||||||
|
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -13644,9 +13638,7 @@ Do you want to uninstall the existing package?</source>
|
|||||||
<translation type="unfinished">Neuspjelo.</translation>
|
<translation type="unfinished">Neuspjelo.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Done
|
<source>Done</source>
|
||||||
|
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|||||||
@@ -1398,12 +1398,8 @@ Do you want to uninstall the existing package?</source>
|
|||||||
<translation>Операция требует вмешательства пользователя. Используйте «sdkmanager» в командной строке.</translation>
|
<translation>Операция требует вмешательства пользователя. Используйте «sdkmanager» в командной строке.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>License command failed.
|
<source>License command failed.</source>
|
||||||
|
<translation>Команда License завершилась с ошибкой.</translation>
|
||||||
</source>
|
|
||||||
<translation>Команда License завершилась с ошибкой.
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Manager</source>
|
<source>Android SDK Manager</source>
|
||||||
@@ -1446,16 +1442,12 @@ Do you want to uninstall the existing package?</source>
|
|||||||
<translation>Принимаете условия лицензии Android SDK?</translation>
|
<translation>Принимаете условия лицензии Android SDK?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking pending licenses...
|
<source>Checking pending licenses...</source>
|
||||||
</source>
|
<translation>Проверка ожидающих лицензий...</translation>
|
||||||
<translation>Проверка ожидающих лицензий...
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>
|
<source>SDK Manager is busy.</source>
|
||||||
SDK Manager is busy.</source>
|
<translation>SDK Manager занят.</translation>
|
||||||
<translation>
|
|
||||||
SDK Manager занят.</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Changes</source>
|
<source>Android SDK Changes</source>
|
||||||
@@ -2081,12 +2073,8 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source>
|
|||||||
<translation>Ошибка.</translation>
|
<translation>Ошибка.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Done
|
<source>Done</source>
|
||||||
|
<translation>Готово</translation>
|
||||||
</source>
|
|
||||||
<translation>Готово
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
@@ -40173,10 +40161,8 @@ If you do not have a private key yet, you can also create one here.</source>
|
|||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Deployment to this device will not work out of the box.
|
<source>Deployment to this device will not work out of the box.</source>
|
||||||
</source>
|
<translation>Развёртывание на это устройство не работает «из коробки».</translation>
|
||||||
<translation>Развёртывание на это устройство не работает «из коробки».
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>rsync is functional.
|
<source>rsync is functional.
|
||||||
|
|||||||
@@ -1460,12 +1460,8 @@ This cannot be undone.</source>
|
|||||||
<translation>失败.</translation>
|
<translation>失败.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Done
|
<source>Done</source>
|
||||||
|
<translation>完成</translation>
|
||||||
</source>
|
|
||||||
<translation>完成
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Installing</source>
|
<source>Installing</source>
|
||||||
@@ -1488,12 +1484,8 @@ This cannot be undone.</source>
|
|||||||
<translation>安卓 SDK 管理器</translation>
|
<translation>安卓 SDK 管理器</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>License command failed.
|
<source>License command failed.</source>
|
||||||
|
<translation>许可命令失败。</translation>
|
||||||
</source>
|
|
||||||
<translation>许可命令失败。
|
|
||||||
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Android SDK Manager</source>
|
<source>Android SDK Manager</source>
|
||||||
@@ -1580,21 +1572,16 @@ Install them manually after the current operation is done.
|
|||||||
<translation>缺失安卓 SDK 安装所必要的包。你想安装这些缺失包吗?</translation>
|
<translation>缺失安卓 SDK 安装所必要的包。你想安装这些缺失包吗?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Checking pending licenses...
|
<source>Checking pending licenses...</source>
|
||||||
</source>
|
<translation>正在检查待处理的许可证...</translation>
|
||||||
<translation>正在检查待处理的许可证...
|
|
||||||
</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>The installation of Android SDK packages may fail if the respective licenses are not accepted.
|
<source>The installation of Android SDK packages may fail if the respective licenses are not accepted.</source>
|
||||||
</source>
|
|
||||||
<translation>如果不接受相应的许可证,安卓 SDK 包安装可能会失败。</translation>
|
<translation>如果不接受相应的许可证,安卓 SDK 包安装可能会失败。</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>
|
<source>SDK Manager is busy.</source>
|
||||||
SDK Manager is busy.</source>
|
<translation>SDK 管理器繁忙。</translation>
|
||||||
<translation>
|
|
||||||
SDK 管理器繁忙。</translation>
|
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<source>%n Android SDK packages shall be updated.</source>
|
<source>%n Android SDK packages shall be updated.</source>
|
||||||
@@ -18093,8 +18080,7 @@ Rebuilding the project might help.</source>
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Running "%1"
|
<source>Running "%1"</source>
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -39240,18 +39226,11 @@ Control process failed to start.</source>
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Failed to start "%1": %2
|
<source>Failed to start "%1": %2</source>
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>"%1" crashed.
|
<source>"%1" failed with exit code %2: %3</source>
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<source>"%1" failed with exit code %2: %3
|
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
@@ -39265,8 +39244,7 @@ Control process failed to start.</source>
|
|||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Deployment to this device will not work out of the box.
|
<source>Deployment to this device will not work out of the box.</source>
|
||||||
</source>
|
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|||||||
@@ -438,7 +438,7 @@ void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
|
|||||||
|
|
||||||
if (result.stdError.isEmpty() && !result.success)
|
if (result.stdError.isEmpty() && !result.success)
|
||||||
result.stdError = Tr::tr("Failed.");
|
result.stdError = Tr::tr("Failed.");
|
||||||
result.stdOutput = Tr::tr("Done\n\n");
|
result.stdOutput = Tr::tr("Done") + "\n\n";
|
||||||
promise.addResult(result);
|
promise.addResult(result);
|
||||||
promise.setProgressValue(100);
|
promise.setProgressValue(100);
|
||||||
}
|
}
|
||||||
@@ -468,8 +468,8 @@ void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const QStringList &inst
|
|||||||
currentProgress += progressQuota;
|
currentProgress += progressQuota;
|
||||||
fi.setProgressValue(currentProgress);
|
fi.setProgressValue(currentProgress);
|
||||||
if (result.stdError.isEmpty() && !result.success)
|
if (result.stdError.isEmpty() && !result.success)
|
||||||
result.stdError = Tr::tr("AndroidSdkManager", "Failed");
|
result.stdError = Tr::tr("Failed");
|
||||||
result.stdOutput = Tr::tr("AndroidSdkManager", "Done\n\n");
|
result.stdOutput = Tr::tr("Done") + "\n\n";
|
||||||
fi.addResult(result);
|
fi.addResult(result);
|
||||||
return fi.isCanceled();
|
return fi.isCanceled();
|
||||||
};
|
};
|
||||||
@@ -569,7 +569,7 @@ void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi)
|
|||||||
m_licenseTextCache.clear();
|
m_licenseTextCache.clear();
|
||||||
result.success = licenseCommand.exitStatus() == QProcess::NormalExit;
|
result.success = licenseCommand.exitStatus() == QProcess::NormalExit;
|
||||||
if (!result.success)
|
if (!result.success)
|
||||||
result.stdError = Tr::tr("License command failed.\n\n");
|
result.stdError = Tr::tr("License command failed.") + "\n\n";
|
||||||
fi.addResult(result);
|
fi.addResult(result);
|
||||||
fi.setProgressValue(100);
|
fi.setProgressValue(100);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -290,9 +290,10 @@ void AndroidSdkManagerWidget::installEssentials()
|
|||||||
|
|
||||||
void AndroidSdkManagerWidget::beginLicenseCheck()
|
void AndroidSdkManagerWidget::beginLicenseCheck()
|
||||||
{
|
{
|
||||||
m_formatter->appendMessage(Tr::tr("Checking pending licenses...\n"), NormalMessageFormat);
|
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 "
|
m_formatter->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
|
||||||
"respective licenses are not accepted.\n"),
|
"respective licenses are not accepted.")
|
||||||
|
+ "\n",
|
||||||
LogMessageFormat);
|
LogMessageFormat);
|
||||||
addPackageFuture(m_sdkManager->checkPendingLicenses());
|
addPackageFuture(m_sdkManager->checkPendingLicenses());
|
||||||
}
|
}
|
||||||
@@ -302,7 +303,7 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage)
|
|||||||
QTC_ASSERT(m_currentView == PackageListing, return);
|
QTC_ASSERT(m_currentView == PackageListing, return);
|
||||||
|
|
||||||
if (m_sdkManager->isBusy()) {
|
if (m_sdkManager->isBusy()) {
|
||||||
m_formatter->appendMessage(Tr::tr("\nSDK Manager is busy."), StdErrFormat);
|
m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -356,7 +357,7 @@ void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage)
|
|||||||
void AndroidSdkManagerWidget::onUpdatePackages()
|
void AndroidSdkManagerWidget::onUpdatePackages()
|
||||||
{
|
{
|
||||||
if (m_sdkManager->isBusy()) {
|
if (m_sdkManager->isBusy()) {
|
||||||
m_formatter->appendMessage(Tr::tr("\nSDK Manager is busy."), StdErrFormat);
|
m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switchView(Operations);
|
switchView(Operations);
|
||||||
|
|||||||
@@ -1201,7 +1201,7 @@ public:
|
|||||||
|
|
||||||
CommandLine cmd{settings().dockerBinaryPath(),
|
CommandLine cmd{settings().dockerBinaryPath(),
|
||||||
{"images", "--format", "{{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.Size}}"}};
|
{"images", "--format", "{{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.Size}}"}};
|
||||||
m_log->append(Tr::tr("Running \"%1\"\n").arg(cmd.toUserOutput()));
|
m_log->append(Tr::tr("Running \"%1\"").arg(cmd.toUserOutput()) + "\n");
|
||||||
|
|
||||||
m_process = new Process(this);
|
m_process = new Process(this);
|
||||||
m_process->setCommand(cmd);
|
m_process->setCommand(cmd);
|
||||||
|
|||||||
@@ -188,12 +188,16 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
|
|||||||
const ProcessResultData resultData = transfer.resultData();
|
const ProcessResultData resultData = transfer.resultData();
|
||||||
QString error;
|
QString error;
|
||||||
if (resultData.m_error == QProcess::FailedToStart) {
|
if (resultData.m_error == QProcess::FailedToStart) {
|
||||||
error = Tr::tr("Failed to start \"%1\": %2\n").arg(methodName, resultData.m_errorString);
|
error = Tr::tr("Failed to start \"%1\": %2").arg(methodName, resultData.m_errorString)
|
||||||
|
+ "\n";
|
||||||
} else if (resultData.m_exitStatus == QProcess::CrashExit) {
|
} else if (resultData.m_exitStatus == QProcess::CrashExit) {
|
||||||
error = Tr::tr("\"%1\" crashed.\n").arg(methodName);
|
error = Tr::tr("\"%1\" crashed.").arg(methodName) + "\n";
|
||||||
} else if (resultData.m_exitCode != 0) {
|
} else if (resultData.m_exitCode != 0) {
|
||||||
error = Tr::tr("\"%1\" failed with exit code %2: %3\n")
|
error = Tr::tr("\"%1\" failed with exit code %2: %3")
|
||||||
.arg(methodName).arg(resultData.m_exitCode).arg(resultData.m_errorString);
|
.arg(methodName)
|
||||||
|
.arg(resultData.m_exitCode)
|
||||||
|
.arg(resultData.m_errorString)
|
||||||
|
+ "\n";
|
||||||
}
|
}
|
||||||
emit q->errorMessage(error);
|
emit q->errorMessage(error);
|
||||||
if (method == FileTransferMethod::Rsync)
|
if (method == FileTransferMethod::Rsync)
|
||||||
@@ -209,8 +213,9 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
|
|||||||
const QString sftp = FileTransfer::transferMethodName(FileTransferMethod::Sftp);
|
const QString sftp = FileTransfer::transferMethodName(FileTransferMethod::Sftp);
|
||||||
const QString rsync = FileTransfer::transferMethodName(FileTransferMethod::Rsync);
|
const QString rsync = FileTransfer::transferMethodName(FileTransferMethod::Rsync);
|
||||||
emit q->progressMessage(Tr::tr("\"%1\" will be used for deployment, because \"%2\" "
|
emit q->progressMessage(Tr::tr("\"%1\" will be used for deployment, because \"%2\" "
|
||||||
"and \"%3\" are not available.\n")
|
"and \"%3\" are not available.")
|
||||||
.arg(generic, sftp, rsync));
|
.arg(generic, sftp, rsync)
|
||||||
|
+ "\n");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return FileTransferTestTask(setup, done, error);
|
return FileTransferTestTask(setup, done, error);
|
||||||
@@ -219,16 +224,16 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
|
|||||||
GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const
|
GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const
|
||||||
{
|
{
|
||||||
TreeStorage<TransferStorage> storage;
|
TreeStorage<TransferStorage> storage;
|
||||||
return Group {
|
return Group{continueOnDone,
|
||||||
continueOnDone,
|
|
||||||
Tasking::Storage(storage),
|
Tasking::Storage(storage),
|
||||||
transferTask(FileTransferMethod::GenericCopy, storage),
|
transferTask(FileTransferMethod::GenericCopy, storage),
|
||||||
transferTask(FileTransferMethod::Sftp, storage),
|
transferTask(FileTransferMethod::Sftp, storage),
|
||||||
transferTask(FileTransferMethod::Rsync, storage),
|
transferTask(FileTransferMethod::Rsync, storage),
|
||||||
onGroupError([this] { emit q->errorMessage(Tr::tr("Deployment to this device will not "
|
onGroupError([this] {
|
||||||
"work out of the box.\n"));
|
emit q->errorMessage(Tr::tr("Deployment to this device will not "
|
||||||
})
|
"work out of the box.")
|
||||||
};
|
+ "\n");
|
||||||
|
})};
|
||||||
}
|
}
|
||||||
|
|
||||||
GroupItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandName) const
|
GroupItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandName) const
|
||||||
|
|||||||
Reference in New Issue
Block a user