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