From a0eb8493b9816de162ce6a0674a7c25530020dcd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sun, 22 Jan 2023 18:59:51 +0100 Subject: [PATCH] Macros: Tr::tr Change-Id: I16d875d238ea9ac14758148c867cbac74042c43c Reviewed-by: hjk --- share/qtcreator/translations/qtcreator_cs.ts | 42 ++----------------- share/qtcreator/translations/qtcreator_da.ts | 23 ---------- share/qtcreator/translations/qtcreator_de.ts | 24 ++--------- share/qtcreator/translations/qtcreator_fr.ts | 39 ++--------------- share/qtcreator/translations/qtcreator_hr.ts | 24 +---------- share/qtcreator/translations/qtcreator_ja.ts | 27 ++---------- share/qtcreator/translations/qtcreator_pl.ts | 20 ++------- share/qtcreator/translations/qtcreator_ru.ts | 27 ------------ share/qtcreator/translations/qtcreator_sl.ts | 29 +------------ share/qtcreator/translations/qtcreator_uk.ts | 41 +----------------- .../qtcreator/translations/qtcreator_zh_CN.ts | 27 ------------ .../qtcreator/translations/qtcreator_zh_TW.ts | 25 +---------- src/plugins/macros/macrolocatorfilter.cpp | 7 ++-- src/plugins/macros/macromanager.cpp | 21 +++++----- src/plugins/macros/macrooptionspage.cpp | 5 ++- src/plugins/macros/macrooptionswidget.cpp | 15 +++---- src/plugins/macros/macrosplugin.cpp | 21 +++++----- src/plugins/macros/savedialog.cpp | 8 ++-- 18 files changed, 64 insertions(+), 361 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 9f6a6621832..52282084336 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -27295,7 +27295,7 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap - Macros::Internal::MacroOptionsWidget + ::Macros Form Formulář @@ -27328,9 +27328,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Description: Popis: - - - Macros::Internal::SaveDialog Save Macro Uložit makro @@ -27339,10 +27336,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Name: Název: - - Description: - Popis: - ::ProjectExplorer @@ -32342,14 +32335,11 @@ když bude zavolán mimo git bash. - Macros::Internal::MacroLocatorFilter + ::Macros Macros Makra - - - Macros::MacroManager Playing Macro Přehrání makra @@ -32366,16 +32356,6 @@ když bude zavolán mimo git bash. Stop Recording Macro Zastavit nahrávání makra - - - ::Macros - - Macros - Makra - - - - Macros::Internal::MacrosPlugin &Macros &Makra @@ -32392,10 +32372,6 @@ když bude zavolán mimo git bash. Alt+( Alt+( - - Stop Recording Macro - Zastavit nahrávání makra - Ctrl+) Ctrl+) @@ -54740,23 +54716,11 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr - Macros::Internal::MacroManager - - Playing Macro - Přehrání makra - - - An error occurred while replaying the macro, execution stopped. - Při přehrávání makra se vyskytla chyba, provádění bylo zastaveno. - + ::Macros Macro mode. Type "%1" to stop recording and "%2" to play the macro. Režim makra. Napište "%1" pro zastavení nahrávání a "%2" pro přehrání makra. - - Stop Recording Macro - Zastavit nahrávání makra - ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index a9d7186bac3..beb39af15f4 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -19067,16 +19067,10 @@ Fejl: %5 Macros Makroer - - - Macros::Internal::MacroLocatorFilter Text Editing Macros Tekstredigeringsmakroer - - - Macros::Internal::MacroManager Playing Macro Afspiller makro @@ -19093,9 +19087,6 @@ Fejl: %5 Stop Recording Macro Stop optagelse af makro - - - Macros::Internal::MacroOptionsWidget Preferences Præferencer @@ -19124,9 +19115,6 @@ Fejl: %5 Description: Beskrivelse: - - - Macros::Internal::MacrosPlugin Text Editing &Macros Tekstredigerings&makroer @@ -19143,10 +19131,6 @@ Fejl: %5 Alt+( Alt+( - - Stop Recording Macro - Stop optagelse af makro - Ctrl+) Ctrl+) @@ -19171,9 +19155,6 @@ Fejl: %5 Save Last Macro Gem sidste makro - - - Macros::Internal::SaveDialog Save Macro Gem makro @@ -19182,10 +19163,6 @@ Fejl: %5 Name: Navn: - - Description: - Beskrivelse: - ::QmlProfiler diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index fc1dc93da95..84f24a74c97 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -16016,7 +16016,7 @@ Möchten Sie sie überschreiben? - Macros::Internal::MacroOptionsWidget + ::Macros Preferences Einstellungen @@ -16049,17 +16049,10 @@ Möchten Sie sie überschreiben? Macros Makros - - - Macros::Internal::SaveDialog Name: Name: - - Description: - Beschreibung: - Save Macro Makro speichern @@ -16396,7 +16389,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden - Macros::Internal::MacroLocatorFilter + ::Macros Text Editing Macros Textbearbeitungs-Makros @@ -16405,9 +16398,6 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden Runs a text editing macro that was recorded with Tools > Text Editing Macros > Record Macro. Führt ein Textbearbeitungs-Makro aus, das mit Extras > Textbearbeitungs-Makros > Makroaufnahme aufgenommen wurde. - - - Macros::Internal::MacrosPlugin Text Editing &Macros Textbearbeitungs-&Makros @@ -19505,10 +19495,6 @@ Speichern fehlgeschlagen. ::Macros - - Macros - Makros - ::ProjectExplorer @@ -28329,7 +28315,7 @@ The affected files are: - Macros::Internal::MacroManager + ::Macros Playing Macro Abspielen eines Makros @@ -28342,10 +28328,6 @@ The affected files are: Macro mode. Type "%1" to stop recording and "%2" to play the macro. Makro-Modus. Geben Sie "%1" ein, um die Aufnahme zu stoppen und "%2", um sie abzuspielen. - - Stop Recording Macro - Makroaufnahme anhalten - ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index cb72805f88d..8f95477b3c0 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -28401,7 +28401,7 @@ Les pulls locaux ne sont pas appliqués à la branche maître. - Macros::Internal::MacroOptionsWidget + ::Macros Form Formulaire @@ -28434,9 +28434,6 @@ Les pulls locaux ne sont pas appliqués à la branche maître. Description: Description : - - - Macros::Internal::SaveDialog Save Macro Sauver la macro @@ -28445,10 +28442,6 @@ Les pulls locaux ne sont pas appliqués à la branche maître. Name: Nom : - - Description: - Description : - MemcheckConfigWidget @@ -31124,14 +31117,11 @@ Do you want to retry? - Macros::Internal::MacroLocatorFilter + ::Macros Macros Macros - - - Macros::MacroManager Playing Macro Lancer une macro @@ -31152,9 +31142,6 @@ Do you want to retry? Stop Recording Macro Arrêter d'enregistrer la macro - - - Macros::Internal::MacrosPlugin &Macros &Macros @@ -31171,10 +31158,6 @@ Do you want to retry? Alt+( Alt+( - - Stop Recording Macro - Arrêter d'enregistrer la macro - Ctrl+) Ctrl+) @@ -32362,10 +32345,6 @@ Voys pouvez compiler l'application et la déployer sur desktop et mobile. P ::Macros - - Macros - Macros - ::QmakeProjectManager @@ -51400,23 +51379,11 @@ réinitialisation du moniteur - Macros::Internal::MacroManager - - Playing Macro - Lancer une macro - - - An error occurred while replaying the macro, execution stopped. - Une erreur est apparue lors de l'exécution de la macro, l'exécution s'est arrêtée. - + ::Macros Macro mode. Type "%1" to stop recording and "%2" to play the macro. Mode macro. Tapez "%1" pour arrêter l'enregistrement et "%2" pour le lancer. - - Stop Recording Macro - Arrêter d'enregistrer la macro - ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index e95b39a1871..85f20ac0daf 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -4722,7 +4722,7 @@ Greška: %5 - Macros::Internal::MacroOptionsWidget + ::Macros Preferences Postavke @@ -4751,9 +4751,6 @@ Greška: %5 Description: Opis: - - - Macros::Internal::SaveDialog Save Macro Spremi makro @@ -4762,10 +4759,6 @@ Greška: %5 Name: Naziv: - - Description: - Opis: - ::Mercurial @@ -25166,14 +25159,11 @@ Rok upotrebe: %3 - Macros::Internal::MacroLocatorFilter + ::Macros Text Editing Macros Uređivač teksta makro naredbi - - - Macros::Internal::MacroManager Playing Macro Pokretanje makro naredbe @@ -25186,20 +25176,10 @@ Rok upotrebe: %3 Macro mode. Type "%1" to stop recording and "%2" to play the macro. Rad pomoću makro naredbi. Utipkaj "%1" za zaustavljanje snimanja i "%2" za pokretanje makro naredbe. - - Stop Recording Macro - Zaustavi snimanje makro naredbe - - - - ::Macros Macros Makro naredbe - - - Macros::Internal::MacrosPlugin Text Editing &Macros Uređivač teksta &makro naredbi diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 28c0cd3ea4c..a47e9842ba1 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -3691,7 +3691,7 @@ Add, modify, and remove document filters, which determine the documentation set - Macros::Internal::MacroOptionsWidget + ::Macros Form フォーム @@ -3728,9 +3728,6 @@ Add, modify, and remove document filters, which determine the documentation set Macros マクロ - - - Macros::Internal::SaveDialog Save Macro マクロ保存 @@ -3739,10 +3736,6 @@ Add, modify, and remove document filters, which determine the documentation set Name: 名前: - - Description: - 説明: - ::Mercurial @@ -21392,7 +21385,7 @@ instead of its installation directory when run outside git bash. - Macros::Internal::MacroManager + ::Macros Playing Macro マクロ実行中 @@ -21409,16 +21402,6 @@ instead of its installation directory when run outside git bash. Stop Recording Macro マクロの記録を停止 - - - ::Macros - - Macros - マクロ - - - - Macros::Internal::MacrosPlugin Text Editing &Macros テキストエディタマクロ(&M) @@ -21435,10 +21418,6 @@ instead of its installation directory when run outside git bash. Alt+( Alt+( - - Stop Recording Macro - マクロの記録を停止 - Ctrl+) Ctrl+) @@ -39452,7 +39431,7 @@ Would you like to overwrite it? - Macros::Internal::MacroLocatorFilter + ::Macros Text Editing Macros テキストエディタマクロ diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index bb673ca2944..10e94697bac 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -13711,7 +13711,7 @@ Local pulls are not applied to the master branch. - Macros::Internal::MacroOptionsWidget + ::Macros Form Formularz @@ -13744,9 +13744,6 @@ Local pulls are not applied to the master branch. Description: Opis: - - - Macros::Internal::SaveDialog Save Macro Zachowaj makro @@ -13755,10 +13752,6 @@ Local pulls are not applied to the master branch. Name: Nazwa: - - Description: - Opis: - QmlJS::TypeDescriptionReader @@ -15107,14 +15100,11 @@ Ponowić próbę? - Macros::Internal::MacroLocatorFilter + ::Macros Text Editing Macros Makra do edycji tekstu - - - Macros::Internal::MacrosPlugin Text Editing &Macros &Makra do edycji tekstu @@ -26406,7 +26396,7 @@ Czy odinstalować istniejący pakiet? - Macros::Internal::MacroManager + ::Macros Playing Macro Odtwarzanie makra @@ -26419,10 +26409,6 @@ Czy odinstalować istniejący pakiet? Macro mode. Type "%1" to stop recording and "%2" to play the macro. Tryb makro. Wpisz "%1" aby zatrzymać nagrywanie albo "%2" aby je odtworzyć. - - Stop Recording Macro - Zatrzymaj nagrywanie makra - ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 40c434cc3ff..899a2893a8a 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -24236,16 +24236,10 @@ Error: %5 Macros Сценарии - - - Macros::Internal::MacroLocatorFilter Text Editing Macros Сценарии редактирования текста - - - Macros::Internal::MacroManager Playing Macro Воспроизведение сценария @@ -24262,9 +24256,6 @@ Error: %5 Stop Recording Macro Остановить запись сценария - - - Macros::Internal::MacroOptionsWidget Preferences Настройки @@ -24293,13 +24284,6 @@ Error: %5 Remove Удалить - - Macros - Сценарии - - - - Macros::Internal::MacrosPlugin Record Macro Записать сценарий @@ -24312,10 +24296,6 @@ Error: %5 Alt+[ Alt+[ - - Stop Recording Macro - Остановить запись сценария - Ctrl+] Ctrl+] @@ -24344,17 +24324,10 @@ Error: %5 Alt+R - - - Macros::Internal::SaveDialog Name: Название: - - Description: - Описание: - Save Macro Сохранить сценарий diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 454a6fbf806..197db14d4e9 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -18446,7 +18446,7 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. - Macros::Internal::MacroOptionsWidget + ::Macros Form Obrazec @@ -18486,9 +18486,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Description: Opis: - - - Macros::Internal::SaveDialog Save Macro Shrani makro @@ -18498,11 +18495,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Name: Ime: - - - Description: - Opis: - ::ProjectExplorer @@ -23405,14 +23397,11 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. - Macros::Internal::MacroLocatorFilter + ::Macros Macros Makroji - - - Macros::MacroManager Playing Macro Predvajanje makra @@ -23429,16 +23418,6 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. Stop Recording Macro Ustavi snemanje makra - - - ::Macros - - Macros - Makroji - - - - Macros::Internal::MacrosPlugin &Macros &Makroji @@ -23455,10 +23434,6 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. Alt+( Alt+( - - Stop Recording Macro - Ustavi snemanje makra - Ctrl+) Ctrl+) diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 072688e83f8..fc3b72068f8 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -10656,20 +10656,10 @@ Ids must begin with a lowercase letter. Macros Макроси - - - Macros::Internal::MacroLocatorFilter - - Macros - Макроси - Text Editing Macros Макроси редагування тексту - - - Macros::Internal::MacroOptionsWidget Form Форма @@ -10702,9 +10692,6 @@ Ids must begin with a lowercase letter. Description: Опис: - - - Macros::Internal::MacrosPlugin &Macros &Макроси @@ -10753,9 +10740,6 @@ Ids must begin with a lowercase letter. Save Last Macro Зберегти останній макрос - - - Macros::Internal::SaveDialog Save Macro Зберегти макрос @@ -10764,29 +10748,10 @@ Ids must begin with a lowercase letter. Name: Назва: - - Description: - Опис: - - - - Macros::MacroManager - - Playing Macro - Відтворення макросу - - - An error occurred while replaying the macro, execution stopped. - Під час програвання макросу сталась помилка, виконання зупинено. - Macro mode. Type "%1" to stop recording and "%2" to play it Режим макросу. Натисніть "%1", щоб зупинити запис та щоб "%2" програти його - - Stop Recording Macro - Зупинити запис макросу - ::QmlProfiler @@ -34174,7 +34139,7 @@ Do you want to uninstall the existing package next time? - Macros::Internal::MacroManager + ::Macros Playing Macro Відтворення макросу @@ -34187,10 +34152,6 @@ Do you want to uninstall the existing package next time? Macro mode. Type "%1" to stop recording and "%2" to play the macro. Режим макросу. Натисніть "%1", щоб зупинити запис та щоб "%2" програти його. - - Stop Recording Macro - Зупинити запис макросу - ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 539530c81ce..9e37a4ec3e7 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -24023,9 +24023,6 @@ Error: %5 Macros 宏 - - - Macros::Internal::MacroLocatorFilter Text Editing Macros @@ -24034,9 +24031,6 @@ Error: %5 Runs a text editing macro that was recorded with Tools > Text Editing Macros > Record Macro. - - - Macros::Internal::MacroManager Playing Macro 播放宏 @@ -24049,13 +24043,6 @@ Error: %5 Macro mode. Type "%1" to stop recording and "%2" to play the macro. - - Stop Recording Macro - 停止录制宏 - - - - Macros::Internal::MacroOptionsWidget Preferences 首选项 @@ -24080,17 +24067,10 @@ Error: %5 Description: 说明: - - Macros - 宏 - Description) - - - Macros::Internal::MacrosPlugin Record Macro 录制宏 @@ -24135,9 +24115,6 @@ Error: %5 Alt+] - - - Macros::Internal::SaveDialog Save Macro 保存宏 @@ -24146,10 +24123,6 @@ Error: %5 Name: 名称: - - Description: - 说明: - MainWidget diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 354149372f3..9e14c4e0b76 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -17514,7 +17514,7 @@ Local pulls are not applied to the master branch. - Macros::Internal::MacroOptionsWidget + ::Macros Form 表單 @@ -17547,9 +17547,6 @@ Local pulls are not applied to the master branch. Description: 描述： - - - Macros::Internal::SaveDialog Save Macro 儲存巨集 @@ -17558,10 +17555,6 @@ Local pulls are not applied to the master branch. Name: 名稱： - - Description: - 描述： - ::ProjectExplorer @@ -19317,14 +19310,11 @@ Do you want to retry? - Macros::Internal::MacroLocatorFilter + ::Macros Macros 巨集 - - - Macros::MacroManager Playing Macro 播放巨集 @@ -19341,9 +19331,6 @@ Do you want to retry? Stop Recording Macro 停止錄製巨集 - - - Macros::Internal::MacrosPlugin &Macros 巨集(&M) @@ -19360,10 +19347,6 @@ Do you want to retry? Alt+( Alt+( - - Stop Recording Macro - 停止錄製巨集 - Ctrl+) Ctrl+) @@ -20463,10 +20446,6 @@ You can build the application and deploy it on desktop and mobile target platfor ::Macros - - Macros - 巨集 - AnchorButtons diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index 769e362374a..43d5bb3cf9a 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -5,6 +5,7 @@ #include "macro.h" #include "macromanager.h" +#include "macrostr.h" #include #include @@ -19,9 +20,9 @@ MacroLocatorFilter::MacroLocatorFilter() : m_icon(QPixmap(":/macros/images/macro.png")) { setId("Macros"); - setDisplayName(tr("Text Editing Macros")); - setDescription(tr("Runs a text editing macro that was recorded with Tools > Text Editing " - "Macros > Record Macro.")); + setDisplayName(Tr::tr("Text Editing Macros")); + setDescription(Tr::tr("Runs a text editing macro that was recorded with Tools > Text Editing " + "Macros > Record Macro.")); setDefaultShortcutString("rm"); } diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 925191754ed..507ed92179d 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -3,14 +3,15 @@ #include "macromanager.h" -#include "macrosconstants.h" -#include "macroevent.h" -#include "macro.h" -#include "imacrohandler.h" -#include "savedialog.h" #include "actionmacrohandler.h" -#include "texteditormacrohandler.h" #include "findmacrohandler.h" +#include "imacrohandler.h" +#include "macro.h" +#include "macroevent.h" +#include "macrosconstants.h" +#include "macrostr.h" +#include "savedialog.h" +#include "texteditormacrohandler.h" #include @@ -190,8 +191,8 @@ bool MacroManagerPrivate::executeMacro(Macro *macro) if (error) { QMessageBox::warning( Core::ICore::dialogParent(), - MacroManager::tr("Playing Macro"), - MacroManager::tr("An error occurred while replaying the macro, execution stopped.")); + Tr::tr("Playing Macro"), + Tr::tr("An error occurred while replaying the macro, execution stopped.")); } // Set the focus back to the editor @@ -266,10 +267,10 @@ void MacroManager::startMacro() ->keySequence() .toString(QKeySequence::NativeText); const QString help - = tr("Macro mode. Type \"%1\" to stop recording and \"%2\" to play the macro.") + = Tr::tr("Macro mode. Type \"%1\" to stop recording and \"%2\" to play the macro.") .arg(endShortcut, executeShortcut); Core::EditorManager::showEditorStatusBar(Constants::M_STATUS_BUFFER, help, - tr("Stop Recording Macro"), + Tr::tr("Stop Recording Macro"), this, [this] { endMacro(); }); } diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp index eb0d1f58d41..6295ea94e78 100644 --- a/src/plugins/macros/macrooptionspage.cpp +++ b/src/plugins/macros/macrooptionspage.cpp @@ -4,8 +4,9 @@ #include "macrooptionspage.h" #include "macromanager.h" -#include "macrosconstants.h" #include "macrooptionswidget.h" +#include "macrosconstants.h" +#include "macrostr.h" #include @@ -15,7 +16,7 @@ namespace Internal { MacroOptionsPage::MacroOptionsPage() { setId(Constants::M_OPTIONS_PAGE); - setDisplayName(MacroOptionsWidget::tr("Macros")); + setDisplayName(Tr::tr("Macros")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); setWidgetCreator([] { return new MacroOptionsWidget; }); } diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 47d337edbe7..3b02d93a80c 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -3,9 +3,10 @@ #include "macrooptionswidget.h" -#include "macrosconstants.h" -#include "macromanager.h" #include "macro.h" +#include "macromanager.h" +#include "macrosconstants.h" +#include "macrostr.h" #include #include @@ -40,23 +41,23 @@ MacroOptionsWidget::MacroOptionsWidget() m_treeWidget->header()->setSortIndicatorShown(true); m_treeWidget->header()->setStretchLastSection(true); m_treeWidget->header()->setSortIndicator(0, Qt::AscendingOrder); - m_treeWidget->setHeaderLabels({tr("Name"), tr("Description)"), tr("Shortcut")}); + m_treeWidget->setHeaderLabels({Tr::tr("Name"), Tr::tr("Description)"), Tr::tr("Shortcut")}); m_description = new QLineEdit; - m_removeButton = new QPushButton(tr("Remove")); + m_removeButton = new QPushButton(Tr::tr("Remove")); - m_macroGroup = new QGroupBox(tr("Macro"), this); + m_macroGroup = new QGroupBox(Tr::tr("Macro"), this); using namespace Utils::Layouting; Row { - tr("Description:"), m_description + Tr::tr("Description:"), m_description }.attachTo(m_macroGroup); Column { Group { - title(tr("Preferences")), + title(Tr::tr("Preferences")), Row { m_treeWidget, Column { m_removeButton, st }, diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index be4d2d2217b..74fffddeb43 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -3,10 +3,11 @@ #include "macrosplugin.h" -#include "macrosconstants.h" +#include "macrolocatorfilter.h" #include "macromanager.h" #include "macrooptionspage.h" -#include "macrolocatorfilter.h" +#include "macrosconstants.h" +#include "macrostr.h" #include @@ -48,30 +49,30 @@ void MacrosPlugin::initialize() Core::ActionContainer *mtools = Core::ActionManager::actionContainer(Core::Constants::M_TOOLS); Core::ActionContainer *mmacrotools = Core::ActionManager::createMenu(Constants::M_TOOLS_MACRO); QMenu *menu = mmacrotools->menu(); - menu->setTitle(tr("Text Editing &Macros")); + menu->setTitle(Tr::tr("Text Editing &Macros")); menu->setEnabled(true); mtools->addMenu(mmacrotools); - QAction *startMacro = new QAction(tr("Record Macro"), this); + QAction *startMacro = new QAction(Tr::tr("Record Macro"), this); Core::Command *command = Core::ActionManager::registerAction(startMacro, Constants::START_MACRO, textContext); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Ctrl+[") : tr("Alt+["))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+[") : Tr::tr("Alt+["))); mmacrotools->addAction(command); connect(startMacro, &QAction::triggered, &d->macroManager, &MacroManager::startMacro); - QAction *endMacro = new QAction(tr("Stop Recording Macro"), this); + QAction *endMacro = new QAction(Tr::tr("Stop Recording Macro"), this); endMacro->setEnabled(false); command = Core::ActionManager::registerAction(endMacro, Constants::END_MACRO); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Ctrl+]") : tr("Alt+]"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+]") : Tr::tr("Alt+]"))); mmacrotools->addAction(command); connect(endMacro, &QAction::triggered, &d->macroManager, &MacroManager::endMacro); - QAction *executeLastMacro = new QAction(tr("Play Last Macro"), this); + QAction *executeLastMacro = new QAction(Tr::tr("Play Last Macro"), this); command = Core::ActionManager::registerAction(executeLastMacro, Constants::EXECUTE_LAST_MACRO, textContext); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+R") : tr("Alt+R"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+R") : Tr::tr("Alt+R"))); mmacrotools->addAction(command); connect(executeLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::executeLastMacro); - QAction *saveLastMacro = new QAction(tr("Save Last Macro"), this); + QAction *saveLastMacro = new QAction(Tr::tr("Save Last Macro"), this); saveLastMacro->setEnabled(false); command = Core::ActionManager::registerAction(saveLastMacro, Constants::SAVE_LAST_MACRO, textContext); mmacrotools->addAction(command); diff --git a/src/plugins/macros/savedialog.cpp b/src/plugins/macros/savedialog.cpp index 64cbd8b20ae..3d8f7d6ada4 100644 --- a/src/plugins/macros/savedialog.cpp +++ b/src/plugins/macros/savedialog.cpp @@ -3,6 +3,8 @@ #include "savedialog.h" +#include "macrostr.h" + #include #include @@ -18,7 +20,7 @@ SaveDialog::SaveDialog(QWidget *parent) : QDialog(parent) { resize(219, 91); - setWindowTitle(tr("Save Macro")); + setWindowTitle(Tr::tr("Save Macro")); m_name = new QLineEdit; m_name->setValidator(new QRegularExpressionValidator(QRegularExpression(QLatin1String("\\w*")), this)); @@ -31,8 +33,8 @@ SaveDialog::SaveDialog(QWidget *parent) : using namespace Layouting; Form { - tr("Name:"), m_name, br, - tr("Description:"), m_description, br, + Tr::tr("Name:"), m_name, br, + Tr::tr("Description:"), m_description, br, buttonBox }.attachTo(this);