aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2023-01-22 18:59:51 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2023-01-23 09:03:18 +0000
commita0eb8493b9816de162ce6a0674a7c25530020dcd (patch)
treec096760bc7064056c71fe7735301fe7c8e5bea4e
parent852a74c9c15b22e3f0ab62631517c7c4945069e0 (diff)
Macros: Tr::tr
Change-Id: I16d875d238ea9ac14758148c867cbac74042c43c Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--share/qtcreator/translations/qtcreator_cs.ts42
-rw-r--r--share/qtcreator/translations/qtcreator_da.ts23
-rw-r--r--share/qtcreator/translations/qtcreator_de.ts24
-rw-r--r--share/qtcreator/translations/qtcreator_fr.ts39
-rw-r--r--share/qtcreator/translations/qtcreator_hr.ts24
-rw-r--r--share/qtcreator/translations/qtcreator_ja.ts27
-rw-r--r--share/qtcreator/translations/qtcreator_pl.ts20
-rw-r--r--share/qtcreator/translations/qtcreator_ru.ts27
-rw-r--r--share/qtcreator/translations/qtcreator_sl.ts29
-rw-r--r--share/qtcreator/translations/qtcreator_uk.ts41
-rw-r--r--share/qtcreator/translations/qtcreator_zh_CN.ts27
-rw-r--r--share/qtcreator/translations/qtcreator_zh_TW.ts25
-rw-r--r--src/plugins/macros/macrolocatorfilter.cpp7
-rw-r--r--src/plugins/macros/macromanager.cpp19
-rw-r--r--src/plugins/macros/macrooptionspage.cpp5
-rw-r--r--src/plugins/macros/macrooptionswidget.cpp15
-rw-r--r--src/plugins/macros/macrosplugin.cpp21
-rw-r--r--src/plugins/macros/savedialog.cpp8
18 files changed, 63 insertions, 360 deletions
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 9f6a662183..5228208433 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
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Form</source>
<translation>Formulář</translation>
@@ -27328,9 +27328,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap
<source>Description:</source>
<translation>Popis:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Uložit makro</translation>
@@ -27339,10 +27336,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap
<source>Name:</source>
<translation>Název:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>Popis:</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
@@ -32342,14 +32335,11 @@ když bude zavolán mimo git bash.</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Macros</source>
<translation>Makra</translation>
</message>
-</context>
-<context>
- <name>Macros::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>Přehrání makra</translation>
@@ -32366,16 +32356,6 @@ když bude zavolán mimo git bash.</translation>
<source>Stop Recording Macro</source>
<translation>Zastavit nahrávání makra</translation>
</message>
-</context>
-<context>
- <name>::Macros</name>
- <message>
- <source>Macros</source>
- <translation>Makra</translation>
- </message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>&amp;Macros</source>
<translation>&amp;Makra</translation>
@@ -32393,10 +32373,6 @@ když bude zavolán mimo git bash.</translation>
<translation>Alt+(</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>Zastavit nahrávání makra</translation>
- </message>
- <message>
<source>Ctrl+)</source>
<translation>Ctrl+)</translation>
</message>
@@ -54740,23 +54716,11 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
</message>
</context>
<context>
- <name>Macros::Internal::MacroManager</name>
- <message>
- <source>Playing Macro</source>
- <translation>Přehrání makra</translation>
- </message>
- <message>
- <source>An error occurred while replaying the macro, execution stopped.</source>
- <translation>Při přehrávání makra se vyskytla chyba, provádění bylo zastaveno.</translation>
- </message>
+ <name>::Macros</name>
<message>
<source>Macro mode. Type &quot;%1&quot; to stop recording and &quot;%2&quot; to play the macro.</source>
<translation>Režim makra. Napište &quot;%1&quot; pro zastavení nahrávání a &quot;%2&quot; pro přehrání makra.</translation>
</message>
- <message>
- <source>Stop Recording Macro</source>
- <translation>Zastavit nahrávání makra</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index a9d7186bac..beb39af15f 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -19067,16 +19067,10 @@ Fejl: %5</translation>
<source>Macros</source>
<translation>Makroer</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
<message>
<source>Text Editing Macros</source>
<translation>Tekstredigeringsmakroer</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>Afspiller makro</translation>
@@ -19093,9 +19087,6 @@ Fejl: %5</translation>
<source>Stop Recording Macro</source>
<translation>Stop optagelse af makro</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
<message>
<source>Preferences</source>
<translation>Præferencer</translation>
@@ -19124,9 +19115,6 @@ Fejl: %5</translation>
<source>Description:</source>
<translation>Beskrivelse:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>Text Editing &amp;Macros</source>
<translation>Tekstredigerings&amp;makroer</translation>
@@ -19144,10 +19132,6 @@ Fejl: %5</translation>
<translation>Alt+(</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>Stop optagelse af makro</translation>
- </message>
- <message>
<source>Ctrl+)</source>
<translation>Ctrl+)</translation>
</message>
@@ -19171,9 +19155,6 @@ Fejl: %5</translation>
<source>Save Last Macro</source>
<translation>Gem sidste makro</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Gem makro</translation>
@@ -19182,10 +19163,6 @@ Fejl: %5</translation>
<source>Name:</source>
<translation>Navn:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>Beskrivelse:</translation>
- </message>
</context>
<context>
<name>::QmlProfiler</name>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index fc1dc93da9..84f24a74c9 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -16016,7 +16016,7 @@ Möchten Sie sie überschreiben?</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Preferences</source>
<translation>Einstellungen</translation>
@@ -16049,18 +16049,11 @@ Möchten Sie sie überschreiben?</translation>
<source>Macros</source>
<translation>Makros</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <source>Description:</source>
- <translation>Beschreibung:</translation>
- </message>
- <message>
<source>Save Macro</source>
<translation>Makro speichern</translation>
</message>
@@ -16396,7 +16389,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Text Editing Macros</source>
<translation>Textbearbeitungs-Makros</translation>
@@ -16405,9 +16398,6 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
<source>Runs a text editing macro that was recorded with Tools &gt; Text Editing Macros &gt; Record Macro.</source>
<translation>Führt ein Textbearbeitungs-Makro aus, das mit Extras &gt; Textbearbeitungs-Makros &gt; Makroaufnahme aufgenommen wurde.</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>Text Editing &amp;Macros</source>
<translation>Textbearbeitungs-&amp;Makros</translation>
@@ -19505,10 +19495,6 @@ Speichern fehlgeschlagen.</translation>
</context>
<context>
<name>::Macros</name>
- <message>
- <source>Macros</source>
- <translation>Makros</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
@@ -28329,7 +28315,7 @@ The affected files are:
</message>
</context>
<context>
- <name>Macros::Internal::MacroManager</name>
+ <name>::Macros</name>
<message>
<source>Playing Macro</source>
<translation>Abspielen eines Makros</translation>
@@ -28342,10 +28328,6 @@ The affected files are:
<source>Macro mode. Type &quot;%1&quot; to stop recording and &quot;%2&quot; to play the macro.</source>
<translation>Makro-Modus. Geben Sie &quot;%1&quot; ein, um die Aufnahme zu stoppen und &quot;%2&quot;, um sie abzuspielen.</translation>
</message>
- <message>
- <source>Stop Recording Macro</source>
- <translation>Makroaufnahme anhalten</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index cb72805f88..8f95477b3c 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. </translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Form</source>
<translation>Formulaire</translation>
@@ -28434,9 +28434,6 @@ Les pulls locaux ne sont pas appliqués à la branche maître. </translation>
<source>Description:</source>
<translation>Description :</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Sauver la macro</translation>
@@ -28445,10 +28442,6 @@ Les pulls locaux ne sont pas appliqués à la branche maître. </translation>
<source>Name:</source>
<translation>Nom :</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>Description :</translation>
- </message>
</context>
<context>
<name>MemcheckConfigWidget</name>
@@ -31124,14 +31117,11 @@ Do you want to retry?</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Macros</source>
<translation>Macros</translation>
</message>
-</context>
-<context>
- <name>Macros::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>Lancer une macro</translation>
@@ -31152,9 +31142,6 @@ Do you want to retry?</source>
<source>Stop Recording Macro</source>
<translation>Arrêter d&apos;enregistrer la macro</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>&amp;Macros</source>
<translation>&amp;Macros</translation>
@@ -31172,10 +31159,6 @@ Do you want to retry?</source>
<translation>Alt+(</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>Arrêter d&apos;enregistrer la macro</translation>
- </message>
- <message>
<source>Ctrl+)</source>
<translation>Ctrl+)</translation>
</message>
@@ -32362,10 +32345,6 @@ Voys pouvez compiler l&apos;application et la déployer sur desktop et mobile. P
</context>
<context>
<name>::Macros</name>
- <message>
- <source>Macros</source>
- <translation>Macros</translation>
- </message>
</context>
<context>
<name>::QmakeProjectManager</name>
@@ -51400,23 +51379,11 @@ réinitialisation du moniteur</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroManager</name>
- <message>
- <source>Playing Macro</source>
- <translation>Lancer une macro</translation>
- </message>
- <message>
- <source>An error occurred while replaying the macro, execution stopped.</source>
- <translation>Une erreur est apparue lors de l&apos;exécution de la macro, l&apos;exécution s&apos;est arrêtée.</translation>
- </message>
+ <name>::Macros</name>
<message>
<source>Macro mode. Type &quot;%1&quot; to stop recording and &quot;%2&quot; to play the macro.</source>
<translation>Mode macro. Tapez &quot;%1&quot; pour arrêter l&apos;enregistrement et &quot;%2&quot; pour le lancer.</translation>
</message>
- <message>
- <source>Stop Recording Macro</source>
- <translation>Arrêter d&apos;enregistrer la macro</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index e95b39a187..85f20ac0da 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -4722,7 +4722,7 @@ Greška: %5</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Preferences</source>
<translation>Postavke</translation>
@@ -4751,9 +4751,6 @@ Greška: %5</translation>
<source>Description:</source>
<translation>Opis:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Spremi makro</translation>
@@ -4762,10 +4759,6 @@ Greška: %5</translation>
<source>Name:</source>
<translation>Naziv:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>Opis:</translation>
- </message>
</context>
<context>
<name>::Mercurial</name>
@@ -25166,14 +25159,11 @@ Rok upotrebe: %3</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Text Editing Macros</source>
<translation>Uređivač teksta makro naredbi</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>Pokretanje makro naredbe</translation>
@@ -25187,19 +25177,9 @@ Rok upotrebe: %3</translation>
<translation>Rad pomoću makro naredbi. Utipkaj &quot;%1&quot; za zaustavljanje snimanja i &quot;%2&quot; za pokretanje makro naredbe.</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>Zaustavi snimanje makro naredbe</translation>
- </message>
-</context>
-<context>
- <name>::Macros</name>
- <message>
<source>Macros</source>
<translation>Makro naredbe</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>Text Editing &amp;Macros</source>
<translation>Uređivač teksta &amp;makro naredbi</translation>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 28c0cd3ea4..a47e9842ba 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
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Form</source>
<translation>フォーム</translation>
@@ -3728,9 +3728,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Macros</source>
<translation>マクロ</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>マクロ保存</translation>
@@ -3739,10 +3736,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Name:</source>
<translation>名前:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>説明:</translation>
- </message>
</context>
<context>
<name>::Mercurial</name>
@@ -21392,7 +21385,7 @@ instead of its installation directory when run outside git bash.</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroManager</name>
+ <name>::Macros</name>
<message>
<source>Playing Macro</source>
<translation>マクロ実行中</translation>
@@ -21409,16 +21402,6 @@ instead of its installation directory when run outside git bash.</source>
<source>Stop Recording Macro</source>
<translation>マクロの記録を停止</translation>
</message>
-</context>
-<context>
- <name>::Macros</name>
- <message>
- <source>Macros</source>
- <translation>マクロ</translation>
- </message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>Text Editing &amp;Macros</source>
<translation>テキストエディタマクロ(&amp;M)</translation>
@@ -21436,10 +21419,6 @@ instead of its installation directory when run outside git bash.</source>
<translation>Alt+(</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>マクロの記録を停止</translation>
- </message>
- <message>
<source>Ctrl+)</source>
<translation>Ctrl+)</translation>
</message>
@@ -39452,7 +39431,7 @@ Would you like to overwrite it?</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Text Editing Macros</source>
<translation>テキストエディタマクロ</translation>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index bb673ca294..10e94697ba 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.</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Form</source>
<translation>Formularz</translation>
@@ -13744,9 +13744,6 @@ Local pulls are not applied to the master branch.</source>
<source>Description:</source>
<translation>Opis:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Zachowaj makro</translation>
@@ -13755,10 +13752,6 @@ Local pulls are not applied to the master branch.</source>
<source>Name:</source>
<translation>Nazwa:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>Opis:</translation>
- </message>
</context>
<context>
<name>QmlJS::TypeDescriptionReader</name>
@@ -15107,14 +15100,11 @@ Ponowić próbę?</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Text Editing Macros</source>
<translation>Makra do edycji tekstu</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>Text Editing &amp;Macros</source>
<translation>&amp;Makra do edycji tekstu</translation>
@@ -26406,7 +26396,7 @@ Czy odinstalować istniejący pakiet?</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroManager</name>
+ <name>::Macros</name>
<message>
<source>Playing Macro</source>
<translation>Odtwarzanie makra</translation>
@@ -26419,10 +26409,6 @@ Czy odinstalować istniejący pakiet?</translation>
<source>Macro mode. Type &quot;%1&quot; to stop recording and &quot;%2&quot; to play the macro.</source>
<translation>Tryb makro. Wpisz &quot;%1&quot; aby zatrzymać nagrywanie albo &quot;%2&quot; aby je odtworzyć.</translation>
</message>
- <message>
- <source>Stop Recording Macro</source>
- <translation>Zatrzymaj nagrywanie makra</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 40c434cc3f..899a2893a8 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -24236,16 +24236,10 @@ Error: %5</translation>
<source>Macros</source>
<translation>Сценарии</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
<message>
<source>Text Editing Macros</source>
<translation>Сценарии редактирования текста</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>Воспроизведение сценария</translation>
@@ -24262,9 +24256,6 @@ Error: %5</translation>
<source>Stop Recording Macro</source>
<translation>Остановить запись сценария</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
<message>
<source>Preferences</source>
<translation>Настройки</translation>
@@ -24294,13 +24285,6 @@ Error: %5</translation>
<translation>Удалить</translation>
</message>
<message>
- <source>Macros</source>
- <translation>Сценарии</translation>
- </message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
- <message>
<source>Record Macro</source>
<translation>Записать сценарий</translation>
</message>
@@ -24313,10 +24297,6 @@ Error: %5</translation>
<translation>Alt+[</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>Остановить запись сценария</translation>
- </message>
- <message>
<source>Ctrl+]</source>
<translation>Ctrl+]</translation>
</message>
@@ -24344,18 +24324,11 @@ Error: %5</translation>
<source>Alt+R</source>
<translation></translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Name:</source>
<translation>Название:</translation>
</message>
<message>
- <source>Description:</source>
- <translation>Описание:</translation>
- </message>
- <message>
<source>Save Macro</source>
<translation>Сохранить сценарий</translation>
</message>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 454a6fbf80..197db14d4e 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«.</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Form</source>
<translation>Obrazec</translation>
@@ -18486,9 +18486,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«.</translation>
<source>Description:</source>
<translation>Opis:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Shrani makro</translation>
@@ -18498,11 +18495,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«.</translation>
<source>Name:</source>
<translation>Ime:</translation>
</message>
- <message>
- <location/>
- <source>Description:</source>
- <translation>Opis:</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
@@ -23405,14 +23397,11 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Macros</source>
<translation>Makroji</translation>
</message>
-</context>
-<context>
- <name>Macros::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>Predvajanje makra</translation>
@@ -23429,16 +23418,6 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
<source>Stop Recording Macro</source>
<translation>Ustavi snemanje makra</translation>
</message>
-</context>
-<context>
- <name>::Macros</name>
- <message>
- <source>Macros</source>
- <translation>Makroji</translation>
- </message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>&amp;Macros</source>
<translation>&amp;Makroji</translation>
@@ -23456,10 +23435,6 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
<translation>Alt+(</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>Ustavi snemanje makra</translation>
- </message>
- <message>
<source>Ctrl+)</source>
<translation>Ctrl+)</translation>
</message>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index 072688e83f..fc3b72068f 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.</source>
<source>Macros</source>
<translation>Макроси</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
- <message>
- <source>Macros</source>
- <translation type="vanished">Макроси</translation>
- </message>
<message>
<source>Text Editing Macros</source>
<translation>Макроси редагування тексту</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
<message>
<source>Form</source>
<translation>Форма</translation>
@@ -10702,9 +10692,6 @@ Ids must begin with a lowercase letter.</source>
<source>Description:</source>
<translation>Опис:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>&amp;Macros</source>
<translation type="vanished">&amp;Макроси</translation>
@@ -10753,9 +10740,6 @@ Ids must begin with a lowercase letter.</source>
<source>Save Last Macro</source>
<translation>Зберегти останній макрос</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>Зберегти макрос</translation>
@@ -10765,28 +10749,9 @@ Ids must begin with a lowercase letter.</source>
<translation>Назва:</translation>
</message>
<message>
- <source>Description:</source>
- <translation>Опис:</translation>
- </message>
-</context>
-<context>
- <name>Macros::MacroManager</name>
- <message>
- <source>Playing Macro</source>
- <translation type="vanished">Відтворення макросу</translation>
- </message>
- <message>
- <source>An error occurred while replaying the macro, execution stopped.</source>
- <translation type="vanished">Під час програвання макросу сталась помилка, виконання зупинено.</translation>
- </message>
- <message>
<source>Macro mode. Type &quot;%1&quot; to stop recording and &quot;%2&quot; to play it</source>
<translation type="vanished">Режим макросу. Натисніть &quot;%1&quot;, щоб зупинити запис та щоб &quot;%2&quot; програти його</translation>
</message>
- <message>
- <source>Stop Recording Macro</source>
- <translation type="vanished">Зупинити запис макросу</translation>
- </message>
</context>
<context>
<name>::QmlProfiler</name>
@@ -34174,7 +34139,7 @@ Do you want to uninstall the existing package next time?</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroManager</name>
+ <name>::Macros</name>
<message>
<source>Playing Macro</source>
<translation>Відтворення макросу</translation>
@@ -34187,10 +34152,6 @@ Do you want to uninstall the existing package next time?</source>
<source>Macro mode. Type &quot;%1&quot; to stop recording and &quot;%2&quot; to play the macro.</source>
<translation>Режим макросу. Натисніть &quot;%1&quot;, щоб зупинити запис та щоб &quot;%2&quot; програти його.</translation>
</message>
- <message>
- <source>Stop Recording Macro</source>
- <translation>Зупинити запис макросу</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 539530c81c..9e37a4ec3e 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -24023,9 +24023,6 @@ Error: %5</source>
<source>Macros</source>
<translation>宏</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
<message>
<source>Text Editing Macros</source>
<translation type="unfinished"></translation>
@@ -24034,9 +24031,6 @@ Error: %5</source>
<source>Runs a text editing macro that was recorded with Tools &gt; Text Editing Macros &gt; Record Macro.</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation type="unfinished">播放宏</translation>
@@ -24050,13 +24044,6 @@ Error: %5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation type="unfinished">停止录制宏</translation>
- </message>
-</context>
-<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
- <message>
<source>Preferences</source>
<translation>首选项</translation>
</message>
@@ -24081,16 +24068,9 @@ Error: %5</source>
<translation>说明:</translation>
</message>
<message>
- <source>Macros</source>
- <translation type="unfinished">宏</translation>
- </message>
- <message>
<source>Description)</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>Record Macro</source>
<translation>录制宏</translation>
@@ -24135,9 +24115,6 @@ Error: %5</source>
<source>Alt+]</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>保存宏</translation>
@@ -24146,10 +24123,6 @@ Error: %5</source>
<source>Name:</source>
<translation>名称:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>说明:</translation>
- </message>
</context>
<context>
<name>MainWidget</name>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index 354149372f..9e14c4e0b7 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.</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroOptionsWidget</name>
+ <name>::Macros</name>
<message>
<source>Form</source>
<translation>表單</translation>
@@ -17547,9 +17547,6 @@ Local pulls are not applied to the master branch.</source>
<source>Description:</source>
<translation>描述:</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::SaveDialog</name>
<message>
<source>Save Macro</source>
<translation>儲存巨集</translation>
@@ -17558,10 +17555,6 @@ Local pulls are not applied to the master branch.</source>
<source>Name:</source>
<translation>名稱:</translation>
</message>
- <message>
- <source>Description:</source>
- <translation>描述:</translation>
- </message>
</context>
<context>
<name>::ProjectExplorer</name>
@@ -19317,14 +19310,11 @@ Do you want to retry?</source>
</message>
</context>
<context>
- <name>Macros::Internal::MacroLocatorFilter</name>
+ <name>::Macros</name>
<message>
<source>Macros</source>
<translation>巨集</translation>
</message>
-</context>
-<context>
- <name>Macros::MacroManager</name>
<message>
<source>Playing Macro</source>
<translation>播放巨集</translation>
@@ -19341,9 +19331,6 @@ Do you want to retry?</source>
<source>Stop Recording Macro</source>
<translation>停止錄製巨集</translation>
</message>
-</context>
-<context>
- <name>Macros::Internal::MacrosPlugin</name>
<message>
<source>&amp;Macros</source>
<translation>巨集(&amp;M)</translation>
@@ -19361,10 +19348,6 @@ Do you want to retry?</source>
<translation>Alt+(</translation>
</message>
<message>
- <source>Stop Recording Macro</source>
- <translation>停止錄製巨集</translation>
- </message>
- <message>
<source>Ctrl+)</source>
<translation>Ctrl+)</translation>
</message>
@@ -20463,10 +20446,6 @@ You can build the application and deploy it on desktop and mobile target platfor
</context>
<context>
<name>::Macros</name>
- <message>
- <source>Macros</source>
- <translation>巨集</translation>
- </message>
</context>
<context>
<name>AnchorButtons</name>
diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp
index 769e362374..43d5bb3cf9 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 <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
@@ -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 925191754e..507ed92179 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 "actionmacrohandler.h"
+#include "findmacrohandler.h"
#include "imacrohandler.h"
+#include "macro.h"
+#include "macroevent.h"
+#include "macrosconstants.h"
+#include "macrostr.h"
#include "savedialog.h"
-#include "actionmacrohandler.h"
#include "texteditormacrohandler.h"
-#include "findmacrohandler.h"
#include <texteditor/texteditorconstants.h>
@@ -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 eb0d1f58d4..6295ea94e7 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 <texteditor/texteditorconstants.h>
@@ -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 47d337edbe..3b02d93a80 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 <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
@@ -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 be4d2d2217..74fffddeb4 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 <texteditor/texteditorconstants.h>
@@ -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 64cbd8b20a..3d8f7d6ada 100644
--- a/src/plugins/macros/savedialog.cpp
+++ b/src/plugins/macros/savedialog.cpp
@@ -3,6 +3,8 @@
#include "savedialog.h"
+#include "macrostr.h"
+
#include <utils/layoutbuilder.h>
#include <QCheckBox>
@@ -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);