diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 99bffc2d3b9..56cfb452a09 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -35950,21 +35950,11 @@ Derudover testes enhedens forbindelse. - SXCMLTag::UnknownAttributeName + ScxmlEditor Unknown Ukendt - - - SXCMLTag::UnknownAttributeValue - - Unknown - Ukendt - - - - ScxmlEditor::Common::ColorPicker Frame Ramme @@ -35977,9 +35967,6 @@ Derudover testes enhedens forbindelse. Last used colors Sidste brugte farver - - - ScxmlEditor::Common::ColorSettings + + @@ -36012,9 +35999,6 @@ Derudover testes enhedens forbindelse. Are you sure you want to delete color theme %1? Er du sikker på, at du vil slette farvetema %1? - - - ScxmlEditor::Common::ColorThemeDialog Dialog Dialog @@ -36031,16 +36015,10 @@ Derudover testes enhedens forbindelse. Apply Anvend - - - ScxmlEditor::Common::ColorThemeItem Pick Color Vælg farve - - - ScxmlEditor::Common::ColorThemes Modify Color Themes... Rediger farvetemaer... @@ -36061,9 +36039,6 @@ Derudover testes enhedens forbindelse. Colors from SCXML Document Farver fra SCXML-dokument - - - ScxmlEditor::Common::ColorToolButton Automatic Color Automatisk farve @@ -36072,9 +36047,6 @@ Derudover testes enhedens forbindelse. More Colors... Flere farver... - - - ScxmlEditor::Common::GraphicsView SCXML Generation Failed SCXML-generering mislykkedes @@ -36083,9 +36055,6 @@ Derudover testes enhedens forbindelse. Loading document... Indlæser dokument... - - - ScxmlEditor::Common::MainWidget State Color Tilstandsfarve @@ -36142,31 +36111,10 @@ Derudover testes enhedens forbindelse. Could not save the screenshot. Kunne ikke gemme skærmbilledet. - - - ScxmlEditor::Common::Navigator Navigator Navigator - - - ScxmlEditor::Common::NavigatorSlider - - Frame - Ramme - - - - - - - - - + - + - - - - ScxmlEditor::Common::Search Enter search term Indtast søgeterm @@ -36175,9 +36123,6 @@ Derudover testes enhedens forbindelse. Search Søgning - - - ScxmlEditor::Common::SearchModel Type Type @@ -36186,16 +36131,6 @@ Derudover testes enhedens forbindelse. Name Navn - - - ScxmlEditor::Common::ShapesToolbox - - Frame - Ramme - - - - ScxmlEditor::Common::StateProperties Attributes Attributter @@ -36204,16 +36139,10 @@ Derudover testes enhedens forbindelse. Content Indhold - - - ScxmlEditor::Common::StateView Back Tilbage - - - ScxmlEditor::Common::Statistics Time Tid @@ -36234,24 +36163,10 @@ Derudover testes enhedens forbindelse. yyyy/MM/dd hh:mm:ss åååå/MM/dd tt:mm:ss - - - ScxmlEditor::Common::StatisticsDialog - - Dialog - Dialog - - - OK - OK - Document Statistics Dokumentstatistik - - - ScxmlEditor::Common::StatisticsModel Tag Tag @@ -36260,9 +36175,6 @@ Derudover testes enhedens forbindelse. Count Antal - - - ScxmlEditor::Common::Structure Common states Almene tilstande @@ -36299,16 +36211,10 @@ Derudover testes enhedens forbindelse. Add child Tilføj barn - - - ScxmlEditor::Common::StructureModel Change parent Skift forælder - - - ScxmlEditor::Internal::ScxmlEditorData Undo (Ctrl + Z) Fortryd (Ctrl + Z) @@ -36325,9 +36231,6 @@ Derudover testes enhedens forbindelse. Switch Mode Skift tilstand - - - ScxmlEditor::OutputPane::ErrorWidget Errors(%1) / Warnings(%2) / Info(%3) Fejl(%1)/Advarsler(%2)/Info(%3) @@ -36340,25 +36243,14 @@ Derudover testes enhedens forbindelse. CSV files (*.csv) CSV-filer (*.csv) - - Export Failed - Eksport mislykkedes - Cannot open file %1. Kan ikke åbne filen %1. - - - ScxmlEditor::OutputPane::WarningModel Severity Alvor - - Type - Type - Reason Årsag @@ -36379,10 +36271,6 @@ Derudover testes enhedens forbindelse. Info Info - - Unknown - Ukendt - Severity: %1 Type: %2 @@ -36393,9 +36281,6 @@ Type: %2 Årsag: %3 Beskrivelse: %4 - - - ScxmlEditor::PluginInterface::ActionHandler Zoom In Zoom ind @@ -36436,10 +36321,6 @@ Beskrivelse: %4 Magnifier Tool (Alt) Forstørrelsesglas-værktøj (Alt) - - Navigator - Navigator - Navigator (Ctrl+E) Navigator (Ctrl+E) @@ -36484,10 +36365,6 @@ Beskrivelse: %4 Toggle Full Namespace Fuld navnerum til/fra - - Align Left - Juster til venstre - Align Left (Ctrl+L,1) Juster til venstre (Ctrl+L,1) @@ -36532,10 +36409,6 @@ Beskrivelse: %4 Align Vertical (Ctrl+L,6) Juster lodret (Ctrl+L,6) - - Adjust Width - Juster bredde - Adjust Width (Ctrl+L,7) Juster bredde (Ctrl+L,7) @@ -36564,16 +36437,6 @@ Beskrivelse: %4 Show Statistics Vis statistik - - - ScxmlEditor::PluginInterface::BaseItem - - Add child - Tilføj barn - - - - ScxmlEditor::PluginInterface::ConnectableItem Add new state Tilføj ny tilstand @@ -36582,9 +36445,6 @@ Beskrivelse: %4 Move State Flyt tilstand - - - ScxmlEditor::PluginInterface::GraphicsScene Align states Juster tilstande @@ -36593,25 +36453,10 @@ Beskrivelse: %4 Adjust states Juster tilstande - - Cut - Klip - - - Remove items - Fjern poster - Re-layout Genlayout - - Add new state - Tilføj ny tilstand - - - - ScxmlEditor::PluginInterface::IdWarningItem State Tilstand @@ -36628,9 +36473,6 @@ Beskrivelse: %4 Duplicate ID (%1). Dupliker ID (%1). - - - ScxmlEditor::PluginInterface::InitialWarningItem Initial Indledende @@ -36643,20 +36485,10 @@ Beskrivelse: %4 Too many initial states at the same level. For mange indledende tilstande ved det samme niveau. - - - ScxmlEditor::PluginInterface::QuickTransitionItem H H - - - ScxmlEditor::PluginInterface::SCAttributeItemModel - - Name - Navn - Value Værdi @@ -36669,25 +36501,14 @@ Beskrivelse: %4 - value - - værdi - - - - ScxmlEditor::PluginInterface::SCShapeProvider Common States Almene tilstande - - Initial - Indledende - Final Endelige - - State - Tilstand - Parallel Parallel @@ -36696,9 +36517,6 @@ Beskrivelse: %4 History Historik - - - ScxmlEditor::PluginInterface::ScxmlDocument Unexpected element. Uventet element. @@ -36745,10 +36563,6 @@ Række: %4, Kolonne: %5 Cannot save XML to the file %1. Kan ikke gemme XML til filen %1. - - Cannot open file %1. - Kan ikke åbne filen %1. - Add Tag Tilføj tag @@ -36757,9 +36571,6 @@ Række: %4, Kolonne: %5 Remove Tag Fjern tag - - - ScxmlEditor::PluginInterface::ScxmlTag Error in reading XML Fejl ved læsning af XML @@ -36772,17 +36583,10 @@ Række: %4, Kolonne: %5 Item Post - - Metadata - Metadata - Remove Fjern - - - ScxmlEditor::PluginInterface::ScxmlUiFactory Created editor-instance. Oprettede redigeringsinstans. @@ -36791,9 +36595,6 @@ Række: %4, Kolonne: %5 Editor-instance is not of the type ISCEditor. Redigeringsinstans er ikke af typen ISCEditor. - - - ScxmlEditor::PluginInterface::StateItem Set as Initial Sæt som indledende @@ -36810,13 +36611,6 @@ Række: %4, Kolonne: %5 Change initial state Skift indledende tilstand - - - ScxmlEditor::PluginInterface::StateWarningItem - - State - Tilstand - Draw some transitions to state. Tegn nogle overgange til tilstand. @@ -36845,16 +36639,10 @@ Række: %4, Kolonne: %5 Draw some transitions from state. Tegn nogle overgange fra tilstand. - - - ScxmlEditor::PluginInterface::TransitionItem Remove Point Fjern punkt - - - ScxmlEditor::PluginInterface::TransitionWarningItem Transition Overgang diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 13161292553..c15aec8445e 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -37538,7 +37538,7 @@ Fehler: %5 - ScxmlEditor::Common::ColorPicker + ScxmlEditor Frame Rahmen @@ -37551,9 +37551,6 @@ Fehler: %5 Last used colors Zuletzt benutzte Farben - - - ScxmlEditor::Common::ColorSettings + + @@ -37586,9 +37583,6 @@ Fehler: %5 Are you sure you want to delete color theme %1? Sind Sie sicher, dass Sie das Farbschema %1 entfernen wollen? - - - ScxmlEditor::Common::ColorThemeDialog Dialog Dialog @@ -37605,24 +37599,6 @@ Fehler: %5 Apply Anwenden - - - ScxmlEditor::Common::NavigatorSlider - - Frame - Rahmen - - - - - - - - - + - + - - - - ScxmlEditor::Common::Search Enter search term Suchbegriff eingeben @@ -37631,23 +37607,10 @@ Fehler: %5 Search Suche - - - ScxmlEditor::Common::ShapesToolbox - - Frame - Rahmen - - - - ScxmlEditor::Common::StateView Back Zurück - - - ScxmlEditor::Common::Statistics Time Zeit @@ -37668,17 +37631,6 @@ Fehler: %5 yyyy/MM/dd hh:mm:ss dd.MM.yyyy hh:mm:ss - - - ScxmlEditor::Common::StatisticsDialog - - Dialog - Dialog - - - OK - OK - Document Statistics Dokumentenstatistik @@ -39331,7 +39283,7 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di - ScxmlEditor::Common::ColorThemes + ScxmlEditor Modify Color Themes... Farbschemata anpassen... @@ -39352,16 +39304,10 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Colors from SCXML Document Farben aus SCXML-Dokument - - - ScxmlEditor::Common::ColorThemeItem Pick Color Farbe auswählen - - - ScxmlEditor::Common::ColorToolButton Automatic Color Automatische Farbe @@ -39370,9 +39316,6 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di More Colors... Mehr Farben... - - - ScxmlEditor::Common::GraphicsView SCXML Generation Failed SCXML-Erzeugung gescheitert @@ -39381,9 +39324,6 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Loading document... Lade Dokument... - - - ScxmlEditor::Common::MainWidget State Color Zustandsfarbe @@ -39440,16 +39380,10 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Could not save the screenshot. Screenshot konnte nicht gespeichert werden. - - - ScxmlEditor::Common::Navigator Navigator Navigator - - - ScxmlEditor::Common::SearchModel Type Typ @@ -39458,9 +39392,6 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Name Name - - - ScxmlEditor::Common::StateProperties Attributes Attribute @@ -39469,9 +39400,6 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Content Inhalt - - - ScxmlEditor::Common::StatisticsModel Tag Tag @@ -39480,9 +39408,6 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Count Anzahl - - - ScxmlEditor::Common::Structure Common states Allgemeine Zustände @@ -39519,16 +39444,10 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di Add child Kindelement hinzufügen - - - ScxmlEditor::Common::StructureModel Change parent Elternelement ändern - - - ScxmlEditor::OutputPane::ErrorWidget Errors(%1) / Warnings(%2) / Info(%3) Fehler(%1) / Warnungen(%2) / Info(%3) @@ -39541,25 +39460,14 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di CSV files (*.csv) CSV-Dateien (*.csv) - - Export Failed - Export gescheitert - Cannot open file %1. Die Datei %1 kann nicht geöffnet werden. - - - ScxmlEditor::OutputPane::WarningModel Severity Schwere - - Type - Typ - Reason Grund @@ -39594,9 +39502,6 @@ Typ: %2 Grund: %3 Beschreibung: %4 - - - ScxmlEditor::PluginInterface::ActionHandler Zoom In Vergrößern @@ -39637,10 +39542,6 @@ Beschreibung: %4 Magnifier Tool (Alt) Vergrößerungswerkzeug (Alt) - - Navigator - Navigator - Navigator (Ctrl+E) Navigator (Strg+E) @@ -39685,10 +39586,6 @@ Beschreibung: %4 Toggle Full Namespace Vollständigen Namensraum umschalten - - Align Left - Links ausrichten - Align Left (Ctrl+L,1) Links ausrichten (Strg+L,1) @@ -39733,10 +39630,6 @@ Beschreibung: %4 Align Vertical (Ctrl+L,6) Vertikal ausrichten (Strg+L,6) - - Adjust Width - Breite anpassen - Adjust Width (Ctrl+L,7) Breite anpassen (Strg+L,7) @@ -39765,16 +39658,6 @@ Beschreibung: %4 Show Statistics Statistiken anzeigen - - - ScxmlEditor::PluginInterface::BaseItem - - Add child - Kindelement hinzufügen - - - - ScxmlEditor::PluginInterface::ConnectableItem Add new state Einen neuen Zustand hinzufügen @@ -39783,9 +39666,6 @@ Beschreibung: %4 Move State Zustand verschieben - - - ScxmlEditor::PluginInterface::GraphicsScene Align states Zustände ausrichten @@ -39794,25 +39674,10 @@ Beschreibung: %4 Adjust states Zustände anpassen - - Cut - Ausschneiden - - - Remove items - Elemente entfernen - Re-layout Neu anordnen - - Add new state - Einen neuen Zustand hinzufügen - - - - ScxmlEditor::PluginInterface::IdWarningItem State Zustand @@ -39829,9 +39694,6 @@ Beschreibung: %4 Duplicate ID (%1). Doppelte ID (%1). - - - ScxmlEditor::PluginInterface::InitialWarningItem Initial Ausgangszustand @@ -39844,20 +39706,10 @@ Beschreibung: %4 Too many initial states at the same level. Zu viele Ausgangszustände auf der gleichen Ebene. - - - ScxmlEditor::PluginInterface::QuickTransitionItem H H - - - ScxmlEditor::PluginInterface::SCAttributeItemModel - - Name - Name - Value Wert @@ -39870,25 +39722,14 @@ Beschreibung: %4 - value - - Wert - - - - ScxmlEditor::PluginInterface::SCShapeProvider Common States Allgemeine Zustände - - Initial - Ausgangszustand - Final Endzustand - - State - Zustand - Parallel Parallel @@ -39897,9 +39738,6 @@ Beschreibung: %4 History Verlauf - - - ScxmlEditor::PluginInterface::ScxmlDocument Unexpected element. Unerwartetes Element. @@ -39946,10 +39784,6 @@ Zeile: %4, Spalte: %5 Cannot save XML to the file %1. In die Datei %1 kann kein XML geschrieben werden. - - Cannot open file %1. - Die Datei %1 kann nicht geöffnet werden. - Add Tag Tag hinzufügen @@ -39958,23 +39792,6 @@ Zeile: %4, Spalte: %5 Remove Tag Tag entfernen - - - SXCMLTag::UnknownAttributeValue - - Unknown - Unbekannt - - - - SXCMLTag::UnknownAttributeName - - Unknown - Unbekannt - - - - ScxmlEditor::PluginInterface::ScxmlTag Error in reading XML Fehler beim Lesen von XML @@ -39987,17 +39804,10 @@ Zeile: %4, Spalte: %5 Item Element - - Metadata - Metadaten - Remove Entfernen - - - ScxmlEditor::PluginInterface::ScxmlUiFactory Created editor-instance. Editorinstanz erzeugt. @@ -40006,9 +39816,6 @@ Zeile: %4, Spalte: %5 Editor-instance is not of the type ISCEditor. Die Editorinstanz ist nicht vom Typ ISCEditor. - - - ScxmlEditor::PluginInterface::StateItem Set as Initial Als Ausgangszustand festlegen @@ -40025,13 +39832,6 @@ Zeile: %4, Spalte: %5 Change initial state Ausgangszustand ändern - - - ScxmlEditor::PluginInterface::StateWarningItem - - State - Zustand - Draw some transitions to state. Einige Übergänge zum Zustand zeichnen. @@ -40060,16 +39860,10 @@ Zeile: %4, Spalte: %5 Draw some transitions from state. Einige Übergänge vom Zustand zeichnen. - - - ScxmlEditor::PluginInterface::TransitionItem Remove Point Punkt entfernen - - - ScxmlEditor::PluginInterface::TransitionWarningItem Transition Übergang @@ -40082,9 +39876,6 @@ Zeile: %4, Spalte: %5 Not connected (%1). Nicht verbunden (%1). - - - ScxmlEditor::Internal::ScxmlEditorData Undo (Ctrl + Z) Rückgängig machen (Strg + Z) diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 92ae17534fc..3174b28c812 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -8172,7 +8172,7 @@ Sigurno želiš nastaviti? - ScxmlEditor::Common::ColorPicker + ScxmlEditor Frame Okvir @@ -8185,9 +8185,6 @@ Sigurno želiš nastaviti? Last used colors Posljednja korištena boja - - - ScxmlEditor::Common::ColorSettings + + @@ -8220,9 +8217,6 @@ Sigurno želiš nastaviti? Are you sure you want to delete color theme %1? Sigurno želiš ukloniti temu boje %1? - - - ScxmlEditor::Common::ColorThemeDialog Dialog Dijalog @@ -8239,24 +8233,6 @@ Sigurno želiš nastaviti? Apply Primijeni - - - ScxmlEditor::Common::NavigatorSlider - - Frame - Okvir - - - - - − - - - + - + - - - - ScxmlEditor::Common::Search Enter search term Upiši izraz za pretraživanje @@ -8265,23 +8241,10 @@ Sigurno želiš nastaviti? Search Traži - - - ScxmlEditor::Common::ShapesToolbox - - Frame - Okvir - - - - ScxmlEditor::Common::StateView Back Natrag - - - ScxmlEditor::Common::Statistics Time Vrijeme @@ -8302,17 +8265,6 @@ Sigurno želiš nastaviti? yyyy/MM/dd hh:mm:ss dd. MM. yyyy. hh:mm:ss - - - ScxmlEditor::Common::StatisticsDialog - - Dialog - Dijalog - - - OK - U redu - Document Statistics Statistike dokumenta @@ -37568,7 +37520,7 @@ Saving failed. - ScxmlEditor::Common::ColorThemes + ScxmlEditor Modify Color Themes... Promijeni teme boja … @@ -37589,16 +37541,10 @@ Saving failed. Colors from SCXML Document Boje iz SCXML dokumenta - - - ScxmlEditor::Common::ColorThemeItem Pick Color - - - ScxmlEditor::Common::ColorToolButton Automatic Color @@ -37607,9 +37553,6 @@ Saving failed. More Colors... - - - ScxmlEditor::Common::GraphicsView SCXML Generation Failed @@ -37618,9 +37561,6 @@ Saving failed. Loading document... - - - ScxmlEditor::Common::MainWidget State Color @@ -37677,16 +37617,10 @@ Saving failed. Could not save the screenshot. - - - ScxmlEditor::Common::Navigator Navigator - - - ScxmlEditor::Common::SearchModel Type Vrsta @@ -37695,9 +37629,6 @@ Saving failed. Name Naziv - - - ScxmlEditor::Common::StateProperties Attributes Svojstva @@ -37706,9 +37637,6 @@ Saving failed. Content Sadržaj - - - ScxmlEditor::Common::StatisticsModel Tag Oznaka @@ -37717,17 +37645,10 @@ Saving failed. Count - - - ScxmlEditor::Common::Structure Common states - - Metadata - - Other tags @@ -37756,16 +37677,10 @@ Saving failed. Add child - - - ScxmlEditor::Common::StructureModel Change parent - - - ScxmlEditor::OutputPane::ErrorWidget Errors(%1) / Warnings(%2) / Info(%3) @@ -37778,25 +37693,14 @@ Saving failed. CSV files (*.csv) - - Export Failed - - Cannot open file %1. - - - ScxmlEditor::OutputPane::WarningModel Severity - - Type - Vrsta - Reason @@ -37828,9 +37732,6 @@ Reason: %3 Description: %4 - - - ScxmlEditor::PluginInterface::ActionHandler Zoom In Uvećaj @@ -37871,10 +37772,6 @@ Description: %4 Magnifier Tool (Alt) - - Navigator - - Navigator (Ctrl+E) @@ -37919,10 +37816,6 @@ Description: %4 Toggle Full Namespace - - Align Left - - Align Left (Ctrl+L,1) @@ -37967,10 +37860,6 @@ Description: %4 Align Vertical (Ctrl+L,6) - - Adjust Width - - Adjust Width (Ctrl+L,7) @@ -37999,16 +37888,6 @@ Description: %4 Show Statistics - - - ScxmlEditor::PluginInterface::BaseItem - - Add child - - - - - ScxmlEditor::PluginInterface::ConnectableItem Add new state @@ -38017,9 +37896,6 @@ Description: %4 Move State - - - ScxmlEditor::PluginInterface::GraphicsScene Align states @@ -38028,25 +37904,10 @@ Description: %4 Adjust states - - Cut - Izreži - - - Remove items - - Re-layout - - Add new state - - - - - ScxmlEditor::PluginInterface::IdWarningItem State Stanje @@ -38063,9 +37924,6 @@ Description: %4 Duplicate ID (%1). - - - ScxmlEditor::PluginInterface::InitialWarningItem Initial @@ -38078,20 +37936,10 @@ Description: %4 Too many initial states at the same level. - - - ScxmlEditor::PluginInterface::QuickTransitionItem H H - - - ScxmlEditor::PluginInterface::SCAttributeItemModel - - Name - Naziv - Value Vrijednost @@ -38104,25 +37952,14 @@ Description: %4 - value - - - - ScxmlEditor::PluginInterface::SCShapeProvider Common States - - Initial - - Final - - State - Stanje - Parallel @@ -38131,9 +37968,6 @@ Description: %4 History Povijest - - - ScxmlEditor::PluginInterface::ScxmlDocument Unexpected element. @@ -38175,10 +38009,6 @@ Row: %4, Column: %5 Cannot save XML to the file %1. - - Cannot open file %1. - - Add Tag @@ -38187,23 +38017,6 @@ Row: %4, Column: %5 Remove Tag - - - SXCMLTag::UnknownAttributeValue - - Unknown - Nepoznato - - - - SXCMLTag::UnknownAttributeName - - Unknown - Nepoznato - - - - ScxmlEditor::PluginInterface::ScxmlTag Error in reading XML Greška u čitanju XML-a @@ -38224,9 +38037,6 @@ Row: %4, Column: %5 Remove Ukloni - - - ScxmlEditor::PluginInterface::ScxmlUiFactory Created editor-instance. @@ -38235,9 +38045,6 @@ Row: %4, Column: %5 Editor-instance is not of the type ISCEditor. - - - ScxmlEditor::PluginInterface::StateItem Set as Initial Postavi kao izvorno @@ -38254,13 +38061,6 @@ Row: %4, Column: %5 Change initial state Promijeni izvorno stanje - - - ScxmlEditor::PluginInterface::StateWarningItem - - State - Stanje - Draw some transitions to state. @@ -38289,16 +38089,10 @@ Row: %4, Column: %5 No input connections (%1). - - - ScxmlEditor::PluginInterface::TransitionItem Remove Point Ukloni točku - - - ScxmlEditor::PluginInterface::TransitionWarningItem Transition Tranzicija @@ -38311,9 +38105,6 @@ Row: %4, Column: %5 Not connected (%1). Ne spojeno (%1). - - - ScxmlEditor::Internal::ScxmlEditorData Undo (Ctrl + Z) Poništi (Ctrl + Z) diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index a448e0fbe71..5251ccf3f23 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -48040,14 +48040,11 @@ Output: - ScxmlEditor::Common::ColorSettings + ScxmlEditor + + - - - ScxmlEditor::Common::ColorThemeDialog Dialog ダイアログ @@ -48064,30 +48061,14 @@ Output: Apply 適用 - - - ScxmlEditor::Common::NavigatorSlider - - + - + - - - - ScxmlEditor::Common::Search Search 検索 - - - ScxmlEditor::Common::StateView Back 戻る - - - ScxmlEditor::Common::Statistics Time タイム @@ -48101,17 +48082,6 @@ Output: ファイル - - ScxmlEditor::Common::StatisticsDialog - - Dialog - ダイアログ - - - OK - OK - - main @@ -55748,7 +55718,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - ScxmlEditor::Common::ColorThemes + ScxmlEditor Modify Color Themes... 色のテーマを変更する... @@ -55769,16 +55739,10 @@ Stepping into the module or setting breakpoints by file and line is expected to Colors from SCXML Document SCXML ドキュメントからの色 - - - ScxmlEditor::Common::ColorThemeItem Pick Color 色を選ぶ - - - ScxmlEditor::Common::ColorToolButton Automatic Color 自動カラー @@ -55787,9 +55751,6 @@ Stepping into the module or setting breakpoints by file and line is expected to More Colors... 他の色... - - - ScxmlEditor::Common::GraphicsView SCXML Generation Failed SCXML の生成に失敗しました @@ -55798,9 +55759,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Loading document... ドキュメントの読み込み... - - - ScxmlEditor::Common::MainWidget State Color 状態の色 @@ -55857,16 +55815,10 @@ Stepping into the module or setting breakpoints by file and line is expected to Could not save the screenshot. スクリーンショットを保存できませんでした。 - - - ScxmlEditor::Common::Navigator Navigator ナビゲータ - - - ScxmlEditor::Common::SearchModel Type 型 @@ -55875,9 +55827,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Name 名前 - - - ScxmlEditor::Common::StateProperties Attributes 属性 @@ -55886,9 +55835,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Content コンテンツ - - - ScxmlEditor::Common::StatisticsModel Tag タグ @@ -55897,9 +55843,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Count カウント - - - ScxmlEditor::Common::Structure Common states 共通する状態 @@ -55936,16 +55879,10 @@ Stepping into the module or setting breakpoints by file and line is expected to Add child 子を追加する - - - ScxmlEditor::Common::StructureModel Change parent 親を変更する - - - ScxmlEditor::OutputPane::ErrorWidget Errors(%1) / Warnings(%2) / Info(%3) エラー(%1) / 警告(%2) / 情報(%3) @@ -55958,25 +55895,14 @@ Stepping into the module or setting breakpoints by file and line is expected to CSV files (*.csv) CSV ファイル (*.csv) - - Export Failed - エクスポートに失敗しました - Cannot open file %1. ファイル %1 を開けません。 - - - ScxmlEditor::OutputPane::WarningModel Severity 重要度 - - Type - 型 - Reason 理由 @@ -56011,9 +55937,6 @@ Description: %4 理由: %3 説明: %4 - - - ScxmlEditor::PluginInterface::ActionHandler Zoom In 拡大 @@ -56022,10 +55945,6 @@ Description: %4 Zoom Out 縮小 - - Navigator - ナビゲータ - Copy コピー @@ -56038,10 +55957,6 @@ Description: %4 Paste 貼り付け - - Align Left - 左揃え - Align Right 右揃え @@ -56054,20 +55969,6 @@ Description: %4 Align Bottom 下揃え - - Adjust Width - 幅の調整 - - - - ScxmlEditor::PluginInterface::BaseItem - - Add child - 子を追加する - - - - ScxmlEditor::PluginInterface::ConnectableItem Add new state 新しい状態を追加します @@ -56076,9 +55977,6 @@ Description: %4 Move State 状態を遷移する - - - ScxmlEditor::PluginInterface::GraphicsScene Align states 状態を揃える @@ -56087,25 +55985,10 @@ Description: %4 Adjust states 状態を調整する - - Cut - 切り取り - - - Remove items - 項目を削除する - Re-layout リレイアウト - - Add new state - 新しい状態を追加します - - - - ScxmlEditor::PluginInterface::IdWarningItem State 状態 @@ -56122,9 +56005,6 @@ Description: %4 Duplicate ID (%1). 重複したID (%1)。 - - - ScxmlEditor::PluginInterface::InitialWarningItem Initial 初期 @@ -56137,20 +56017,10 @@ Description: %4 Too many initial states at the same level. 同じレベルの初期状態が多すぎます。 - - - ScxmlEditor::PluginInterface::QuickTransitionItem H H - - - ScxmlEditor::PluginInterface::SCAttributeItemModel - - Name - 名前 - Value 値 @@ -56163,25 +56033,14 @@ Description: %4 - value - - 値 - - - - ScxmlEditor::PluginInterface::SCShapeProvider Common States 共通する状態 - - Initial - 初期 - Final 最終 - - State - 状態 - Parallel 並列 @@ -56190,9 +56049,6 @@ Description: %4 History 履歴 - - - ScxmlEditor::PluginInterface::ScxmlDocument Unexpected element. 予想外のエレメント。 @@ -56239,10 +56095,6 @@ Row: %4, Column: %5 Cannot save XML to the file %1. XML をファイル %1 に保存できません。 - - Cannot open file %1. - ファイル %1. を開けません. - Add Tag タグを追加する @@ -56251,23 +56103,6 @@ Row: %4, Column: %5 Remove Tag タグを削除する - - - SXCMLTag::UnknownAttributeValue - - Unknown - 不明 - - - - SXCMLTag::UnknownAttributeName - - Unknown - 不明 - - - - ScxmlEditor::PluginInterface::ScxmlTag Error in reading XML XML の読み込みに失敗 @@ -56280,17 +56115,10 @@ Row: %4, Column: %5 Item アイテム - - Metadata - メタデータ - Remove 削除 - - - ScxmlEditor::PluginInterface::ScxmlUiFactory Created editor-instance. エディタインスタンスを作成しました。 @@ -56299,9 +56127,6 @@ Row: %4, Column: %5 Editor-instance is not of the type ISCEditor. エディタインスタンスは ISCEditor 型ではありません。 - - - ScxmlEditor::PluginInterface::StateItem Set as Initial 初期設定 @@ -56318,13 +56143,6 @@ Row: %4, Column: %5 Change initial state 初期状態を変更する - - - ScxmlEditor::PluginInterface::StateWarningItem - - State - 状態 - Draw some transitions to state. 状態への遷移をいくつか描いてみましょう。 @@ -56353,16 +56171,10 @@ Row: %4, Column: %5 No input connections (%1). 入力の接続がありません (%1)。 - - - ScxmlEditor::PluginInterface::TransitionItem Remove Point ポイントを削除 - - - ScxmlEditor::PluginInterface::TransitionWarningItem Transition トランジション @@ -56375,9 +56187,6 @@ Row: %4, Column: %5 Not connected (%1). 接続されていません(%1)。 - - - ScxmlEditor::Internal::ScxmlEditorData Undo (Ctrl + Z) 元に戻す(Ctrl + Z) diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 87c1d6fd9e5..6eb13d88f97 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -40519,7 +40519,7 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc - ScxmlEditor::Common::ColorPicker + ScxmlEditor Frame Ramka @@ -40532,9 +40532,6 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc Last used colors Ostatnio używane kolory - - - ScxmlEditor::Common::ColorSettings Form Formularz @@ -40571,9 +40568,6 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc Are you sure you want to delete color theme %1? Czy usunąć motyw kolorów %1? - - - ScxmlEditor::Common::ColorThemeDialog Dialog Dialog @@ -40590,35 +40584,6 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc Apply Zastosuj - - - ScxmlEditor::Common::Magnifier - - Form - Formularz - - - - ScxmlEditor::Common::NavigatorSlider - - Frame - Ramka - - - - - - - - - + - + - - - - ScxmlEditor::Common::Search - - Form - Formularz - Enter search term Wprowadź tekst do wyszukania @@ -40627,31 +40592,10 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc Search Wyszukaj - - - ScxmlEditor::Common::ShapesToolbox - - Frame - Ramka - - - - ScxmlEditor::Common::StateView - - Form - Formularz - Back Wstecz - - - ScxmlEditor::Common::Statistics - - Form - Formularz - Time Czas @@ -40672,17 +40616,6 @@ Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektóryc yyyy/MM/dd hh:mm:ss yyyy/MM/dd hh:mm:ss - - - ScxmlEditor::Common::StatisticsDialog - - Dialog - Dialog - - - OK - OK - Document Statistics Statystyka dokumentu @@ -41313,7 +41246,7 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący - ScxmlEditor::Common::ColorThemes + ScxmlEditor Modify Color Themes... Modyfikuj motywy kolorów... @@ -41334,16 +41267,10 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Colors from SCXML Document Kolory z dokumentu SCXML - - - ScxmlEditor::Common::ColorThemeItem Pick Color Wybierz kolor - - - ScxmlEditor::Common::ColorToolButton Automatic Color Kolor automatyczny @@ -41352,9 +41279,6 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący More Colors... Więcej kolorów... - - - ScxmlEditor::Common::GraphicsView SCXML Generation Failed Błąd generowania SCXML @@ -41363,9 +41287,6 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Loading document... Ładowanie dokumentu... - - - ScxmlEditor::Common::MainWidget State Color Kolor stanu @@ -41422,16 +41343,10 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Could not save the screenshot. Nie można zachować zrzutu ekranu. - - - ScxmlEditor::Common::Navigator Navigator Nawigator - - - ScxmlEditor::Common::SearchModel Type Typ @@ -41440,9 +41355,6 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Name Nazwa - - - ScxmlEditor::Common::StateProperties Attributes Atrybuty @@ -41451,9 +41363,6 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Content Zawartość - - - ScxmlEditor::Common::StatisticsModel Tag Tag @@ -41462,9 +41371,6 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Count Ilość - - - ScxmlEditor::Common::Structure Common states Wspólne stany @@ -41501,16 +41407,10 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Add child Dodaj dziecko - - - ScxmlEditor::Common::StructureModel Change parent Zmień rodzica - - - ScxmlEditor::OutputPane::ErrorWidget Errors(%1) / Warnings(%2) / Info(%3) Błędy (%1) / Ostrzeżenia (%2) / Informacje (%3) @@ -41523,25 +41423,14 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Export to File Wyeksportuj do pliku - - Export Failed - Błąd eksportowania - Cannot open file %1. Nie można otworzyć pliku %1. - - - ScxmlEditor::OutputPane::WarningModel Severity Ciężkość - - Type - Typ - Reason Przyczyna @@ -41576,16 +41465,6 @@ Typ: %2 Przyczyna: %3 Opis: %4 - - - ScxmlEditor::PluginInterface::BaseItem - - Add child - Dodaj dziecko - - - - ScxmlEditor::PluginInterface::ConnectableItem Add new state Dodaj nowy stan @@ -41594,9 +41473,6 @@ Opis: %4 Move State Przenieś stan - - - ScxmlEditor::PluginInterface::GraphicsScene Align states Wyrównaj stany @@ -41617,13 +41493,6 @@ Opis: %4 Relayout Rozmieść ponownie - - Add new state - Dodaj nowy stan - - - - ScxmlEditor::PluginInterface::IdWarningItem State Stan @@ -41640,9 +41509,6 @@ Opis: %4 Duplicate ID (%1) Powielony identyfikator (%1) - - - ScxmlEditor::PluginInterface::InitialWarningItem Initial Stan początkowy @@ -41655,20 +41521,10 @@ Opis: %4 Too many initial states at the same level Zbyt wiele stanów początkowych na tym samym poziomie - - - ScxmlEditor::PluginInterface::QuickTransitionItem H H - - - ScxmlEditor::PluginInterface::SCAttributeItemModel - - Name - Nazwa - Value Wartość @@ -41681,25 +41537,14 @@ Opis: %4 - value - - wartość - - - - ScxmlEditor::PluginInterface::SCShapeProvider Common States Wspólne stany - - Initial - Stan początkowy - Final Stan finalny - - State - Stan - Parallel Stan równoległy @@ -41708,9 +41553,6 @@ Opis: %4 History Stan historyczny - - - ScxmlEditor::PluginInterface::ScxmlDocument Error in reading XML. Type: %1 (%2) @@ -41757,10 +41599,6 @@ Wiersz: %4, kolumna: %5 Cannot save XML to the file %1. Nie można zachować pliku XML %1. - - Cannot open file %1. - Nie można otworzyć pliku %1. - Add Tag Dodaj tag @@ -41769,23 +41607,6 @@ Wiersz: %4, kolumna: %5 Remove Tag Usuń tag - - - SXCMLTag::UnknownAttributeValue - - Unknown - Nieznany - - - - SXCMLTag::UnknownAttributeName - - Unknown - Nieznany - - - - ScxmlEditor::PluginInterface::ScxmlTag Error in reading XML Błąd odczytu XML @@ -41798,17 +41619,10 @@ Wiersz: %4, kolumna: %5 Item Element - - Metadata - Metadane - Remove Usuń - - - ScxmlEditor::PluginInterface::ScxmlUiFactory Created editor-instance. Utworzono instancję edytora. @@ -41817,9 +41631,6 @@ Wiersz: %4, kolumna: %5 Editor-instance is not of the type ISCEditor. Instancja edytora nie jest typu ISCEditor. - - - ScxmlEditor::PluginInterface::StateItem Set as Initial Ustaw jako początkowy @@ -41832,21 +41643,10 @@ Wiersz: %4, kolumna: %5 Re-Layout Rozmieść ponownie - - Relayout - Rozmieść ponownie - Change initial state Zmień stan początkowy - - - ScxmlEditor::PluginInterface::StateWarningItem - - State - Stan - Draw some transitions to state. Narysuj przejścia do stanu. @@ -41875,16 +41675,10 @@ Wiersz: %4, kolumna: %5 No input connections (%1) Brak połączeń wejściowych (%1) - - - ScxmlEditor::PluginInterface::TransitionItem Remove Point Usuń punkt - - - ScxmlEditor::PluginInterface::TransitionWarningItem Transition Przejście @@ -41897,9 +41691,6 @@ Wiersz: %4, kolumna: %5 Not Connected (%1) Niepołączone (%1) - - - ScxmlEditor::Internal::ScxmlEditorData Undo (Ctrl + Z) Cofnij (Ctrl+Z) @@ -41937,7 +41728,7 @@ Wiersz: %4, kolumna: %5 - ScxmlEditor::PluginInterface::ActionHandler + ScxmlEditor Zoom In Powiększ @@ -41978,10 +41769,6 @@ Wiersz: %4, kolumna: %5 Magnifier Tool (Alt) Lupa (Alt) - - Navigator - Nawigator - Navigator (Ctrl+E) Nawigator (Ctrl+E) @@ -41994,10 +41781,6 @@ Wiersz: %4, kolumna: %5 Copy (Ctrl + C) Skopiuj (Ctrl+C) - - Cut - Wytnij - Cut (Ctrl + X) Wytnij (Ctrl+X) @@ -42026,10 +41809,6 @@ Wiersz: %4, kolumna: %5 Toggle Full Namespace Przełącz pokazywanie pełnych przestrzeni nazw - - Align Left - Wyrównaj do lewej - Align Left (Ctrl+L,1) Wyrównaj do lewej (Ctrl+L,1) @@ -42074,10 +41853,6 @@ Wiersz: %4, kolumna: %5 Align Vertical (Ctrl+L,6) Wyrównaj w pionie (Ctrl+L,6) - - Adjust Width - Dopasuj szerokość - Adjust Width (Ctrl+L,7) Dopasuj szerokość (Ctrl+L,7) diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 1e181876839..5e1804a572c 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -45926,14 +45926,7 @@ If you do not have a private key yet, you can also create one here. - SXCMLTag::UnknownAttributeName - - Unknown - - - - - SXCMLTag::UnknownAttributeValue + ScxmlEditor Unknown Неизвестное @@ -45947,7 +45940,7 @@ If you do not have a private key yet, you can also create one here. - ScxmlEditor::Common::ColorPicker + ScxmlEditor Frame Рамка @@ -45960,9 +45953,6 @@ If you do not have a private key yet, you can also create one here. Last used colors Недавние использованные цвета - - - ScxmlEditor::Common::ColorSettings + + @@ -45995,9 +45985,6 @@ If you do not have a private key yet, you can also create one here. Are you sure you want to delete color theme %1? Удалить цветовую тему %1? - - - ScxmlEditor::Common::ColorThemeDialog Dialog @@ -46014,16 +46001,10 @@ If you do not have a private key yet, you can also create one here. Apply Применить - - - ScxmlEditor::Common::ColorThemeItem Pick Color Захватить цвет - - - ScxmlEditor::Common::ColorThemes Modify Color Themes... Изменить цветовые схемы... @@ -46044,9 +46025,6 @@ If you do not have a private key yet, you can also create one here. Colors from SCXML Document Цвета из документа SCXML - - - ScxmlEditor::Common::ColorToolButton Automatic Color Автоматический цвет @@ -46055,9 +46033,6 @@ If you do not have a private key yet, you can also create one here. More Colors... Больше цветов... - - - ScxmlEditor::Common::GraphicsView SCXML Generation Failed Не удалось создать SCXML @@ -46066,9 +46041,6 @@ If you do not have a private key yet, you can also create one here. Loading document... Загрузка документа... - - - ScxmlEditor::Common::MainWidget State Color Цвет состояния @@ -46125,31 +46097,10 @@ If you do not have a private key yet, you can also create one here. Could not save the screenshot. Не удалось сохранить снимок экрана. - - - ScxmlEditor::Common::Navigator Navigator Навигатор - - - ScxmlEditor::Common::NavigatorSlider - - Frame - - - - - - - - - - + - + - - - - ScxmlEditor::Common::Search Enter search term Введите термин для поиска @@ -46158,9 +46109,6 @@ If you do not have a private key yet, you can also create one here. Search Поиск - - - ScxmlEditor::Common::SearchModel Type Тип @@ -46169,16 +46117,6 @@ If you do not have a private key yet, you can also create one here. Name Имя - - - ScxmlEditor::Common::ShapesToolbox - - Frame - - - - - ScxmlEditor::Common::StateProperties Attributes Атрибуты @@ -46187,16 +46125,10 @@ If you do not have a private key yet, you can also create one here. Content Содержимое - - - ScxmlEditor::Common::StateView Back Назад - - - ScxmlEditor::Common::Statistics Time Время @@ -46217,24 +46149,10 @@ If you do not have a private key yet, you can also create one here. yyyy/MM/dd hh:mm:ss yyyy/MM/dd hh:mm:ss - - - ScxmlEditor::Common::StatisticsDialog - - Dialog - - - - OK - OK - Document Statistics Статистика документа - - - ScxmlEditor::Common::StatisticsModel Tag Тег @@ -46243,9 +46161,6 @@ If you do not have a private key yet, you can also create one here. Count Число - - - ScxmlEditor::Common::Structure Common states Общие состояния @@ -46282,16 +46197,10 @@ If you do not have a private key yet, you can also create one here. Add child Добавить потомка - - - ScxmlEditor::Common::StructureModel Change parent Сменить родителя - - - ScxmlEditor::Internal::ScxmlEditorData Undo (Ctrl + Z) Отменить (Ctrl+Z) @@ -46308,9 +46217,6 @@ If you do not have a private key yet, you can also create one here. Switch Mode Переключить режим - - - ScxmlEditor::OutputPane::ErrorWidget Errors(%1) / Warnings(%2) / Info(%3) Ошибки(%1) / Предупреждения(%2) / Информация(%3) @@ -46323,25 +46229,14 @@ If you do not have a private key yet, you can also create one here. Export to File Экспорт в файл - - Export Failed - Ошибка экспорта - Cannot open file %1. Невозможно открыть файл %1. - - - ScxmlEditor::OutputPane::WarningModel Severity Строгость - - Type - Тип - Reason Причина @@ -46362,10 +46257,6 @@ If you do not have a private key yet, you can also create one here. Info Информация - - Unknown - Неизвестно - Severity: %1 Type: %2 @@ -46376,9 +46267,6 @@ Description: %4 Причина: %3 Описание: %4 - - - ScxmlEditor::PluginInterface::ActionHandler Zoom In Увеличить @@ -46419,10 +46307,6 @@ Description: %4 Magnifier Tool (Alt) Лупа (Alt) - - Navigator - Навигатор - Navigator (Ctrl+E) Навигатор (Ctrl+E) @@ -46467,10 +46351,6 @@ Description: %4 Toggle Full Namespace Переключить пространство имён - - Align Left - По левому краю - Align Left (Ctrl+L,1) По левому краю (Ctrl + L,1) @@ -46515,10 +46395,6 @@ Description: %4 Align Vertical (Ctrl+L,6) Выровнить горизонтально (Ctrl+L,6) - - Adjust Width - Подогнать ширину - Adjust Width (Ctrl+L,7) Подогнать ширину (Ctrl+L,7) @@ -46547,16 +46423,6 @@ Description: %4 Show Statistics Показать статистику - - - ScxmlEditor::PluginInterface::BaseItem - - Add child - Добавить потомка - - - - ScxmlEditor::PluginInterface::ConnectableItem Add new state Добавление нового состояния @@ -46565,9 +46431,6 @@ Description: %4 Move State Переместить состояние - - - ScxmlEditor::PluginInterface::GraphicsScene Align states Выровнить состояния @@ -46576,25 +46439,10 @@ Description: %4 Adjust states Подогнать состояния - - Cut - Вырезать - - - Remove items - Удаление элементов - Re-layout Перекомпоновка - - Add new state - Добавление нового состояния - - - - ScxmlEditor::PluginInterface::IdWarningItem State Состояние @@ -46611,9 +46459,6 @@ Description: %4 Duplicate ID (%1). Повторный ID (%1). - - - ScxmlEditor::PluginInterface::InitialWarningItem Initial Начало @@ -46626,21 +46471,11 @@ Description: %4 Too many initial states at the same level. Слишком много начальных состояний на одном уровне. - - - ScxmlEditor::PluginInterface::QuickTransitionItem H История И - - - ScxmlEditor::PluginInterface::SCAttributeItemModel - - Name - Имя - Value Значение @@ -46653,25 +46488,14 @@ Description: %4 - value - - значение - - - - ScxmlEditor::PluginInterface::SCShapeProvider Common States Общие состояния - - Initial - Начало - Final Конец - - State - Состояние - Parallel Параллельное @@ -46680,9 +46504,6 @@ Description: %4 History История - - - ScxmlEditor::PluginInterface::ScxmlDocument Error in reading XML. Type: %1 (%2) @@ -46729,10 +46550,6 @@ Row: %4, Column: %5 Cannot save XML to the file %1. Невозможно сохранить XML в файл %1. - - Cannot open file %1. - Невозможно открыть файл %1. - Add Tag Добавить тег @@ -46741,9 +46558,6 @@ Row: %4, Column: %5 Remove Tag Удалить тег - - - ScxmlEditor::PluginInterface::ScxmlTag Error in reading XML Ошибка чтения XML @@ -46756,17 +46570,10 @@ Row: %4, Column: %5 Item Элемент - - Metadata - Метаданные - Remove Удалить - - - ScxmlEditor::PluginInterface::ScxmlUiFactory Created editor-instance. Создан экземпляр редактора. @@ -46775,9 +46582,6 @@ Row: %4, Column: %5 Editor-instance is not of the type ISCEditor. Экземпляр редактора не типа ISCEditor. - - - ScxmlEditor::PluginInterface::StateItem Set as Initial Сделать началом @@ -46794,13 +46598,6 @@ Row: %4, Column: %5 Change initial state Сменить начальное состояние - - - ScxmlEditor::PluginInterface::StateWarningItem - - State - Состояние - Draw some transitions to state. Нарисуйте переходы в состояние. @@ -46829,16 +46626,10 @@ Row: %4, Column: %5 Draw some transitions from state. Нарисуйте переходы из состояния. - - - ScxmlEditor::PluginInterface::TransitionItem Remove Point Удалить узел - - - ScxmlEditor::PluginInterface::TransitionWarningItem Transition Переход diff --git a/src/plugins/scxmleditor/common/colorpicker.cpp b/src/plugins/scxmleditor/common/colorpicker.cpp index bcd88213f46..1033ee6f420 100644 --- a/src/plugins/scxmleditor/common/colorpicker.cpp +++ b/src/plugins/scxmleditor/common/colorpicker.cpp @@ -3,6 +3,7 @@ #include "colorpicker.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include @@ -47,9 +48,9 @@ ColorPicker::ColorPicker(const QString &key, QWidget *parent) } colorGrid.attachTo(basicColorContentFrame, WithoutMargins); Column { - tr("Basic Colors"), + Tr::tr("Basic Colors"), basicColorContentFrame, - tr("Last used colors"), + Tr::tr("Last used colors"), lastUsedColorContainer, }.attachTo(this); diff --git a/src/plugins/scxmleditor/common/colorsettings.cpp b/src/plugins/scxmleditor/common/colorsettings.cpp index f0fc76e0cfa..bafcd98f6f6 100644 --- a/src/plugins/scxmleditor/common/colorsettings.cpp +++ b/src/plugins/scxmleditor/common/colorsettings.cpp @@ -4,6 +4,7 @@ #include "colorsettings.h" #include "colorthemeview.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include #include @@ -81,10 +82,10 @@ void ColorSettings::selectTheme(int index) void ColorSettings::createTheme() { - QString name = QInputDialog::getText(this, tr("Create New Color Theme"), tr("Theme ID")); + QString name = QInputDialog::getText(this, Tr::tr("Create New Color Theme"), Tr::tr("Theme ID")); if (!name.isEmpty()) { if (m_colorThemes.contains(name)) { - QMessageBox::warning(this, tr("Cannot Create Theme"), tr("Theme %1 is already available.").arg(name)); + QMessageBox::warning(this, Tr::tr("Cannot Create Theme"), Tr::tr("Theme %1 is already available.").arg(name)); } else { m_colorThemeView->reset(); m_colorThemes[name] = QVariantMap(); @@ -97,8 +98,8 @@ void ColorSettings::createTheme() void ColorSettings::removeTheme() { const QString name = m_comboColorThemes->currentText(); - const QMessageBox::StandardButton result = QMessageBox::question(this, tr("Remove Color Theme"), - tr("Are you sure you want to delete color theme %1?").arg(name), + const QMessageBox::StandardButton result = QMessageBox::question(this, Tr::tr("Remove Color Theme"), + Tr::tr("Are you sure you want to delete color theme %1?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (result == QMessageBox::Yes) { m_comboColorThemes->removeItem(m_comboColorThemes->currentIndex()); diff --git a/src/plugins/scxmleditor/common/colorthemes.cpp b/src/plugins/scxmleditor/common/colorthemes.cpp index c6f8c849a09..3af2a93ab52 100644 --- a/src/plugins/scxmleditor/common/colorthemes.cpp +++ b/src/plugins/scxmleditor/common/colorthemes.cpp @@ -1,11 +1,12 @@ // 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 "colorthemes.h" #include "colorthemedialog.h" +#include "colorthemes.h" #include "colorthemeview.h" #include "scxmldocument.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmltag.h" #include @@ -19,12 +20,12 @@ using namespace ScxmlEditor::Common; ColorThemes::ColorThemes(QObject *parent) : QObject(parent) { - m_modifyAction = new QAction(QIcon(":/scxmleditor/images/colorthemes.png"), tr("Modify Color Themes..."), this); - m_modifyAction->setToolTip(tr("Modify Color Theme")); + m_modifyAction = new QAction(QIcon(":/scxmleditor/images/colorthemes.png"), Tr::tr("Modify Color Themes..."), this); + m_modifyAction->setToolTip(Tr::tr("Modify Color Theme")); m_toolButton = new QToolButton; m_toolButton->setIcon(QIcon(":/scxmleditor/images/colorthemes.png")); - m_toolButton->setToolTip(tr("Select Color Theme")); + m_toolButton->setToolTip(Tr::tr("Select Color Theme")); m_toolButton->setPopupMode(QToolButton::InstantPopup); m_menu = new QMenu; @@ -78,8 +79,8 @@ void ColorThemes::updateColorThemeMenu() for (const QString &key: keys) { const QString actionText = key == Constants::C_COLOR_SCHEME_DEFAULT - ? tr("Factory Default") : key == Constants::C_COLOR_SCHEME_SCXMLDOCUMENT - ? tr("Colors from SCXML Document") + ? Tr::tr("Factory Default") : key == Constants::C_COLOR_SCHEME_SCXMLDOCUMENT + ? Tr::tr("Colors from SCXML Document") : key; QAction *action = m_menu->addAction(actionText, this, [this, key]() { selectColorTheme(key); diff --git a/src/plugins/scxmleditor/common/colorthemeview.cpp b/src/plugins/scxmleditor/common/colorthemeview.cpp index cc7f5bf9efb..01cbf1f3432 100644 --- a/src/plugins/scxmleditor/common/colorthemeview.cpp +++ b/src/plugins/scxmleditor/common/colorthemeview.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "colorthemeview.h" +#include "scxmleditortr.h" #include @@ -39,7 +40,7 @@ void ColorThemeItem::openColorDialog() QColor oldColor = m_color; QColorDialog dialog(oldColor, Core::ICore::dialogParent()); - dialog.setWindowTitle(tr("Pick Color")); + dialog.setWindowTitle(Tr::tr("Pick Color")); connect(&dialog, &QColorDialog::currentColorChanged, this, &ColorThemeItem::setColor); QPoint topRight = parentWidget()->mapToGlobal(parentWidget()->rect().topRight()); dialog.move(topRight.x(), topRight.y()); diff --git a/src/plugins/scxmleditor/common/colortoolbutton.cpp b/src/plugins/scxmleditor/common/colortoolbutton.cpp index 5b3ebb55316..98ecec9011e 100644 --- a/src/plugins/scxmleditor/common/colortoolbutton.cpp +++ b/src/plugins/scxmleditor/common/colortoolbutton.cpp @@ -3,6 +3,8 @@ #include "colortoolbutton.h" #include "colorpicker.h" +#include "scxmleditortr.h" + #include #include @@ -42,11 +44,11 @@ ColorToolButton::ColorToolButton(const QString &key, const QString &iconName, co connect(this, &ColorToolButton::colorSelected, m_colorPickerAction, &ColorPickerAction::lastUsedColor); m_menu = new QMenu(this); - m_menu->addAction(QIcon(p), tr("Automatic Color"), this, &ColorToolButton::autoColorSelected); + m_menu->addAction(QIcon(p), Tr::tr("Automatic Color"), this, &ColorToolButton::autoColorSelected); m_menu->addSeparator(); m_menu->addAction(m_colorPickerAction); m_menu->addSeparator(); - m_menu->addAction(QIcon(QPixmap(":/scxmleditor/images/more_colors.png")), tr("More Colors..."), this, &ColorToolButton::showColorDialog); + m_menu->addAction(QIcon(QPixmap(":/scxmleditor/images/more_colors.png")), Tr::tr("More Colors..."), this, &ColorToolButton::showColorDialog); setMenu(m_menu); } diff --git a/src/plugins/scxmleditor/common/graphicsview.cpp b/src/plugins/scxmleditor/common/graphicsview.cpp index 31b17f26e9b..e8c96e2db79 100644 --- a/src/plugins/scxmleditor/common/graphicsview.cpp +++ b/src/plugins/scxmleditor/common/graphicsview.cpp @@ -1,11 +1,13 @@ // 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 "graphicsview.h" #include "baseitem.h" #include "connectableitem.h" #include "graphicsscene.h" +#include "graphicsview.h" #include "sceneutils.h" +#include "scxmleditortr.h" +#include "scxmleditortr.h" #include "scxmluifactory.h" #include "shapeprovider.h" @@ -225,7 +227,7 @@ void GraphicsView::dropEvent(QDropEvent *event) m_document->setCurrentTag(targetTag); QByteArray scxmlData = m_shapeProvider->scxmlCode(groupIndex, shapeIndex, targetTag); if (!scxmlData.isEmpty() && !m_document->pasteData(scxmlData, targetPos, targetPos)) - QMessageBox::warning(Core::ICore::dialogParent(), tr("SCXML Generation Failed"), + QMessageBox::warning(Core::ICore::dialogParent(), Tr::tr("SCXML Generation Failed"), m_document->lastError()); } } else { @@ -240,7 +242,7 @@ void GraphicsView::paintEvent(QPaintEvent *event) } else { QPainter painter(viewport()); painter.save(); - painter.drawText(rect(), Qt::AlignCenter, tr("Loading document...")); + painter.drawText(rect(), Qt::AlignCenter, Tr::tr("Loading document...")); painter.restore(); } } diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp index 0e820ffa12b..b06c0db563d 100644 --- a/src/plugins/scxmleditor/common/mainwidget.cpp +++ b/src/plugins/scxmleditor/common/mainwidget.cpp @@ -13,6 +13,7 @@ #include "navigator.h" #include "outputtabwidget.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmltagutils.h" #include "scxmluifactory.h" #include "search.h" @@ -326,10 +327,10 @@ void MainWidget::init() }); // Init ToolButtons - auto stateColorButton = new ColorToolButton("StateColor", ":/scxmleditor/images/state_color.png", tr("State Color")); - auto fontColorButton = new ColorToolButton("FontColor", ":/scxmleditor/images/font_color.png", tr("Font Color")); - QToolButton *alignToolButton = createToolButton(toolButtonIcon(ActionAlignLeft), tr("Align Left"), QToolButton::MenuButtonPopup); - QToolButton *adjustToolButton = createToolButton(toolButtonIcon(ActionAdjustWidth), tr("Adjust Width"), QToolButton::MenuButtonPopup); + auto stateColorButton = new ColorToolButton("StateColor", ":/scxmleditor/images/state_color.png", Tr::tr("State Color")); + auto fontColorButton = new ColorToolButton("FontColor", ":/scxmleditor/images/font_color.png", Tr::tr("Font Color")); + QToolButton *alignToolButton = createToolButton(toolButtonIcon(ActionAlignLeft), Tr::tr("Align Left"), QToolButton::MenuButtonPopup); + QToolButton *adjustToolButton = createToolButton(toolButtonIcon(ActionAdjustWidth), Tr::tr("Adjust Width"), QToolButton::MenuButtonPopup); // Connect state color change connect(stateColorButton, &ColorToolButton::colorSelected, [this](const QString &color) { @@ -361,12 +362,12 @@ void MainWidget::init() view->scene()->adjustStates(adjustToolButton->property("currentAdjustment").toInt()); }); - auto alignmentMenu = new QMenu(tr("Alignment"), this); + auto alignmentMenu = new QMenu(Tr::tr("Alignment"), this); for (int i = ActionAlignLeft; i <= ActionAlignVertical; ++i) alignmentMenu->addAction(m_actionHandler->action(ActionType(i))); alignToolButton->setMenu(alignmentMenu); - auto adjustmentMenu = new QMenu(tr("Adjustment"), this); + auto adjustmentMenu = new QMenu(Tr::tr("Adjustment"), this); for (int i = ActionAdjustWidth; i <= ActionAdjustSize; ++i) adjustmentMenu->addAction(m_actionHandler->action(ActionType(i))); adjustToolButton->setMenu(adjustmentMenu); @@ -400,7 +401,7 @@ QString saveImageFileFilter() const auto imageFormats = QImageWriter::supportedImageFormats(); const QByteArrayList supportedFormats = Utils::transform(imageFormats, [](const QByteArray &in) { return QByteArray{"*." + in}; }); - return MainWidget::tr("Images (%1)").arg(QString::fromUtf8(supportedFormats.join(' '))); + return ScxmlEditor::Tr::tr("Images (%1)").arg(QString::fromUtf8(supportedFormats.join(' '))); } void MainWidget::exportToImage() @@ -411,7 +412,7 @@ void MainWidget::exportToImage() QString suggestedFileName = QFileInfo(m_document->fileName()).baseName(); if (suggestedFileName.isEmpty()) - suggestedFileName = tr("Untitled"); + suggestedFileName = Tr::tr("Untitled"); QSettings *s = Core::ICore::settings(); const QString documentsLocation = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); @@ -422,7 +423,7 @@ void MainWidget::exportToImage() .arg(suggestedFileName) .arg(QDateTime::currentDateTime().toString("yyyyMMddhhmmss")); const FilePath filePath = FileUtils::getSaveFilePath(this, - tr("Export Canvas to Image"), + Tr::tr("Export Canvas to Image"), FilePath::fromString(suggestedFileName), saveImageFileFilter()); if (!filePath.isEmpty()) { @@ -436,7 +437,7 @@ void MainWidget::exportToImage() if (image.save(filePath.toString())) { s->setValue(Constants::C_SETTINGS_LASTEXPORTFOLDER, filePath.parentDir().toString()); } else { - QMessageBox::warning(this, tr("Export Failed"), tr("Could not export to image.")); + QMessageBox::warning(this, Tr::tr("Export Failed"), Tr::tr("Could not export to image.")); } } } @@ -452,7 +453,7 @@ void MainWidget::saveScreenShot() const FilePath lastFolder = FilePath::fromVariant( s->value(Constants::C_SETTINGS_LASTSAVESCREENSHOTFOLDER, documentsLocation)); const FilePath filePath = FileUtils::getSaveFilePath(this, - tr("Save Screenshot"), + Tr::tr("Save Screenshot"), lastFolder / "scxml_screenshot.png", saveImageFileFilter()); if (!filePath.isEmpty()) { @@ -461,7 +462,7 @@ void MainWidget::saveScreenShot() if (image.save(filePath.toString())) { s->setValue(Constants::C_SETTINGS_LASTSAVESCREENSHOTFOLDER, filePath.parentDir().toVariant()); } else { - QMessageBox::warning(this, tr("Saving Failed"), tr("Could not save the screenshot.")); + QMessageBox::warning(this, Tr::tr("Saving Failed"), Tr::tr("Could not save the screenshot.")); } } } diff --git a/src/plugins/scxmleditor/common/navigator.cpp b/src/plugins/scxmleditor/common/navigator.cpp index 459553846ba..8c30532550d 100644 --- a/src/plugins/scxmleditor/common/navigator.cpp +++ b/src/plugins/scxmleditor/common/navigator.cpp @@ -1,11 +1,12 @@ // 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 "navigator.h" #include "graphicsscene.h" #include "graphicsview.h" +#include "navigator.h" #include "navigatorgraphicsview.h" #include "navigatorslider.h" +#include "scxmleditortr.h" #include "sizegrip.h" #include @@ -60,7 +61,7 @@ void Navigator::resizeEvent(QResizeEvent *e) void Navigator::createUi() { - auto titleLabel = new QLabel(tr("Navigator")); + auto titleLabel = new QLabel(Tr::tr("Navigator")); titleLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); m_closeButton = new QToolButton; diff --git a/src/plugins/scxmleditor/common/search.h b/src/plugins/scxmleditor/common/search.h index c59c6287e0c..9e72ccbebcf 100644 --- a/src/plugins/scxmleditor/common/search.h +++ b/src/plugins/scxmleditor/common/search.h @@ -4,6 +4,7 @@ #pragma once #include "outputpane.h" +#include "scxmleditortr.h" #include @@ -39,7 +40,7 @@ public: QString title() const override { - return tr("Search"); + return Tr::tr("Search"); } QIcon icon() const override diff --git a/src/plugins/scxmleditor/common/searchmodel.cpp b/src/plugins/scxmleditor/common/searchmodel.cpp index b1fdf15446c..c0ff9b8b698 100644 --- a/src/plugins/scxmleditor/common/searchmodel.cpp +++ b/src/plugins/scxmleditor/common/searchmodel.cpp @@ -1,8 +1,9 @@ // 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 "searchmodel.h" +#include "scxmleditortr.h" #include "scxmltagutils.h" +#include "searchmodel.h" using namespace ScxmlEditor::PluginInterface; using namespace ScxmlEditor::Common; @@ -15,7 +16,7 @@ SearchModel::SearchModel(QObject *parent) QVariant SearchModel::headerData(int section, Qt::Orientation orientation, int role) const { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) - return section == 0 ? tr("Type") : tr("Name"); + return section == 0 ? Tr::tr("Type") : Tr::tr("Name"); return QVariant(); } diff --git a/src/plugins/scxmleditor/common/stateproperties.cpp b/src/plugins/scxmleditor/common/stateproperties.cpp index b4904311ed1..58de2fd5636 100644 --- a/src/plugins/scxmleditor/common/stateproperties.cpp +++ b/src/plugins/scxmleditor/common/stateproperties.cpp @@ -1,11 +1,12 @@ // 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 "stateproperties.h" #include "attributeitemdelegate.h" #include "attributeitemmodel.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmluifactory.h" +#include "stateproperties.h" #include @@ -99,7 +100,7 @@ void StateProperties::setUIFactory(ScxmlUiFactory *factory) void StateProperties::createUi() { - auto titleLabel = new QLabel(tr("Attributes")); + auto titleLabel = new QLabel(Tr::tr("Attributes")); titleLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); m_currentTagName = new QLabel; @@ -123,7 +124,7 @@ void StateProperties::createUi() m_contentFrame = new QWidget; m_contentFrame->setLayout(new QVBoxLayout); - m_contentFrame->layout()->addWidget(new QLabel(tr("Content"))); + m_contentFrame->layout()->addWidget(new QLabel(Tr::tr("Content"))); m_contentFrame->layout()->addWidget(m_contentEdit); auto splitter = new Core::MiniSplitter; diff --git a/src/plugins/scxmleditor/common/statistics.cpp b/src/plugins/scxmleditor/common/statistics.cpp index 43d7f129111..a1a6dceb8e0 100644 --- a/src/plugins/scxmleditor/common/statistics.cpp +++ b/src/plugins/scxmleditor/common/statistics.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "scxmldocument.h" +#include "scxmleditortr.h" #include "scxmltag.h" #include "statistics.h" #include "warningmodel.h" @@ -82,9 +83,9 @@ QVariant StatisticsModel::headerData(int section, Qt::Orientation orientation, i if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { switch (section) { case 0: - return tr("Tag"); + return Tr::tr("Tag"); case 1: - return tr("Count"); + return Tr::tr("Count"); default: break; } @@ -123,7 +124,7 @@ Statistics::Statistics(QWidget *parent) m_levels = new QLabel; m_timeLabel = new QLabel; - m_timeLabel->setText(QDateTime::currentDateTime().toString(tr("yyyy/MM/dd hh:mm:ss"))); + m_timeLabel->setText(QDateTime::currentDateTime().toString(Tr::tr("yyyy/MM/dd hh:mm:ss"))); m_proxyModel = new QSortFilterProxyModel(this); m_proxyModel->setFilterKeyColumn(-1); @@ -136,9 +137,9 @@ Statistics::Statistics(QWidget *parent) using namespace Utils::Layouting; Grid { - tr("File"), m_fileNameLabel, br, - tr("Time"), m_timeLabel, br, - tr("Max. levels"), m_levels, br, + Tr::tr("File"), m_fileNameLabel, br, + Tr::tr("Time"), m_timeLabel, br, + Tr::tr("Max. levels"), m_levels, br, Span(2, m_statisticsView), br }.attachTo(this, WithoutMargins); } diff --git a/src/plugins/scxmleditor/common/statisticsdialog.cpp b/src/plugins/scxmleditor/common/statisticsdialog.cpp index 718a481395b..c9e2c4e3174 100644 --- a/src/plugins/scxmleditor/common/statisticsdialog.cpp +++ b/src/plugins/scxmleditor/common/statisticsdialog.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "scxmldocument.h" +#include "scxmleditortr.h" #include "statistics.h" #include "statisticsdialog.h" @@ -15,7 +16,7 @@ StatisticsDialog::StatisticsDialog(QWidget *parent) : QDialog(parent) { resize(400, 300); - setWindowTitle(tr("Document Statistics")); + setWindowTitle(Tr::tr("Document Statistics")); m_statistics = new Statistics; auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok); diff --git a/src/plugins/scxmleditor/common/structure.cpp b/src/plugins/scxmleditor/common/structure.cpp index dd664f5083f..bf098c9ab30 100644 --- a/src/plugins/scxmleditor/common/structure.cpp +++ b/src/plugins/scxmleditor/common/structure.cpp @@ -1,16 +1,17 @@ // 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 "structure.h" #include "actionhandler.h" #include "actionprovider.h" #include "graphicsscene.h" #include "sceneutils.h" -#include "scxmleditorconstants.h" #include "scxmldocument.h" +#include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmlnamespace.h" #include "scxmltagutils.h" #include "scxmluifactory.h" +#include "structure.h" #include "structuremodel.h" #include "treeview.h" @@ -86,10 +87,10 @@ Structure::Structure(QWidget *parent) { createUi(); - addCheckbox(tr("Common states"), State); - addCheckbox(tr("Metadata"), Metadata); - addCheckbox(tr("Other tags"), OnEntry); - addCheckbox(tr("Unknown tags"), UnknownTag); + addCheckbox(Tr::tr("Common states"), State); + addCheckbox(Tr::tr("Metadata"), Metadata); + addCheckbox(Tr::tr("Other tags"), OnEntry); + addCheckbox(Tr::tr("Unknown tags"), UnknownTag); m_tagVisibilityFrame->setVisible(false); connect(m_checkboxButton, &QToolButton::toggled, m_tagVisibilityFrame, &QFrame::setVisible); @@ -220,7 +221,7 @@ void Structure::keyPressEvent(QKeyEvent *e) QModelIndex ind = m_proxyModel->mapToSource(m_structureView->currentIndex()); auto tag = static_cast(ind.internalPointer()); if (tag && m_currentDocument) { - m_currentDocument->undoStack()->beginMacro(tr("Remove items")); + m_currentDocument->undoStack()->beginMacro(Tr::tr("Remove items")); m_currentDocument->removeTag(tag); m_currentDocument->undoStack()->endMacro(); } @@ -230,7 +231,7 @@ void Structure::keyPressEvent(QKeyEvent *e) void Structure::createUi() { - auto titleLabel = new QLabel(tr("Structure")); + auto titleLabel = new QLabel(Tr::tr("Structure")); titleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); m_checkboxButton = new QToolButton; @@ -278,8 +279,8 @@ void Structure::showMenu(const QModelIndex &index, const QPoint &globalPos) auto tag = static_cast(ind.internalPointer()); if (tag) { auto menu = new QMenu; - menu->addAction(tr("Expand All"), m_structureView, &TreeView::expandAll); - menu->addAction(tr("Collapse All"), m_structureView, &TreeView::collapseAll); + menu->addAction(Tr::tr("Expand All"), m_structureView, &TreeView::expandAll); + menu->addAction(Tr::tr("Collapse All"), m_structureView, &TreeView::collapseAll); menu->addSeparator(); menu->addAction(m_scene->actionHandler()->action(ActionCopy)); menu->addAction(m_scene->actionHandler()->action(ActionPaste)); @@ -299,13 +300,13 @@ void Structure::showMenu(const QModelIndex &index, const QPoint &globalPos) QVariantMap data = selectedAction->data().toMap(); int actionType = data.value(Constants::C_SCXMLTAG_ACTIONTYPE, -1).toInt(); if (actionType == TagUtils::Remove) { - m_currentDocument->undoStack()->beginMacro(tr("Remove items")); + m_currentDocument->undoStack()->beginMacro(Tr::tr("Remove items")); m_currentDocument->setCurrentTag(tag); m_currentDocument->removeTag(tag); m_currentDocument->setCurrentTag(nullptr); m_currentDocument->undoStack()->endMacro(); } else if (actionType == TagUtils::AddChild) { - tag->document()->undoStack()->beginMacro(tr("Add child")); + tag->document()->undoStack()->beginMacro(Tr::tr("Add child")); ScxmlTag *childTag = (tag->tagType() == TagType::Else || tag->tagType() == TagType::ElseIf) ? SceneUtils::addSibling(tag, data, m_scene) diff --git a/src/plugins/scxmleditor/common/structuremodel.cpp b/src/plugins/scxmleditor/common/structuremodel.cpp index 5097bf0e4d4..161d33de19e 100644 --- a/src/plugins/scxmleditor/common/structuremodel.cpp +++ b/src/plugins/scxmleditor/common/structuremodel.cpp @@ -1,9 +1,10 @@ // 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 "structuremodel.h" #include "scxmldocument.h" +#include "scxmleditortr.h" #include "scxmltag.h" +#include "structuremodel.h" #include #include @@ -200,7 +201,7 @@ bool StructureModel::dropMimeData(const QMimeData *data, Qt::DropAction action, ScxmlTag *tag = getItem(p); if (tag && m_dragTag && tag != m_dragTag && (tag->tagType() == State || tag->tagType() == Parallel || tag->tagType() == Scxml)) { - m_document->undoStack()->beginMacro(tr("Change parent")); + m_document->undoStack()->beginMacro(Tr::tr("Change parent")); m_document->changeParent(m_dragTag, tag); m_document->undoStack()->endMacro(); m_dragTag = nullptr; diff --git a/src/plugins/scxmleditor/outputpane/errorwidget.cpp b/src/plugins/scxmleditor/outputpane/errorwidget.cpp index 3ada8f2cfbe..f907ae8faba 100644 --- a/src/plugins/scxmleditor/outputpane/errorwidget.cpp +++ b/src/plugins/scxmleditor/outputpane/errorwidget.cpp @@ -2,8 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "errorwidget.h" -#include "tableview.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" +#include "tableview.h" #include #include @@ -142,7 +143,7 @@ void ErrorWidget::updateWarnings() int warningCount = m_warningModel->count(Warning::WarningType); int infoCount = m_warningModel->count(Warning::InfoType); - m_title = tr("Errors(%1) / Warnings(%2) / Info(%3)").arg(errorCount).arg(warningCount).arg(infoCount); + m_title = Tr::tr("Errors(%1) / Warnings(%2) / Info(%3)").arg(errorCount).arg(warningCount).arg(infoCount); if (errorCount > 0) m_icon = m_showErrors->icon(); else if (warningCount > 0) @@ -184,13 +185,13 @@ QString ErrorWidget::modifyExportedValue(const QString &val) void ErrorWidget::exportWarnings() { - FilePath fileName = FileUtils::getSaveFilePath(this, tr("Export to File"), {}, tr("CSV files (*.csv)")); + FilePath fileName = FileUtils::getSaveFilePath(this, Tr::tr("Export to File"), {}, Tr::tr("CSV files (*.csv)")); if (fileName.isEmpty()) return; QFile file(fileName.toString()); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - QMessageBox::warning(this, tr("Export Failed"), tr("Cannot open file %1.").arg(fileName.toUserOutput())); + QMessageBox::warning(this, Tr::tr("Export Failed"), Tr::tr("Cannot open file %1.").arg(fileName.toUserOutput())); file.close(); return; } diff --git a/src/plugins/scxmleditor/outputpane/warningmodel.cpp b/src/plugins/scxmleditor/outputpane/warningmodel.cpp index 600397f19ff..e88b0f234be 100644 --- a/src/plugins/scxmleditor/outputpane/warningmodel.cpp +++ b/src/plugins/scxmleditor/outputpane/warningmodel.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "warningmodel.h" #include @@ -77,13 +78,13 @@ QVariant WarningModel::headerData(int section, Qt::Orientation orientation, int if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { switch (section) { case 0: - return tr("Severity"); + return Tr::tr("Severity"); case 1: - return tr("Type"); + return Tr::tr("Type"); case 2: - return tr("Reason"); + return Tr::tr("Reason"); case 3: - return tr("Description"); + return Tr::tr("Description"); default: break; } @@ -96,13 +97,13 @@ QString WarningModel::severityName(Warning::Severity severity) const { switch (severity) { case Warning::ErrorType: - return tr("Error"); + return Tr::tr("Error"); case Warning::WarningType: - return tr("Warning"); + return Tr::tr("Warning"); case Warning::InfoType: - return tr("Info"); + return Tr::tr("Info"); default: - return tr("Unknown"); + return Tr::tr("Unknown"); } } @@ -144,7 +145,7 @@ QVariant WarningModel::data(const QModelIndex &index, int role) const break; } case Qt::ToolTipRole: { - return tr("Severity:\t%1\nType: \t%2\nReason: \t%3\nDescription:\t%4") + return Tr::tr("Severity:\t%1\nType: \t%2\nReason: \t%3\nDescription:\t%4") .arg(severityName(it->severity())) .arg(it->typeName()) .arg(it->reason()) diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp index 71670a3d49e..444af245066 100644 --- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp +++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.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 "actionhandler.h" - #include "mytypes.h" +#include "scxmleditortr.h" #include @@ -21,32 +21,32 @@ ActionHandler::ActionHandler(QObject *parent) const char *keyseq; bool checkable; } actionInfos[] = { - {Utils::Icons::ZOOMIN_TOOLBAR, tr("Zoom In"), tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false}, - {Utils::Icons::ZOOMOUT_TOOLBAR, tr("Zoom Out"), tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false}, - {Utils::Icons::FITTOVIEW_TOOLBAR, tr("Fit to View"), tr("Fit to View (F11)"), "F11", false}, - {Utils::Icons::PAN_TOOLBAR, tr("Panning"), tr("Panning (Shift)"), "Shift", true}, + {Utils::Icons::ZOOMIN_TOOLBAR, Tr::tr("Zoom In"), Tr::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false}, + {Utils::Icons::ZOOMOUT_TOOLBAR, Tr::tr("Zoom Out"), Tr::tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false}, + {Utils::Icons::FITTOVIEW_TOOLBAR, Tr::tr("Fit to View"), Tr::tr("Fit to View (F11)"), "F11", false}, + {Utils::Icons::PAN_TOOLBAR, Tr::tr("Panning"), Tr::tr("Panning (Shift)"), "Shift", true}, - {Utils::Icons::ZOOM_TOOLBAR, tr("Magnifier"), tr("Magnifier Tool"), "", true}, - {Utils::Icon(":/scxmleditor/images/navigator.png"), tr("Navigator"), tr("Navigator (Ctrl+E)"), "Ctrl+E", true}, + {Utils::Icons::ZOOM_TOOLBAR, Tr::tr("Magnifier"), Tr::tr("Magnifier Tool"), "", true}, + {Utils::Icon(":/scxmleditor/images/navigator.png"), Tr::tr("Navigator"), Tr::tr("Navigator (Ctrl+E)"), "Ctrl+E", true}, - {Utils::Icons::COPY_TOOLBAR, tr("Copy"), tr("Copy (Ctrl + C)"), "Ctrl+C", false}, - {Utils::Icons::CUT_TOOLBAR, tr("Cut"), tr("Cut (Ctrl + X)"), "Ctrl+X", false}, - {Utils::Icons::PASTE_TOOLBAR, tr("Paste"), tr("Paste (Ctrl + V)"), "Ctrl+V", false}, - {Utils::Icons::SNAPSHOT_TOOLBAR, tr("Screenshot"), tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false}, - {Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png", Utils::Theme::IconsBaseColor}}), tr("Export to Image"), tr("Export to Image"), "Ctrl+Shift+E", false}, - {Utils::Icon({{":/utils/images/namespace.png", Utils::Theme::IconsBaseColor}}), tr("Toggle Full Namespace"), tr("Toggle Full Namespace"), "Ctrl+Shift+N", true}, + {Utils::Icons::COPY_TOOLBAR, Tr::tr("Copy"), Tr::tr("Copy (Ctrl + C)"), "Ctrl+C", false}, + {Utils::Icons::CUT_TOOLBAR, Tr::tr("Cut"), Tr::tr("Cut (Ctrl + X)"), "Ctrl+X", false}, + {Utils::Icons::PASTE_TOOLBAR, Tr::tr("Paste"), Tr::tr("Paste (Ctrl + V)"), "Ctrl+V", false}, + {Utils::Icons::SNAPSHOT_TOOLBAR, Tr::tr("Screenshot"), Tr::tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false}, + {Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png", Utils::Theme::IconsBaseColor}}), Tr::tr("Export to Image"), Tr::tr("Export to Image"), "Ctrl+Shift+E", false}, + {Utils::Icon({{":/utils/images/namespace.png", Utils::Theme::IconsBaseColor}}), Tr::tr("Toggle Full Namespace"), Tr::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true}, - {Utils::Icon({{":/scxmleditor/images/align_left.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Left"), tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false}, - {Utils::Icon({{":/scxmleditor/images/align_right.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Right"), tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false}, - {Utils::Icon({{":/scxmleditor/images/align_top.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Top"), tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false}, - {Utils::Icon({{":/scxmleditor/images/align_bottom.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Bottom"), tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false}, - {Utils::Icon({{":/scxmleditor/images/align_horizontal.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Horizontal"), tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false}, - {Utils::Icon({{":/scxmleditor/images/align_vertical.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Align Vertical"), tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false}, - {Utils::Icon({{":/scxmleditor/images/adjust_width.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Width"), tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false}, - {Utils::Icon({{":/scxmleditor/images/adjust_height.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Height"), tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false}, - {Utils::Icon({{":/scxmleditor/images/adjust_size.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), tr("Adjust Size"), tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false}, + {Utils::Icon({{":/scxmleditor/images/align_left.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Align Left"), Tr::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false}, + {Utils::Icon({{":/scxmleditor/images/align_right.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Align Right"), Tr::tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false}, + {Utils::Icon({{":/scxmleditor/images/align_top.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Align Top"), Tr::tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false}, + {Utils::Icon({{":/scxmleditor/images/align_bottom.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Align Bottom"), Tr::tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false}, + {Utils::Icon({{":/scxmleditor/images/align_horizontal.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Align Horizontal"), Tr::tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false}, + {Utils::Icon({{":/scxmleditor/images/align_vertical.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Align Vertical"), Tr::tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false}, + {Utils::Icon({{":/scxmleditor/images/adjust_width.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Adjust Width"), Tr::tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false}, + {Utils::Icon({{":/scxmleditor/images/adjust_height.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Adjust Height"), Tr::tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false}, + {Utils::Icon({{":/scxmleditor/images/adjust_size.png", Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint), Tr::tr("Adjust Size"), Tr::tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false}, - {Utils::Icon(":/scxmleditor/images/statistics.png"), tr("Show Statistics..."), tr("Show Statistics"), "", false} + {Utils::Icon(":/scxmleditor/images/statistics.png"), Tr::tr("Show Statistics..."), Tr::tr("Show Statistics"), "", false} }; // Init actions diff --git a/src/plugins/scxmleditor/plugin_interface/baseitem.cpp b/src/plugins/scxmleditor/plugin_interface/baseitem.cpp index 1d06d11dbbb..2d6390e4664 100644 --- a/src/plugins/scxmleditor/plugin_interface/baseitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/baseitem.cpp @@ -1,13 +1,14 @@ // 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 "baseitem.h" #include "actionhandler.h" #include "actionprovider.h" +#include "baseitem.h" #include "graphicsscene.h" #include "sceneutils.h" #include "scxmldocument.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmltagutils.h" #include "scxmluifactory.h" #include "stateitem.h" @@ -185,7 +186,7 @@ void BaseItem::selectedMenuAction(const QAction *action) case TagUtils::AddChild: { const ScxmlDocument *document = tag->document(); if (m_scene && document) { - document->undoStack()->beginMacro(tr("Add child")); + document->undoStack()->beginMacro(Tr::tr("Add child")); SceneUtils::addChild(tag, data, m_scene); document->undoStack()->endMacro(); } diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp index 658d24c14ee..88dec58eaad 100644 --- a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp @@ -8,6 +8,7 @@ #include "quicktransitionitem.h" #include "sceneutils.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "serializer.h" #include "stateitem.h" @@ -198,7 +199,7 @@ bool ConnectableItem::sceneEventFilter(QGraphicsItem *watched, QEvent *event) if (event->type() == QEvent::GraphicsSceneMousePress) { m_newTransitionStartedPoint = mouseEvent->pos(); - tag()->document()->undoStack()->beginMacro(tr("Add new state")); + tag()->document()->undoStack()->beginMacro(Tr::tr("Add new state")); m_newTransition = new TransitionItem; scene()->addItem(m_newTransition); @@ -370,7 +371,7 @@ void ConnectableItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (!m_moveMacroStarted) { m_moveMacroStarted = true; - tag()->document()->undoStack()->beginMacro(tr("Move State")); + tag()->document()->undoStack()->beginMacro(Tr::tr("Move State")); } //Restore old behavior if ctrl & alt modifiers are present diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp index c8943347d7f..50edce3c12d 100644 --- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp +++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.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 "graphicsscene.h" #include "actionhandler.h" #include "actionprovider.h" #include "finalstateitem.h" +#include "graphicsscene.h" #include "initialstateitem.h" #include "parallelitem.h" #include "sceneutils.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmltagutils.h" #include "scxmluifactory.h" #include "snapline.h" @@ -96,7 +97,7 @@ qreal GraphicsScene::selectedMaxHeight() const void GraphicsScene::alignStates(int alignType) { if (alignType >= ActionAlignLeft && alignType <= ActionAlignVertical) { - m_document->undoStack()->beginMacro(tr("Align states")); + m_document->undoStack()->beginMacro(Tr::tr("Align states")); QRectF r = selectedBoundingRect(); if (r.isValid()) { @@ -149,7 +150,7 @@ void GraphicsScene::alignStates(int alignType) void GraphicsScene::adjustStates(int adjustType) { if (adjustType >= ActionAdjustWidth && adjustType <= ActionAdjustSize) { - m_document->undoStack()->beginMacro(tr("Adjust states")); + m_document->undoStack()->beginMacro(Tr::tr("Adjust states")); qreal maxw = selectedMaxWidth(); qreal maxh = selectedMaxHeight(); @@ -170,7 +171,7 @@ void GraphicsScene::adjustStates(int adjustType) } void GraphicsScene::cut() { - m_document->undoStack()->beginMacro(tr("Cut")); + m_document->undoStack()->beginMacro(Tr::tr("Cut")); copy(); removeSelectedItems(); m_document->undoStack()->endMacro(); @@ -180,7 +181,7 @@ void GraphicsScene::removeSelectedItems() { QVector tags = SceneUtils::findRemovedTags(m_baseItems); if (!tags.isEmpty()) { - m_document->undoStack()->beginMacro(tr("Remove items")); + m_document->undoStack()->beginMacro(Tr::tr("Remove items")); // Then remove found tags for (int i = tags.count(); i--;) { @@ -346,7 +347,7 @@ void GraphicsScene::init() void GraphicsScene::runLayoutToSelectedStates() { - m_document->undoStack()->beginMacro(tr("Re-layout")); + m_document->undoStack()->beginMacro(Tr::tr("Re-layout")); QVector selectedItems; for (BaseItem *node : qAsConst(m_baseItems)) { @@ -625,7 +626,7 @@ ScxmlUiFactory *GraphicsScene::uiFactory() const void GraphicsScene::addConnectableItem(ItemType type, const QPointF &pos, BaseItem *parentItem) { - m_document->undoStack()->beginMacro(tr("Add new state")); + m_document->undoStack()->beginMacro(Tr::tr("Add new state")); ConnectableItem *newItem = SceneUtils::createItem(type, pos); if (newItem) { diff --git a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp index caa2e3910c4..92ef2e7c7a7 100644 --- a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "idwarningitem.h" +#include "scxmleditortr.h" + #include using namespace ScxmlEditor::PluginInterface; @@ -10,9 +12,9 @@ IdWarningItem::IdWarningItem(QGraphicsItem *parent) : WarningItem(parent) { setSeverity(OutputPane::Warning::ErrorType); - setTypeName(tr("State")); - setDescription(tr("Each state must have a unique ID.")); - setReason(tr("Missing ID.")); + setTypeName(Tr::tr("State")); + setDescription(Tr::tr("Each state must have a unique ID.")); + setReason(Tr::tr("Missing ID.")); setX(-boundingRect().width()); } @@ -32,7 +34,7 @@ void IdWarningItem::setId(const QString &text) // Check new id if (m_id.isEmpty()) { - setReason(tr("Missing ID.")); + setReason(Tr::tr("Missing ID.")); setWarningActive(true); } else checkDuplicates(m_id); @@ -56,7 +58,7 @@ void IdWarningItem::checkDuplicates(const QString &id) foundItems[0]->setWarningActive(false); } else { for (int i = 0; i < foundItems.count(); ++i) { - foundItems[i]->setReason(tr("Duplicate ID (%1).").arg(id)); + foundItems[i]->setReason(Tr::tr("Duplicate ID (%1).").arg(id)); foundItems[i]->setWarningActive(true); } } diff --git a/src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp index a974b5e7c6a..69c6d1378ae 100644 --- a/src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp @@ -1,9 +1,10 @@ // 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 "initialwarningitem.h" #include "initialstateitem.h" +#include "initialwarningitem.h" #include "sceneutils.h" +#include "scxmleditortr.h" using namespace ScxmlEditor::PluginInterface; @@ -12,9 +13,9 @@ InitialWarningItem::InitialWarningItem(InitialStateItem *parent) , m_parentItem(parent) { setSeverity(OutputPane::Warning::ErrorType); - setTypeName(tr("Initial")); - setDescription(tr("One level can contain only one initial state.")); - setReason(tr("Too many initial states at the same level.")); + setTypeName(Tr::tr("Initial")); + setDescription(Tr::tr("One level can contain only one initial state.")); + setReason(Tr::tr("Too many initial states at the same level.")); } void InitialWarningItem::updatePos() diff --git a/src/plugins/scxmleditor/plugin_interface/quicktransitionitem.cpp b/src/plugins/scxmleditor/plugin_interface/quicktransitionitem.cpp index bdbdc76df46..079c92d01a6 100644 --- a/src/plugins/scxmleditor/plugin_interface/quicktransitionitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/quicktransitionitem.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "quicktransitionitem.h" +#include "scxmleditortr.h" + #include #include @@ -100,7 +102,7 @@ void QuickTransitionItem::paint(QPainter *painter, const QStyleOptionGraphicsIte painter->setPen(m_pen); painter->setBrush(Qt::white); painter->drawEllipse(m_stateRect.center(), 7, 7); - painter->drawText(m_stateRect, Qt::AlignCenter, tr("H")); + painter->drawText(m_stateRect, Qt::AlignCenter, Tr::tr("H")); break; default: break; diff --git a/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp b/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp index fe0080fdfb0..30581fb42da 100644 --- a/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp @@ -1,8 +1,9 @@ // 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 "scattributeitemmodel.h" #include "mytypes.h" +#include "scattributeitemmodel.h" +#include "scxmleditortr.h" #include @@ -16,7 +17,7 @@ SCAttributeItemModel::SCAttributeItemModel(QObject *parent) QVariant SCAttributeItemModel::headerData(int section, Qt::Orientation orientation, int role) const { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) - return section == 0 ? tr("Name") : tr("Value"); + return section == 0 ? Tr::tr("Name") : Tr::tr("Value"); return QVariant(); } @@ -68,7 +69,7 @@ QVariant SCAttributeItemModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::DisplayRole: if (bExtraRow) - return index.column() == 0 ? tr("- name -") : tr(" - value -"); + return index.column() == 0 ? Tr::tr("- name -") : Tr::tr(" - value -"); Q_FALLTHROUGH(); case Qt::EditRole: { if (index.column() == 0) { diff --git a/src/plugins/scxmleditor/plugin_interface/scshapeprovider.cpp b/src/plugins/scxmleditor/plugin_interface/scshapeprovider.cpp index 2adfe099d57..8649e09c5e9 100644 --- a/src/plugins/scxmleditor/plugin_interface/scshapeprovider.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scshapeprovider.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "scshapeprovider.h" +#include "scxmleditortr.h" #include "scxmltag.h" #include @@ -32,24 +33,24 @@ void SCShapeProvider::initGroups() void SCShapeProvider::init() { - ShapeGroup *group = addGroup(tr("Common States")); - group->addShape(createShape(tr("Initial"), QIcon(":/scxmleditor/images/initial.png"), QStringList() << "scxml" + ShapeGroup *group = addGroup(Tr::tr("Common States")); + group->addShape(createShape(Tr::tr("Initial"), QIcon(":/scxmleditor/images/initial.png"), QStringList() << "scxml" << "state" << "parallel", "")); - group->addShape(createShape(tr("Final"), QIcon(":/scxmleditor/images/final.png"), QStringList() << "scxml" + group->addShape(createShape(Tr::tr("Final"), QIcon(":/scxmleditor/images/final.png"), QStringList() << "scxml" << "state" << "parallel", "")); - group->addShape(createShape(tr("State"), QIcon(":/scxmleditor/images/state.png"), QStringList() << "scxml" + group->addShape(createShape(Tr::tr("State"), QIcon(":/scxmleditor/images/state.png"), QStringList() << "scxml" << "state" << "parallel", "")); - group->addShape(createShape(tr("Parallel"), QIcon(":/scxmleditor/images/parallel.png"), QStringList() << "scxml" + group->addShape(createShape(Tr::tr("Parallel"), QIcon(":/scxmleditor/images/parallel.png"), QStringList() << "scxml" << "state" << "parallel", "")); - group->addShape(createShape(tr("History"), QIcon(":/scxmleditor/images/history.png"), QStringList() << "state" + group->addShape(createShape(Tr::tr("History"), QIcon(":/scxmleditor/images/history.png"), QStringList() << "state" << "parallel", "")); } diff --git a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp index 1ea1acbee4a..1cfe0ba95ff 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmldocument.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "scxmldocument.h" +#include "scxmleditortr.h" #include "scxmlnamespace.h" #include "scxmltagutils.h" #include "undocommands.h" @@ -236,16 +237,16 @@ void ScxmlDocument::initErrorMessage(const QXmlStreamReader &xml, QIODevice *io) QString errorString; switch (xml.error()) { case QXmlStreamReader::Error::UnexpectedElementError: - errorString = tr("Unexpected element."); + errorString = Tr::tr("Unexpected element."); break; case QXmlStreamReader::Error::NotWellFormedError: - errorString = tr("Not well formed."); + errorString = Tr::tr("Not well formed."); break; case QXmlStreamReader::Error::PrematureEndOfDocumentError: - errorString = tr("Premature end of document."); + errorString = Tr::tr("Premature end of document."); break; case QXmlStreamReader::Error::CustomError: - errorString = tr("Custom error."); + errorString = Tr::tr("Custom error."); break; default: break; @@ -257,7 +258,7 @@ void ScxmlDocument::initErrorMessage(const QXmlStreamReader &xml, QIODevice *io) io->readLine(); lineString = QLatin1String(io->readLine()); - m_lastError = tr("Error in reading XML.\nType: %1 (%2)\nDescription: %3\n\nRow: %4, Column: %5\n%6") + m_lastError = Tr::tr("Error in reading XML.\nType: %1 (%2)\nDescription: %3\n\nRow: %4, Column: %5\n%6") .arg(xml.error()) .arg(errorString) .arg(xml.errorString()) @@ -273,18 +274,18 @@ bool ScxmlDocument::pasteData(const QByteArray &data, const QPointF &minPos, con if (!m_currentTag) { m_hasError = true; - m_lastError = tr("Current tag is not selected."); + m_lastError = Tr::tr("Current tag is not selected."); return false; } if (data.trimmed().isEmpty()) { m_hasError = true; - m_lastError = tr("Pasted data is empty."); + m_lastError = Tr::tr("Pasted data is empty."); return false; } bool ok = true; - m_undoStack->beginMacro(tr("Paste items")); + m_undoStack->beginMacro(Tr::tr("Paste items")); QByteArray d(data); QBuffer buffer(&d); @@ -432,10 +433,10 @@ bool ScxmlDocument::save(const QString &fileName) } file.close(); if (!ok) - m_lastError = tr("Cannot save XML to the file %1.").arg(fileName); + m_lastError = Tr::tr("Cannot save XML to the file %1.").arg(fileName); } else { ok = false; - m_lastError = tr("Cannot open file %1.").arg(fileName); + m_lastError = Tr::tr("Cannot open file %1.").arg(fileName); } return ok; @@ -518,7 +519,7 @@ void ScxmlDocument::addTag(ScxmlTag *parent, ScxmlTag *child) parent = rootTag(); if (parent && child) { - m_undoStack->beginMacro(tr("Add Tag")); + m_undoStack->beginMacro(Tr::tr("Add Tag")); addTagRecursive(parent, child); m_undoStack->endMacro(); } @@ -528,7 +529,7 @@ void ScxmlDocument::removeTag(ScxmlTag *tag) { if (tag && !m_undoRedoRunning) { // Create undo/redo -macro, because state can includes lot of child-states - m_undoStack->beginMacro(tr("Remove Tag")); + m_undoStack->beginMacro(Tr::tr("Remove Tag")); removeTagRecursive(tag); m_undoStack->endMacro(); } diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp index 82204ae55a0..e982f275c0d 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltag.cpp @@ -1,9 +1,10 @@ // 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 "scxmltag.h" #include "scxmldocument.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" +#include "scxmltag.h" #include "scxmltagutils.h" #include @@ -348,8 +349,7 @@ void ScxmlTag::setAttributeName(int ind, const QString &name) m_attributeNames[ind] = name; } else { m_attributeNames << name; - m_attributeValues << QCoreApplication::translate( - "SXCMLTag::UnknownAttributeValue", "Unknown"); + m_attributeValues << Tr::tr("Unknown"); } } @@ -358,8 +358,7 @@ void ScxmlTag::setAttribute(int ind, const QString &value) if (ind >= 0 && ind < m_attributeNames.count()) setAttribute(m_attributeNames[ind], value); else { - m_attributeNames << QCoreApplication::translate( - "SXCMLTag::UnknownAttributeName", "Unknown"); + m_attributeNames << Tr::tr("Unknown"); m_attributeValues << value; } } @@ -641,7 +640,7 @@ void ScxmlTag::readXml(QXmlStreamReader &xml, bool checkCopyId) childTag->readXml(xml, checkCopyId); } } else if (token == QXmlStreamReader::Invalid) { - qDebug() << ScxmlTag::tr("Error in reading XML ") << xml.error() << ":" + qDebug() << Tr::tr("Error in reading XML ") << xml.error() << ":" << xml.errorString(); break; } diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp index fdf291d2d60..cd2f44c2554 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp @@ -1,9 +1,10 @@ // 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 "scxmltagutils.h" #include "scxmldocument.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" +#include "scxmltagutils.h" #include "serializer.h" #include @@ -55,20 +56,20 @@ void createChildMenu(const ScxmlTag *tag, QMenu *menu, bool addRemove) if (tag->tagType() == UnknownTag) { data[Constants::C_SCXMLTAG_TAGTYPE] = UnknownTag; - menu->addAction(ScxmlTag::tr("New Tag"))->setData(data); + menu->addAction(Tr::tr("New Tag"))->setData(data); } else if (tag->tagType() == Metadata) { data[Constants::C_SCXMLTAG_TAGTYPE] = MetadataItem; - menu->addAction(ScxmlTag::tr("Item"))->setData(data); + menu->addAction(Tr::tr("Item"))->setData(data); } else { data[Constants::C_SCXMLTAG_PARENTTAG] = Metadata; data[Constants::C_SCXMLTAG_TAGTYPE] = MetadataItem; - menu->addAction(ScxmlTag::tr("Metadata"))->setData(data); + menu->addAction(Tr::tr("Metadata"))->setData(data); } if (addRemove) { menu->addSeparator(); data[Constants::C_SCXMLTAG_ACTIONTYPE] = Remove; - QAction *act = menu->addAction(ScxmlTag::tr("Remove")); + QAction *act = menu->addAction(Tr::tr("Remove")); act->setData(data); act->setEnabled(!tag->isRootTag()); } diff --git a/src/plugins/scxmleditor/plugin_interface/scxmluifactory.cpp b/src/plugins/scxmleditor/plugin_interface/scxmluifactory.cpp index d7b367c83eb..ceb8c8d3c7f 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmluifactory.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmluifactory.cpp @@ -1,9 +1,10 @@ // 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 "scxmluifactory.h" #include "genericscxmlplugin.h" #include "isceditor.h" +#include "scxmleditortr.h" +#include "scxmluifactory.h" #include #include @@ -90,10 +91,10 @@ void ScxmlUiFactory::initPlugins() if (instance) { auto scEditorInstance = qobject_cast(instance); if (scEditorInstance) { - qDebug() << tr("Created editor-instance."); + qDebug() << Tr::tr("Created editor-instance."); m_plugins << scEditorInstance; } else { - qWarning() << tr("Editor-instance is not of the type ISCEditor."); + qWarning() << Tr::tr("Editor-instance is not of the type ISCEditor."); loader.unload(); } } diff --git a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp index c03ee7a12df..3180e285aaa 100644 --- a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp @@ -1,7 +1,6 @@ // 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 "stateitem.h" #include "finalstateitem.h" #include "graphicsitemprovider.h" #include "graphicsscene.h" @@ -11,8 +10,10 @@ #include "parallelitem.h" #include "sceneutils.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmltagutils.h" #include "scxmluifactory.h" +#include "stateitem.h" #include "statewarningitem.h" #include "textitem.h" #include "transitionitem.h" @@ -279,15 +280,15 @@ void StateItem::createContextMenu(QMenu *menu) QVariantMap data; if (!m_parallelState) { data[Constants::C_SCXMLTAG_ACTIONTYPE] = TagUtils::SetAsInitial; - menu->addAction(tr("Set as Initial"))->setData(data); + menu->addAction(Tr::tr("Set as Initial"))->setData(data); } data[Constants::C_SCXMLTAG_ACTIONTYPE] = TagUtils::ZoomToState; - menu->addAction(tr("Zoom to State"))->setData(data); + menu->addAction(Tr::tr("Zoom to State"))->setData(data); if (type() == ParallelType) { data[Constants::C_SCXMLTAG_ACTIONTYPE] = TagUtils::Relayout; - menu->addAction(tr("Re-Layout"))->setData(data); + menu->addAction(Tr::tr("Re-Layout"))->setData(data); } menu->addSeparator(); @@ -310,7 +311,7 @@ void StateItem::selectedMenuAction(const QAction *action) case TagUtils::SetAsInitial: { ScxmlTag *parentTag = tag->parentTag(); if (parentTag) { - document->undoStack()->beginMacro(tr("Change initial state")); + document->undoStack()->beginMacro(Tr::tr("Change initial state")); ScxmlTag *initialTag = parentTag->child("initial"); if (initialTag) { @@ -331,7 +332,7 @@ void StateItem::selectedMenuAction(const QAction *action) break; } case TagUtils::Relayout: { - document->undoStack()->beginMacro(tr("Re-Layout")); + document->undoStack()->beginMacro(Tr::tr("Re-Layout")); doLayout(depth()); document->undoStack()->endMacro(); break; diff --git a/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp index d3c1fcf4fb2..dad12721301 100644 --- a/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp @@ -1,8 +1,9 @@ // 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 "statewarningitem.h" #include "idwarningitem.h" +#include "scxmleditortr.h" +#include "statewarningitem.h" #include @@ -12,11 +13,11 @@ StateWarningItem::StateWarningItem(StateItem *parent) : WarningItem(parent) { setSeverity(OutputPane::Warning::InfoType); - setTypeName(tr("State")); - setDescription(tr("Draw some transitions to state.")); + setTypeName(Tr::tr("State")); + setDescription(Tr::tr("Draw some transitions to state.")); setPixmap(Utils::Icons::WARNING.pixmap()); - setReason(tr("No input connection.")); + setReason(Tr::tr("No input connection.")); } void StateWarningItem::setIdWarning(IdWarningItem *idwarning) @@ -34,16 +35,16 @@ void StateWarningItem::check() bool inputProblem = !m_parentItem->isInitial() && !m_parentItem->hasInputTransitions(m_parentItem, true); if (outputProblem && inputProblem) { - setReason(tr("No input or output connections (%1).").arg(m_parentItem->itemId())); - setDescription(tr("Draw some transitions to or from state.")); + setReason(Tr::tr("No input or output connections (%1).").arg(m_parentItem->itemId())); + setDescription(Tr::tr("Draw some transitions to or from state.")); setWarningActive(true); } else if (outputProblem) { - setReason(tr("No output connections (%1).").arg(m_parentItem->itemId())); - setDescription(tr("Draw some transitions from state.")); + setReason(Tr::tr("No output connections (%1).").arg(m_parentItem->itemId())); + setDescription(Tr::tr("Draw some transitions from state.")); setWarningActive(true); } else if (inputProblem) { - setReason(tr("No input connections (%1).").arg(m_parentItem->itemId())); - setDescription(tr("Draw some transitions to state.")); + setReason(Tr::tr("No input connections (%1).").arg(m_parentItem->itemId())); + setDescription(Tr::tr("Draw some transitions to state.")); setWarningActive(true); } else setWarningActive(false); diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp index 0f51df280aa..db59260c648 100644 --- a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp @@ -1,7 +1,6 @@ // 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 "transitionitem.h" #include "connectableitem.h" #include "cornergrabberitem.h" #include "finalstateitem.h" @@ -11,11 +10,13 @@ #include "sceneutils.h" #include "scxmldocument.h" #include "scxmleditorconstants.h" +#include "scxmleditortr.h" #include "scxmltagutils.h" #include "scxmluifactory.h" #include "serializer.h" #include "stateitem.h" #include "tagtextitem.h" +#include "transitionitem.h" #include #include @@ -395,7 +396,7 @@ void TransitionItem::createContextMenu(QMenu *menu) if (m_selectedGrabberIndex > 0) { data[Constants::C_SCXMLTAG_ACTIONTYPE] = TagUtils::RemovePoint; data["cornerIndex"] = m_selectedGrabberIndex; - menu->addAction(tr("Remove Point"))->setData(data); + menu->addAction(Tr::tr("Remove Point"))->setData(data); } menu->addSeparator(); diff --git a/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp index cea19cc32d3..a5a912b5bfd 100644 --- a/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp @@ -1,8 +1,9 @@ // 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 "transitionwarningitem.h" +#include "scxmleditortr.h" #include "transitionitem.h" +#include "transitionwarningitem.h" #include @@ -13,8 +14,8 @@ TransitionWarningItem::TransitionWarningItem(TransitionItem *parent) , m_parentItem(parent) { setSeverity(OutputPane::Warning::WarningType); - setTypeName(tr("Transition")); - setDescription(tr("Transitions should be connected.")); + setTypeName(Tr::tr("Transition")); + setDescription(Tr::tr("Transitions should be connected.")); setPixmap(Utils::Icons::WARNING.pixmap()); } @@ -23,7 +24,7 @@ void TransitionWarningItem::check() { if (m_parentItem) { if (m_parentItem->targetType() == TransitionItem::ExternalNoTarget) { - setReason(tr("Not connected (%1).").arg(m_parentItem->tagValue("event"))); + setReason(Tr::tr("Not connected (%1).").arg(m_parentItem->tagValue("event"))); setWarningActive(true); } else setWarningActive(false); diff --git a/src/plugins/scxmleditor/scxmleditordata.cpp b/src/plugins/scxmleditor/scxmleditordata.cpp index 9d3357abf60..6ca861131be 100644 --- a/src/plugins/scxmleditor/scxmleditordata.cpp +++ b/src/plugins/scxmleditor/scxmleditordata.cpp @@ -1,11 +1,12 @@ // 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 "scxmleditordata.h" #include "mainwidget.h" #include "scxmleditorconstants.h" +#include "scxmleditordata.h" #include "scxmleditordocument.h" #include "scxmleditorstack.h" +#include "scxmleditortr.h" #include "scxmltexteditor.h" #include @@ -110,11 +111,11 @@ void ScxmlEditorData::fullInit() m_undoGroup = new QUndoGroup(m_widgetToolBar); m_undoAction = m_undoGroup->createUndoAction(m_widgetToolBar); m_undoAction->setIcon(Utils::Icons::UNDO_TOOLBAR.icon()); - m_undoAction->setToolTip(tr("Undo (Ctrl + Z)")); + m_undoAction->setToolTip(Tr::tr("Undo (Ctrl + Z)")); m_redoAction = m_undoGroup->createRedoAction(m_widgetToolBar); m_redoAction->setIcon(Utils::Icons::REDO_TOOLBAR.icon()); - m_redoAction->setToolTip(tr("Redo (Ctrl + Y)")); + m_redoAction->setToolTip(Tr::tr("Redo (Ctrl + Y)")); ActionManager::registerAction(m_undoAction, Core::Constants::UNDO, m_contexts); ActionManager::registerAction(m_redoAction, Core::Constants::REDO, m_contexts); @@ -140,8 +141,8 @@ IEditor *ScxmlEditorData::createEditor() if (xmlEditor) { Utils::InfoBarEntry info(Id(Constants::INFO_READ_ONLY), - tr("This file can only be edited in Design mode.")); - info.addCustomButton(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); }); + Tr::tr("This file can only be edited in Design mode.")); + info.addCustomButton(Tr::tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); }); xmlEditor->document()->infoBar()->addInfo(info); }