Merge remote-tracking branch 'origin/4.5'

Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb

5 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
index b1347007be..ffbbd0d0ab 100644
--- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
@@ -202,7 +202,7 @@ void GraphicsScene::removeSelectedItems()
 {
     QVector<ScxmlTag*> tags = SceneUtils::findRemovedTags(m_baseItems);
     if (tags.count() > 0) {
-        m_document->undoStack()->beginMacro(tr("Remove item(s)"));
+        m_document->undoStack()->beginMacro(tr("Remove items"));
 
         // Then remove found tags
         for (int i = tags.count(); i--;) {
@@ -368,7 +368,7 @@ void GraphicsScene::init()
 
 void GraphicsScene::runLayoutToSelectedStates()
 {
-    m_document->undoStack()->beginMacro(tr("Relayout"));
+    m_document->undoStack()->beginMacro(tr("Re-layout"));
 
     QVector<BaseItem*> selectedItems;
     foreach (BaseItem *node, m_baseItems) {
diff --git a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
index 2e50ac5b64..7376192581 100644
--- a/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/idwarningitem.cpp
@@ -54,7 +54,7 @@ void IdWarningItem::setId(const QString &text)
 
     // Check new id
     if (m_id.isEmpty()) {
-        setReason(tr("Missing ID"));
+        setReason(tr("Missing ID."));
         setWarningActive(true);
     } else
         checkDuplicates(m_id);
@@ -78,7 +78,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("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 987113eca0..f92fe501b8 100644
--- a/src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/initialwarningitem.cpp
@@ -36,7 +36,7 @@ InitialWarningItem::InitialWarningItem(InitialStateItem *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"));
+    setReason(tr("Too many initial states at the same level."));
 }
 
 void InitialWarningItem::updatePos()
diff --git a/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp
index 8074c9c7ff..4f8e7d1124 100644
--- a/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/statewarningitem.cpp
@@ -38,7 +38,7 @@ StateWarningItem::StateWarningItem(StateItem *parent)
     setDescription(tr("Draw some transitions to state."));
 
     setPixmap(Utils::Icons::WARNING.pixmap());
-    setReason(tr("No input connection"));
+    setReason(tr("No input connection."));
 }
 
 void StateWarningItem::setIdWarning(IdWarningItem *idwarning)
@@ -56,15 +56,15 @@ 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()));
+                setReason(tr("No input or output connections (%1).").arg(m_parentItem->itemId()));
                 setDescription(tr("Draw some transitions to or from state."));
                 setWarningActive(true);
             } else if (outputProblem) {
-                setReason(tr("No output connections (%1)").arg(m_parentItem->itemId()));
+                setReason(tr("No output connections (%1).").arg(m_parentItem->itemId()));
                 setDescription(tr("Draw some transitions from state."));
                 setWarningActive(true);
             } else if (inputProblem) {
-                setReason(tr("No input connections (%1)").arg(m_parentItem->itemId()));
+                setReason(tr("No input connections (%1).").arg(m_parentItem->itemId()));
                 setDescription(tr("Draw some transitions to state."));
                 setWarningActive(true);
             } else
diff --git a/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp b/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp
index b92cd8ef8d..8b85c401c5 100644
--- a/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/transitionwarningitem.cpp
@@ -45,7 +45,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("Not connected (%1).").arg(m_parentItem->tagValue("event")));
             setWarningActive(true);
         } else
             setWarningActive(false);