diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index adca0c251ce..74f113fb526 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -42141,7 +42141,7 @@ Jméno <E-mail> alias <E-mail>. - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 8c790b08afa..476b3930413 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -27284,7 +27284,7 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro- - QmlDebug::QmlDebugConnection + QmlDebug Socket state changed to %1 Socket-tilstand ændret til %1 @@ -27293,9 +27293,6 @@ Hverken stien til biblioteket eller stien til dets includere tilføjes til .pro- Error: %1 Fejl: %1 - - - QmlDebug::QmlOutputParser The port seems to be in use. Error message shown after 'Could not connect ... debugger:" @@ -39859,7 +39856,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o - QmlDebug::QmlDebugConnectionManager + QmlDebug Debug connection opened. Fejlret-forbindelse åbnet. diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 73dbad2bc56..1b6efd8efe4 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -24840,7 +24840,7 @@ the manifest file by overriding your settings. Allow override? - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" @@ -30860,7 +30860,7 @@ Möchten Sie es beenden? - QmlDebug::QmlDebugConnection + QmlDebug Socket state changed to %1 Socket-Status geändert zu %1 @@ -40755,7 +40755,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten. - QmlDebug::QmlDebugConnectionManager + QmlDebug Debug connection opened. Debug-Verbindung geöffnet. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index d263ac96401..d1d6b97c9a2 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -41770,7 +41770,7 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques. - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 556333481bd..65014fdfced 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -11429,7 +11429,7 @@ will also disable the following plugins: - QmlDebug::QmlDebugConnection + QmlDebug Socket state changed to %1 @@ -11438,9 +11438,6 @@ will also disable the following plugins: Error: %1 Greška: %1 - - - QmlDebug::QmlDebugConnectionManager Debug connection opened. @@ -11453,9 +11450,6 @@ will also disable the following plugins: Debug connection failed. - - - QmlDebug::QmlOutputParser The port seems to be in use. Error message shown after 'Could not connect ... debugger:" diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index c9c0dac9266..3259b629736 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -9153,7 +9153,7 @@ will also disable the following plugins: - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" @@ -35270,7 +35270,7 @@ the program. - QmlDebug::QmlDebugConnection + QmlDebug Network connection dropped ネットワーク接続がありません @@ -43558,7 +43558,7 @@ Output: - QmlDebug::QmlDebugConnectionManager + QmlDebug Debug connection opened. デバッグ接続を開きました。 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index d4887990572..f8ddef24c16 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -19719,7 +19719,7 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" @@ -28393,7 +28393,7 @@ Czy kontynuować instalację? - QmlDebug::QmlDebugConnection + QmlDebug Socket state changed to %1 Zmiana stanu gniazda na %1 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 4a8fd2e342a..eadda2085cc 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -34638,7 +34638,7 @@ Neither the path to the library nor the path to its includes is added to the .pr - QmlDebug::QmlDebugConnection + QmlDebug Socket state changed to %1 Состояние сокета изменилось на %1 @@ -34647,9 +34647,6 @@ Neither the path to the library nor the path to its includes is added to the .pr Error: %1 Ошибка: %1 - - - QmlDebug::QmlDebugConnectionManager Debug connection opened. Отладочное соединение открыто. @@ -34662,9 +34659,6 @@ Neither the path to the library nor the path to its includes is added to the .pr Debug connection failed. Не удалось установить отладочное подключение. - - - QmlDebug::QmlOutputParser The port seems to be in use. Error message shown after 'Could not connect ... debugger:" diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index c6664f8cc5c..1039040174d 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -24773,7 +24773,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" @@ -36173,7 +36173,7 @@ Are you sure you want to continue? - QmlDebug::QmlDebugConnectionPrivate + QmlDebug Error: (%1) %2 %1=error code, %2=error message @@ -36183,37 +36183,6 @@ Are you sure you want to continue? <device is gone> <пристрій зник> - - Network connection dropped - Мережеве з'єднання розірване - - - Resolving host - Визначення імені вузла - - - Establishing network connection ... - Встановлення мережевого з'єднання... - - - Network connection established - Мережеве з'єднання встановлене - - - Network connection closing - Мережеве з'єднання закривається - - - Socket state changed to BoundState. This should not happen! - Стан сокета змінився на BoundState. Цього не мало трапитись! - - - Socket state changed to ListeningState. This should not happen! - Стан сокета змінився на ListeningState. Цього не мало трапитись! - - - - QmlDebug::QmlDebugConnection Connecting to debug server at %1:%2 ... Підключення до сервера зневадження на %1: %2 ... diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index aeb1e8a364f..85e840f6d8b 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -32254,7 +32254,7 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe - QmlDebug::QmlDebugConnection + QmlDebug Socket state changed to %1 @@ -32264,9 +32264,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe 错误: %1 {1?} - - - QmlDebug::QmlDebugConnectionManager Debug connection opened. @@ -32279,9 +32276,6 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe Debug connection failed. - - - QmlDebug::QmlOutputParser The port seems to be in use. Error message shown after 'Could not connect ... debugger:" diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index f21802724b6..fb1a0e372a5 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -28328,7 +28328,7 @@ This option is useful when you want to try your application on devices which don - QmlDebug::QmlOutputParser + QmlDebug The port seems to be in use. Error message shown after 'Could not connect ... debugger:" diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp index ed6929bcb73..e3477f6fdd2 100644 --- a/src/libs/qmldebug/qmldebugconnection.cpp +++ b/src/libs/qmldebug/qmldebugconnection.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmldebugconnection.h" + #include "qmldebugclient.h" +#include "qmldebugtr.h" #include "qpacketprotocol.h" #include @@ -44,14 +46,14 @@ static QString socketStateToString(QAbstractSocket::SocketState state) { QString stateString; QDebug(&stateString) << state; - return QmlDebugConnection::tr("Socket state changed to %1").arg(stateString); + return Tr::tr("Socket state changed to %1").arg(stateString); } static QString socketErrorToString(QAbstractSocket::SocketError error) { QString errorString; QDebug(&errorString) << error; - return QmlDebugConnection::tr("Error: %1").arg(errorString); + return Tr::tr("Error: %1").arg(errorString); } void QmlDebugConnectionPrivate::advertisePlugins() diff --git a/src/libs/qmldebug/qmldebugconnectionmanager.cpp b/src/libs/qmldebug/qmldebugconnectionmanager.cpp index dc613c96db7..7dd2500e2b2 100644 --- a/src/libs/qmldebug/qmldebugconnectionmanager.cpp +++ b/src/libs/qmldebug/qmldebugconnectionmanager.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmldebugconnectionmanager.h" + #include "qmldebugconnection.h" +#include "qmldebugtr.h" #include #include @@ -195,7 +197,7 @@ void QmlDebugConnectionManager::destroyConnection() void QmlDebugConnectionManager::qmlDebugConnectionOpened() { - logState(tr("Debug connection opened.")); + logState(Tr::tr("Debug connection opened.")); QTC_ASSERT(m_connection, return); QTC_ASSERT(m_connection->isConnected(), return); stopConnectionTimer(); @@ -204,7 +206,7 @@ void QmlDebugConnectionManager::qmlDebugConnectionOpened() void QmlDebugConnectionManager::qmlDebugConnectionClosed() { - logState(tr("Debug connection closed.")); + logState(Tr::tr("Debug connection closed.")); QTC_ASSERT(m_connection, return); QTC_ASSERT(!m_connection->isConnected(), return); destroyConnection(); @@ -213,7 +215,7 @@ void QmlDebugConnectionManager::qmlDebugConnectionClosed() void QmlDebugConnectionManager::qmlDebugConnectionFailed() { - logState(tr("Debug connection failed.")); + logState(Tr::tr("Debug connection failed.")); QTC_ASSERT(m_connection, return); QTC_ASSERT(!m_connection->isConnected(), /**/); diff --git a/src/libs/qmldebug/qmloutputparser.cpp b/src/libs/qmldebug/qmloutputparser.cpp index 756c3f631ed..5d0e07025f7 100644 --- a/src/libs/qmldebug/qmloutputparser.cpp +++ b/src/libs/qmldebug/qmloutputparser.cpp @@ -2,7 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmloutputparser.h" + #include "qmldebugconstants.h" +#include "qmldebugtr.h" + #include namespace QmlDebug { @@ -68,10 +71,10 @@ void QmlOutputParser::processOutput(const QString &output) } } else if (status.startsWith(unableToListen)) { //: Error message shown after 'Could not connect ... debugger:" - emit errorMessage(tr("The port seems to be in use.")); + emit errorMessage(Tr::tr("The port seems to be in use.")); } else if (status.startsWith(debuggingNotEnabled)) { //: Error message shown after 'Could not connect ... debugger:" - emit errorMessage(tr("The application is not set up for QML/JS debugging.")); + emit errorMessage(Tr::tr("The application is not set up for QML/JS debugging.")); } else if (status.startsWith(connectionEstablished)) { emit connectionEstablishedMessage(); } else if (status.startsWith(connectingToSocket)) {