Merge remote-tracking branch 'origin/2.0' into dev

Change-Id: I37a0773c0867ad6bc135f5e4156e352bdaedb99e

25 files changed, 205 insertions, 530 deletions

diff --git a/src/qmakefilereader/qmakefilereader.pro b/src/qmakefilereader/qmakefilereader.pro
index 951ef874..4ed539f8 100644
--- a/src/qmakefilereader/qmakefilereader.pro
+++ b/src/qmakefilereader/qmakefilereader.pro
@@ -4,6 +4,7 @@ DESTDIR = $$PWD/bin
 TARGET = QMakeFileReader
 
 include(../src.pri)
+include(../../vstools.pri)
 include(./evaluator/evaluator.pri)
 
 SOURCES += main.cpp \
diff --git a/src/qrceditor/mainwindow.cpp b/src/qrceditor/mainwindow.cpp
index 91b4ceb4..9e7aba07 100644
--- a/src/qrceditor/mainwindow.cpp
+++ b/src/qrceditor/mainwindow.cpp
@@ -51,7 +51,7 @@ MainWindow::MainWindow() :
     QToolBar* tb = new QToolBar("Title", this);
     tb->setMovable(false);
     addToolBar(Qt::TopToolBarArea, tb);
-    
+
     QAction* oa = fMenu->addAction(tr("&Open..."));
     oa->setShortcut(tr("Ctrl+O", "File|Open"));
     oa->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
@@ -108,12 +108,12 @@ void MainWindow::openFile(QString fileName)
         setWindowTitle(tr("Qt Resource Editor") + " - " + fi.fileName());
     }
     else
-        statusBar()->showMessage(tr("Unable to open %1!").arg(fileName));
+        statusBar()->showMessage(tr("Unable to open %1.").arg(fileName));
 }
 
 void MainWindow::slotOpen()
 {
-    const QString fileName = QFileDialog::getOpenFileName(this, tr("Choose resource file"),
+    const QString fileName = QFileDialog::getOpenFileName(this, tr("Choose Resource File"),
                                                           QString(),
                                                           tr("Resource files (*.qrc)"));
     this->openFile(fileName);
@@ -125,7 +125,7 @@ void MainWindow::slotSave()
     QString fileName = oldFileName;
 
     if (fileName.isEmpty()) {
-        fileName = QFileDialog::getSaveFileName(this, tr("Save resource file"),
+        fileName = QFileDialog::getSaveFileName(this, tr("Save Resource File"),
                                                 QString(),
                                                 tr("Resource files (*.qrc)"));
         if (fileName.isEmpty())
@@ -137,7 +137,7 @@ void MainWindow::slotSave()
         statusBar()->showMessage(tr("%1 written").arg(fileName));
         sendFileNameToQtAppWrapper();
     } else {
-        statusBar()->showMessage(tr("Unable to write %1!").arg(fileName));
+        statusBar()->showMessage(tr("Unable to write %1.").arg(fileName));
         m_qrcEditor->setFileName(oldFileName);
     }
 }
@@ -177,7 +177,7 @@ int MainWindow::fileChangedDialog()
     QMessageBox message(this);
     message.setText(tr("The .qrc file has been modified."));
     message.setWindowTitle("Qt Resource Editor");
-    message.setInformativeText(tr("Do you want the changes to be saved?"));
+    message.setInformativeText(tr("Do you want to save the changes?"));
     message.setStandardButtons(QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
     message.setDefaultButton(QMessageBox::Yes);
     return message.exec();
diff --git a/src/qrceditor/qrceditor.pro b/src/qrceditor/qrceditor.pro
index 6ae628fe..775b5046 100644
--- a/src/qrceditor/qrceditor.pro
+++ b/src/qrceditor/qrceditor.pro
@@ -4,6 +4,7 @@ TARGET = QrcEditor
 DESTDIR = $$PWD/bin
 
 include(../src.pri)
+include(../../vstools.pri)
 include(./shared/qrceditor.pri)
 
 SOURCES += main.cpp \
diff --git a/src/qrceditor/shared/qrceditor.cpp b/src/qrceditor/shared/qrceditor.cpp
index 9d7a3d1b..abc065ca 100644
--- a/src/qrceditor/shared/qrceditor.cpp
+++ b/src/qrceditor/shared/qrceditor.cpp
@@ -226,7 +226,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
         } else {
             // Path troublesome -> query user
             QMessageBox message(this);
-            message.setWindowTitle(tr("Invalid file location"));
+            message.setWindowTitle(tr("Invalid File Location"));
             message.setIcon(QMessageBox::Warning);
             QPushButton * const copyButton = message.addButton(tr("Copy"), QMessageBox::ActionRole);
             QPushButton * skipButton = NULL;
@@ -262,7 +262,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
                     }
                     if (QFile::exists(copyName)) {
                         if (!QFile::remove(copyName)) {
-                            QMessageBox::critical(this, tr("Overwrite failed"),
+                            QMessageBox::critical(this, tr("Overwrite Failed"),
                                                   tr("Could not overwrite file %1.")
                                                   .arg(QDir::toNativeSeparators(copyName)));
                             // Remove file
@@ -273,7 +273,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
                         }
                     }
                     if (!QFile::copy(file, copyName)) {
-                        QMessageBox::critical(this, tr("Copying failed"),
+                        QMessageBox::critical(this, tr("Copying Failed"),
                                               tr("Could not copy the file to %1.")
                                               .arg(QDir::toNativeSeparators(copyName)));
                         // Remove file
diff --git a/src/qrceditor/shared/resourceview.cpp b/src/qrceditor/shared/resourceview.cpp
index c61a82e4..4e937560 100644
--- a/src/qrceditor/shared/resourceview.cpp
+++ b/src/qrceditor/shared/resourceview.cpp
@@ -405,7 +405,7 @@ QModelIndex ResourceView::addPrefix()
 
 QStringList ResourceView::fileNamesToAdd()
 {
-    return QFileDialog::getOpenFileNames(this, tr("Open file"),
+    return QFileDialog::getOpenFileNames(this, tr("Open File"),
             m_qrcModel->absolutePath(QString()),
             tr("All files (*)"));
 }
@@ -500,7 +500,7 @@ void ResourceView::changePrefix(const QModelIndex &index)
     QString dummy;
     m_qrcModel->getItem(preindex, prefixBefore, dummy);
 
-    QString const prefixAfter = QInputDialog::getText(this, tr("Change Prefix"), tr("Input Prefix:"),
+    QString const prefixAfter = QInputDialog::getText(this, tr("Change Prefix"), tr("Input prefix:"),
         QLineEdit::Normal, prefixBefore, &ok);
 
     if (ok)
diff --git a/src/qtprojectlib/HelperFunctions.cs b/src/qtprojectlib/HelperFunctions.cs
index 382cac7c..e89289d4 100644
--- a/src/qtprojectlib/HelperFunctions.cs
+++ b/src/qtprojectlib/HelperFunctions.cs
@@ -158,9 +158,12 @@ namespace QtProjectLib
             string activePlatformName = "";
             if (string.IsNullOrEmpty(solutionConfig)) {
                 // First get active configuration cause not given as parameter
-                EnvDTE.Configuration activeConf = prj.ConfigurationManager.ActiveConfiguration;
-                solutionConfig = activeConf.ConfigurationName + "|" + activeConf.PlatformName;
-                activePlatformName = activeConf.PlatformName;
+                try {
+                    var activeConf = prj.ConfigurationManager.ActiveConfiguration;
+                    activePlatformName = activeConf.PlatformName;
+                } catch {
+                    Messages.PaneMessage(prj.DTE, "Could not get the active platform name.");
+                }
             } else {
                 activePlatformName = solutionConfig.Split('|')[1];
             }
diff --git a/src/qtprojectlib/Messages.cs b/src/qtprojectlib/Messages.cs
index 253a32d0..ec6d6bcf 100644
--- a/src/qtprojectlib/Messages.cs
+++ b/src/qtprojectlib/Messages.cs
@@ -46,7 +46,7 @@ namespace QtProjectLib
         {
             var wnd = (EnvDTE.OutputWindow) dte.Windows.Item(EnvDTE.Constants.vsWindowKindOutput).Object;
             if (wndp == null) {
-                wndp = wnd.OutputWindowPanes.Add(Resources.msgBoxCaption);
+                wndp = wnd.OutputWindowPanes.Add(SR.GetString("Resources_QtVsTools"));
             }
 
             wndp.OutputString(str + "\r\n");
@@ -88,14 +88,14 @@ namespace QtProjectLib
         {
             MessageBox.Show(ErrorString +
                 ExceptionToString(e),
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         static public void DisplayCriticalErrorMessage(string msg)
         {
             MessageBox.Show(ErrorString +
                 MessageToString(msg),
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         static public void DisplayErrorMessage(System.Exception e, string solution)
@@ -104,7 +104,7 @@ namespace QtProjectLib
                 ExceptionToString(e) +
                 SolutionString +
                 solution,
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         static public void DisplayErrorMessage(string msg, string solution)
@@ -113,21 +113,21 @@ namespace QtProjectLib
                 MessageToString(msg) +
                 SolutionString +
                 solution,
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         static public void DisplayErrorMessage(System.Exception e)
         {
             MessageBox.Show(ErrorString +
                 ExceptionToString(e),
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         static public void DisplayErrorMessage(string msg)
         {
             MessageBox.Show(ErrorString +
                 MessageToString(msg),
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         static public void DisplayWarningMessage(System.Exception e, string solution)
@@ -136,7 +136,7 @@ namespace QtProjectLib
                 ExceptionToString(e) +
                 SolutionString +
                 solution,
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
 
         static public void DisplayWarningMessage(string msg, string solution)
@@ -145,21 +145,21 @@ namespace QtProjectLib
                 MessageToString(msg) +
                 SolutionString +
                 solution,
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
 
         static public void DisplayWarningMessage(System.Exception e)
         {
             MessageBox.Show(WarningString +
                 ExceptionToString(e),
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
 
         static public void DisplayWarningMessage(string msg)
         {
             MessageBox.Show(WarningString +
                 MessageToString(msg),
-                Resources.msgBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                SR.GetString("Resources_QtVsTools"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
     }
 }
diff --git a/src/qtprojectlib/ProjectImporter.cs b/src/qtprojectlib/ProjectImporter.cs
index d2079ed6..c71776ee 100644
--- a/src/qtprojectlib/ProjectImporter.cs
+++ b/src/qtprojectlib/ProjectImporter.cs
@@ -83,7 +83,7 @@ namespace QtProjectLib
             var VCInfo = RunQmake(mainInfo, ".sln", true, versionInfo);
             if (null == VCInfo)
                 return;
-            ReplaceAbsoluteQtDirInSolution(VCInfo);
+            ReplaceAbsoluteQtDirInSolution(VCInfo, versionInfo);
 
             try {
                 if (CheckQtVersion(versionInfo)) {
@@ -112,7 +112,7 @@ namespace QtProjectLib
             if (null == VCInfo)
                 return;
 
-            ReplaceAbsoluteQtDirInProject(VCInfo);
+            ReplaceQtDirInProject(VCInfo, versionInfo);
 
             try {
                 if (CheckQtVersion(versionInfo)) {
@@ -178,12 +178,12 @@ namespace QtProjectLib
             }
         }
 
-        private void ReplaceAbsoluteQtDirInSolution(FileInfo solutionFile)
+        private void ReplaceAbsoluteQtDirInSolution(FileInfo solutionFile, VersionInformation vi)
         {
             var projects = ParseProjectsFromSolution(solutionFile);
             foreach (string project in projects) {
                 var projectInfo = new FileInfo(project);
-                ReplaceAbsoluteQtDirInProject(projectInfo);
+                ReplaceQtDirInProject(projectInfo, vi);
             }
         }
 
@@ -205,15 +205,18 @@ namespace QtProjectLib
             return projects;
         }
 
-        private void ReplaceAbsoluteQtDirInProject(FileInfo projectFile)
+        private void ReplaceQtDirInProject(FileInfo projectFile, VersionInformation vi)
         {
             var sr = projectFile.OpenText();
             var content = sr.ReadToEnd();
             sr.Close();
 
-            var qtDir = ParseQtDirFromFileContent(content);
+            var qtDir = ParseQtDirFromFileContent(content, vi);
             if (!string.IsNullOrEmpty(qtDir)) {
                 content = content.Replace(qtDir, "$(QTDIR)\\", StringComparison.OrdinalIgnoreCase);
+                // qmake tends to write relative and absolute paths into the .vcxproj file
+                if (!Path.IsPathRooted(qtDir)) // if the project is on the same drive as Qt.
+                    content = content.Replace(vi.qtDir + '\\', "$(QTDIR)\\", StringComparison.OrdinalIgnoreCase);
                 var sw = projectFile.CreateText();
                 sw.Write(content);
                 sw.Flush();
@@ -223,11 +226,18 @@ namespace QtProjectLib
             }
         }
 
-        private static string ParseQtDirFromFileContent(string vcFileContent)
+        private static string ParseQtDirFromFileContent(string vcFileContent, VersionInformation vi)
         {
+            // Starting with Qt5 beta2 the "\\mkspecs\\default" folder is not available anymore,
+            var mkspecs = "mkspecs\\"; // try to use the spec we run qmake with.
+            var index = vi.QMakeSpecDirectory.IndexOf(mkspecs, StringComparison.OrdinalIgnoreCase);
+            if (!string.IsNullOrEmpty(vi.QMakeSpecDirectory) && index >= 0)
+                mkspecs = vi.QMakeSpecDirectory.Substring(index);
+
             var uicQtDir = FindQtDirFromExtension(vcFileContent, "bin\\uic.exe");
             var rccQtDir = FindQtDirFromExtension(vcFileContent, "bin\\rcc.exe");
-            var mkspecQtDir = FindQtDirFromExtension(vcFileContent, "mkspecs\\default");
+            var mkspecQtDir = FindQtDirFromExtension(vcFileContent, mkspecs);
+
             if (!string.IsNullOrEmpty(mkspecQtDir)) {
                 if (!string.IsNullOrEmpty(uicQtDir) && uicQtDir.ToLower() != mkspecQtDir.ToLower()) {
                     return "";
@@ -271,8 +281,6 @@ namespace QtProjectLib
                 s = s.Trim(new char[] { ' ', '\"', ',' });
                 if (s.StartsWith(">", StringComparison.Ordinal))
                     s = s.Substring(1);
-                if (!Path.IsPathRooted(s))
-                    s = null;
             }
             return s;
         }
diff --git a/src/qtprojectlib/QMakeConf.cs b/src/qtprojectlib/QMakeConf.cs
index 191d943b..4ca6ae40 100644
--- a/src/qtprojectlib/QMakeConf.cs
+++ b/src/qtprojectlib/QMakeConf.cs
@@ -36,7 +36,6 @@ namespace QtProjectLib
     {
         protected Hashtable mEntries = new Hashtable();
         private FileInfo fileInfo;
-        private string qmakespecFolder = "";
 
         public QMakeConf(VersionInformation versionInfo)
         {
@@ -59,28 +58,30 @@ namespace QtProjectLib
             }
         }
 
+        public string QMakeSpecDirectory { get; private set; }
+
         protected void Init(VersionInformation versionInfo)
         {
-            string filename = versionInfo.qtDir + "\\mkspecs\\default\\qmake.conf";
-            fileInfo = new FileInfo(filename);
+            QMakeSpecDirectory = Path.Combine(versionInfo.qtDir, "mkspecs", "default");
+            var qmakeConf = Path.Combine(QMakeSpecDirectory, "qmake.conf");
 
             // Starting from Qt5 beta2 there is no more "\\mkspecs\\default" folder available
             // To find location of "qmake.conf" there is a need to run "qmake -query" command
             // This is what happens below.
-            if (!fileInfo.Exists) {
+            if (!File.Exists(qmakeConf)) {
                 var qmakeQuery = new QMakeQuery(versionInfo);
-                qmakespecFolder = qmakeQuery.query("QMAKE_XSPEC");
+                var qmakespecDir = qmakeQuery.query("QMAKE_XSPEC");
 
-                if (qmakeQuery.ErrorValue == 0 && qmakespecFolder.Length > 0) {
-                    filename = versionInfo.qtDir + "\\mkspecs\\" + qmakespecFolder + "\\qmake.conf";
-                    fileInfo = new FileInfo(filename);
+                if (qmakeQuery.ErrorValue == 0 && !string.IsNullOrEmpty(qmakespecDir)) {
+                    QMakeSpecDirectory = Path.Combine(versionInfo.qtDir, "mkspecs", qmakespecDir);
+                    qmakeConf = Path.Combine(QMakeSpecDirectory, "qmake.conf");
                 }
 
-                if (qmakeQuery.ErrorValue != 0 || !fileInfo.Exists)
-                    throw new QtVSException("qmake.conf expected at " + filename + " not found");
+                if (qmakeQuery.ErrorValue != 0 || !File.Exists(qmakeConf))
+                    throw new QtVSException("qmake.conf expected at " + qmakeConf + " not found");
             }
 
-            Init(filename);
+            Init(qmakeConf);
         }
 
         protected void Init(string filename)
@@ -138,9 +139,18 @@ namespace QtProjectLib
                     line = streamReader.ReadLine();
                 }
                 streamReader.Close();
+
+                RemoveQmakeSubsystemSuffix("QMAKE_LFLAGS_CONSOLE", ref entries);
+                RemoveQmakeSubsystemSuffix("QMAKE_LFLAGS_WINDOWS", ref entries);
             }
         }
 
+        static void RemoveQmakeSubsystemSuffix(string key, ref Hashtable hash)
+        {
+            if (hash.Contains(key))
+                hash[key] = hash[key].ToString().Replace("@QMAKE_SUBSYSTEM_SUFFIX@", string.Empty);
+        }
+
         private string ExpandVariables(string value, Hashtable entries)
         {
             var pos = value.IndexOf("$$", StringComparison.Ordinal);
diff --git a/src/qtprojectlib/QMakeProcess.cs b/src/qtprojectlib/QMakeProcess.cs
index 15469cbd..6bcbe2a5 100644
--- a/src/qtprojectlib/QMakeProcess.cs
+++ b/src/qtprojectlib/QMakeProcess.cs
@@ -82,7 +82,7 @@ namespace QtProjectLib
             MinimizeBox = false;
             Name = "Form1";
             ShowInTaskbar = false;
-            Text = Resources.msgBoxCaption;
+            Text = SR.GetString("Resources_QtVsTools");
             StartPosition = FormStartPosition.CenterParent;
 
             ResumeLayout(false);
@@ -171,6 +171,17 @@ namespace QtProjectLib
                 InvokeExternalTarget(PaneMessageDataEvent, "--- (qmake) : Arguments: "
                     + qmakeProcess.StartInfo.Arguments
                     + Environment.NewLine);
+                if (qmakeProcess.StartInfo.EnvironmentVariables.ContainsKey("QMAKESPEC")) {
+                    var qmakeSpec = qmakeProcess.StartInfo.EnvironmentVariables["QMAKESPEC"];
+                    if (qmakeSpec != qtVersionInformation.QMakeSpecDirectory) {
+                        InvokeExternalTarget(PaneMessageDataEvent, "--- (qmake) : Environment "
+                            + "variable QMAKESPEC overwriting Qt version QMAKESPEC.");
+                        InvokeExternalTarget(PaneMessageDataEvent, "--- (qmake) : Qt version "
+                            + "QMAKESPEC: " + qtVersionInformation.QMakeSpecDirectory);
+                        InvokeExternalTarget(PaneMessageDataEvent,"--- (qmake) : Environment "
+                            + "variable QMAKESPEC: " + qmakeSpec + Environment.NewLine);
+                    }
+                }
 
                 if (qmakeProcess.Start()) {
                     errOutput = new StringBuilder();
diff --git a/src/qtprojectlib/QtProject.cs b/src/qtprojectlib/QtProject.cs
index f16587fd..6d229508 100644
--- a/src/qtprojectlib/QtProject.cs
+++ b/src/qtprojectlib/QtProject.cs
@@ -1839,7 +1839,7 @@ namespace QtProjectLib
             bool replace = true;
             if (File.Exists(fullDestName)) {
                 if (DialogResult.No == MessageBox.Show(SR.GetString("QtProject_FileExistsInProjectFolder", destName)
-                    , Resources.msgBoxCaption, MessageBoxButtons.YesNo, MessageBoxIcon.Question)) {
+                    , SR.GetString("Resources_QtVsTools"), MessageBoxButtons.YesNo, MessageBoxIcon.Question)) {
                     replace = false;
                 }
             }
@@ -2545,7 +2545,12 @@ namespace QtProjectLib
                         context.ShouldBuild = false;
                 }
             }
-            envPro.DTE.Solution.SolutionBuild.Clean(true);
+            try {
+                envPro.DTE.Solution.SolutionBuild.Clean(true);
+            } catch (System.Runtime.InteropServices.COMException e) {
+                // TODO: Implement some logging mechanism for exceptions.
+            }
+
             foreach (KeyValuePair<SolutionContext, bool> item in backup)
                 item.Key.ShouldBuild = item.Value;
         }
diff --git a/src/qtprojectlib/Resources.cs b/src/qtprojectlib/Resources.cs
index d66f3118..a80a2420 100644
--- a/src/qtprojectlib/Resources.cs
+++ b/src/qtprojectlib/Resources.cs
@@ -98,8 +98,6 @@ namespace QtProjectLib
         public const string generatedFilesDir = "GeneratedFiles";
         #endregion
 
-        public static string msgBoxCaption = SR.GetString("Resources_QtVisualStudioIntegration");
-
         public const string mocDirKeyword = "MocDir";
         public const string mocOptionsKeyword = "MocOptions";
         public const string uicDirKeyword = "UicDir";
diff --git a/src/qtprojectlib/Resources.resx b/src/qtprojectlib/Resources.resx
index d48244f6..27c9e708 100644
--- a/src/qtprojectlib/Resources.resx
+++ b/src/qtprojectlib/Resources.resx
@@ -117,12 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="OK" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>&amp;Cancel</value>
-  </data>
   <data name="ExportSolution" xml:space="preserve">
     <value>Export Solution</value>
   </data>
@@ -130,11 +124,11 @@
     <value>Open Solution</value>
   </data>
   <data name="ProjectExists" xml:space="preserve">
-    <value>Project file exists!</value>
+    <value>Project file already exists.</value>
   </data>
   <data name="ExportProject_CheckFileAndSyntax" xml:space="preserve">
-    <value>1. Check that all the files exists.
-2. Check for syntax errors in the pri file.</value>
+    <value>1. Check that all the files exist.
+2. Check for syntax errors in the .pri file.</value>
   </data>
   <data name="ExportProject_EditProjectFileManually" xml:space="preserve">
     <value>qmake has generated a .vcproj file, but it needs to be converted.
@@ -142,7 +136,7 @@ To do this you must open the .vcproj file manually.
 (Reason: qmake in Qt3 does not support generation of Visual Studio 2005 .vcproj files)</value>
   </data>
   <data name="ExportProject_ErrorParsingPriFile" xml:space="preserve">
-    <value>Error while parsing pri file! ({0})</value>
+    <value>Error while parsing .pri file. ({0})</value>
   </data>
   <data name="ExportProject_ExistsOverwriteQuestion" xml:space="preserve">
     <value>{0} already exists.
@@ -150,22 +144,22 @@ To do this you must open the .vcproj file manually.
 Do you want to overwrite it?</value>
   </data>
   <data name="ExportProject_ExportPriFile" xml:space="preserve">
-    <value>Export to .pri file</value>
+    <value>Export to .pri File</value>
   </data>
   <data name="ExportProject_ImportPriFile" xml:space="preserve">
-    <value>Import from .pri file</value>
+    <value>Import from .pri File</value>
   </data>
   <data name="ExportProject_NoProjectsToExport" xml:space="preserve">
-    <value>Did not find any Qt4 projects to export.</value>
+    <value>Cannot find any Qt 4 projects to export.</value>
   </data>
   <data name="ExportProject_PriFileContainsSpaces" xml:space="preserve">
-    <value>The generated pri file contains paths with spaces. You will not be able to import from this file!
-1. Manually edit the generated pri file.
+    <value>The generated .pri file contains paths with spaces. You will not be able to import from this file.
+1. Manually edit the generated .pri file.
 2. Move your project to a location without spaces in the path.
-3. Place the pri file in another directory.</value>
+3. Place the .pri file in another directory.</value>
   </data>
   <data name="ExportProject_ProjectExistsRegenerateOrReuse" xml:space="preserve">
-    <value>{0} already exists!
+    <value>{0} already exists.
 Select 'Yes' to regenerate the file, and 'No' to use the existing one.</value>
   </data>
   <data name="ExportProject_ProjectOrSolutionCorrupt" xml:space="preserve">
@@ -173,14 +167,14 @@ Select 'Yes' to regenerate the file, and 'No' to use the existing one.</value>
 (Maybe the .vcproj or .sln file is corrupt?)</value>
   </data>
   <data name="ExportProject_SelectQtProjectToAdd" xml:space="preserve">
-    <value>Select a Qt Project to add to the Solution</value>
+    <value>Select a Qt Project to Add to the Solution</value>
   </data>
   <data name="ExportProject_SolutionProFileBuildIn" xml:space="preserve">
     <value>Do you want a solution .pro file to be built in {0}?</value>
   </data>
   <data name="ExportProject_SubdirsProfileSolutionClose" xml:space="preserve">
-    <value>It looks like this is a SUBDIRS .pro file. In order to open this
-file the existing solution needs to be closed (pending changes will be saved).</value>
+    <value>This seems to be a SUBDIRS .pro file. To open this file, the existing
+    solution needs to be closed (pending changes will be saved).</value>
   </data>
   <data name="ExportProjectDialog_Cancel" xml:space="preserve">
     <value>&amp;Cancel</value>
@@ -204,19 +198,13 @@ file the existing solution needs to be closed (pending changes will be saved).</
     <value>Export Project</value>
   </data>
   <data name="QMakeProcess_OpenSolutionFromFile" xml:space="preserve">
-    <value>Open Solution from File: </value>
-  </data>
-  <data name="HelperFunctions_TryCreatingNewProject" xml:space="preserve">
-    <value>Try creating a new project.</value>
-  </data>
-  <data name="HelperFunctions_ErrorSearchForQtTemplatePath" xml:space="preserve">
-    <value>An error occured while searching for the Qt templates path.</value>
+    <value>Open solution from file: </value>
   </data>
   <data name="HelperFunctions_CannotWriteEnvQTDIR" xml:space="preserve">
     <value>Cannot write environment variable QTDIR.</value>
   </data>
   <data name="Messages_ErrorOccured" xml:space="preserve">
-    <value>The following error occured:
+    <value>The following error occurred:
 </value>
   </data>
   <data name="Messages_Warning" xml:space="preserve">
@@ -225,24 +213,24 @@ file the existing solution needs to be closed (pending changes will be saved).</
   </data>
   <data name="Messages_SolveProblem" xml:space="preserve">
     <value>
-      
+
 To solve this problem:
 </value>
   </data>
   <data name="QtProject_CannotConstructWithoutValidProject" xml:space="preserve">
-    <value>Cannot construct a QtProject object without a valid project!</value>
+    <value>Cannot construct a QtProject object without a valid project.</value>
   </data>
   <data name="QtProject_CannotAddUicStep" xml:space="preserve">
-    <value>Cannot add uic step to file {0}</value>
+    <value>Cannot add a uic step to file {0}</value>
   </data>
   <data name="QtProject_CannotAddMocStep" xml:space="preserve">
-    <value>Cannot add moc step to file {0}</value>
+    <value>Cannot add a moc step to file {0}</value>
   </data>
   <data name="QtProject_CannotRemoveMocStep" xml:space="preserve">
-    <value>Cannot remove moc step from file {0}</value>
+    <value>Cannot remove a moc step from file {0}</value>
   </data>
   <data name="QtProject_CannotAddFilter" xml:space="preserve">
-    <value>Project can't add filter {0}</value>
+    <value>Project cannot add filter {0}</value>
   </data>
   <data name="QtProject_CannotAddFile" xml:space="preserve">
     <value>Cannot add file {0} to filter.</value>
@@ -258,47 +246,47 @@ To solve this problem:
     <value>Cannot find filter.</value>
   </data>
   <data name="QtProject_ProjectCannotAddFilter" xml:space="preserve">
-    <value>Project can't add filter {0}</value>
+    <value>Project cannot add filter {0}</value>
   </data>
   <data name="QtProject_ProjectCannotAddResourceFilter" xml:space="preserve">
-    <value>Cannot add resource filter.</value>
+    <value>Cannot add a resource filter.</value>
   </data>
   <data name="QtProject_CannotCreateResourceDir" xml:space="preserve">
-    <value>Cannot create resource directory.</value>
+    <value>Cannot create a resource directory.</value>
   </data>
   <data name="QtProject_CannotAdjustWhitespaces" xml:space="preserve">
-    <value>Can't adjust whitespaces or tabs in file (write).
+    <value>Cannot adjust whitespace or tabs in file (write).
 ({0})</value>
   </data>
   <data name="QtProject_CannotReplaceTokenRead" xml:space="preserve">
-    <value>Can't replace token ({0} -&gt; {1}) in file (read).
+    <value>Cannot replace token ({0} -&gt; {1}) in file (read).
 ({3})</value>
   </data>
   <data name="QtProject_CannotReplaceTokenWrite" xml:space="preserve">
-    <value>Can't replace token ({0} -&gt; {1}) in file (write).
+    <value>Cannot replace token ({0} -&gt; {1}) in file (write).
 ({3})</value>
   </data>
   <data name="QtProject_CannotEnableSectionRead" xml:space="preserve">
-    <value>Can't enable section {0} in file (read).
+    <value>Cannot enable section {0} in file (read).
 ({1})</value>
   </data>
   <data name="QtProject_CannotEnableSectionWrite" xml:space="preserve">
-    <value>Can't enable section {0} in file (write).
+    <value>Cannot enable section {0} in file (write).
 ({1})</value>
   </data>
   <data name="QtProject_CannotUpdateUicStep" xml:space="preserve">
-    <value>Cannot update uic steps!</value>
+    <value>Cannot update uic steps.</value>
   </data>
   <data name="QtProject_FileExistsInProjectFolder" xml:space="preserve">
-    <value>The file {0} existst in your project folder. Qt Visual Studio Tools will overwrite the existing file!
+    <value>The file {0} exists in your project folder. Qt VS Tools will overwrite the existing file.
 
-Select 'Yes' to overwrite, select 'No' to keep the existing file and automatically readd it to the project.</value>
+Select 'Yes' to overwrite, select 'No' to keep the existing file and automatically add it to the project.</value>
   </data>
   <data name="QtVersionManager_CannotLoadQtVersion" xml:space="preserve">
     <value>Cannot load the default Qt version.</value>
   </data>
-  <data name="Resources_QtVisualStudioIntegration" xml:space="preserve">
-    <value>Qt Visual Studio Tools</value>
+  <data name="Resources_QtVsTools" xml:space="preserve">
+    <value>Qt VS Tools</value>
   </data>
   <data name="Resources_AddQtResource" xml:space="preserve">
     <value>Add Qt Resource</value>
@@ -321,21 +309,15 @@ Select 'Yes' to overwrite, select 'No' to keep the existing file and automatical
   <data name="Resources_GeneratedFiles" xml:space="preserve">
     <value>Generated Files</value>
   </data>
-  <data name="CommandBarNotFound" xml:space="preserve">
-    <value>Could not add "Qt" entry to command bar.</value>
-  </data>
   <data name="QtProject_CannotFindCustomBuildTool" xml:space="preserve">
     <value>Could not find custom build tool for {0}.</value>
   </data>
   <data name="QtProject_CannotAccessUserFile" xml:space="preserve">
-    <value>Could not add QTDIR to {0}'s user file.</value>
+    <value>Could not add QTDIR to {0}'s .user file.</value>
   </data>
   <data name="ImportProject_CannotFindQtDirectory" xml:space="preserve">
     <value>Could not parse QTDIR from project file {0}.</value>
   </data>
-  <data name="Helpers_ExitError" xml:space="preserve">
-    <value>The application exited with an error (ExitCode {0}):</value>
-  </data>
   <data name="Resources_OtherFiles" xml:space="preserve">
     <value>Other Files</value>
   </data>
diff --git a/src/qtprojectlib/VersionInformation.cs b/src/qtprojectlib/VersionInformation.cs
index 6f8fd2ce..3e03f371 100644
--- a/src/qtprojectlib/VersionInformation.cs
+++ b/src/qtprojectlib/VersionInformation.cs
@@ -112,6 +112,11 @@ namespace QtProjectLib
             get; private set;
         }
 
+        public string QMakeSpecDirectory
+        {
+            get { return qmakeConf.QMakeSpecDirectory; }
+        }
+
         public bool IsStaticBuild()
         {
             if (qtConfig == null)
diff --git a/src/qttemplates/designer/designer.vstemplate b/src/qttemplates/designer/designer.vstemplate
index e8ab9609..748daa7e 100644
--- a/src/qttemplates/designer/designer.vstemplate
+++ b/src/qttemplates/designer/designer.vstemplate
@@ -34,8 +34,8 @@
             xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010"
             Type="Project" >
     <TemplateData>
-        <Name>Qt Custom Designer Widget</Name>
-        <Description>This wizard generates a Qt Custom Designer widget.</Description>
+        <Name>Qt Designer Custom Widget</Name>
+        <Description>This wizard generates a Qt Designer Custom widget.</Description>
         <ProjectType>VC</ProjectType>
         <SortOrder>1000</SortOrder>
         <CreateNewFolder>true</CreateNewFolder>
diff --git a/src/qttemplates/dialogbuttonbottom/dialogbuttonbottom.vstemplate b/src/qttemplates/dialogbuttonbottom/dialogbuttonbottom.vstemplate
index affb9b3b..c6b1b2b4 100644
--- a/src/qttemplates/dialogbuttonbottom/dialogbuttonbottom.vstemplate
+++ b/src/qttemplates/dialogbuttonbottom/dialogbuttonbottom.vstemplate
@@ -34,7 +34,7 @@
             xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010"
             Type="Item">
     <TemplateData>
-        <Name>Qt Dialog Form File (Button bottom)</Name>
+        <Name>Qt Dialog Form File (Button Bottom)</Name>
         <Icon>dialogbuttonbottom.ico</Icon>
         <ProjectType>VC</ProjectType>
         <AppliesTo>VisualC</AppliesTo>
diff --git a/src/qttemplates/dialogbuttonright/dialogbuttonright.vstemplate b/src/qttemplates/dialogbuttonright/dialogbuttonright.vstemplate
index 60794e83..76406071 100644
--- a/src/qttemplates/dialogbuttonright/dialogbuttonright.vstemplate
+++ b/src/qttemplates/dialogbuttonright/dialogbuttonright.vstemplate
@@ -34,7 +34,7 @@
             xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010"
             Type="Item">
     <TemplateData>
-        <Name>Qt Dialog Form File (Button right)</Name>
+        <Name>Qt Dialog Form File (Button Right)</Name>
         <Icon>dialogbuttonright.ico</Icon>
         <ProjectType>VC</ProjectType>
         <AppliesTo>VisualC</AppliesTo>
diff --git a/src/qtvstools/DefaultEditorsHandler.cs b/src/qtvstools/DefaultEditorsHandler.cs
index e4ede9fe..f2f4bff6 100644
--- a/src/qtvstools/DefaultEditorsHandler.cs
+++ b/src/qtvstools/DefaultEditorsHandler.cs
@@ -137,7 +137,7 @@ namespace QtVsTools
             if (QtVSIPSettings.GetAskBeforeCheckoutFile()) {
                 var shortFileName = Path.GetFileName(fileName);
                 var dr = MessageBox.Show(SR.GetString("QuestionSCCCheckoutOnOpen", shortFileName),
-                    Resources.msgBoxCaption, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question,
+                    SR.GetString("Resources_QtVsTools"), MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question,
                     MessageBoxDefaultButton.Button1);
                 if (dr == DialogResult.Cancel)
                     abortOperation = true;
@@ -267,7 +267,7 @@ namespace QtVsTools
 
             qtDir = HelperFunctions.FindQtDirWithTools(tool, qtVersion);
             if (string.IsNullOrEmpty(qtDir))
-                MessageBox.Show(SR.GetString("NoDefaultQtVersionError"), Resources.msgBoxCaption);
+                MessageBox.Show(SR.GetString("NoDefaultQtVersionError"), SR.GetString("Resources_QtVsTools"));
             return !string.IsNullOrEmpty(qtDir);
         }
 
diff --git a/src/qtvstools/FormProjectQtSettings.cs b/src/qtvstools/FormProjectQtSettings.cs
index 62113b6c..75b8ceea 100644
--- a/src/qtvstools/FormProjectQtSettings.cs
+++ b/src/qtvstools/FormProjectQtSettings.cs
@@ -82,7 +82,7 @@ namespace QtVsTools
             scriptToolsLib.Text = SR.GetString("ScriptToolsLibrary");
             uiToolsLib.Text = SR.GetString("UiToolsLibrary");
 
-            threeDLib.Text = SR.GetString("3DLibrary");
+            threeDLib.Text = SR.GetString("ThreeDLibrary");
             locationLib.Text = SR.GetString("LocationLibrary");
             qmlLib.Text = SR.GetString("QmlLibrary");
             quickLib.Text = SR.GetString("QuickLibrary");
@@ -176,6 +176,12 @@ namespace QtVsTools
 
         private void okButton_Click(object sender, EventArgs e)
         {
+            // Disable the buttons since some operations are quite expensive (e.g. changing
+            // the Qt version) and take some to finish. Keeping the buttons enables allows to hit
+            // the buttons several times resulting in successive executions of these operations.
+            okButton.Enabled = false;
+            cancelButton.Enabled = false;
+
             qtSettings.SaveSettings();
             saveModules();
             okButton.DialogResult = DialogResult.OK;
diff --git a/src/qtvstools/FormVSQtSettings.cs b/src/qtvstools/FormVSQtSettings.cs
index 008c3042..a5b47282 100644
--- a/src/qtvstools/FormVSQtSettings.cs
+++ b/src/qtvstools/FormVSQtSettings.cs
@@ -47,8 +47,8 @@ namespace QtVsTools
                 HorizontalAlignment.Left);
             listView.Columns.Add(SR.GetString("BuildOptionsPage_Path"), 180,
                 HorizontalAlignment.Left);
-            addButton.Text = SR.GetString(SR.Add);
-            deleteButton.Text = SR.GetString(SR.Delete);
+            addButton.Text = SR.GetString("Add");
+            deleteButton.Text = SR.GetString("Delete");
             label2.Text = SR.GetString("BuildOptionsPage_DefaultQtVersion");
             okButton.Text = SR.GetString("OK");
             cancelButton.Text = SR.GetString("Cancel");
diff --git a/src/qtvstools/QtMenus.vsct b/src/qtvstools/QtMenus.vsct
index 8857c474..80f874d4 100644
--- a/src/qtvstools/QtMenus.vsct
+++ b/src/qtvstools/QtMenus.vsct
@@ -180,8 +180,8 @@
                 <Icon guid="MenuImages" id="LaunchDesignerBitmap" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>Launch Designer</ButtonText>
-                    <ToolTipText>This will start Qt Designer.</ToolTipText>
+                    <ButtonText>Launch Qt Designer</ButtonText>
+                    <ToolTipText>Start Qt Designer</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="LaunchLinguistId" priority="0x0100" type="Button">
@@ -189,8 +189,8 @@
                 <Icon guid="MenuImages" id="LaunchLinguistBitmap" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>Launch Linguist</ButtonText>
-                    <ToolTipText>This will start Qt Linguist.</ToolTipText>
+                    <ButtonText>Launch Qt Linguist</ButtonText>
+                    <ToolTipText>Start Qt Linguist</ToolTipText>
                 </Strings>
             </Button>
 
@@ -199,7 +199,7 @@
                 <Icon guid="MenuImages" id="OpenProFileBitmap" />
                 <Strings>
                     <ButtonText>Open Qt Project File (.pro)...</ButtonText>
-                    <ToolTipText>Opens a Qt Project File (.pro) and creates a new solution respectively adds a new project to the current solution.</ToolTipText>
+                    <ToolTipText>Open a Qt Project File (.pro), create a new solution, and add a new project to it</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="ImportPriFileId" priority="0x0100" type="Button">
@@ -208,7 +208,7 @@
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
                     <ButtonText>Import .pri File to Project...</ButtonText>
-                    <ToolTipText>This will import a .pri file and create a Qt project from it.</ToolTipText>
+                    <ToolTipText>Import a .pri file and create a Qt project from it</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="ExportPriFileId" priority="0x0100" type="Button">
@@ -217,7 +217,7 @@
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
                     <ButtonText>Export Project to .pri File...</ButtonText>
-                    <ToolTipText>This will export the current project to a .pri file.</ToolTipText>
+                    <ToolTipText>Export the current project to a .pri file</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="ExportProFileId" priority="0x0100" type="Button">
@@ -225,8 +225,8 @@
                 <Icon guid="MenuImages" id="CreateProFileBitmap" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>Create basic .pro File...</ButtonText>
-                    <ToolTipText>This will export the current project to a Qt Project file (.pro).</ToolTipText>
+                    <ButtonText>Create Basic .pro File...</ButtonText>
+                    <ToolTipText>Export the current project to a Qt project file (.pro)</ToolTipText>
                 </Strings>
             </Button>
 
@@ -234,8 +234,8 @@
                 <Parent guid="MainMenuGuid" id="OthersMenuGroup" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>Create new Translation File</ButtonText>
-                    <ToolTipText>Creates a new translation file for Qt Linguist.</ToolTipText>
+                    <ButtonText>Create New Translation File</ButtonText>
+                    <ToolTipText>Create a new translation file that you can open in Qt Linguist</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="ConvertToQtId" priority="0x0100" type="Button">
@@ -244,7 +244,7 @@
                 <CommandFlag>DefaultInvisible</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>Convert project to Qt VS Tools project</ButtonText>
+                    <ButtonText>Convert Project to Qt VS Tools Project</ButtonText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="ConvertToQmakeId" priority="0x0100" type="Button">
@@ -252,7 +252,7 @@
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>Convert project to QMake generated project</ButtonText>
+                    <ButtonText>Convert Project to QMake Generated Project</ButtonText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="QtProjectSettingsId" priority="0x0100" type="Button">
@@ -261,7 +261,7 @@
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
                     <ButtonText>Qt Project Settings</ButtonText>
-                    <ToolTipText>Edit Qt settings of the current project.</ToolTipText>
+                    <ToolTipText>Edit Qt settings of the current project</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="MainMenuGuid" id="ChangeProjectQtVersionId" priority="0x0100" type="Button">
@@ -270,7 +270,7 @@
                 <CommandFlag>DefaultInvisible</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>Change project's Qt Version</ButtonText>
+                    <ButtonText>Change Project's Qt Version</ButtonText>
                 </Strings>
             </Button>
 
@@ -279,7 +279,7 @@
                 <Icon guid="MenuImages" id="QtLogoBitmap" />
                 <Strings>
                     <ButtonText>Qt Options</ButtonText>
-                    <ToolTipText>Configure the default Qt settings.</ToolTipText>
+                    <ToolTipText>Configure the default Qt settings</ToolTipText>
                 </Strings>
             </Button>
 
@@ -294,7 +294,7 @@
                 <CommandFlag>DefaultInvisible</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>lupdate all .ts files in solution</ButtonText>
+                    <ButtonText>lupdate All .ts Files in Solution</ButtonText>
                 </Strings>
             </Button>
             <Button guid="SolutionContextMenuGuid" id="lReleaseOnSolutionId" priority="0x0100" type="Button">
@@ -304,7 +304,7 @@
                 <CommandFlag>DefaultInvisible</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>lrelease all .ts files in solution</ButtonText>
+                    <ButtonText>lrelease All .ts Files in Solution</ButtonText>
                 </Strings>
             </Button>
 
@@ -315,7 +315,7 @@
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
                     <ButtonText>Change Solution's Qt Version</ButtonText>
-                    <ToolTipText>Change the Qt version for this solution and all contained projects.</ToolTipText>
+                    <ToolTipText>Change the Qt version for this solution and all contained projects</ToolTipText>
                 </Strings>
             </Button>
 
@@ -329,7 +329,7 @@
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
                     <ButtonText>Import .pri File to Project...</ButtonText>
-                    <ToolTipText>This will import a .pri file and create a Qt project from it.</ToolTipText>
+                    <ToolTipText>Import a .pri file and create a Qt project from it</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="ExportPriFileProjectId" priority="0x0100" type="Button">
@@ -338,7 +338,7 @@
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
                     <ButtonText>Export Project to .pri File...</ButtonText>
-                    <ToolTipText>This will export the current project to a .pri file.</ToolTipText>
+                    <ToolTipText>Export the current project to a .pri file</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="ExportProFileProjectId" priority="0x0100" type="Button">
@@ -346,8 +346,8 @@
                 <Icon guid="MenuImages" id="CreateProFileBitmap" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>Create basic .pro File...</ButtonText>
-                    <ToolTipText>This will export the current project to a Qt Project file (.pro).</ToolTipText>
+                    <ButtonText>Create Basic .pro File...</ButtonText>
+                    <ToolTipText>Export the current project to a Qt Project file (.pro)</ToolTipText>
                 </Strings>
             </Button>
 
@@ -355,8 +355,8 @@
                 <Parent guid="ProjectContextMenuGuid" id="ProjectContextTsMenuGroup" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>Create new Translation File</ButtonText>
-                    <ToolTipText>Creates a new translation file for Qt Linguist.</ToolTipText>
+                    <ButtonText>Create New Translation File</ButtonText>
+                    <ToolTipText>Create a new translation file that you can open in Qt Linguist</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="lUpdateOnProjectId" priority="0x0100" type="Button">
@@ -364,7 +364,7 @@
                 <Icon guid="MenuImages" id="LaunchLinguistBitmap" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>lupdate all .ts files in project</ButtonText>
+                    <ButtonText>lupdate All .ts Files in Project</ButtonText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="lReleaseOnProjectId" priority="0x0100" type="Button">
@@ -372,7 +372,7 @@
                 <Icon guid="MenuImages" id="LaunchLinguistBitmap" />
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <Strings>
-                    <ButtonText>lrelease all .ts files in project</ButtonText>
+                    <ButtonText>lrelease All .ts Files in Project</ButtonText>
                 </Strings>
             </Button>
 
@@ -382,7 +382,7 @@
                 <CommandFlag>DefaultInvisible</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>Convert project to Qt VS Tools project</ButtonText>
+                    <ButtonText>Convert Project to Qt VS Tools Project</ButtonText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="ConvertToQmakeProjectId" priority="0x0100" type="Button">
@@ -390,7 +390,7 @@
                 <CommandFlag>DefaultDisabled</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>Convert project to QMake generated project</ButtonText>
+                    <ButtonText>Convert Project to QMake Generated Project</ButtonText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="QtProjectSettingsProjectId" priority="0x0100" type="Button">
@@ -399,7 +399,7 @@
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
                     <ButtonText>Qt Project Settings</ButtonText>
-                    <ToolTipText>Edit Qt settings of the current project.</ToolTipText>
+                    <ToolTipText>Edit Qt settings of the current project</ToolTipText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="ChangeProjectQtVersionProjectId" priority="0x0100" type="Button">
@@ -408,7 +408,7 @@
                 <CommandFlag>DefaultInvisible</CommandFlag>
                 <CommandFlag>DynamicVisibility</CommandFlag>
                 <Strings>
-                    <ButtonText>Change project's Qt Version</ButtonText>
+                    <ButtonText>Change Project's Qt Version</ButtonText>
                 </Strings>
             </Button>
             <Button guid="ProjectContextMenuGuid" id="ProjectAddNewQtClassProjectId" priority="0x0100" type="Button">
diff --git a/src/qtvstools/ResClass.cs b/src/qtvstools/ResClass.cs
index b5779b79..b1772a72 100644
--- a/src/qtvstools/ResClass.cs
+++ b/src/qtvstools/ResClass.cs
@@ -92,13 +92,7 @@ namespace QtVsTools
 
         internal const string OK = "OK";
         internal const string Cancel = "Cancel";
-        internal const string QtVSIntegration = "QtVSIntegration";
-        internal const string CannotOpenFile = "CannotOpenFile";
-        internal const string NotExistingFile = "NotExistingFile";
-        internal const string Add = "Add";
-        internal const string Edit = "Edit";
-        internal const string Remove = "Remove";
-        internal const string Delete = "Delete";
+
         internal static CultureInfo appCultureInfo;
         internal static CultureInfo defaultCultureInfo;
 
diff --git a/src/qtvstools/Resources.resx b/src/qtvstools/Resources.resx
index fa174f42..b4bba614 100644
--- a/src/qtvstools/Resources.resx
+++ b/src/qtvstools/Resources.resx
@@ -120,21 +120,9 @@
   <data name="ThreeDLibrary" xml:space="preserve">
     <value>3D</value>
   </data>
-  <data name="ActionDialog_Change" xml:space="preserve">
-    <value>Change</value>
-  </data>
-  <data name="ActionDialog_Icon" xml:space="preserve">
-    <value>Icon:</value>
-  </data>
-  <data name="ActionDialog_ObjectName" xml:space="preserve">
-    <value>Object Name:</value>
-  </data>
   <data name="ActionDialog_Properties" xml:space="preserve">
     <value>Properties</value>
   </data>
-  <data name="ActionDialog_Text" xml:space="preserve">
-    <value>Text:</value>
-  </data>
   <data name="ActiveQtContainerLibrary" xml:space="preserve">
     <value>ActiveQt container</value>
   </data>
@@ -151,20 +139,17 @@
     <value>This Qt version uses an unsupported makefile generator (used: {0}, supported: MSVC.NET, MSBUILD)</value>
   </data>
   <data name="AddQtVersionDialog_InvalidDirectory" xml:space="preserve">
-    <value>The given path is no valid directory.</value>
+    <value>The given path is not a valid directory.</value>
   </data>
   <data name="AddQtVersionDialog_MingwQt" xml:space="preserve">
     <value>Qt in the given path was built using MinGW.</value>
   </data>
   <data name="AddQtVersionDialog_NotFound" xml:space="preserve">
-    <value>{0} could not be found.</value>
+    <value>{0} cannot be found.</value>
   </data>
   <data name="AddQtVersionDialog_Path" xml:space="preserve">
     <value>Path:</value>
   </data>
-  <data name="AddQtVersionDialog_PlatformNotFoundError" xml:space="preserve">
-    <value>The platform "{0}" is not defined within Visual Studio. Make sure you have installed the required SDK.</value>
-  </data>
   <data name="AddQtVersionDialog_Title" xml:space="preserve">
     <value>Add New Qt Version</value>
   </data>
@@ -174,12 +159,6 @@
   <data name="AddQtVersionDialog_VersionName" xml:space="preserve">
     <value>Version name:</value>
   </data>
-  <data name="AddRemoveModulesButtonText" xml:space="preserve">
-    <value>Add/Remove Qt Modules</value>
-  </data>
-  <data name="AddRemoveModulesToolTip" xml:space="preserve">
-    <value>Add or remove Qt Modules to/from the current Project</value>
-  </data>
   <data name="AddTranslationDialog_FileName" xml:space="preserve">
     <value>Filename:</value>
   </data>
@@ -201,56 +180,18 @@
   <data name="BuildOptionsPage_Path" xml:space="preserve">
     <value>Path</value>
   </data>
-  <data name="BuildOptionsPage_QtBuilds" xml:space="preserve">
-    <value>Qt Builds:</value>
-  </data>
   <data name="BuildOptionsPage_Title" xml:space="preserve">
     <value>Qt Versions</value>
   </data>
-  <data name="BuildPlatformQtVersionNotFound" xml:space="preserve">
-    <value>Can't find a Qt version for the current build platform.</value>
-  </data>
-  <data name="BuildSystem_IncompatibleMsg" xml:space="preserve">
-    <value>The currently selected Qt version is not compatible to the one used by the Qt Visual Studio Tools.
-To enable the plugin to be loaded, the Qt version {0} has to be used. Do you want to switch Qt version?</value>
-  </data>
-  <data name="BuildSystem_Problem" xml:space="preserve">
-    <value>Warning: A matching Qt version could not be found!
-The resulting plugin will not work with the current Qt Visual Studio Tools.</value>
-  </data>
-  <data name="BuildSystem_Solution" xml:space="preserve">
-    <value>Goto www.qt.io and download the binary package of Qt {0}.</value>
-  </data>
   <data name="Cancel" xml:space="preserve">
     <value>&amp;Cancel</value>
   </data>
   <data name="CannotChangeQtVersion" xml:space="preserve">
-    <value>The Qt version of at least one project could not be changed.</value>
+    <value>The Qt version of at least one project cannot be changed.</value>
   </data>
   <data name="CannotFindQMake" xml:space="preserve">
     <value>Cannot find qmake. Make sure you have specified a Qt version.</value>
   </data>
-  <data name="CannotOpenFile" xml:space="preserve">
-    <value>Cannot open {0}!</value>
-  </data>
-  <data name="ChangeProjectQtVersionButtonText" xml:space="preserve">
-    <value>Change project's Qt Version</value>
-  </data>
-  <data name="ChangeSolutionQtVersionButtonText" xml:space="preserve">
-    <value>Change Solution's Qt Version</value>
-  </data>
-  <data name="ChangeSolutionQtVersionToolTip" xml:space="preserve">
-    <value>Change the Qt version for this solution and all contained projects .</value>
-  </data>
-  <data name="CommandBarsNotRegistered" xml:space="preserve">
-    <value>Couldn't register CommandBars</value>
-  </data>
-  <data name="CommandServiceFailure" xml:space="preserve">
-    <value>Cannot retrieve the command service of Visual Studio!</value>
-  </data>
-  <data name="CommandsNotRegistered" xml:space="preserve">
-    <value>Couldn't register all Qt4VSAddin commands.</value>
-  </data>
   <data name="ConcurrentLibrary" xml:space="preserve">
     <value>Concurrent</value>
   </data>
@@ -264,13 +205,7 @@ The resulting plugin will not work with the current Qt Visual Studio Tools.</val
     <value>Core</value>
   </data>
   <data name="CouldNotConnectToAppwrapper" xml:space="preserve">
-    <value>Could not connect to Appwrapper. Please make sure that TCP port {0} is not blocked.</value>
-  </data>
-  <data name="CreateNewTranslationFileButtonText" xml:space="preserve">
-    <value>Create new Translation File</value>
-  </data>
-  <data name="CreateNewTranslationFileToolTip" xml:space="preserve">
-    <value>Creates a new translation file for Qt Linguist</value>
+    <value>Cannot connect to Appwrapper. Please make sure that TCP port {0} is not blocked.</value>
   </data>
   <data name="DeclarativeLibrary" xml:space="preserve">
     <value>Declarative</value>
@@ -279,79 +214,16 @@ The resulting plugin will not work with the current Qt Visual Studio Tools.</val
     <value>Delete</value>
   </data>
   <data name="DeleteGeneratedFilesError" xml:space="preserve">
-    <value>The generated files could not be deleted.</value>
+    <value>The generated files cannot be deleted.</value>
   </data>
   <data name="DesignerAddError" xml:space="preserve">
-    <value>Could not open .ui file in existing Qt Designer</value>
-  </data>
-  <data name="Edit" xml:space="preserve">
-    <value>Edit</value>
-  </data>
-  <data name="EditorFactory_OpenFailure" xml:space="preserve">
-    <value>
-The file {0}
-cannot be opened with the Qt 4 form editor.
-Try converting the file using uic.exe</value>
-  </data>
-  <data name="EditorPane_CannotOpenUi" xml:space="preserve">
-    <value>Cannot open {0}!
-Is this a valid .ui file?"</value>
-  </data>
-  <data name="EditorPane_CannotRunUic" xml:space="preserve">
-    <value>Cannot run uic!</value>
-  </data>
-  <data name="EditorPane_ErrorWhileOpening" xml:space="preserve">
-    <value>An error occured while opening the form editor!</value>
-  </data>
-  <data name="EditorPane_NoFormClassFound" xml:space="preserve">
-    <value>The project doesn't contain any class which uses this form!</value>
-  </data>
-  <data name="EditorPane_NoSourceFileFound" xml:space="preserve">
-    <value>Cannot find a suitable source file for writing the slot implementation!</value>
-  </data>
-  <data name="EditorPane_Reload" xml:space="preserve">
-    <value>{0}
-
-This file has changed outside the editor. Do you want to reload it?</value>
-  </data>
-  <data name="EditorPane_TrySetProperty" xml:space="preserve">
-    <value>Try to set property: {0}
-
-{1} {2}</value>
-  </data>
-  <data name="EditorPane_UnableToRetrieve" xml:space="preserve">
-    <value>Unable to retrieve more information for {0}.</value>
+    <value>Cannot open .ui file in Qt Designer.</value>
   </data>
   <data name="EnginioLibrary" xml:space="preserve">
-    <value>The default Qt version does not support Visual Studio. In order to import .pro files specify a Qt version &gt;=5.6 as default.</value>
-  </data>
-  <data name="ExportPriFileButtonText" xml:space="preserve">
-    <value>Export Project to .pri File...</value>
-  </data>
-  <data name="ExportPriFileToolTip" xml:space="preserve">
-    <value>This will export the current project to a .pri file.</value>
+    <value>Enginio</value>
   </data>
-  <data name="ExportProFileButtonText" xml:space="preserve">
-    <value>Create basic .pro File...</value>
-  </data>
-  <data name="ExportProFileToolTip" xml:space="preserve">
-    <value>This will export the current project to a Qt Project file (.pro).</value>
-  </data>
-  <data name="ExportToProFile" xml:space="preserve">
-    <value>Export {0} to .pri File...</value>
-  </data>
-  <data name="ExtensionServiceFailure" xml:space="preserve">
-    <value>Cannot retrieve the extension service of Visual Studio!</value>
-  </data>
-  <data name="File" xml:space="preserve">
-    <value>file</value>
-  </data>
-  <data name="FileNotPartOfSolution" xml:space="preserve">
-    <value>The file {0} is not part of the solution!</value>
-  </data>
-  <data name="GeneralOptionsPage_ManualBuildSteps" xml:space="preserve">
-    <value>Manually managed build steps may cause problems when the project is built outside Visual Studio.
-Do you want to continue?</value>
+  <data name="NoVSSupport" xml:space="preserve">
+    <value>The default Qt version does not support Visual Studio. To import .pro files, specify Qt 5.0 or later as the default.</value>
   </data>
   <data name="GUILibrary" xml:space="preserve">
     <value>GUI</value>
@@ -360,107 +232,24 @@ Do you want to continue?</value>
     <value>Cannot start {0}
 
 Make sure that you have specified a valid Qt version in the current project.
-If you haven't specified a Qt version at all, goto Qt VS Tools|Qt Project Settings|Version
-and insert the information about the Qt version you want to use.</value>
+If you haven't specified a Qt version at all, go to Qt VS Tools|Qt Project Settings|Version
+and select the Qt version to use.</value>
   </data>
   <data name="HelpLibrary" xml:space="preserve">
     <value>Help</value>
   </data>
-  <data name="HelpServiceFailure" xml:space="preserve">
-    <value>Cannot retrieve the help service of Visual Studio!</value>
-  </data>
-  <data name="IconPropertyDialog_Filter" xml:space="preserve">
-    <value>Filter:</value>
-  </data>
-  <data name="IconPropertyDialog_Icon" xml:space="preserve">
-    <value>Icon:</value>
-  </data>
-  <data name="IconPropertyDialog_Preview" xml:space="preserve">
-    <value>Preview:</value>
-  </data>
-  <data name="IconPropertyDialog_Title" xml:space="preserve">
-    <value>Icon Property Dialog</value>
-  </data>
-  <data name="ImportingFromProFile" xml:space="preserve">
-    <value>Importing project(s) from .pro file...</value>
-  </data>
-  <data name="ImportingPriFile" xml:space="preserve">
-    <value>Importing .pri file...</value>
-  </data>
-  <data name="ImportPriFile" xml:space="preserve">
-    <value>Import .pri File to {0}...</value>
-  </data>
   <data name="ImportPriFileButtonText" xml:space="preserve">
     <value>Import .pri File to Project...</value>
   </data>
-  <data name="ImportPriFileNotRead" xml:space="preserve">
-    <value>--- (importing .pri file) file: {0} could not be read.</value>
-  </data>
   <data name="ImportPriFileNotResolved" xml:space="preserve">
-    <value>--- (importing .pri file) file: {0} could not be resolved. Skipping file.</value>
-  </data>
-  <data name="ImportPriFileToolTip" xml:space="preserve">
-    <value>This will import a .pri file and create a Qt project from it.</value>
-  </data>
-  <data name="ImportProFileButtonText" xml:space="preserve">
-    <value>Open Qt Project File (.pro)...</value>
-  </data>
-  <data name="ImportProFileToolTip" xml:space="preserve">
-    <value>Opens a Qt Project File (.pro) and creates a new solution respectively adds a new project to the current solution.</value>
-  </data>
-  <data name="InitComponentsFailure" xml:space="preserve">
-    <value>Cannot initialize FormEditor components!</value>
-  </data>
-  <data name="InitFactoryFailure" xml:space="preserve">
-    <value>Cannot initialize EditorFactory!</value>
-  </data>
-  <data name="InitIntegrationFailure" xml:space="preserve">
-    <value>The Qt Visual Studio Tools could not be initialized!</value>
+    <value>--- (importing .pri file) file: {0} cannot be resolved. Skipping file.</value>
   </data>
   <data name="InstalledQtVersions" xml:space="preserve">
     <value>Installed Qt Versions</value>
   </data>
-  <data name="InvalidLicense" xml:space="preserve">
-    <value>A valid Qt license key could not be found or your license has expired!
-        
-Please use contact form at https://www.qt.io/buy-product/ to order a Qt license.</value>
-  </data>
-  <data name="InvalidPropertyName" xml:space="preserve">
-    <value>No valid property name was entered.</value>
-  </data>
-  <data name="LaunchDesignerButtonText" xml:space="preserve">
-    <value>Launch Designer</value>
-  </data>
-  <data name="LaunchDesignerToolTip" xml:space="preserve">
-    <value>This will start Qt Designer.</value>
-  </data>
-  <data name="LaunchLinguistButtonText" xml:space="preserve">
-    <value>Launch Linguist</value>
-  </data>
-  <data name="LaunchLinguistToolTip" xml:space="preserve">
-    <value>This will start Qt Linguist.</value>
-  </data>
-  <data name="LicenseCheck" xml:space="preserve">
-    <value>Qt License Check</value>
-  </data>
   <data name="LocationLibrary" xml:space="preserve">
     <value>Location</value>
   </data>
-  <data name="lreleaseProjectButtonText" xml:space="preserve">
-    <value>lrelease all .ts files in project</value>
-  </data>
-  <data name="lreleaseSolutionButtonText" xml:space="preserve">
-    <value>lrelease all .ts files in solution</value>
-  </data>
-  <data name="lupdateProjectButtonText" xml:space="preserve">
-    <value>lupdate all .ts files in project</value>
-  </data>
-  <data name="lupdateSolutionButtonText" xml:space="preserve">
-    <value>lupdate all .ts files in solution</value>
-  </data>
-  <data name="MakeSureWritePermission" xml:space="preserve">
-    <value>Make sure you have write permission.</value>
-  </data>
   <data name="MultimediaLibrary" xml:space="preserve">
     <value>Multimedia</value>
   </data>
@@ -474,19 +263,16 @@ Please use contact form at https://www.qt.io/buy-product/ to order a Qt license.
     <value>NFC</value>
   </data>
   <data name="NoDefaultQtVersionError" xml:space="preserve">
-    <value>No default Qt version found. Please check your Qt Visual Studio Tools settings</value>
+    <value>No default Qt version found. Check your Qt VS Tools settings.</value>
   </data>
   <data name="NoProjectOpened" xml:space="preserve">
     <value>No Project Opened</value>
   </data>
-  <data name="NotExistingFile" xml:space="preserve">
-    <value>The file {0} does not exist!</value>
-  </data>
   <data name="OK" xml:space="preserve">
     <value>&amp;OK</value>
   </data>
   <data name="OnlyVariableInDir" xml:space="preserve">
-    <value>The path may only contain the "$(ConfigurationName)" and/or "$(PlatformName)" variable! A valid path is e.g.".$(ConfigurationName)/moc".</value>
+    <value>The path may only contain the "$(ConfigurationName)" and/or "$(PlatformName)" variable. A valid path is e.g.".$(ConfigurationName)/moc".</value>
   </data>
   <data name="OpenGLLibrary" xml:space="preserve">
     <value>OpenGL</value>
@@ -497,62 +283,23 @@ Please use contact form at https://www.qt.io/buy-product/ to order a Qt license.
   <data name="PrintSupportLibrary" xml:space="preserve">
     <value>Print Support</value>
   </data>
-  <data name="PriWatcher_Import" xml:space="preserve">
-    <value>The watched .pri file has been changed outside Visual Studio. Do you want to import the changes into the vcproj file?</value>
-  </data>
-  <data name="PriWatcher_Title" xml:space="preserve">
-    <value>Watched .pri file changed</value>
-  </data>
-  <data name="ProjectExtender_CannotUpdate" xml:space="preserve">
-    <value>Cannot update the Qt libraries in your project to reflect the currently selected version.</value>
-  </data>
-  <data name="ProjectExtender_CannotUpdateSolution" xml:space="preserve">
-    <value>Verify that the path for this Qt installation is correct.</value>
-  </data>
-  <data name="ProjectExtender_Filter" xml:space="preserve">
-    <value>pri Files (*.pri)|*.pri</value>
-  </data>
-  <data name="ProjectExtender_Title" xml:space="preserve">
-    <value>Changing {0} Output Path</value>
-  </data>
-  <data name="ProjectExtender_Warning" xml:space="preserve">
-    <value>Changing the path will update all {0} build steps. Manual changes will be lost. Do you want to continue?</value>
-  </data>
   <data name="ProjectQtSettingsButtonText" xml:space="preserve">
     <value>Qt Project Settings</value>
   </data>
-  <data name="ProjectQtSettingsToolTip" xml:space="preserve">
-    <value>Edit Qt settings of the current project.</value>
-  </data>
   <data name="ProjectQtVersion" xml:space="preserve">
     <value>Set Project's Qt Version</value>
   </data>
   <data name="ProjectQtVersionNotFoundError" xml:space="preserve">
     <value>There's no Qt version assigned to this project for platform {0}. Please use the 'change Qt version' feature and choose a valid Qt version for this platform.</value>
   </data>
-  <data name="PropertyEditor_DefaultError" xml:space="preserve">
-    <value>Cannot create default value function for {0}!</value>
-  </data>
-  <data name="QDateTimeControl_Time" xml:space="preserve">
-    <value>Time:</value>
-  </data>
   <data name="QmlLibrary" xml:space="preserve">
     <value>QML</value>
   </data>
   <data name="QProcess_UnspecifiedError" xml:space="preserve">
     <value>&lt;unspecified return code&gt;</value>
   </data>
-  <data name="Qt3SupportLibrary" xml:space="preserve">
-    <value>Qt3 support library</value>
-  </data>
-  <data name="QtActionEditorFailure" xml:space="preserve">
-    <value>Failed to create the Qt Action Editor!</value>
-  </data>
-  <data name="QtActionEditorFrame" xml:space="preserve">
-    <value>Qt Action Editor</value>
-  </data>
   <data name="QtAppNotFoundErrorMessage" xml:space="preserve">
-    <value>*** Couldn't start {0}!</value>
+    <value>*** Couldn't start {0}.</value>
   </data>
   <data name="QtAppNotFoundErrorTitle" xml:space="preserve">
     <value>Not starting {0}</value>
@@ -563,64 +310,22 @@ Please use contact form at https://www.qt.io/buy-product/ to order a Qt license.
   <data name="QtModules" xml:space="preserve">
     <value>Qt Modules</value>
   </data>
-  <data name="QtObjectInspectorFailure" xml:space="preserve">
-    <value>Failed to create the Qt Object Inspector!</value>
-  </data>
-  <data name="QtObjectInspectorFrame" xml:space="preserve">
-    <value>Qt Object Inspector</value>
-  </data>
-  <data name="QtPropertyAddFailure" xml:space="preserve">
-    <value>Cannot add Qt property to a class containing no Q_OBJECT macro.</value>
-  </data>
-  <data name="QtSignalSlotEditorFailure" xml:space="preserve">
-    <value>Failed to create the Qt Signal Slot Editor!</value>
-  </data>
-  <data name="QtSignalSlotEditorFrame" xml:space="preserve">
-    <value>Qt Signal Slot Editor</value>
-  </data>
-  <data name="QtToolBoxFailure" xml:space="preserve">
-    <value>Failed to create the Qt Toolbox!</value>
-  </data>
-  <data name="QtToolBoxFrame" xml:space="preserve">
-    <value>Qt Toolbox</value>
-  </data>
   <data name="QtVersionDialog_BoxTitle" xml:space="preserve">
     <value>Solution wide Qt Version</value>
   </data>
   <data name="QtVersionDialog_Title" xml:space="preserve">
     <value>Change Qt Version for Solution</value>
   </data>
-  <data name="QtVSIntegration" xml:space="preserve">
-    <value>Qt Visual Studio Tools</value>
-  </data>
   <data name="QuestionSCCCheckoutOnOpen" xml:space="preserve">
     <value>The file {0} is under source control and not checked out. Do you want to check out the file before opening it?
 
-Note: You can turn off this question by setting "ask_before_checkout_file" to "false" in the options menu of the Qt Vs Tools.</value>
+Note: You can turn off this question by setting "Ask before checking out files" to "False" in Qt Options.</value>
   </data>
   <data name="QuickLibrary" xml:space="preserve">
-    <value>Quick</value>
+    <value>Qt Quick</value>
   </data>
   <data name="QuickWidgetsLibrary" xml:space="preserve">
-    <value>Quick Widgets</value>
-  </data>
-  <data name="Remove" xml:space="preserve">
-    <value>Remove</value>
-  </data>
-  <data name="ResourceDialog_Import" xml:space="preserve">
-    <value>Import...</value>
-  </data>
-  <data name="ResourceDialog_Name" xml:space="preserve">
-    <value>Name:</value>
-  </data>
-  <data name="ResourceDialog_New" xml:space="preserve">
-    <value>New</value>
-  </data>
-  <data name="ResourceDialog_Title" xml:space="preserve">
-    <value>Resource Dialog</value>
-  </data>
-  <data name="ResourceDialog_Type" xml:space="preserve">
-    <value>Resource Type:</value>
+    <value>Qt Quick Widgets</value>
   </data>
   <data name="ScriptLibrary" xml:space="preserve">
     <value>Script</value>
@@ -628,9 +333,6 @@ Note: You can turn off this question by setting "ask_before_checkout_file" to "f
   <data name="ScriptToolsLibrary" xml:space="preserve">
     <value>Script Tools</value>
   </data>
-  <data name="SelectionServiceFailure" xml:space="preserve">
-    <value>Cannot retrieve the selection service of Visual Studio!</value>
-  </data>
   <data name="SelectQtPath" xml:space="preserve">
     <value>Select Qt Path</value>
   </data>
@@ -640,18 +342,9 @@ Note: You can turn off this question by setting "ask_before_checkout_file" to "f
   <data name="SerialPortLibrary" xml:space="preserve">
     <value>Serial Port</value>
   </data>
-  <data name="SignalChooser_Connect" xml:space="preserve">
-    <value>Connect Signal</value>
-  </data>
-  <data name="SignalChooser_Title" xml:space="preserve">
-    <value>Connecting Signals &amp; Slots</value>
-  </data>
   <data name="SolutionQtVersion" xml:space="preserve">
     <value>Set Solution's Qt Version</value>
   </data>
-  <data name="SolutionServiceFailure" xml:space="preserve">
-    <value>Cannot retrieve the solution service of Visual Studio!</value>
-  </data>
   <data name="SQLLibrary" xml:space="preserve">
     <value>SQL</value>
   </data>
@@ -661,21 +354,12 @@ Note: You can turn off this question by setting "ask_before_checkout_file" to "f
   <data name="TestLibrary" xml:space="preserve">
     <value>Test</value>
   </data>
-  <data name="TrackProjectDocuments2ServiceFailure" xml:space="preserve">
-    <value>Cannot retrieve the TrackProjectDocuments2 service of Visual Studio!</value>
-  </data>
-  <data name="UicOuputFileCreationFailure" xml:space="preserve">
-    <value>Uic could not create output file {0}!</value>
-  </data>
   <data name="UiToolsLibrary" xml:space="preserve">
     <value>UI Tools</value>
   </data>
   <data name="VSQtOptionsButtonText" xml:space="preserve">
     <value>Qt Options</value>
   </data>
-  <data name="VSQtOptionsToolTip" xml:space="preserve">
-    <value>Configure the default Qt settings</value>
-  </data>
   <data name="WebChannelLibrary" xml:space="preserve">
     <value>Web Channel</value>
   </data>
@@ -688,18 +372,6 @@ Note: You can turn off this question by setting "ask_before_checkout_file" to "f
   <data name="WebSocketsLibrary" xml:space="preserve">
     <value>Web Sockets</value>
   </data>
-  <data name="WelcomeDialog_Close" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="WelcomeDialog_DontShow" xml:space="preserve">
-    <value>Don't show this dialog again.</value>
-  </data>
-  <data name="WelcomeDialog_ShowDocumentation" xml:space="preserve">
-    <value>Show Documentation</value>
-  </data>
-  <data name="WelcomeDialog_ShowTutorial" xml:space="preserve">
-    <value>Show Tutorial</value>
-  </data>
   <data name="WidgetsLibrary" xml:space="preserve">
     <value>Widgets</value>
   </data>
@@ -712,7 +384,13 @@ Note: You can turn off this question by setting "ask_before_checkout_file" to "f
   <data name="XmlPatternsLibrary" xml:space="preserve">
     <value>XML Patterns</value>
   </data>
-  <data name="ActionDialog_AddAction" xml:space="preserve">
-    <value>Add New Action</value>
+  <data name="ExportProject_ImportPriFile" xml:space="preserve">
+    <value>Import from .pri File</value>
+  </data>
+  <data name="Helpers_ExitError" xml:space="preserve">
+    <value>The application exited with an error (ExitCode {0}):</value>
+  </data>
+  <data name="Resources_QtVsTools" xml:space="preserve">
+    <value>Qt VS Tools</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/src.pri b/src/src.pri
index 50881b12..96b4e07d 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -1,36 +1,8 @@
-!isEmpty(QT_VS_TOOLS_PRI) {
+!isEmpty(QTVSOOLS_SRC_PRI) {
     error("src.pri already included")
 }
-QT_VS_TOOLS_PRI = 1
-
-defineTest(minQtVersion) {
-    maj = $$1
-    min = $$2
-    patch = $$3
-    isEqual(QT_MAJOR_VERSION, $$maj) {
-        isEqual(QT_MINOR_VERSION, $$min) {
-            isEqual(QT_PATCH_VERSION, $$patch) {
-                return(true)
-            }
-            greaterThan(QT_PATCH_VERSION, $$patch) {
-                return(true)
-            }
-        }
-        greaterThan(QT_MINOR_VERSION, $$min) {
-            return(true)
-        }
-    }
-    greaterThan(QT_MAJOR_VERSION, $$maj) {
-        return(true)
-    }
-    return(false)
-}
+QTVSTOOLS_SRC_PRI = 1
 
 !static {
     error("Please use a static Qt to build the tools.")
 }
-
-!minQtVersion(5, 6, 0) {
-    message("Cannot build Qt VS Tools with Qt version $${QT_VERSION}.")
-    error("Use at least Qt 5.6.0.")
-}
diff --git a/src/src.pro b/src/src.pro
index 996583e5..7d830106 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,3 +4,4 @@ SUBDIRS = \
     qrceditor
 
 include(src.pri)
+include(../vstools.pri)