Merge remote-tracking branch 'origin/4.10'

 Conflicts:
	CMakeLists.txt
	tests/unit/unittest/unittest.pro

Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index 7141148ef8..7684de0795 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -104,7 +104,7 @@ public:
         : QDialog(parent), m_view(new Utils::TreeView(this))
     {
         setWindowTitle(QCoreApplication::translate("ProjectExplorer::JsonWizard",
-                                                   "Choose project file"));
+                                                   "Choose Project File"));
         const auto model = new ProjectFilesModel(candidates, this);
         m_view->setSelectionMode(Utils::TreeView::ExtendedSelection);
         m_view->setSelectionBehavior(Utils::TreeView::SelectRows);
@@ -121,7 +121,7 @@ public:
         const auto layout = new QVBoxLayout(this);
         layout->addWidget(new QLabel(QCoreApplication::translate("ProjectExplorer::JsonWizard",
             "The project contains more than one project file. "
-            "Please select the one you would like to use.")));
+            "Select the one you would like to use.")));
         layout->addWidget(m_view);
         layout->addWidget(buttonBox);
     }