QmlDesigner: Make puppet dialogs more homogeneous

Change-Id: I99652e4c549650c62f4c8256523db85b38f3ca3f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index 5f5dc80ffa..8c265dd0e4 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -100,8 +100,8 @@ static bool hasQtQuick1(NodeInstanceView *nodeInstanceView)
 
 static void showCannotConnectToPuppetWarningAndSwitchToEditMode()
 {
-    QmlDesignerWarning::show(QCoreApplication::translate("NodeInstanceServerProxy", "Cannot Connect to Qml Emulation Layer (Qml Puppet)"),
-                             QCoreApplication::translate("NodeInstanceServerProxy", "The executable of the emulation layer process is maybe hanging. "
+    QmlDesignerWarning::show(QCoreApplication::translate("NodeInstanceServerProxy", "Cannot Connect to QML Emulation Layer (QML Puppet)"),
+                             QCoreApplication::translate("NodeInstanceServerProxy", "The executable of the QML emulation layer (QML Puppet) process is maybe hanging. "
                                                                                     "Switching to an other kit maybe helps."));
 
     QmlDesignerPlugin::instance()->switchToTextModeDeferred();
@@ -200,8 +200,8 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
        }
 
    } else {
-       QmlDesignerWarning::show(tr("Cannot Start QML Puppet Executable"),
-                            tr("The executable of the QML Puppet process cannot be started or does not respond."));
+       QmlDesignerWarning::show(tr("Cannot Start QML Emulation Layer (QML Puppet)"),
+                            tr("The executable of the QML emulation layer (QML Puppet) process cannot be started or is hanging."));
 
        QmlDesignerPlugin::instance()->switchToTextModeDeferred();
    }
@@ -384,8 +384,8 @@ void NodeInstanceServerProxy::processFinished(int exitCode, QProcess::ExitStatus
     if (m_captureFileForTest.isOpen()) {
         m_captureFileForTest.close();
         m_captureFileForTest.remove();
-        QMessageBox::warning(Core::ICore::dialogParent(), tr("QML Puppet Crashed"),
-                             tr("You are recording a puppet stream and the puppet crashed. "
+        QMessageBox::warning(Core::ICore::dialogParent(), tr("QML Emulation Layer (QML Puppet) Crashed"),
+                             tr("You are recording a puppet stream and the emulations layer crashed. "
                                 "It is recommended to reopen the Qt Quick Designer and start again."));
     }
 
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index 7e1c937b4e..f7e69c674e 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -184,16 +184,16 @@ bool PuppetCreator::build(const QString &qmlPuppetProjectFilePath) const
             }
 
             if (!buildSucceeded)
-                QmlDesignerWarning::show(QCoreApplication::translate("PuppetCreator", "Emulation layer building was unsuccessful"),
+                QmlDesignerWarning::show(QCoreApplication::translate("PuppetCreator", "QML Emulation Layer (QML Puppet) Building was Unsuccessful"),
                                          QCoreApplication::translate("PuppetCreator",
-                                                                     "The emulation layer (Qml Puppet) cannot be built. "
+                                                                     "The QML emulation layer (QML Puppet) cannot be built. "
                                                                      "The fallback emulation layer, which does not support all features, will be used."
                                                                      ));
         }
     } else {
         QmlDesignerWarning::show(QCoreApplication::translate("PuppetCreator", "Qt Version is not supported"),
                                  QCoreApplication::translate("PuppetCreator",
-                                                             "The emulation layer (Qml Puppet) cannot be built because the Qt version is too old "
+                                                             "The QML emulation layer (QML Puppet) cannot be built because the Qt version is too old "
                                                              "or it cannot run natively on your computer. "
                                                              "The fallback emulation layer, which does not support all features, will be used."
                                                              ));
@@ -206,7 +206,7 @@ static void warnAboutInvalidKit()
 {
     QmlDesignerWarning::show(QCoreApplication::translate("PuppetCreator", "Kit is invalid"),
                              QCoreApplication::translate("PuppetCreator",
-                                                         "The emulation layer (Qml Puppet) cannot be built because the kit is not configured correctly. "
+                                                         "The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. "
                                                          "For example the compiler can be misconfigured. "
                                                          "Fix the kit configuration and restart Qt Creator. "
                                                          "Otherwise, the fallback emulation layer, which does not support all features, will be used."