From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 19 Apr 2014 16:58:22 +0000 (+0200)
Subject: Windows installer: add 3 new features/bugfixes
X-Git-Tag: 2.2.0alpha1~2083
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=62cbf893d2341543c37ed210fce5ac5ac9176b8a;p=features.git

Windows installer: add 3 new features/bugfixes

As discussed with Vincent I added 3 new features:

* LyX can now also be installed over an existing installation of the same LyX version if the users really wants this.
(A message box appears recommending not to do so for test releases and when there are problems with an existing installation of the same release.)
* LyX can now also be installed if the uninstaller executable of a former LyX was accidentally deleted.
(That this case was not handled was more a bug. Thanks Vicent for the pointer.)
* If a user set MiKTeX's automatic package installation to "No" the installer will.
(As discussed with Vincent, if a user has disabled this MiKTeX feature he most probably know the consequences. So respect his decision.)
  respect that and not re-enable it.

I would be happy if anybody can spend a translation of the changed installer message.
---

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 44020a7932..3223f8d59d 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,23 @@
-Changelog for LyX-207-4:
+Changelog for LyX-210-2:
+- LyX can now also be installed over an existing installation of the same LyX version
+  if the users really wants this.
+- LyX can now also be installed if the uninstaller executable of a former LyX was
+  accidentally deleted.
+- If a user set MiKTeX's automatic package installation to "No" the installer will
+  respect that and not re-enable it.
+
+
+Changelog for LyX-210-1:
+- installs LyX 2.1.0
+- fixed a bug that MiKTeX was not found if Windows' PATH variable is very long
+
+
+Changelog for LyX-208-1:
+- installs LyX 2.0.7
+- fixed a bug that MiKTeX was not found if Windows' PATH variable is very long
+
+
+Changelog for LyX-207-4:
 - downgraded to Qt 4.8.4
   (there is a bug in the newer Qt 4.8.5 that destroys some shortcuts)
 - updated to JabRef 2.10
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh
index 1b4cf98ec3..7a0cef8187 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -306,6 +306,11 @@ Function ConfigureMiKTeX
    SetRegView 32
   ${endif}
   ${if} $MiKTeXUser == "HKCU" # if only for current user
+   # if AutoInstall is set to "0" we can assume that this was set purposly since the default is "1"
+   ReadRegStr $2 HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall"
+   ${if} $2 == "0"
+    Goto NoAutoInstall
+   ${endif}
    WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
    ReadRegStr $1 HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository"
    ${if} $1 == ""
@@ -313,6 +318,11 @@ Function ConfigureMiKTeX
     WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
    ${endif}
   ${else}
+   # if AutoInstall is set to "0" we can assume that this was set purposly since the default is "1"
+   ReadRegStr $2 HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall"
+   ${if} $2 == "0"
+    Goto NoAutoInstall
+   ${endif}
    WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
    ReadRegStr $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository"
    ${if} $1 == ""
@@ -322,6 +332,7 @@ Function ConfigureMiKTeX
    # we need to state that missing packages should be installed for all users too
    WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoAdmin" "t"
   ${endif}
+  NoAutoInstall:
   
   # update MiKTeX's package file list
   ExecWait '$PathLaTeX\mpm.exe --update-fndb'
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index b58478ad4d..053570619f 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -635,8 +635,13 @@ Function .onInit
    ${endif}
   ${endif}
   ${if} $0 != ""
-   MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" /SD IDOK
+   # installing over an existing installation of the same LyX release is not necessary
+   # if the users does this he most probably has a problem with LyX that can better be solved
+   # by reinstalling LyX
+   # for beta and other test releases over-installing can even cause errors
+   MessageBox MB_YESNO|MB_DEFBUTTON2|MB_ICONEXCLAMATION "$(AlreadyInstalled)" /SD IDNO IDYES ForceInstallation 
    Abort
+   ForceInstallation:
   ${endif}
   
   # check if there is an existing LyX installation of the same LyX series
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh b/development/Win32/packaging/installer/lang/arabic.nsh
index e31c1b7265..eb83ebf0d0 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -75,7 +75,11 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the c
 ${LangFileString} RunConfigureFailed "äÇ êåãæ ÊæáêÐ Çäà configure script"
 ${LangFileString} NotAdmin "êÌÈ Ãæ Êãèæ ÈÕäÇÍêÉ ÇäåÏêÑ äãê ääâêÇå ÈÙåäêÉ ÇäÊÑãêÈ!"
 ${LangFileString} InstallRunning "Êå ÈÇäáÙä ÇäÈÏÁ ÈÙåäêÉ ÇäÊÑãêÈ!"
-${LangFileString} StillInstalled "Êå ${APP_SERIES_KEY2} ÈÇäáÙä ÊÑãêÈ ÈÑæÇåÌ äêã äÐÇ Ùäêã ÇèäÇë ÇäÚÇÁ ÊÑãêÈ ÇäæÓÎÉÇäÓÇÈâÉ."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is already installed!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/basque.nsh b/development/Win32/packaging/installer/lang/basque.nsh
index 19ca6ec3ff..2988c2769e 100644
--- a/development/Win32/packaging/installer/lang/basque.nsh
+++ b/development/Win32/packaging/installer/lang/basque.nsh
@@ -83,7 +83,11 @@ ${LangFileString} MiKTeXInfo 'LaTeX-en $\"MiKTeX$\" banaketa LyX-ekin batera era
 ${LangFileString} ModifyingConfigureFailed "Ezin izan da 'path_prefix' ezarri konfigurazioaren script-ean"
 #${LangFileString} RunConfigureFailed "Ezin izan da konfigurazioaren script-a exekutatu"
 ${LangFileString} InstallRunning "Instalatzailea jadanik exekutatzen ari da."
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} jadanik instalatuta dago. Aurrenik LyX desinstalatu."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} jadanik instalatuta dago!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Instalatuta dagoen LyX baino bertsio zaharragoa instalatzen saiatzen ari zara.$\r$\n\
 				  Hori egitea nahi baduzu, lehenbizi existitzen den LyX $OldVersionNumber desinstalatu beharko duzu."
 
diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/lang/catalan.nsh
index a8888dd366..0084fa76d6 100644
--- a/development/Win32/packaging/installer/lang/catalan.nsh
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "No es pot establir 'path_prefix' dur
 ${LangFileString} RunConfigureFailed "No es pot executar el programa de configuració"
 ${LangFileString} NotAdmin "Necessiteu drets d'administrador per instal·lar el LyX!"
 ${LangFileString} InstallRunning "L'instal·lador ja s'està executant!"
-${LangFileString} StillInstalled "El LyX ${APP_SERIES_KEY2} ja es troba instal·lat! Desinstal·leu-lo primer."
+${LangFileString} AlreadyInstalled "El LyX ${APP_SERIES_KEY2} ja es troba instal·lat!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/lang/czech.nsh
index db1bac8197..7b15087925 100644
--- a/development/Win32/packaging/installer/lang/czech.nsh
+++ b/development/Win32/packaging/installer/lang/czech.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Nelze nastavit 'path_prefix' v konfi
 ${LangFileString} RunConfigureFailed "Nelze spustit konfiguraèní skript"
 ${LangFileString} NotAdmin "Potøebujete administrátorská práva pro nainstalování LyXu!"
 ${LangFileString} InstallRunning "Instalátor je již spuštìn!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je již nainstalován! Nejprve LyX odinstalujte."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} je již nainstalován!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/lang/danish.nsh
index 73ecde1306..5fb50fe9dd 100644
--- a/development/Win32/packaging/installer/lang/danish.nsh
+++ b/development/Win32/packaging/installer/lang/danish.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Forsoget p
 ${LangFileString} RunConfigureFailed "Mislykket forsog på at afvikle konfigurations-scriptet"
 ${LangFileString} NotAdmin "Du skal have administrator-rettigheder for at installere LyX!"
 ${LangFileString} InstallRunning "Installationsprogrammet kører allerede!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installeret! Afinstaller LyX først."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} er allerede installeret!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/lang/dutch.nsh
index 116208a94d..e6831d9528 100644
--- a/development/Win32/packaging/installer/lang/dutch.nsh
+++ b/development/Win32/packaging/installer/lang/dutch.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Mislukte poging om 'path_prefix' te
 ${LangFileString} RunConfigureFailed "Mislukte configuratie poging"
 ${LangFileString} NotAdmin "U heeft systeem-beheerrechten nodig om LyX te installeren!"
 ${LangFileString} InstallRunning "Het installatieprogramma is al gestart!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is reeds geinstalleerd! Verwijder LyX eerst."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is reeds geinstalleerd!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh
index cf3b867e14..9b8ba29780 100644
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -82,7 +82,11 @@ ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used t
 ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script"
 #${LangFileString} RunConfigureFailed "Could not execute the configure script"
 ${LangFileString} InstallRunning "The installer is already running!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is already installed! Deinstall LyX first."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is already installed!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh
index 576f1850d3..23e1bdfaeb 100644
--- a/development/Win32/packaging/installer/lang/french.nsh
+++ b/development/Win32/packaging/installer/lang/french.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "
 ${LangFileString} RunConfigureFailed "Échec de la tentative de configuration initiale de LyX."
 ${LangFileString} NotAdmin "Vous devez avoir les droits d$\'administration pour installer LyX !"
 ${LangFileString} InstallRunning "Le programme d$\'installation est toujours en cours !"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} est déjà installé ! Le désinstaller d'abord."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} est déjà installé !$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version ?"
 ${LangFileString} NewerInstalled "Vous essayez d$\'installer une version de LyX plus ancienne que celle qui est déjà installée.$\r$\n\
 				  Si c$\'est ce qu vous voulez, vous devez d$\'abord désinstaller LyX $OldVersionNumber."
 
diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/lang/galician.nsh
index 72f8a698d9..620ecca8ef 100644
--- a/development/Win32/packaging/installer/lang/galician.nsh
+++ b/development/Win32/packaging/installer/lang/galician.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Non se puido engadir o 'path_prefix'
 ${LangFileString} RunConfigureFailed "Non se deu executado o script de configuración"
 ${LangFileString} NotAdmin "Precisa de priviléxios de administrador para instalar o LyX!"
 ${LangFileString} InstallRunning "O instalador xa está a correr!"
-${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} xa está instalado! Desinstale o LyX primeiro."
+${LangFileString} AlreadyInstalled "O LyX ${APP_SERIES_KEY2} xa está instalado!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh
index 2a02a8553a..7113080118 100644
--- a/development/Win32/packaging/installer/lang/german.nsh
+++ b/development/Win32/packaging/installer/lang/german.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed 'Der $\"PATH_pr
 #${LangFileString} RunConfigureFailed "Konnte das Konfigurationsskript nicht ausführen."
 ${LangFileString} NotAdmin "Sie benötigen Administratorrechte um LyX zu installieren!"
 ${LangFileString} InstallRunning "Der Installer läuft bereits!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ist bereits installiert! Deinstallieren Sie LyX zuerst."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} ist bereits installiert!$\r$\n\
+				Das Installieren über bestehende Installationen ist nicht empfohlen, wenn die installierte Version$\r$\n\
+				eine Testversion ist oder wenn es Probleme mit der bestehenden LyX-Installation gibt.$\r$\n\
+				Besser Sie deinstallieren in diesen Fällen LyX zuerst.$\r$\n\
+				Wollen Sie LyX dennoch über die bestehende Version installieren?"
 ${LangFileString} NewerInstalled "Sie versuchen eine Vesion von LyX zu installieren, die älter als die derzeit installierte ist.$\r$\n\
 				  Wenn Sie das wirklich wollen, müssen Sie erst das existierende LyX $OldVersionNumber deinstallieren."
 
diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/lang/hungarian.nsh
index 49f8ee21a7..9348e3822a 100644
--- a/development/Win32/packaging/installer/lang/hungarian.nsh
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "Nem tudom be
 ${LangFileString} RunConfigureFailed "Nem tudom végrehajtani a configure parancsfájlt!"
 ${LangFileString} NotAdmin "A LyX telepítéséhez rendszergazdai jogok szükségesek!"
 ${LangFileString} InstallRunning "A telepítõ már fut!"
-${LangFileString} StillInstalled "A LyX ${APP_SERIES_KEY2} már teleptve van! Elõször távolítsa el a régit."
+${LangFileString} AlreadyInstalled "A LyX ${APP_SERIES_KEY2} már teleptve van!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "A jelenleg telepítettnél régebbi LyX verziót próbál telepíteni.$\r$\n\
 				  Ha valóban ezt akarja, elõször el kell távolítania a meglévõ LyX $OldVersionNumber változatot."
 
diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/lang/indonesian.nsh
index 9553eb82b6..e4d2697320 100644
--- a/development/Win32/packaging/installer/lang/indonesian.nsh
+++ b/development/Win32/packaging/installer/lang/indonesian.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 'path_prefix'
 ${LangFileString} RunConfigureFailed "Tidak bisa menjalankan skrip konfigurasi"
 ${LangFileString} NotAdmin "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!"
 ${LangFileString} InstallRunning "Program instalasi sedang berjalan!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} sudah pernah diinstal!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Anda akan memasang versi LyX yang lama dari yang sudah terpasang.$\r$\n\
 				  Jika memang dikehendaki, anda harus menghapus dulu LyX yang ada, LyX $OldVersionNumber."
 
diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh
index 5c7a3f19c3..cf6fc5461e 100644
--- a/development/Win32/packaging/installer/lang/italian.nsh
+++ b/development/Win32/packaging/installer/lang/italian.nsh
@@ -85,7 +85,11 @@ ${LangFileString} ModifyingConfigureFailed "Fallito tentativo di aggiornare 'pat
 ${LangFileString} RunConfigureFailed "Fallito tentativo di eseguire lo script di configurazione"
 ${LangFileString} NotAdmin "Occorrono i privilegi da amministratore per installare LyX!"
 ${LangFileString} InstallRunning "Il programma di installazione è già in esecuzione!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} è già installato! Occorre rimuoverlo per poter procedere."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} è già installato!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh
index 21408a532c..9881c62c5a 100644
--- a/development/Win32/packaging/installer/lang/japanese.nsh
+++ b/development/Win32/packaging/installer/lang/japanese.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "configure
 ${LangFileString} RunConfigureFailed "configureƒXƒNƒŠƒvƒg‚ðŽÀs‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 ${LangFileString} NotAdmin "LyX‚𓱓ü‚·‚é‚ɂ́AŠÇ—ŽÒŒ ŒÀ‚ðŽ‚Á‚Ä‚¢‚È‚­‚Ä‚Í‚È‚è‚Ü‚¹‚ñI"
 ${LangFileString} InstallRunning "“±“üƒvƒƒOƒ‰ƒ€‚ÍŠù‚É“®ì’†‚Å‚·I"
-${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}‚ÍŠù‚É“±“üÏ‚Ý‚Å‚·Iæ‚ÉLyX‚Ì“±“ü‚ð‰ðœ‚µ‚Ä‚­‚¾‚³‚¢B"
+${LangFileString} AlreadyInstalled "LyX${APP_SERIES_KEY2}‚ÍŠù‚É“±“üÏ‚Ý‚Å‚·I$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?B"
 ${LangFileString} NewerInstalled "‚ ‚È‚½‚́AŠù‚É“±“üÏ‚Ý‚ÌLyX‚æ‚è‚àŒÃ‚¢”ł𓱓ü‚µ‚悤‚Æ‚µ‚Ä‚¢‚Ü‚·B$\r$\n\
 				  –{“–‚É‚»‚¤‚µ‚½‚¢‚Ì‚Å‚ ‚ê‚΁AŠù‘¶‚Ì LyX $OldVersionNumber ‚ð‚Ü‚¸“±“ü‰ðœ‚µ‚Ä‚­‚¾‚³‚¢B"
 
diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh
index 71c37fe359..16a2a35987 100644
--- a/development/Win32/packaging/installer/lang/norwegian.nsh
+++ b/development/Win32/packaging/installer/lang/norwegian.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "Fors
 ${LangFileString} RunConfigureFailed "Fikk ikke kjørt konfigurasjonsscriptet"
 ${LangFileString} NotAdmin "Du trenger administratorrettigheter for å installere LyX!"
 ${LangFileString} InstallRunning "Installasjonsprogrammet er allerede i gang!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installert! Fjern LyX først."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} er allerede installert!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Du prøver å installere en eldre versjon av Lyx enn den du har installert fra før.$\r$\n\
 				  Dersom du ønsker dette må du avinstallere LyX $OldVersionNumber først."
 
diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh
index f61f57f0cb..3e7287a490 100644
--- a/development/Win32/packaging/installer/lang/polish.nsh
+++ b/development/Win32/packaging/installer/lang/polish.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Nieudana pr
 ${LangFileString} RunConfigureFailed "Niedana próba wykonania skryptu konfiguracyjnego"
 ${LangFileString} NotAdmin "Musisz mieæ prawa administratora aby zainstalowaæ LyX$\'a!"
 ${LangFileString} InstallRunning "Instalator jest ju¿ uruchomiony!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} jest ju¿ zainstalowany! Aby kontynowaæ musisz go najpierw usun¹æ."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} jest ju¿ zainstalowany!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Próbujesz zainstalowaæ starsz¹ wersjê LyX, ni¿ ta która jest ju¿ zainstalowana.$\r$\n\
 				  Je¿eli naprawdê chcesz tego dokonaæ, musisz wpierw odinstalowaæ LyX $OldVersionNumber."
 
diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/lang/portuguese.nsh
index 728652c972..5e2d3b1a66 100644
--- a/development/Win32/packaging/installer/lang/portuguese.nsh
+++ b/development/Win32/packaging/installer/lang/portuguese.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "N
 ${LangFileString} RunConfigureFailed "Não foi possível executar o script de configuração"
 ${LangFileString} NotAdmin "Precisa de privilégios de administrador para instalar o LyX!"
 ${LangFileString} InstallRunning "O instalador já está a correr!"
-${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} já está instalado! Desinstale o LyX primeiro."
+${LangFileString} AlreadyInstalled "O LyX ${APP_SERIES_KEY2} já está instalado!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/lang/romanian.nsh
index 701d46d706..aed8c4b177 100644
--- a/development/Win32/packaging/installer/lang/romanian.nsh
+++ b/development/Win32/packaging/installer/lang/romanian.nsh
@@ -78,7 +78,11 @@ ${LangFileString} ModifyingConfigureFailed "Nu am putut seta 'path_prefix' 
 ${LangFileString} RunConfigureFailed "Nu am putut executa scriptul de configurare"
 ${LangFileString} NotAdmin "Trebuie sã aveþi drepturi de administrator pentru instalarea programului LyX!"
 ${LangFileString} InstallRunning "Programul de instalare este deja pornit!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} este deja instalat! Dezinstalaþi LyX prima oarã."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} este deja instalat!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh
index 9c7c7aa8ba..cb14438619 100644
--- a/development/Win32/packaging/installer/lang/slovak.nsh
+++ b/development/Win32/packaging/installer/lang/slovak.nsh
@@ -84,7 +84,11 @@ ${LangFileString} ModifyingConfigureFailed "Nedal sa nastavi
 ${LangFileString} RunConfigureFailed "Nedal sa spusti konfiguraèný skript"
 ${LangFileString} NotAdmin "Pre inštaláciu LyXu potrebujete administrátorské práva!"
 ${LangFileString} InstallRunning "Inštalatér už beží!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je už inštalovaný! LyX treba najprv odinštalova."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} je už inštalovaný!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Pokúšate sa inštalova verziu LyXu ktorá je staršia ako tá ktorá je inštalovaná.$\r$\n\
 				  Keï to naozaj chcete, odinštalujte najprv existujúci LyX $OldVersionNumber."
 
diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh
index 4bdd5cde0a..67aefd5efd 100644
--- a/development/Win32/packaging/installer/lang/spanish.nsh
+++ b/development/Win32/packaging/installer/lang/spanish.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "Error al intentar a
 ${LangFileString} RunConfigureFailed "Error al intentar ejecutar el programa de configuración"
 ${LangFileString} NotAdmin "Necesita privilegios de administrador para instalar LyX!"
 ${LangFileString} InstallRunning "El instalador ya esta siendo ejecutado!"
-${LangFileString} StillInstalled "¡LyX ${APP_SERIES_KEY2} ya esta instalado! Antes desinstale LyX."
+${LangFileString} AlreadyInstalled "¡LyX ${APP_SERIES_KEY2} ya esta instalado!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Está tratando de instalar una versión de LyX más antigua que la que tiene instalada.$\r$\n\
 				  Si realmente lo desea, debe desinstalar antes la versión de LyX instalada $OldVersionNumber."
 
diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/lang/swedish.nsh
index aee64063ef..49b497ebc5 100644
--- a/development/Win32/packaging/installer/lang/swedish.nsh
+++ b/development/Win32/packaging/installer/lang/swedish.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Kunde inte s
 ${LangFileString} RunConfigureFailed "Kunde inte köra konfigurationsskriptet"
 ${LangFileString} NotAdmin "Du måste ha administratörsrättigheter för att installera LyX!"
 ${LangFileString} InstallRunning "Installationsprogrammet körs redan!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} är redan installerad! Avinstallera LyX först."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} är redan installerad!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Du försöker att installera en äldre version av LyX än vad du har installerad.$\r$\n\
 				  Om du verkligen vill detta måste du avinstallera den befintliga LyX $OldVersionNumber innan."
 
diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/lang/turkish.nsh
index d4d2fdf0b4..27dc62ba4f 100644
--- a/development/Win32/packaging/installer/lang/turkish.nsh
+++ b/development/Win32/packaging/installer/lang/turkish.nsh
@@ -77,7 +77,11 @@ ${LangFileString} ModifyingConfigureFailed "Yap
 ${LangFileString} RunConfigureFailed "Yapýlandýrma programý çalýþtýrýlamadý"
 ${LangFileString} NotAdmin "LyX kurabilmek için yönetici yetkileri gerekiyor!"
 ${LangFileString} InstallRunning "Kurulum programý zaten çalýþýyor!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} kurulu zaten! Önce onu kaldýrýn."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} kurulu zaten!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\
 				  If you really want this, you must uninstall the existing LyX $OldVersionNumber before."
 
diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh
index 2cc30710b0..78d84c42cc 100644
--- a/development/Win32/packaging/installer/lang/ukrainian.nsh
+++ b/development/Win32/packaging/installer/lang/ukrainian.nsh
@@ -83,7 +83,11 @@ ${LangFileString} ModifyingConfigureFailed "
 ${LangFileString} RunConfigureFailed "Íå âäàëîñÿ âèêîíàòè ñêðèïò íàëàøòóâàííÿ"
 ${LangFileString} NotAdmin "Äëÿ âñòàíîâëåííÿ LyX âàì ïîòð³áí³ ïðèâ³ëå¿ àäì³í³ñòðàòîðà!"
 ${LangFileString} InstallRunning "Çàñ³á äëÿ âñòàíîâëåííÿ âæå ïðàöþº!"
-${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} âæå âñòàíîâëåíî! Ñïî÷àòêó âèëó÷³òü éîãî LyX."
+${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} âæå âñòàíîâëåíî!$\r$\n\
+				Installing over existing installations is not recommended if the installed version$\r$\n\
+				is a test release or if you have problems with your existing LyX installation.$\r$\n\
+				In these cases better reinstall LyX.$\r$\n\
+				Dou you nevertheles want to install LyX over the existing version?"
 ${LangFileString} NewerInstalled "Âè íàìàãàºòåñÿ âñòàíîâèòè âåðñ³þ LyX, ÿêà º çàñòàð³ëîþ ïîð³âíÿíî ç âæå âñòàíîâëåíîþ.$\r$\n\
 				  ßêùî âè õî÷åòå âñòàíîâèòè çàñòàð³ëó âåðñ³þ, âàì ñë³ä ñïî÷àòêó âèëó÷èòè âæå âñòàíîâëåíèé LyX $OldVersionNumber."
 
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 9e6d18be95..639bfd5ccf 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -55,8 +55,8 @@ Section -InstallData
   WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoRepair" 0x00000001
   WriteRegStr SHCTX ${APP_UNINST_KEY} "StartMenu" "$SMPROGRAMS\$StartmenuFolder"
   
-  # if we install over an existing version, remove the old uninstaller information
-  ${if} $OldVersionNumber != ""
+  # if we install over an older existing version, remove the old uninstaller information
+  ${if} $OldVersionNumber < ${APP_SERIES_KEY}
    DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber"
    # also delete in the case of an emergency release
    DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber1"