Fix up issues with merge proposal.

openlp.pyw

@@ -170,9 +170,9 @@ class OpenLP(QtGui.QApplication):
         # Decide how many screens we have and their size
         screens = ScreenList(self.desktop())
         # First time checks in settings
-        firstTime = QtCore.QSettings().value(
+        has_run_wizard = QtCore.QSettings().value(
             u'general/has run wizard', QtCore.QVariant(False)).toBool()
-        if not firstTime:
+        if not has_run_wizard:
             FirstTimeForm(screens).exec_()
         if os.name == u'nt':
             self.setStyleSheet(application_stylesheet)

openlp/core/ui/firsttimeform.py

@@ -253,8 +253,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                         translate('OpenLP.FirstTimeWizard',
                         'Overwrite Existing Songs?'),
                         translate('OpenLP.FirstTimeWizard', 'Your songs '
-                        'database already exists, are you sure you want to '
-                        'overwrite it?'),
+                        'database already exists and your current songs will '
+                        'be permanently lost, are you sure you want to '
+                        'replace it ?'),
                         QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
                         QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes:
                         continue