diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-23 17:06:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-23 17:06:59 +0100 |
| commit | 437590a99905fecb7efa9b3b51fa9bfff1a4138c (patch) | |
| tree | fe9fcff462bb79cedde2fccabd50b0688f0e8144 /src/plugins/scxmleditor | |
| parent | a5935cb27a0609764586302bf109796d74060f3d (diff) | |
| parent | a40f11e071d78eca267edb75f8808025fcd26a9c (diff) | |
| download | qt-creator-437590a99905fecb7efa9b3b51fa9bfff1a4138c.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
Diffstat (limited to 'src/plugins/scxmleditor')
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/stateitem.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp index 7376192581..6422c22292 100644 --- a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp @@ -34,7 +34,7 @@ IdWarningItem::IdWarningItem(QGraphicsItem *parent) setSeverity(OutputPane::Warning::ErrorType); setTypeName(tr("State")); setDescription(tr("Each state must have a unique ID.")); - setReason(tr("Missing ID")); + setReason(tr("Missing ID.")); setX(-boundingRect().width()); } diff --git a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp index edc2562ccf..01fd5a994b 100644 --- a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp @@ -350,7 +350,7 @@ void StateItem::selectedMenuAction(const QAction *action) break; } case TagUtils::Relayout: { - document->undoStack()->beginMacro(tr("Relayout")); + document->undoStack()->beginMacro(tr("Re-Layout")); doLayout(depth()); document->undoStack()->endMacro(); break; |