ModelingLib: Tr::tr()

Following orphaned contexts are merged into ::qmt

  qmt::ClassItem
  qmt::DiagramController
  qmt::DiagramSceneController
  qmt::DocumentController
  qmt::Exception
  qmt::FileCreationException
  qmt::FileNotFoundException
  qmt::FileReadError
  qmt::FileWriteError
  qmt::IllegalXmlFile
  qmt::ModelController
  qmt::ModelTreeView
  qmt::NullPointerException
  qmt::ObjectItem
  qmt::ProjectController
  qmt::PropertiesView::MView
  qmt::TreeModel
  qmt::UnknownFileVersion
  qmt::V

Change-Id: Iaf98c2bfc654452d44f6bed155be6ddfe7556b19
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

16 files changed, 185 insertions, 166 deletions

diff --git a/src/libs/modelinglib/modelinglibtr.h b/src/libs/modelinglib/modelinglibtr.h
index 6ad06204c9..16fd273bee 100644
--- a/src/libs/modelinglib/modelinglibtr.h
+++ b/src/libs/modelinglib/modelinglibtr.h
@@ -5,11 +5,11 @@
 
 #include <QCoreApplication>
 
-namespace ModelingLib {
+namespace qmt {
 
 struct Tr
 {
-    Q_DECLARE_TR_FUNCTIONS(::ModelingLib)
+    Q_DECLARE_TR_FUNCTIONS(::qmt)
 };
 
-} // ModelingLib
+} // qmt
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
index a01b94f277..1c8591f153 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
@@ -24,6 +24,8 @@
 #include "qmt/model/mdiagram.h"
 #include "qmt/model/mrelation.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QDebug>
 
 namespace qmt {
@@ -71,7 +73,7 @@ class DiagramController::UpdateElementCommand : public DiagramUndoCommand
 public:
     UpdateElementCommand(DiagramController *diagramController, const Uid &diagramKey, DElement *element,
                          DiagramController::UpdateAction updateAction)
-        : DiagramUndoCommand(diagramController, diagramKey, tr("Change")),
+        : DiagramUndoCommand(diagramController, diagramKey, Tr::tr("Change")),
           m_updateAction(updateAction)
     {
         DCloneVisitor visitor;
@@ -372,7 +374,7 @@ void DiagramController::addElement(DElement *element, MDiagram *diagram)
     emit beginInsertElement(row, diagram);
     updateElementFromModel(element, diagram, false);
     if (m_undoController) {
-        auto undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Add Object"));
+        auto undoCommand = new AddElementsCommand(this, diagram->uid(), Tr::tr("Add Object"));
         m_undoController->push(undoCommand);
         undoCommand->add(element->uid());
     }
@@ -388,7 +390,7 @@ void DiagramController::removeElement(DElement *element, MDiagram *diagram)
     int row = diagram->diagramElements().indexOf(element);
     emit beginRemoveElement(row, diagram);
     if (m_undoController) {
-        auto undoCommand = new RemoveElementsCommand(this, diagram->uid(), tr("Remove Object"));
+        auto undoCommand = new RemoveElementsCommand(this, diagram->uid(), Tr::tr("Remove Object"));
         m_undoController->push(undoCommand);
         undoCommand->add(element);
     }
@@ -440,7 +442,7 @@ void DiagramController::breakUndoChain()
 DContainer DiagramController::cutElements(const DSelection &diagramSelection, MDiagram *diagram)
 {
     DContainer copiedElements = copyElements(diagramSelection, diagram);
-    deleteElements(diagramSelection, diagram, tr("Cut"));
+    deleteElements(diagramSelection, diagram, Tr::tr("Cut"));
     return copiedElements;
 }
 
@@ -484,7 +486,7 @@ void DiagramController::pasteElements(const DReferences &diagramContainer, MDiag
             updateRelationKeys(relation, renewedKeys);
     }
     if (m_undoController)
-        m_undoController->beginMergeSequence(tr("Paste"));
+        m_undoController->beginMergeSequence(Tr::tr("Paste"));
     // insert all elements
     bool added = false;
     for (DElement *clonedElement : std::as_const(clonedElements)) {
@@ -492,7 +494,7 @@ void DiagramController::pasteElements(const DReferences &diagramContainer, MDiag
             int row = diagram->diagramElements().size();
             emit beginInsertElement(row, diagram);
             if (m_undoController) {
-                auto undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Paste"));
+                auto undoCommand = new AddElementsCommand(this, diagram->uid(), Tr::tr("Paste"));
                 m_undoController->push(undoCommand);
                 undoCommand->add(clonedElement->uid());
             }
@@ -507,7 +509,7 @@ void DiagramController::pasteElements(const DReferences &diagramContainer, MDiag
             int row = diagram->diagramElements().size();
             emit beginInsertElement(row, diagram);
             if (m_undoController) {
-                auto undoCommand = new AddElementsCommand(this, diagram->uid(), tr("Paste"));
+                auto undoCommand = new AddElementsCommand(this, diagram->uid(), Tr::tr("Paste"));
                 m_undoController->push(undoCommand);
                 undoCommand->add(clonedElement->uid());
             }
@@ -525,7 +527,7 @@ void DiagramController::pasteElements(const DReferences &diagramContainer, MDiag
 
 void DiagramController::deleteElements(const DSelection &diagramSelection, MDiagram *diagram)
 {
-    deleteElements(diagramSelection, diagram, tr("Delete"));
+    deleteElements(diagramSelection, diagram, Tr::tr("Delete"));
 }
 
 void DiagramController::onBeginResetModel()
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
index 8cb871c432..14ad25b2c1 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
@@ -45,6 +45,8 @@
 
 #include <qmt/stereotype/customrelation.h>
 
+#include "../../modelinglibtr.h"
+
 namespace qmt {
 
 static const char ASSOCIATION[] = "association";
@@ -378,7 +380,7 @@ bool ClassItem::extendContextMenu(QMenu *menu)
 {
     bool extended = false;
     if (diagramSceneModel()->diagramSceneController()->elementTasks()->hasClassDefinition(object(), diagramSceneModel()->diagram())) {
-        menu->addAction(new ContextMenuAction(tr("Show Definition"), "showDefinition", menu));
+        menu->addAction(new ContextMenuAction(Tr::tr("Show Definition"), "showDefinition", menu));
         extended = true;
     }
     return extended;
@@ -444,11 +446,11 @@ void ClassItem::addRelationStarterTool(const QString &id)
     if (id == INHERITANCE)
         relationStarter()->addArrow(INHERITANCE, ArrowItem::ShaftSolid,
                                     ArrowItem::HeadNone, ArrowItem::HeadTriangle,
-                                    tr("Inheritance"));
+                                    Tr::tr("Inheritance"));
     else if (id == ASSOCIATION)
         relationStarter()->addArrow(ASSOCIATION, ArrowItem::ShaftSolid,
                                     ArrowItem::HeadNone, ArrowItem::HeadFilledTriangle,
-                                    tr("Association"));
+                                    Tr::tr("Association"));
     else
         ObjectItem::addRelationStarterTool(id);
 }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
index 34e315b9f0..83ce0a9a5a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
@@ -24,8 +24,6 @@ class Style;
 
 class ClassItem : public ObjectItem
 {
-    Q_DECLARE_TR_FUNCTIONS(qmt::ClassItem)
-
 public:
     ClassItem(DClass *klass, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = nullptr);
     ~ClassItem() override;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
index 056c02f206..398069e91d 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
@@ -29,6 +29,8 @@
 #include "qmt/tasks/diagramscenecontroller.h"
 #include "qmt/tasks/ielementtasks.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
@@ -734,7 +736,7 @@ void ObjectItem::addRelationStarterTool(const QString &id)
     if (id == DEPENDENCY)
         m_relationStarter->addArrow(DEPENDENCY, ArrowItem::ShaftDashed,
                                     ArrowItem::HeadNone, ArrowItem::HeadOpen,
-                                    tr("Dependency"));
+                                    Tr::tr("Dependency"));
 }
 
 void ObjectItem::addRelationStarterTool(const CustomRelation &customRelation)
@@ -979,10 +981,10 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 
     bool addSeparator = false;
     if (element_tasks->hasDiagram(m_object, m_diagramSceneModel->diagram())) {
-        menu.addAction(new ContextMenuAction(tr("Open Diagram"), "openDiagram", &menu));
+        menu.addAction(new ContextMenuAction(Tr::tr("Open Diagram"), "openDiagram", &menu));
         addSeparator = true;
     } else if (element_tasks->mayCreateDiagram(m_object, m_diagramSceneModel->diagram())) {
-        menu.addAction(new ContextMenuAction(tr("Create Diagram"), "createDiagram", &menu));
+        menu.addAction(new ContextMenuAction(Tr::tr("Create Diagram"), "createDiagram", &menu));
         addSeparator = true;
     }
     if (extendContextMenu(&menu))
@@ -991,37 +993,37 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
         addSeparator = true;
     if (addSeparator)
         menu.addSeparator();
-    menu.addAction(new ContextMenuAction(tr("Remove"), "remove",
+    menu.addAction(new ContextMenuAction(Tr::tr("Remove"), "remove",
                                          QKeySequence(QKeySequence::Delete), &menu));
     menu.addAction(
-        new ContextMenuAction(tr("Delete"), "delete", QKeySequence(Qt::CTRL | Qt::Key_D), &menu));
-    //menu.addAction(new ContextMenuAction(tr("Select in Model Tree"), "selectInModelTree", &menu));
+        new ContextMenuAction(Tr::tr("Delete"), "delete", QKeySequence(Qt::CTRL | Qt::Key_D), &menu));
+    //menu.addAction(new ContextMenuAction(Tr::tr("Select in Model Tree"), "selectInModelTree", &menu));
     QMenu alignMenu;
-    alignMenu.setTitle(tr("Align Objects"));
-    alignMenu.addAction(new ContextMenuAction(tr("Align Left"), "alignLeft", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(tr("Center Vertically"), "centerVertically",
+    alignMenu.setTitle(Tr::tr("Align Objects"));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Left"), "alignLeft", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Vertically"), "centerVertically",
                                               &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(tr("Align Right"), "alignRight", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Right"), "alignRight", &alignMenu));
     alignMenu.addSeparator();
-    alignMenu.addAction(new ContextMenuAction(tr("Align Top"), "alignTop", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(tr("Center Horizontally"), "centerHorizontally",
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Top"), "alignTop", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Horizontally"), "centerHorizontally",
                                               &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(tr("Align Bottom"), "alignBottom", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Bottom"), "alignBottom", &alignMenu));
     alignMenu.addSeparator();
-    alignMenu.addAction(new ContextMenuAction(tr("Same Width"), "sameWidth", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(tr("Same Height"), "sameHeight", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(tr("Same Size"), "sameSize", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Same Width"), "sameWidth", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Same Height"), "sameHeight", &alignMenu));
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Same Size"), "sameSize", &alignMenu));
     alignMenu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection());
     menu.addMenu(&alignMenu);
     QMenu layoutMenu;
-    layoutMenu.setTitle(tr("Layout Objects"));
-    layoutMenu.addAction(new ContextMenuAction(tr("Equal Horizontal Distance"), "sameHCenterDistance", &alignMenu));
-    layoutMenu.addAction(new ContextMenuAction(tr("Equal Vertical Distance"), "sameVCenterDistance", &alignMenu));
-    layoutMenu.addAction(new ContextMenuAction(tr("Equal Horizontal Space"), "sameHBorderDistance", &alignMenu));
-    layoutMenu.addAction(new ContextMenuAction(tr("Equal Vertical Space"), "sameVBorderDistance", &alignMenu));
+    layoutMenu.setTitle(Tr::tr("Layout Objects"));
+    layoutMenu.addAction(new ContextMenuAction(Tr::tr("Equal Horizontal Distance"), "sameHCenterDistance", &alignMenu));
+    layoutMenu.addAction(new ContextMenuAction(Tr::tr("Equal Vertical Distance"), "sameVCenterDistance", &alignMenu));
+    layoutMenu.addAction(new ContextMenuAction(Tr::tr("Equal Horizontal Space"), "sameHBorderDistance", &alignMenu));
+    layoutMenu.addAction(new ContextMenuAction(Tr::tr("Equal Vertical Space"), "sameVBorderDistance", &alignMenu));
     layoutMenu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection());
     menu.addMenu(&layoutMenu);
-    menu.addAction(new ContextMenuAction(tr("Add Related Elements"), "addRelatedElements", &menu));
+    menu.addAction(new ContextMenuAction(Tr::tr("Add Related Elements"), "addRelatedElements", &menu));
 
     QAction *selectedAction = menu.exec(event->screenPos());
     if (selectedAction) {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
index 1b67f4b135..e7acd5705c 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
@@ -52,8 +52,6 @@ class ObjectItem :
         public IAlignable,
         public IEditable
 {
-    Q_DECLARE_TR_FUNCTIONS(qmt::ObjectItem)
-
 protected:
     enum ResizeFlags {
         ResizeUnlocked,
diff --git a/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
index cc539c2237..68184d2fb5 100644
--- a/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
+++ b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
@@ -30,6 +30,8 @@
 #include "qmt/tasks/diagramscenecontroller.h"
 #include "qmt/tasks/findrootdiagramvisitor.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QFileInfo>
 
 namespace qmt {
@@ -178,7 +180,7 @@ void DocumentController::selectAllOnDiagram(MDiagram *diagram)
 MPackage *DocumentController::createNewPackage(MPackage *parent)
 {
     auto newPackage = new MPackage();
-    newPackage->setName(tr("New Package"));
+    newPackage->setName(Tr::tr("New Package"));
     m_modelController->addObject(parent, newPackage);
     return newPackage;
 }
@@ -186,7 +188,7 @@ MPackage *DocumentController::createNewPackage(MPackage *parent)
 MClass *DocumentController::createNewClass(MPackage *parent)
 {
     auto newClass = new MClass();
-    newClass->setName(tr("New Class"));
+    newClass->setName(Tr::tr("New Class"));
     m_modelController->addObject(parent, newClass);
     return newClass;
 }
@@ -194,7 +196,7 @@ MClass *DocumentController::createNewClass(MPackage *parent)
 MComponent *DocumentController::createNewComponent(MPackage *parent)
 {
     auto newComponent = new MComponent();
-    newComponent->setName(tr("New Component"));
+    newComponent->setName(Tr::tr("New Component"));
     m_modelController->addObject(parent, newComponent);
     return newComponent;
 }
@@ -205,7 +207,7 @@ MCanvasDiagram *DocumentController::createNewCanvasDiagram(MPackage *parent)
     if (!m_diagramSceneController->findDiagramBySearchId(parent, parent->name()))
         newDiagram->setName(parent->name());
     else
-        newDiagram->setName(tr("New Diagram"));
+        newDiagram->setName(Tr::tr("New Diagram"));
     m_modelController->addObject(parent, newDiagram);
     return newDiagram;
 }
diff --git a/src/libs/modelinglib/qmt/infrastructure/exceptions.cpp b/src/libs/modelinglib/qmt/infrastructure/exceptions.cpp
index 453c2879ca..2b95c81ac8 100644
--- a/src/libs/modelinglib/qmt/infrastructure/exceptions.cpp
+++ b/src/libs/modelinglib/qmt/infrastructure/exceptions.cpp
@@ -3,6 +3,8 @@
 
 #include "exceptions.h"
 
+#include "../../modelinglibtr.h"
+
 namespace qmt {
 
 Exception::Exception(const QString &errorMessage)
@@ -11,7 +13,7 @@ Exception::Exception(const QString &errorMessage)
 }
 
 NullPointerException::NullPointerException()
-    : Exception(Exception::tr("Unacceptable null object."))
+    : Exception(Tr::tr("Unacceptable null object."))
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/infrastructure/exceptions.h b/src/libs/modelinglib/qmt/infrastructure/exceptions.h
index d3f06b73d7..085a57cf1b 100644
--- a/src/libs/modelinglib/qmt/infrastructure/exceptions.h
+++ b/src/libs/modelinglib/qmt/infrastructure/exceptions.h
@@ -12,8 +12,6 @@ namespace qmt {
 
 class QMT_EXPORT Exception
 {
-    Q_DECLARE_TR_FUNCTIONS(qmt::Exception)
-
 public:
     explicit Exception(const QString &errorMessage);
     virtual ~Exception() = default;
diff --git a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp
index ce43f9b749..4af8df9236 100644
--- a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp
+++ b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp
@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "ioexceptions.h"
+
+#include "../../modelinglibtr.h"
+
 #include <QObject>
 
 namespace qmt {
@@ -19,32 +22,32 @@ FileIOException::FileIOException(const QString &errorMsg, const QString &fileNam
 }
 
 FileNotFoundException::FileNotFoundException(const QString &fileName)
-    : FileIOException(Exception::tr("File not found."), fileName)
+    : FileIOException(Tr::tr("File not found."), fileName)
 {
 }
 
 FileCreationException::FileCreationException(const QString &fileName)
-    : FileIOException(Exception::tr("Unable to create file."), fileName)
+    : FileIOException(Tr::tr("Unable to create file."), fileName)
 {
 }
 
 FileWriteError::FileWriteError(const QString &fileName, int lineNumber)
-    : FileIOException(Exception::tr("Writing to file failed."), fileName, lineNumber)
+    : FileIOException(Tr::tr("Writing to file failed."), fileName, lineNumber)
 {
 }
 
 FileReadError::FileReadError(const QString &fileName, int lineNumber)
-    : FileIOException(Exception::tr("Reading from file failed."), fileName, lineNumber)
+    : FileIOException(Tr::tr("Reading from file failed."), fileName, lineNumber)
 {
 }
 
 IllegalXmlFile::IllegalXmlFile(const QString &fileName, int lineNumber)
-    : FileIOException(Exception::tr("Illegal XML file."), fileName, lineNumber)
+    : FileIOException(Tr::tr("Illegal XML file."), fileName, lineNumber)
 {
 }
 
 UnknownFileVersion::UnknownFileVersion(int version, const QString &fileName, int lineNumber)
-    : FileIOException(Exception::tr("Unable to handle file version %1.")
+    : FileIOException(Tr::tr("Unable to handle file version %1.")
                       .arg(version), fileName, lineNumber)
 {
 }
diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
index d72f0266c2..3e38aabdf3 100644
--- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
@@ -16,6 +16,8 @@
 #include "qmt/model/mpackage.h"
 #include "qmt/model/mrelation.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QDebug>
 
 namespace qmt {
@@ -34,7 +36,7 @@ class ModelController::UpdateObjectCommand : public UndoCommand
 {
 public:
     UpdateObjectCommand(ModelController *modelController, MObject *object)
-        : UndoCommand(tr("Change Object")),
+        : UndoCommand(Tr::tr("Change Object")),
           m_modelController(modelController)
     {
         MCloneVisitor visitor;
@@ -108,7 +110,7 @@ class ModelController::UpdateRelationCommand :
 {
 public:
     UpdateRelationCommand(ModelController *modelController, MRelation *relation)
-        : UndoCommand(tr("Change Relation")),
+        : UndoCommand(Tr::tr("Change Relation")),
           m_modelController(modelController)
     {
         MCloneVisitor visitor;
@@ -450,7 +452,7 @@ class ModelController::MoveObjectCommand : public UndoCommand
 {
 public:
     MoveObjectCommand(ModelController *modelController, MObject *object)
-        : UndoCommand(tr("Move Object")),
+        : UndoCommand(Tr::tr("Move Object")),
           m_modelController(modelController),
           m_objectKey(object->uid()),
           m_ownerKey(object->owner()->uid()),
@@ -506,7 +508,7 @@ class ModelController::MoveRelationCommand : public UndoCommand
 {
 public:
     MoveRelationCommand(ModelController *modelController, MRelation *relation)
-        : UndoCommand(tr("Move Relation")),
+        : UndoCommand(Tr::tr("Move Relation")),
           m_modelController(modelController),
           m_relationKey(relation->uid()),
           m_ownerKey(relation->owner()->uid()),
@@ -650,7 +652,7 @@ void ModelController::addObject(MPackage *parentPackage, MObject *object)
         emit beginInsertObject(row, parentPackage);
     mapObject(object);
     if (m_undoController) {
-        auto undoCommand = new AddElementsCommand(this, tr("Add Object"));
+        auto undoCommand = new AddElementsCommand(this, Tr::tr("Add Object"));
         m_undoController->push(undoCommand);
         undoCommand->add(TypeObject, object->uid(), parentPackage->uid());
     }
@@ -666,7 +668,7 @@ void ModelController::removeObject(MObject *object)
 {
     QMT_ASSERT(object, return);
     if (m_undoController)
-        m_undoController->beginMergeSequence(tr("Delete Object"));
+        m_undoController->beginMergeSequence(Tr::tr("Delete Object"));
     removeRelatedRelations(object);
     // remove object
     QMT_ASSERT(object->owner(), return);
@@ -675,7 +677,7 @@ void ModelController::removeObject(MObject *object)
     if (!m_isResettingModel)
         emit beginRemoveObject(row, owner);
     if (m_undoController) {
-        auto undoCommand = new RemoveElementsCommand(this, tr("Delete Object"));
+        auto undoCommand = new RemoveElementsCommand(this, Tr::tr("Delete Object"));
         m_undoController->push(undoCommand);
         undoCommand->add(object, object->owner());
     }
@@ -787,7 +789,7 @@ void ModelController::addRelation(MObject *owner, MRelation *relation)
         emit beginInsertRelation(row, owner);
     mapRelation(relation);
     if (m_undoController) {
-        auto undoCommand = new AddElementsCommand(this, tr("Add Relation"));
+        auto undoCommand = new AddElementsCommand(this, Tr::tr("Add Relation"));
         m_undoController->push(undoCommand);
         undoCommand->add(TypeRelation, relation->uid(), owner->uid());
     }
@@ -808,7 +810,7 @@ void ModelController::removeRelation(MRelation *relation)
     if (!m_isResettingModel)
         emit beginRemoveRelation(row, owner);
     if (m_undoController) {
-        auto undoCommand = new RemoveElementsCommand(this, tr("Delete Relation"));
+        auto undoCommand = new RemoveElementsCommand(this, Tr::tr("Delete Relation"));
         m_undoController->push(undoCommand);
         undoCommand->add(relation, owner);
     }
@@ -884,7 +886,7 @@ MContainer ModelController::cutElements(const MSelection &modelSelection)
 {
     // PERFORM avoid duplicate call of simplify(modelSelection)
     MContainer copiedElements = copyElements(modelSelection);
-    deleteElements(modelSelection, tr("Cut"));
+    deleteElements(modelSelection, Tr::tr("Cut"));
     return copiedElements;
 }
 
@@ -922,7 +924,7 @@ void ModelController::pasteElements(MObject *owner, const MReferences &modelCont
     for (MElement *clonedElement : std::as_const(clonedElements))
         updateRelationKeys(clonedElement, renewedKeys);
     if (m_undoController)
-        m_undoController->beginMergeSequence(tr("Paste"));
+        m_undoController->beginMergeSequence(Tr::tr("Paste"));
     // insert all elements
     bool added = false;
     for (MElement *clonedElement : std::as_const(clonedElements)) {
@@ -935,7 +937,7 @@ void ModelController::pasteElements(MObject *owner, const MReferences &modelCont
             emit beginInsertObject(row, objectOwner);
             mapObject(object);
             if (m_undoController) {
-                auto undoCommand = new AddElementsCommand(this, tr("Paste"));
+                auto undoCommand = new AddElementsCommand(this, Tr::tr("Paste"));
                 m_undoController->push(undoCommand);
                 undoCommand->add(TypeObject, object->uid(), objectOwner->uid());
             }
@@ -947,7 +949,7 @@ void ModelController::pasteElements(MObject *owner, const MReferences &modelCont
             emit beginInsertRelation(row, owner);
             mapRelation(relation);
             if (m_undoController) {
-                auto undoCommand = new AddElementsCommand(this, tr("Paste"));
+                auto undoCommand = new AddElementsCommand(this, Tr::tr("Paste"));
                 m_undoController->push(undoCommand);
                 undoCommand->add(TypeRelation, relation->uid(), owner->uid());
             }
@@ -965,7 +967,7 @@ void ModelController::pasteElements(MObject *owner, const MReferences &modelCont
 
 void ModelController::deleteElements(const MSelection &modelSelection)
 {
-    deleteElements(modelSelection, tr("Delete"));
+    deleteElements(modelSelection, Tr::tr("Delete"));
 }
 
 void ModelController::deleteElements(const MSelection &modelSelection, const QString &commandLabel)
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
index 1a2239414b..3e8d5a59b6 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
@@ -26,6 +26,8 @@
 #include "qmt/style/style.h"
 #include "qmt/style/stylecontroller.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QStandardItem>
 
 namespace qmt {
@@ -779,7 +781,7 @@ QString TreeModel::createObjectLabel(const MObject *object)
             if (!item->variety().isEmpty())
                 return filterLabel(QString("[%1]").arg(item->variety()));
         }
-        return tr("[unnamed]");
+        return Tr::tr("[unnamed]");
     }
 
     if (auto klass = dynamic_cast<const MClass *>(object)) {
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
index ed818db5c7..68c22ce6df 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
@@ -13,6 +13,8 @@
 #include "qmt/model_ui/treemodel.h"
 #include "qmt/tasks/ielementtasks.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QPainter>
 #include <QMimeData>
 #include <QDrag>
@@ -228,17 +230,17 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event)
         QMenu menu;
         bool addSeparator = false;
         if (m_elementTasks->hasClassDefinition(melement)) {
-            menu.addAction(new ContextMenuAction(tr("Show Definition"), "showDefinition", &menu));
+            menu.addAction(new ContextMenuAction(Tr::tr("Show Definition"), "showDefinition", &menu));
             addSeparator = true;
         }
         if (m_elementTasks->hasDiagram(melement)) {
-            menu.addAction(new ContextMenuAction(tr("Open Diagram"), "openDiagram", &menu));
+            menu.addAction(new ContextMenuAction(Tr::tr("Open Diagram"), "openDiagram", &menu));
             addSeparator = true;
         }
         if (melement->owner()) {
             if (addSeparator)
                 menu.addSeparator();
-            menu.addAction(new ContextMenuAction(tr("Delete"),
+            menu.addAction(new ContextMenuAction(Tr::tr("Delete"),
                                                  "delete",
                                                  QKeySequence(Qt::CTRL | Qt::Key_D),
                                                  &menu));
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index 60ff14536d..969313ca33 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -47,6 +47,8 @@
 #include "qmt/style/style.h"
 #include "qmt/style/objectvisuals.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QCoreApplication>
 #include <QWidget>
 #include <QFormLayout>
@@ -326,7 +328,7 @@ void PropertiesView::MView::visitMElement(const MElement *element)
         m_stereotypeComboBox = new QComboBox(m_topWidget);
         m_stereotypeComboBox->setEditable(true);
         m_stereotypeComboBox->setInsertPolicy(QComboBox::NoInsert);
-        addRow(tr("Stereotypes:"), m_stereotypeComboBox, "stereotypes");
+        addRow(Tr::tr("Stereotypes:"), m_stereotypeComboBox, "stereotypes");
         m_stereotypeComboBox->addItems(m_propertiesView->stereotypeController()->knownStereotypes(m_stereotypeElement));
         connect(m_stereotypeComboBox->lineEdit(), &QLineEdit::textEdited,
                 this, &PropertiesView::MView::onStereotypesChanged);
@@ -348,9 +350,9 @@ void PropertiesView::MView::visitMElement(const MElement *element)
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_reverseEngineeredLabel) {
         m_reverseEngineeredLabel = new QLabel(m_topWidget);
-        addRow(tr("Reverse engineered:"), m_reverseEngineeredLabel, "reverse engineered");
+        addRow(Tr::tr("Reverse engineered:"), m_reverseEngineeredLabel, "reverse engineered");
     }
-    QString text = element->flags().testFlag(MElement::ReverseEngineered) ? tr("Yes") : tr("No");
+    QString text = element->flags().testFlag(MElement::ReverseEngineered) ? Tr::tr("Yes") : Tr::tr("No");
     m_reverseEngineeredLabel->setText(text);
 #endif
 }
@@ -362,7 +364,7 @@ void PropertiesView::MView::visitMObject(const MObject *object)
     bool isSingleSelection = selection.size() == 1;
     if (!m_elementNameLineEdit) {
         m_elementNameLineEdit = new QLineEdit(m_topWidget);
-        addRow(tr("Name:"), m_elementNameLineEdit, "name");
+        addRow(Tr::tr("Name:"), m_elementNameLineEdit, "name");
         connect(m_elementNameLineEdit, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onObjectNameChanged);
     }
@@ -378,12 +380,12 @@ void PropertiesView::MView::visitMObject(const MObject *object)
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_childrenLabel) {
         m_childrenLabel = new QLabel(m_topWidget);
-        addRow(tr("Children:"), m_childrenLabel, "children");
+        addRow(Tr::tr("Children:"), m_childrenLabel, "children");
     }
     m_childrenLabel->setText(QString::number(object->children().size()));
     if (!m_relationsLabel) {
         m_relationsLabel = new QLabel(m_topWidget);
-        addRow(tr("Relations:"), m_relationsLabel, "relations");
+        addRow(Tr::tr("Relations:"), m_relationsLabel, "relations");
     }
     m_relationsLabel->setText(QString::number(object->relations().size()));
 #endif
@@ -392,21 +394,21 @@ void PropertiesView::MView::visitMObject(const MObject *object)
 void PropertiesView::MView::visitMPackage(const MPackage *package)
 {
     if (m_modelElements.size() == 1 && !package->owner())
-        setTitle<MPackage>(m_modelElements, tr("Model"), tr("Models"));
+        setTitle<MPackage>(m_modelElements, Tr::tr("Model"), Tr::tr("Models"));
     else
-        setTitle<MPackage>(m_modelElements, tr("Package"), tr("Packages"));
+        setTitle<MPackage>(m_modelElements, Tr::tr("Package"), Tr::tr("Packages"));
     visitMObject(package);
 }
 
 void PropertiesView::MView::visitMClass(const MClass *klass)
 {
-    setTitle<MClass>(m_modelElements, tr("Class"), tr("Classes"));
+    setTitle<MClass>(m_modelElements, Tr::tr("Class"), Tr::tr("Classes"));
     visitMObject(klass);
     QList<MClass *> selection = filter<MClass>(m_modelElements);
     bool isSingleSelection = selection.size() == 1;
     if (!m_namespaceLineEdit) {
         m_namespaceLineEdit = new QLineEdit(m_topWidget);
-        addRow(tr("Namespace:"), m_namespaceLineEdit, "namespace");
+        addRow(Tr::tr("Namespace:"), m_namespaceLineEdit, "namespace");
         connect(m_namespaceLineEdit, &QLineEdit::textEdited,
                 this, &PropertiesView::MView::onNamespaceChanged);
     }
@@ -423,7 +425,7 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
     }
     if (!m_templateParametersLineEdit) {
         m_templateParametersLineEdit = new QLineEdit(m_topWidget);
-        addRow(tr("Template:"), m_templateParametersLineEdit, "template");
+        addRow(Tr::tr("Template:"), m_templateParametersLineEdit, "template");
         connect(m_templateParametersLineEdit, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onTemplateParametersChanged);
     }
@@ -441,7 +443,7 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
     if (!m_classMembersStatusLabel) {
         QMT_CHECK(!m_classMembersParseButton);
         m_classMembersStatusLabel = new QLabel(m_topWidget);
-        m_classMembersParseButton = new QPushButton(tr("Clean Up"), m_topWidget);
+        m_classMembersParseButton = new QPushButton(Tr::tr("Clean Up"), m_topWidget);
         auto layout = new QHBoxLayout();
         layout->addWidget(m_classMembersStatusLabel);
         layout->addWidget(m_classMembersParseButton);
@@ -456,7 +458,7 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
     if (!m_classMembersEdit) {
         m_classMembersEdit = new ClassMembersEdit(m_topWidget);
         m_classMembersEdit->setLineWrapMode(QPlainTextEdit::NoWrap);
-        addRow(tr("Members:"), m_classMembersEdit, "members");
+        addRow(Tr::tr("Members:"), m_classMembersEdit, "members");
         connect(m_classMembersEdit, &ClassMembersEdit::membersChanged,
                 this, &PropertiesView::MView::onClassMembersChanged);
         connect(m_classMembersEdit, &ClassMembersEdit::statusChanged,
@@ -474,18 +476,18 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
 
 void PropertiesView::MView::visitMComponent(const MComponent *component)
 {
-    setTitle<MComponent>(m_modelElements, tr("Component"), tr("Components"));
+    setTitle<MComponent>(m_modelElements, Tr::tr("Component"), Tr::tr("Components"));
     visitMObject(component);
 }
 
 void PropertiesView::MView::visitMDiagram(const MDiagram *diagram)
 {
-    setTitle<MDiagram>(m_modelElements, tr("Diagram"), tr("Diagrams"));
+    setTitle<MDiagram>(m_modelElements, Tr::tr("Diagram"), Tr::tr("Diagrams"));
     visitMObject(diagram);
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_diagramsLabel) {
         m_diagramsLabel = new QLabel(m_topWidget);
-        addRow(tr("Elements:"), m_diagramsLabel, "elements");
+        addRow(Tr::tr("Elements:"), m_diagramsLabel, "elements");
     }
     m_diagramsLabel->setText(QString::number(diagram->diagramElements().size()));
 #endif
@@ -493,20 +495,20 @@ void PropertiesView::MView::visitMDiagram(const MDiagram *diagram)
 
 void PropertiesView::MView::visitMCanvasDiagram(const MCanvasDiagram *diagram)
 {
-    setTitle<MCanvasDiagram>(m_modelElements, tr("Canvas Diagram"), tr("Canvas Diagrams"));
+    setTitle<MCanvasDiagram>(m_modelElements, Tr::tr("Canvas Diagram"), Tr::tr("Canvas Diagrams"));
     visitMDiagram(diagram);
 }
 
 void PropertiesView::MView::visitMItem(const MItem *item)
 {
-    setTitle<MItem>(item, m_modelElements, tr("Item"), tr("Items"));
+    setTitle<MItem>(item, m_modelElements, Tr::tr("Item"), Tr::tr("Items"));
     visitMObject(item);
     QList<MItem *> selection = filter<MItem>(m_modelElements);
     bool isSingleSelection = selection.size() == 1;
     if (item->isVarietyEditable()) {
         if (!m_itemVarietyEdit) {
             m_itemVarietyEdit = new QLineEdit(m_topWidget);
-            addRow(tr("Variety:"), m_itemVarietyEdit, "variety");
+            addRow(Tr::tr("Variety:"), m_itemVarietyEdit, "variety");
             connect(m_itemVarietyEdit, &QLineEdit::textChanged,
                     this, &PropertiesView::MView::onItemVarietyChanged);
         }
@@ -528,7 +530,7 @@ void PropertiesView::MView::visitMRelation(const MRelation *relation)
     bool isSingleSelection = selection.size() == 1;
     if (!m_elementNameLineEdit) {
         m_elementNameLineEdit = new QLineEdit(m_topWidget);
-        addRow(tr("Name:"), m_elementNameLineEdit, "name");
+        addRow(Tr::tr("Name:"), m_elementNameLineEdit, "name");
         connect(m_elementNameLineEdit, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onRelationNameChanged);
     }
@@ -542,22 +544,22 @@ void PropertiesView::MView::visitMRelation(const MRelation *relation)
         m_elementNameLineEdit->setEnabled(isSingleSelection);
     MObject *endAObject = m_propertiesView->modelController()->findObject(relation->endAUid());
     QMT_ASSERT(endAObject, return);
-    setEndAName(tr("End A: %1").arg(endAObject->name()));
+    setEndAName(Tr::tr("End A: %1").arg(endAObject->name()));
     MObject *endBObject = m_propertiesView->modelController()->findObject(relation->endBUid());
     QMT_ASSERT(endBObject, return);
-    setEndBName(tr("End B: %1").arg(endBObject->name()));
+    setEndBName(Tr::tr("End B: %1").arg(endBObject->name()));
 }
 
 void PropertiesView::MView::visitMDependency(const MDependency *dependency)
 {
-    setTitle<MDependency>(m_modelElements, tr("Dependency"), tr("Dependencies"));
+    setTitle<MDependency>(m_modelElements, Tr::tr("Dependency"), Tr::tr("Dependencies"));
     visitMRelation(dependency);
     QList<MDependency *> selection = filter<MDependency>(m_modelElements);
     bool isSingleSelection = selection.size() == 1;
     if (!m_directionSelector) {
         m_directionSelector = new QComboBox(m_topWidget);
         m_directionSelector->addItems(QStringList({ "->", "<-", "<->" }));
-        addRow(tr("Direction:"), m_directionSelector, "direction");
+        addRow(Tr::tr("Direction:"), m_directionSelector, "direction");
         connect(m_directionSelector, &QComboBox::activated,
                 this, &PropertiesView::MView::onDependencyDirectionChanged);
     }
@@ -576,19 +578,19 @@ void PropertiesView::MView::visitMDependency(const MDependency *dependency)
 
 void PropertiesView::MView::visitMInheritance(const MInheritance *inheritance)
 {
-    setTitle<MInheritance>(m_modelElements, tr("Inheritance"), tr("Inheritances"));
+    setTitle<MInheritance>(m_modelElements, Tr::tr("Inheritance"), Tr::tr("Inheritances"));
     MObject *derivedClass = m_propertiesView->modelController()->findObject(inheritance->derived());
     QMT_ASSERT(derivedClass, return);
-    setEndAName(tr("Derived class: %1").arg(derivedClass->name()));
+    setEndAName(Tr::tr("Derived class: %1").arg(derivedClass->name()));
     MObject *baseClass = m_propertiesView->modelController()->findObject(inheritance->base());
     QMT_ASSERT(baseClass, return);
-    setEndBName(tr("Base class: %1").arg(baseClass->name()));
+    setEndBName(Tr::tr("Base class: %1").arg(baseClass->name()));
     visitMRelation(inheritance);
 }
 
 void PropertiesView::MView::visitMAssociation(const MAssociation *association)
 {
-    setTitle<MAssociation>(m_modelElements, tr("Association"), tr("Associations"));
+    setTitle<MAssociation>(m_modelElements, Tr::tr("Association"), Tr::tr("Associations"));
     visitMRelation(association);
     QList<MAssociation *> selection = filter<MAssociation>(m_modelElements);
     bool isSingleSelection = selection.size() == 1;
@@ -598,7 +600,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
     }
     if (!m_endAEndName) {
         m_endAEndName = new QLineEdit(m_topWidget);
-        addRow(tr("Role:"), m_endAEndName, "role a");
+        addRow(Tr::tr("Role:"), m_endAEndName, "role a");
         connect(m_endAEndName, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onAssociationEndANameChanged);
     }
@@ -612,7 +614,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
         m_endAEndName->setEnabled(isSingleSelection);
     if (!m_endACardinality) {
         m_endACardinality = new QLineEdit(m_topWidget);
-        addRow(tr("Cardinality:"), m_endACardinality, "cardinality a");
+        addRow(Tr::tr("Cardinality:"), m_endACardinality, "cardinality a");
         connect(m_endACardinality, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onAssociationEndACardinalityChanged);
     }
@@ -625,7 +627,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
     if (m_endACardinality->isEnabled() != isSingleSelection)
         m_endACardinality->setEnabled(isSingleSelection);
     if (!m_endANavigable) {
-        m_endANavigable = new QCheckBox(tr("Navigable"), m_topWidget);
+        m_endANavigable = new QCheckBox(Tr::tr("Navigable"), m_topWidget);
         addRow(QString(), m_endANavigable, "navigable a");
         connect(m_endANavigable, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onAssociationEndANavigableChanged);
@@ -640,8 +642,8 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
         m_endANavigable->setEnabled(isSingleSelection);
     if (!m_endAKind) {
         m_endAKind = new QComboBox(m_topWidget);
-        m_endAKind->addItems({ tr("Association"), tr("Aggregation"), tr("Composition") });
-        addRow(tr("Relationship:"), m_endAKind, "relationship a");
+        m_endAKind->addItems({ Tr::tr("Association"), Tr::tr("Aggregation"), Tr::tr("Composition") });
+        addRow(Tr::tr("Relationship:"), m_endAKind, "relationship a");
         connect(m_endAKind, &QComboBox::activated,
                 this, &PropertiesView::MView::onAssociationEndAKindChanged);
     }
@@ -663,7 +665,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
     }
     if (!m_endBEndName) {
         m_endBEndName = new QLineEdit(m_topWidget);
-        addRow(tr("Role:"), m_endBEndName, "role b");
+        addRow(Tr::tr("Role:"), m_endBEndName, "role b");
         connect(m_endBEndName, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onAssociationEndBNameChanged);
     }
@@ -677,7 +679,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
         m_endBEndName->setEnabled(isSingleSelection);
     if (!m_endBCardinality) {
         m_endBCardinality = new QLineEdit(m_topWidget);
-        addRow(tr("Cardinality:"), m_endBCardinality, "cardinality b");
+        addRow(Tr::tr("Cardinality:"), m_endBCardinality, "cardinality b");
         connect(m_endBCardinality, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onAssociationEndBCardinalityChanged);
     }
@@ -690,7 +692,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
     if (m_endBCardinality->isEnabled() != isSingleSelection)
         m_endBCardinality->setEnabled(isSingleSelection);
     if (!m_endBNavigable) {
-        m_endBNavigable = new QCheckBox(tr("Navigable"), m_topWidget);
+        m_endBNavigable = new QCheckBox(Tr::tr("Navigable"), m_topWidget);
         addRow(QString(), m_endBNavigable, "navigable b");
         connect(m_endBNavigable, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onAssociationEndBNavigableChanged);
@@ -705,8 +707,8 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
         m_endBNavigable->setEnabled(isSingleSelection);
     if (!m_endBKind) {
         m_endBKind = new QComboBox(m_topWidget);
-        m_endBKind->addItems({ tr("Association"), tr("Aggregation"), tr("Composition") });
-        addRow(tr("Relationship:"), m_endBKind, "relationship b");
+        m_endBKind->addItems({ Tr::tr("Association"), Tr::tr("Aggregation"), Tr::tr("Composition") });
+        addRow(Tr::tr("Relationship:"), m_endBKind, "relationship b");
         connect(m_endBKind, &QComboBox::activated,
                 this, &PropertiesView::MView::onAssociationEndBKindChanged);
     }
@@ -725,7 +727,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
 
 void PropertiesView::MView::visitMConnection(const MConnection *connection)
 {
-    setTitle<MConnection>(connection, m_modelElements, tr("Connection"), tr("Connections"));
+    setTitle<MConnection>(connection, m_modelElements, Tr::tr("Connection"), Tr::tr("Connections"));
     visitMRelation(connection);
     QList<MConnection *> selection = filter<MConnection>(m_modelElements);
     const bool isSingleSelection = selection.size() == 1;
@@ -735,7 +737,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
     }
     if (!m_endAEndName) {
         m_endAEndName = new QLineEdit(m_topWidget);
-        addRow(tr("Role:"), m_endAEndName, "role a");
+        addRow(Tr::tr("Role:"), m_endAEndName, "role a");
         connect(m_endAEndName, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onConnectionEndANameChanged);
     }
@@ -749,7 +751,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
         m_endAEndName->setEnabled(isSingleSelection);
     if (!m_endACardinality) {
         m_endACardinality = new QLineEdit(m_topWidget);
-        addRow(tr("Cardinality:"), m_endACardinality, "cardinality a");
+        addRow(Tr::tr("Cardinality:"), m_endACardinality, "cardinality a");
         connect(m_endACardinality, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onConnectionEndACardinalityChanged);
     }
@@ -762,7 +764,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
     if (m_endACardinality->isEnabled() != isSingleSelection)
         m_endACardinality->setEnabled(isSingleSelection);
     if (!m_endANavigable) {
-        m_endANavigable = new QCheckBox(tr("Navigable"), m_topWidget);
+        m_endANavigable = new QCheckBox(Tr::tr("Navigable"), m_topWidget);
         addRow(QString(), m_endANavigable, "navigable a");
         connect(m_endANavigable, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onConnectionEndANavigableChanged);
@@ -782,7 +784,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
     }
     if (!m_endBEndName) {
         m_endBEndName = new QLineEdit(m_topWidget);
-        addRow(tr("Role:"), m_endBEndName, "role b");
+        addRow(Tr::tr("Role:"), m_endBEndName, "role b");
         connect(m_endBEndName, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onConnectionEndBNameChanged);
     }
@@ -796,7 +798,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
         m_endBEndName->setEnabled(isSingleSelection);
     if (!m_endBCardinality) {
         m_endBCardinality = new QLineEdit(m_topWidget);
-        addRow(tr("Cardinality:"), m_endBCardinality, "cardinality b");
+        addRow(Tr::tr("Cardinality:"), m_endBCardinality, "cardinality b");
         connect(m_endBCardinality, &QLineEdit::textChanged,
                 this, &PropertiesView::MView::onConnectionEndBCardinalityChanged);
     }
@@ -809,7 +811,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
     if (m_endBCardinality->isEnabled() != isSingleSelection)
         m_endBCardinality->setEnabled(isSingleSelection);
     if (!m_endBNavigable) {
-        m_endBNavigable = new QCheckBox(tr("Navigable"), m_topWidget);
+        m_endBNavigable = new QCheckBox(Tr::tr("Navigable"), m_topWidget);
         addRow(QString(), m_endBNavigable, "navigable b");
         connect(m_endBNavigable, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onConnectionEndBNavigableChanged);
@@ -851,7 +853,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_posRectLabel) {
         m_posRectLabel = new QLabel(m_topWidget);
-        addRow(tr("Position and size:"), m_posRectLabel, "position and size");
+        addRow(Tr::tr("Position and size:"), m_posRectLabel, "position and size");
     }
     m_posRectLabel->setText(QString("(%1,%2):(%3,%4)-(%5,%6)")
                              .arg(object->pos().x())
@@ -862,7 +864,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
                              .arg(object->rect().bottom()));
 #endif
     if (!m_autoSizedCheckbox) {
-        m_autoSizedCheckbox = new QCheckBox(tr("Auto sized"), m_topWidget);
+        m_autoSizedCheckbox = new QCheckBox(Tr::tr("Auto sized"), m_topWidget);
         addRow(QString(), m_autoSizedCheckbox, "auto size");
         connect(m_autoSizedCheckbox, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onAutoSizedChanged);
@@ -881,7 +883,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
         setPrimaryRolePalette(m_styleElementType, DObject::PrimaryRoleCustom3, QColor());
         setPrimaryRolePalette(m_styleElementType, DObject::PrimaryRoleCustom4, QColor());
         setPrimaryRolePalette(m_styleElementType, DObject::PrimaryRoleCustom5, QColor());
-        addRow(tr("Color:"), m_visualPrimaryRoleSelector, "color");
+        addRow(Tr::tr("Color:"), m_visualPrimaryRoleSelector, "color");
         connect(m_visualPrimaryRoleSelector, &PaletteBox::activated,
                 this, &PropertiesView::MView::onVisualPrimaryRoleChanged);
     }
@@ -905,9 +907,9 @@ void PropertiesView::MView::visitDObject(const DObject *object)
     }
     if (!m_visualSecondaryRoleSelector) {
         m_visualSecondaryRoleSelector = new QComboBox(m_topWidget);
-        m_visualSecondaryRoleSelector->addItems({ tr("Normal"), tr("Lighter"), tr("Darker"),
-                                                  tr("Soften"), tr("Outline"), tr("Flat") });
-        addRow(tr("Role:"), m_visualSecondaryRoleSelector, "role");
+        m_visualSecondaryRoleSelector->addItems({ Tr::tr("Normal"), Tr::tr("Lighter"), Tr::tr("Darker"),
+                                                  Tr::tr("Soften"), Tr::tr("Outline"), Tr::tr("Flat") });
+        addRow(Tr::tr("Role:"), m_visualSecondaryRoleSelector, "role");
         connect(m_visualSecondaryRoleSelector, &QComboBox::activated,
                 this, &PropertiesView::MView::onVisualSecondaryRoleChanged);
     }
@@ -919,7 +921,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
             m_visualSecondaryRoleSelector->setCurrentIndex(-1);
     }
     if (!m_visualEmphasizedCheckbox) {
-        m_visualEmphasizedCheckbox = new QCheckBox(tr("Emphasized"), m_topWidget);
+        m_visualEmphasizedCheckbox = new QCheckBox(Tr::tr("Emphasized"), m_topWidget);
         addRow(QString(), m_visualEmphasizedCheckbox, "emphasized");
         connect(m_visualEmphasizedCheckbox, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onVisualEmphasizedChanged);
@@ -933,9 +935,9 @@ void PropertiesView::MView::visitDObject(const DObject *object)
     }
     if (!m_stereotypeDisplaySelector) {
         m_stereotypeDisplaySelector = new QComboBox(m_topWidget);
-        m_stereotypeDisplaySelector->addItems({ tr("Smart"), tr("None"), tr("Label"),
-                                                tr("Decoration"), tr("Icon") });
-        addRow(tr("Stereotype display:"), m_stereotypeDisplaySelector, "stereotype display");
+        m_stereotypeDisplaySelector->addItems({ Tr::tr("Smart"), Tr::tr("None"), Tr::tr("Label"),
+                                                Tr::tr("Decoration"), Tr::tr("Icon") });
+        addRow(Tr::tr("Stereotype display:"), m_stereotypeDisplaySelector, "stereotype display");
         connect(m_stereotypeDisplaySelector, &QComboBox::activated,
                 this, &PropertiesView::MView::onStereotypeDisplayChanged);
     }
@@ -949,7 +951,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_depthLabel) {
         m_depthLabel = new QLabel(m_topWidget);
-        addRow(tr("Depth:"), m_depthLabel, "depth");
+        addRow(Tr::tr("Depth:"), m_depthLabel, "depth");
     }
     m_depthLabel->setText(QString::number(object->depth()));
 #endif
@@ -957,7 +959,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
 
 void PropertiesView::MView::visitDPackage(const DPackage *package)
 {
-    setTitle<DPackage>(m_diagramElements, tr("Package"), tr("Packages"));
+    setTitle<DPackage>(m_diagramElements, Tr::tr("Package"), Tr::tr("Packages"));
     setStereotypeIconElement(StereotypeIcon::ElementPackage);
     setStyleElementType(StyleEngine::TypePackage);
     visitDObject(package);
@@ -965,14 +967,14 @@ void PropertiesView::MView::visitDPackage(const DPackage *package)
 
 void PropertiesView::MView::visitDClass(const DClass *klass)
 {
-    setTitle<DClass>(m_diagramElements, tr("Class"), tr("Classes"));
+    setTitle<DClass>(m_diagramElements, Tr::tr("Class"), Tr::tr("Classes"));
     setStereotypeIconElement(StereotypeIcon::ElementClass);
     setStyleElementType(StyleEngine::TypeClass);
     visitDObject(klass);
     if (!m_templateDisplaySelector) {
         m_templateDisplaySelector = new QComboBox(m_topWidget);
-        m_templateDisplaySelector->addItems({ tr("Smart"), tr("Box"), tr("Angle Brackets") });
-        addRow(tr("Template display:"), m_templateDisplaySelector, "template display");
+        m_templateDisplaySelector->addItems({ Tr::tr("Smart"), Tr::tr("Box"), Tr::tr("Angle Brackets") });
+        addRow(Tr::tr("Template display:"), m_templateDisplaySelector, "template display");
         connect(m_templateDisplaySelector, &QComboBox::activated,
                 this, &PropertiesView::MView::onTemplateDisplayChanged);
     }
@@ -984,7 +986,7 @@ void PropertiesView::MView::visitDClass(const DClass *klass)
             m_templateDisplaySelector->setCurrentIndex(-1);
     }
     if (!m_showAllMembersCheckbox) {
-        m_showAllMembersCheckbox = new QCheckBox(tr("Show members"), m_topWidget);
+        m_showAllMembersCheckbox = new QCheckBox(Tr::tr("Show members"), m_topWidget);
         addRow(QString(), m_showAllMembersCheckbox, "show members");
         connect(m_showAllMembersCheckbox, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onShowAllMembersChanged);
@@ -1000,12 +1002,12 @@ void PropertiesView::MView::visitDClass(const DClass *klass)
 
 void PropertiesView::MView::visitDComponent(const DComponent *component)
 {
-    setTitle<DComponent>(m_diagramElements, tr("Component"), tr("Components"));
+    setTitle<DComponent>(m_diagramElements, Tr::tr("Component"), Tr::tr("Components"));
     setStereotypeIconElement(StereotypeIcon::ElementComponent);
     setStyleElementType(StyleEngine::TypeComponent);
     visitDObject(component);
     if (!m_plainShapeCheckbox) {
-        m_plainShapeCheckbox = new QCheckBox(tr("Plain shape"), m_topWidget);
+        m_plainShapeCheckbox = new QCheckBox(Tr::tr("Plain shape"), m_topWidget);
         addRow(QString(), m_plainShapeCheckbox, "plain shape");
         connect(m_plainShapeCheckbox, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onPlainShapeChanged);
@@ -1021,14 +1023,14 @@ void PropertiesView::MView::visitDComponent(const DComponent *component)
 
 void PropertiesView::MView::visitDDiagram(const DDiagram *diagram)
 {
-    setTitle<DDiagram>(m_diagramElements, tr("Diagram"), tr("Diagrams"));
+    setTitle<DDiagram>(m_diagramElements, Tr::tr("Diagram"), Tr::tr("Diagrams"));
     setStyleElementType(StyleEngine::TypeOther);
     visitDObject(diagram);
 }
 
 void PropertiesView::MView::visitDItem(const DItem *item)
 {
-    setTitle<DItem>(m_diagramElements, tr("Item"), tr("Items"));
+    setTitle<DItem>(m_diagramElements, Tr::tr("Item"), Tr::tr("Items"));
     setStereotypeIconElement(StereotypeIcon::ElementItem);
     setStyleElementType(StyleEngine::TypeItem);
     visitDObject(item);
@@ -1037,7 +1039,7 @@ void PropertiesView::MView::visitDItem(const DItem *item)
     if (item->isShapeEditable()) {
         if (!m_itemShapeEdit) {
             m_itemShapeEdit = new QLineEdit(m_topWidget);
-            addRow(tr("Shape:"), m_itemShapeEdit, "shape");
+            addRow(Tr::tr("Shape:"), m_itemShapeEdit, "shape");
             connect(m_itemShapeEdit, &QLineEdit::textChanged,
                     this, &PropertiesView::MView::onItemShapeChanged);
         }
@@ -1058,7 +1060,7 @@ void PropertiesView::MView::visitDRelation(const DRelation *relation)
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_pointsLabel) {
         m_pointsLabel = new QLabel(m_topWidget);
-        addRow(tr("Intermediate points:"), m_pointsLabel, "intermediate points");
+        addRow(Tr::tr("Intermediate points:"), m_pointsLabel, "intermediate points");
     }
     QString points;
     for (const auto &point : relation->intermediatePoints()) {
@@ -1067,41 +1069,41 @@ void PropertiesView::MView::visitDRelation(const DRelation *relation)
         points.append(QString("(%1,%2)").arg(point.pos().x()).arg(point.pos().y()));
     }
     if (points.isEmpty())
-        points = tr("none");
+        points = Tr::tr("none");
     m_pointsLabel->setText(points);
 #endif
 }
 
 void PropertiesView::MView::visitDInheritance(const DInheritance *inheritance)
 {
-    setTitle<DInheritance>(m_diagramElements, tr("Inheritance"), tr("Inheritances"));
+    setTitle<DInheritance>(m_diagramElements, Tr::tr("Inheritance"), Tr::tr("Inheritances"));
     visitDRelation(inheritance);
 }
 
 void PropertiesView::MView::visitDDependency(const DDependency *dependency)
 {
-    setTitle<DDependency>(m_diagramElements, tr("Dependency"), tr("Dependencies"));
+    setTitle<DDependency>(m_diagramElements, Tr::tr("Dependency"), Tr::tr("Dependencies"));
     visitDRelation(dependency);
 }
 
 void PropertiesView::MView::visitDAssociation(const DAssociation *association)
 {
-    setTitle<DAssociation>(m_diagramElements, tr("Association"), tr("Associations"));
+    setTitle<DAssociation>(m_diagramElements, Tr::tr("Association"), Tr::tr("Associations"));
     visitDRelation(association);
 }
 
 void PropertiesView::MView::visitDConnection(const DConnection *connection)
 {
-    setTitle<DConnection>(m_diagramElements, tr("Connection"), tr("Connections"));
+    setTitle<DConnection>(m_diagramElements, Tr::tr("Connection"), Tr::tr("Connections"));
     visitDRelation(connection);
 }
 
 void PropertiesView::MView::visitDAnnotation(const DAnnotation *annotation)
 {
-    setTitle<DAnnotation>(m_diagramElements, tr("Annotation"), tr("Annotations"));
+    setTitle<DAnnotation>(m_diagramElements, Tr::tr("Annotation"), Tr::tr("Annotations"));
     visitDElement(annotation);
     if (!m_annotationAutoWidthCheckbox) {
-        m_annotationAutoWidthCheckbox = new QCheckBox(tr("Auto width"), m_topWidget);
+        m_annotationAutoWidthCheckbox = new QCheckBox(Tr::tr("Auto width"), m_topWidget);
         addRow(QString(), m_annotationAutoWidthCheckbox, "auto width");
         connect(m_annotationAutoWidthCheckbox, &QAbstractButton::clicked,
                 this, &PropertiesView::MView::onAutoWidthChanged);
@@ -1115,10 +1117,10 @@ void PropertiesView::MView::visitDAnnotation(const DAnnotation *annotation)
     }
     if (!m_annotationVisualRoleSelector) {
         m_annotationVisualRoleSelector = new QComboBox(m_topWidget);
-        m_annotationVisualRoleSelector->addItems(QStringList({ tr("Normal"), tr("Title"),
-                                                               tr("Subtitle"), tr("Emphasized"),
-                                                               tr("Soften"), tr("Footnote") }));
-        addRow(tr("Role:"), m_annotationVisualRoleSelector, "visual role");
+        m_annotationVisualRoleSelector->addItems(QStringList({ Tr::tr("Normal"), Tr::tr("Title"),
+                                                               Tr::tr("Subtitle"), Tr::tr("Emphasized"),
+                                                               Tr::tr("Soften"), Tr::tr("Footnote") }));
+        addRow(Tr::tr("Role:"), m_annotationVisualRoleSelector, "visual role");
         connect(m_annotationVisualRoleSelector, &QComboBox::activated,
                 this, &PropertiesView::MView::onAnnotationVisualRoleChanged);
     }
@@ -1133,13 +1135,13 @@ void PropertiesView::MView::visitDAnnotation(const DAnnotation *annotation)
 
 void PropertiesView::MView::visitDBoundary(const DBoundary *boundary)
 {
-    setTitle<DBoundary>(m_diagramElements, tr("Boundary"), tr("Boundaries"));
+    setTitle<DBoundary>(m_diagramElements, Tr::tr("Boundary"), Tr::tr("Boundaries"));
     visitDElement(boundary);
 }
 
 void PropertiesView::MView::visitDSwimlane(const DSwimlane *swimlane)
 {
-    setTitle<DSwimlane>(m_diagramElements, tr("Swimlane"), tr("Swimlanes"));
+    setTitle<DSwimlane>(m_diagramElements, Tr::tr("Swimlane"), Tr::tr("Swimlanes"));
     visitDElement(swimlane);
 }
 
@@ -1173,7 +1175,7 @@ void PropertiesView::MView::onClassMembersStatusChanged(bool valid)
     if (valid)
         m_classMembersStatusLabel->clear();
     else
-        m_classMembersStatusLabel->setText("<font color=red>" + tr("Invalid syntax.") + "</font>");
+        m_classMembersStatusLabel->setText("<font color=red>" + Tr::tr("Invalid syntax.") + "</font>");
 }
 
 void PropertiesView::MView::onParseClassMembers()
@@ -1476,7 +1478,7 @@ void PropertiesView::MView::setTitle(const QList<V *> &elements,
         else
             m_propertiesTitle = pluralTitle;
     } else {
-        m_propertiesTitle = QCoreApplication::translate("qmt::PropertiesView::MView", "Multi-Selection");
+        m_propertiesTitle = Tr::tr("Multi-Selection");
     }
 }
 
@@ -1503,7 +1505,7 @@ void PropertiesView::MView::setTitle(const MItem *item, const QList<V *> &elemen
             m_propertiesTitle = pluralTitle;
         }
     } else {
-        m_propertiesTitle = QCoreApplication::translate("qmt::PropertiesView::MView", "Multi-Selection");
+        m_propertiesTitle = Tr::tr("Multi-Selection");
     }
 }
 
@@ -1531,7 +1533,7 @@ void PropertiesView::MView::setTitle(const MConnection *connection, const QList<
             m_propertiesTitle = pluralTitle;
         }
     } else {
-        m_propertiesTitle = QCoreApplication::translate("qmt::PropertiesView::MView", "Multi-Selection");
+        m_propertiesTitle = Tr::tr("Multi-Selection");
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
index 3224083448..f7a7e6d2c9 100644
--- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
+++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
@@ -8,15 +8,17 @@
 
 #include "qmt/model/mpackage.h"
 
+#include "../../modelinglibtr.h"
+
 namespace qmt {
 
 NoFileNameException::NoFileNameException()
-    : Exception(ProjectController::tr("Missing file name."))
+    : Exception(Tr::tr("Missing file name."))
 {
 }
 
 ProjectIsModifiedException::ProjectIsModifiedException()
-    : Exception(ProjectController::tr("Project is modified."))
+    : Exception(Tr::tr("Project is modified."))
 {
 }
 
@@ -33,7 +35,7 @@ void ProjectController::newProject(const QString &fileName)
 {
     m_project.reset(new Project());
     auto rootPackage = new MPackage();
-    rootPackage->setName(tr("Model"));
+    rootPackage->setName(Tr::tr("Model"));
     m_project->setRootPackage(rootPackage);
     m_project->setFileName(fileName);
     m_isModified = false;
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
index a50a936a3b..00aacf9c82 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
@@ -39,6 +39,8 @@
 #include "qmt/tasks/isceneinspector.h"
 #include "qmt/tasks/voidelementtasks.h"
 
+#include "../../modelinglibtr.h"
+
 #include <QMenu>
 #include <QFileInfo>
 #include <QDir>
@@ -186,7 +188,7 @@ void DiagramSceneController::deleteFromDiagram(const DSelection &dselection, MDi
 void DiagramSceneController::createDependency(DObject *endAObject, DObject *endBObject,
                                               const QList<QPointF> &intermediatePoints, MDiagram *diagram)
 {
-    m_diagramController->undoController()->beginMergeSequence(tr("Create Dependency"));
+    m_diagramController->undoController()->beginMergeSequence(Tr::tr("Create Dependency"));
 
     MObject *endAModelObject = m_modelController->findObject<MObject>(endAObject->modelUid());
     QMT_ASSERT(endAModelObject, return);
@@ -213,7 +215,7 @@ void DiagramSceneController::createDependency(DObject *endAObject, DObject *endB
 void DiagramSceneController::createInheritance(DClass *derivedClass, DClass *baseClass,
                                                const QList<QPointF> &intermediatePoints, MDiagram *diagram)
 {
-    m_diagramController->undoController()->beginMergeSequence(tr("Create Inheritance"));
+    m_diagramController->undoController()->beginMergeSequence(Tr::tr("Create Inheritance"));
 
     MClass *derivedModelClass = m_modelController->findObject<MClass>(derivedClass->modelUid());
     QMT_ASSERT(derivedModelClass, return);
@@ -240,7 +242,7 @@ void DiagramSceneController::createAssociation(DClass *endAClass, DClass *endBCl
                                                const QList<QPointF> &intermediatePoints, MDiagram *diagram,
                                                std::function<void (MAssociation*, DAssociation*)> custom)
 {
-    m_diagramController->undoController()->beginMergeSequence(tr("Create Association"));
+    m_diagramController->undoController()->beginMergeSequence(Tr::tr("Create Association"));
 
     MClass *endAModelObject = m_modelController->findObject<MClass>(endAClass->modelUid());
     QMT_ASSERT(endAModelObject, return);
@@ -277,7 +279,7 @@ void DiagramSceneController::createConnection(const QString &customRelationId,
                                               const QList<QPointF> &intermediatePoints, MDiagram *diagram,
                                               std::function<void (MConnection *, DConnection *)> custom)
 {
-    m_diagramController->undoController()->beginMergeSequence(tr("Create Connection"));
+    m_diagramController->undoController()->beginMergeSequence(Tr::tr("Create Connection"));
 
     MObject *endAModelObject = m_modelController->findObject<MObject>(endAObject->modelUid());
     QMT_CHECK(endAModelObject);
@@ -411,7 +413,7 @@ void DiagramSceneController::dropNewElement(const QString &newElementId, const Q
 void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage *parentPackage, const QPointF &pos,
                                                  MDiagram *diagram)
 {
-    m_modelController->undoController()->beginMergeSequence(tr("Drop Element"));
+    m_modelController->undoController()->beginMergeSequence(Tr::tr("Drop Element"));
     m_modelController->addObject(parentPackage, modelObject);
     DElement *element = addObject(modelObject, pos, diagram);
     m_modelController->undoController()->endMergeSequence();
@@ -421,7 +423,7 @@ void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage
 
 void DiagramSceneController::addRelatedElements(const DSelection &selection, MDiagram *diagram)
 {
-    m_diagramController->undoController()->beginMergeSequence(tr("Add Related Element"));
+    m_diagramController->undoController()->beginMergeSequence(Tr::tr("Add Related Element"));
     const QList<DSelection::Index> indices = selection.indices();
     for (const DSelection::Index &index : indices) {
         DElement *delement = m_diagramController->findElement(index.elementKey(), diagram);
@@ -833,7 +835,7 @@ DObject *DiagramSceneController::addObject(MObject *modelObject, const QPointF &
     if (m_diagramController->hasDelegate(modelObject, diagram))
         return nullptr;
 
-    m_diagramController->undoController()->beginMergeSequence(tr("Add Element"));
+    m_diagramController->undoController()->beginMergeSequence(Tr::tr("Add Element"));
 
     DFactory factory;
     modelObject->accept(&factory);
@@ -957,7 +959,7 @@ bool DiagramSceneController::relocateRelationEnd(DRelation *relation, DObject *t
         if (visitor.isAccepted()) {
             MObject *currentTargetMObject = m_modelController->findObject((modelRelation->*endUid)());
             QMT_ASSERT(currentTargetMObject, return false);
-            m_modelController->undoController()->beginMergeSequence(tr("Relocate Relation"));
+            m_modelController->undoController()->beginMergeSequence(Tr::tr("Relocate Relation"));
             // move relation into new target if it was a child of the old target
             if (currentTargetMObject == modelRelation->owner())
                 m_modelController->moveRelation(targetMObject, modelRelation);