diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 31bbd36f7af..ef0a6913417 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -36343,7 +36343,7 @@ a vlastností součástek QML přímo. - QmlJSTools::Internal::FunctionFilter + QmlJSTools Methods and functions Metody a funkce @@ -36360,16 +36360,10 @@ a vlastností součástek QML přímo. QML Functions Funkce QML - - - QmlJSTools::Internal::ModelManager Indexing Rejstříkování - - - QmlJSTools::Internal::PluginDumper Type dump of QML plugin in %1 failed. Errors: @@ -36492,9 +36486,6 @@ Please build the debugging helpers on the Qt version options page. Pomocný program ke sdělení informací o typu přídavného modulu C++ se nepodařilo najít. Vytvořte, prosím, součástky pomocné knihovny pro výstup dat o ladění na stránce pro nastavení verzí Qt. - - - QmlJSTools Code Style Styl kódování @@ -36503,9 +36494,6 @@ Vytvořte, prosím, součástky pomocné knihovny pro výstup dat o ladění na Qt Quick Qt Quick - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -36514,9 +36502,6 @@ Vytvořte, prosím, součástky pomocné knihovny pro výstup dat o ladění na Reset Code Model Nastavit model kódu znovu - - - QmlJSTools::QmlJSToolsSettings Global Qt Quick Settings @@ -51783,7 +51768,7 @@ Vzdálený chybový výstup byl: '%1' - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in Qt Creator's QML editors when the type name is a string literal Tento typ bude v editoru QML Qt Creatoru viditelný jen tehdy, když je název typu řetězec znaků tvořený písmeny (literal) @@ -54958,7 +54943,7 @@ Commit now? - QmlJSTools::Internal::QmlConsoleEdit + QmlJSTools Cu&t Vyj&mout @@ -54979,16 +54964,10 @@ Commit now? C&lear Sma&zat - - - QmlJSTools::Internal::QmlConsoleModel Can only evaluate during a QML debug session. Vyhodnocovat lze jen během sezení ladění QML. - - - QmlJSTools::Internal::QmlConsolePane Show debug, log, and info messages. Ukázat ladění, záznamy a informační zprávy. @@ -54997,21 +54976,10 @@ Commit now? QML/JS Console Konzole QML/JS - - - QmlJSTools::Internal::QmlConsoleView - - &Copy - &Kopírovat - &Show in Editor &Ukázat v editoru - - C&lear - Sma&zat - QmlApplicationWizard diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index d1484ae1368..11295348df2 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -32093,9 +32093,6 @@ Se "Checking Code Syntax"-dokumentation for mere information.Qt Quick Qt Quick - - - QmlJSTools::FindExportedCppTypes The type will only be available in the QML editors when the type name is a string literal Typen er kun tilgængelig i QML-redigeringerne når typenavnet er en streng-literal @@ -32112,16 +32109,10 @@ QML-redigeringen skal kende til en sandsynlig URI. must be a string literal to be available in the QML editor skal være en streng-literal for at være tilgængelig i QML-redigeringen - - - QmlJSTools::Internal::FunctionFilter QML Functions QML-funktioner - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -32130,9 +32121,6 @@ QML-redigeringen skal kende til en sandsynlig URI. Reset Code Model Nulstil kodemodel - - - QmlJSTools::QmlJSToolsSettings Global Settings diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 3f62d54795a..b8c545084c1 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -12972,7 +12972,7 @@ Soll es noch einmal versucht werden? - QmlJSTools::Internal::FunctionFilter + QmlJSTools QML Functions QML-Funktionen @@ -15258,9 +15258,6 @@ Bei vollständiger Cache-Simulation werden weitere Ereigniszähler aktiviert: Qt Quick Qt Quick - - - QmlJSTools::QmlJSToolsSettings Global Settings @@ -16026,7 +16023,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet. - QmlJSTools::Internal::QmlJSToolsPlugin + QmlJSTools &QML/JS &QML/JS @@ -19908,7 +19905,7 @@ gehören nicht zu den verifizierten Remotes in %3. Anderes Verzeichnis angeben?< - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in the QML editors when the type name is a string literal Dieser Typ wird im QML Editor nur sichtbar sein, wenn der Typname ein Zeichenketten-Literal ist diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 477a51b6798..2f5ad8d111b 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -35669,7 +35669,7 @@ QML component instance objects and properties directly. - QmlJSTools::Internal::FunctionFilter + QmlJSTools Functions Fonctions @@ -35690,9 +35690,6 @@ QML component instance objects and properties directly. QML Functions Fonctions QML - - - QmlJSTools::Internal::ModelManager Indexing Indexation @@ -35701,9 +35698,6 @@ QML component instance objects and properties directly. Qml import scan Analyse de l'import Qml - - - QmlJSTools::Internal::PluginDumper Type dump of QML plugin in %1 failed. Errors: @@ -39172,9 +39166,6 @@ These files are preserved. Code Style Style de code - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -39183,9 +39174,6 @@ These files are preserved. Reset Code Model Restaurer le modèle de code - - - QmlJSTools::QmlJSToolsSettings Global Qt Quick Settings @@ -50203,7 +50191,7 @@ Remote stderr was: %1 - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in Qt Creator's QML editors when the type name is a string literal Le type sera disponible dans l'éditeur QML de Qt Creator lorsque le nom du type est une chaîne de caractères @@ -54625,7 +54613,7 @@ Distant : %4 - QmlJSTools::Internal::QmlConsoleEdit + QmlJSTools Cu&t Co&uper @@ -54646,16 +54634,10 @@ Distant : %4 C&lear &Effacer - - - QmlJSTools::Internal::QmlConsoleModel Can only evaluate during a QML debug session. Ne peut être évalué que dans une session de débogage QML. - - - QmlJSTools::Internal::QmlConsolePane Show debug, log, and info messages. Montrer les messages de débogage, de log et d'information. @@ -54664,21 +54646,10 @@ Distant : %4 QML/JS Console Console QML/JS - - - QmlJSTools::Internal::QmlConsoleView - - &Copy - &Copier - &Show in Editor Montrer dans l'éditeur (&S) - - C&lear - &Effacer - QmlApplicationWizard diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index aa0101eeb40..0daf6ffa57c 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -12156,7 +12156,7 @@ will also disable the following plugins: - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in the QML editors when the type name is a string literal @@ -35020,14 +35020,11 @@ ID oznake moraju započeti malim slovom. - QmlJSTools::Internal::FunctionFilter + QmlJSTools QML Functions - - - QmlJSTools Code Style @@ -35036,9 +35033,6 @@ ID oznake moraju započeti malim slovom. Qt Quick - - - QmlJSTools::Internal::QmlJSToolsPlugin Reset Code Model @@ -35047,9 +35041,6 @@ ID oznake moraju započeti malim slovom. &QML/JS - - - QmlJSTools::QmlJSToolsSettings Global Settings diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 3c5af372adc..25c5cd6a553 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -29271,7 +29271,7 @@ Ids must begin with a lowercase letter. - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in Qt Creator's QML editors when the type name is a string literal この型は型名が文字列リテラルであるため、Qt Creator の QML エディタでのみ利用可能できます @@ -29298,16 +29298,10 @@ the QML editor know about a likely URI. must be a string literal to be available in the QML editor QML エディタ内では文字列リテラルでなければなりません - - - QmlJSTools::Internal::FunctionFilter QML Functions QML 関数 - - - QmlJSTools Code Style コードスタイル @@ -29316,9 +29310,6 @@ the QML editor know about a likely URI. Qt Quick Qt Quick - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -29327,9 +29318,6 @@ the QML editor know about a likely URI. Reset Code Model コードモデルのリセット - - - QmlJSTools::QmlJSToolsSettings Global Settings diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 23080705b2f..7e3fa2d64c4 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -15998,7 +15998,7 @@ Ponowić próbę? - QmlJSTools::Internal::FunctionFilter + QmlJSTools QML Functions Funkcje QML @@ -17474,9 +17474,6 @@ With cache simulation, further event counters are enabled: Qt Quick Qt Quick - - - QmlJSTools::QmlJSToolsSettings Global Settings @@ -18085,7 +18082,7 @@ Kiedy zostaje wykryty problem, aplikacja jest zatrzymywana i może zostać zdebu - QmlJSTools::Internal::QmlJSToolsPlugin + QmlJSTools &QML/JS &QML/JS @@ -22328,7 +22325,7 @@ were not verified among remotes in %3. Select different folder? - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in Qt Creator's QML editors when the type name is a string literal Typ będzie tylko wtedy dostępny w edytorach QML, gdy jego nazwa będzie literałem łańcuchowym diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 0e7fd60b4f9..8f8b850c6d4 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -41654,9 +41654,6 @@ For more information, see the "Checking Code Syntax" documentation.Qt Quick - - - QmlJSTools::FindExportedCppTypes The type will only be available in the QML editors when the type name is a string literal Имя типа должно быть строковым литералом, чтобы он был доступен в редакторах QML @@ -41673,16 +41670,10 @@ the QML editor know about a likely URI. must be a string literal to be available in the QML editor должен быть строковым литералом, чтобы быть доступным в редакторе QML - - - QmlJSTools::Internal::FunctionFilter QML Functions Функции QML - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS @@ -41691,9 +41682,6 @@ the QML editor know about a likely URI. Reset Code Model Сбросить модель кода - - - QmlJSTools::QmlJSToolsSettings Global Settings diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index da207332c60..edd214d9eb5 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -25531,21 +25531,15 @@ neposredno dostopati do objektov izvodov komponent QML in lastnosti. - QmlJSTools::Internal::FunctionFilter + QmlJSTools Methods and functions Metode in funkcije - - - QmlJSTools::Internal::ModelManager Indexing Indeksiranje - - - QmlJSTools::Internal::PluginDumper Type dump of QML plugin in %1 failed. Errors: @@ -25592,9 +25586,6 @@ Please build the debugging helpers on the Qt version options page. Pomožnega programa za odlaganje podatkov o tipih iz vstavkov C++ ni bilo moč najti. S strani z možnostmi za različice Qt zgradite razhroščevalne pomočnike. - - - QmlJSTools Code Style Slog kode @@ -25603,9 +25594,6 @@ S strani z možnostmi za različice Qt zgradite razhroščevalne pomočnike.Qt Quick Qt Quick - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -25614,9 +25602,6 @@ S strani z možnostmi za različice Qt zgradite razhroščevalne pomočnike.Reset Code Model Ponastavi model kode - - - QmlJSTools::QmlJSToolsSettings Global Qt Quick Settings diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index d1eac66034b..a4e4fd22fe9 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -17896,9 +17896,6 @@ For qmlproject projects, use the importPaths property to add import paths.Qt Quick Qt Quick - - - QmlJSTools::Internal::FunctionFilter QML Methods and Functions Методи та функції QML @@ -17907,16 +17904,10 @@ For qmlproject projects, use the importPaths property to add import paths.QML Functions Функцій QML - - - QmlJSTools::Internal::ModelManager Indexing Індексування - - - QmlJSTools::Internal::PluginDumper "%1" crashed. "%1" завершився аварійно. @@ -17925,9 +17916,6 @@ For qmlproject projects, use the importPaths property to add import paths.Arguments: %1 Аргументи: %1 - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -17936,9 +17924,6 @@ For qmlproject projects, use the importPaths property to add import paths.Reset Code Model Скинути модель коду - - - QmlJSTools::QmlJSToolsSettings Global Settings @@ -32135,7 +32120,7 @@ Remote stderr was: %1 - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in Qt Creator's QML editors when the type name is a string literal @@ -34936,7 +34921,7 @@ Remote: %4 - QmlJSTools::Internal::QmlConsoleEdit + QmlJSTools Cu&t Вирі&зати @@ -34957,9 +34942,6 @@ Remote: %4 C&lear &Очистити - - - QmlJSTools::Internal::QmlConsolePane Show debug, log, and info messages. Показувати зневаджувальні, журналу та інформаційні повідомлення. @@ -34976,21 +34958,10 @@ Remote: %4 QML/JS Console Консоль QML/JS - - - QmlJSTools::Internal::QmlConsoleView - - &Copy - &Копіювати - &Show in Editor &Показати в редакторі - - C&lear - &Очистити - QmlApplicationWizard diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 9c5aea526b5..7be070daae5 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -33688,7 +33688,7 @@ QML component instance objects and properties directly. - QmlJSTools::Internal::FunctionFilter + QmlJSTools Functions 功能 @@ -33701,16 +33701,10 @@ QML component instance objects and properties directly. Methods and Functions 方法和函数 - - - QmlJSTools::Internal::ModelManager Indexing 索引中 - - - QmlJSTools::Internal::PluginDumper Type dump of QML plugin in %1 failed. Errors: @@ -36382,9 +36376,6 @@ These files are preserved. Qt Quick Qt Quick - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS &QML/JS @@ -36393,9 +36384,6 @@ These files are preserved. Reset Code Model 重置代码模型 - - - QmlJSTools::QmlJSToolsSettings Global Qt Quick Settings @@ -46974,7 +46962,7 @@ Remote stderr was: %1 - QmlJSTools::Internal::QmlConsoleEdit + QmlJSTools Cu&t 剪切 @@ -46983,23 +46971,14 @@ Remote stderr was: %1 Select &All 全选 - - - QmlJSTools::Internal::QmlConsolePane Console 控制台 - - - QmlJSTools::Internal::QmlConsoleView &Show in Editor 在编辑器中显示(&S) - - - QmlJSTools::FindExportedCppTypes The type will only be available in Qt Creator's QML editors when the type name is a string literal 仅在类型名称为字符串时该类型才能在Qt Creator 中的 QML编辑器中使用 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 0cff87067cb..5a0f90b9fa6 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -20629,21 +20629,15 @@ QML component instance objects and properties directly. - QmlJSTools::Internal::FunctionFilter + QmlJSTools Methods and Functions 方法和函式 - - - QmlJSTools::Internal::ModelManager Indexing 建索引中 - - - QmlJSTools::Internal::PluginDumper QML module does not contain information about components contained in plugins @@ -22724,9 +22718,6 @@ These files are preserved. Qt Quick Qt Quick - - - QmlJSTools::Internal::QmlJSToolsPlugin &QML/JS QML/JS(&Q) @@ -22735,9 +22726,6 @@ These files are preserved. Reset Code Model 重置代碼模型 - - - QmlJSTools::QmlJSToolsSettings Global Settings @@ -32616,7 +32604,7 @@ Remote stderr was: %1 - QmlJSTools::FindExportedCppTypes + QmlJSTools The type will only be available in Qt Creator's QML editors when the type name is a string literal 此種類型名稱字串字面常數僅在 Qt Creator 中的 QML編輯器時可使用 diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index edb7b942468..da4101fc5b3 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -9,6 +9,7 @@ #include "qmljsqtstylecodeformatter.h" #include "qmljstoolsconstants.h" #include "qmljstoolssettings.h" +#include "qmljstoolstr.h" #include #include @@ -124,9 +125,9 @@ void QmlJSCodeStylePreferencesWidget::updatePreview() QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage() { setId(Constants::QML_JS_CODE_STYLE_SETTINGS_ID); - setDisplayName(QCoreApplication::translate("QmlJSTools", Constants::QML_JS_CODE_STYLE_SETTINGS_NAME)); + setDisplayName(Tr::tr(Constants::QML_JS_CODE_STYLE_SETTINGS_NAME)); setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML); - setDisplayCategory(QCoreApplication::translate("QmlJSEditor", "Qt Quick")); + setDisplayCategory(Tr::tr("Qt Quick")); setCategoryIconPath(":/qmljstools/images/settingscategory_qml.png"); } diff --git a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp index 0e6ece1934d..b9e3a34a66e 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "qmljscodestylesettingswidget.h" - #include "qmljscodestylesettings.h" +#include "qmljstoolstr.h" #include @@ -22,9 +22,9 @@ QmlJSCodeStyleSettingsWidget::QmlJSCodeStyleSettingsWidget(QWidget *parent) using namespace Utils::Layouting; Column { Group { - title(tr("Qml JS Code Style")), + title(Tr::tr("Qml JS Code Style")), Form { - tr("&Line length:"), m_lineLengthSpinBox, br, + Tr::tr("&Line length:"), m_lineLengthSpinBox, br, } } }.attachTo(this, WithoutMargins); diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index d115da8bbfd..70d129da972 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "qmljsfunctionfilter.h" - #include "qmljslocatordata.h" +#include "qmljstoolstr.h" #include #include @@ -21,7 +21,7 @@ FunctionFilter::FunctionFilter(LocatorData *data, QObject *parent) , m_data(data) { setId("Functions"); - setDisplayName(tr("QML Functions")); + setDisplayName(Tr::tr("QML Functions")); setDefaultShortcutString("m"); setDefaultIncludedByDefault(false); } diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index f611f2ad127..650d0b5ec8f 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.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 "qmljstoolsplugin.h" -#include "qmljsmodelmanager.h" +#include "qmljsbundleprovider.h" +#include "qmljscodestylesettingspage.h" #include "qmljsfunctionfilter.h" #include "qmljslocatordata.h" -#include "qmljscodestylesettingspage.h" +#include "qmljsmodelmanager.h" #include "qmljstoolsconstants.h" +#include "qmljstoolsplugin.h" #include "qmljstoolssettings.h" -#include "qmljsbundleprovider.h" +#include "qmljstoolstr.h" #include #include @@ -34,7 +35,7 @@ public: QmlJSToolsSettings settings; ModelManager modelManager; - QAction resetCodeModelAction{QmlJSToolsPlugin::tr("Reset Code Model"), nullptr}; + QAction resetCodeModelAction{Tr::tr("Reset Code Model"), nullptr}; LocatorData locatorData; FunctionFilter functionFilter{&locatorData}; @@ -70,7 +71,7 @@ QmlJSToolsPluginPrivate::QmlJSToolsPluginPrivate() ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS); ActionContainer *mqmljstools = ActionManager::createMenu(Constants::M_TOOLS_QMLJS); QMenu *menu = mqmljstools->menu(); - menu->setTitle(QmlJSToolsPlugin::tr("&QML/JS")); + menu->setTitle(Tr::tr("&QML/JS")); menu->setEnabled(true); mtools->addMenu(mqmljstools); diff --git a/src/plugins/qmljstools/qmljstoolssettings.cpp b/src/plugins/qmljstools/qmljstoolssettings.cpp index f1e6bbcc087..817529924c8 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.cpp +++ b/src/plugins/qmljstools/qmljstoolssettings.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 "qmljstoolssettings.h" -#include "qmljstoolsconstants.h" #include "qmljscodestylepreferences.h" #include "qmljscodestylepreferencesfactory.h" +#include "qmljstoolsconstants.h" +#include "qmljstoolssettings.h" +#include "qmljstoolstr.h" #include #include @@ -48,7 +49,7 @@ QmlJSToolsSettings::QmlJSToolsSettings() // Qt style auto qtCodeStyle = new QmlJSCodeStylePreferences; qtCodeStyle->setId("qt"); - qtCodeStyle->setDisplayName(tr("Qt")); + qtCodeStyle->setDisplayName(Tr::tr("Qt")); qtCodeStyle->setReadOnly(true); TabSettings qtTabSettings; qtTabSettings.m_tabPolicy = TabSettings::SpacesOnlyTabPolicy; @@ -98,7 +99,7 @@ QmlJSToolsSettings::QmlJSToolsSettings() // create custom code style out of old settings ICodeStylePreferences *oldCreator = pool->createCodeStyle( - "legacy", legacyTabSettings, QVariant(), tr("Old Creator")); + "legacy", legacyTabSettings, QVariant(), Tr::tr("Old Creator")); // change the current delegate and save m_globalCodeStyle->setCurrentDelegate(oldCreator);