commit 62cbf893d2341543c37ed210fce5ac5ac9176b8a
Author: Uwe Stöhr <[email protected]>
Date: Sat Apr 19 18:58:22 2014 +0200
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 44020a7..3223f8d 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 1b4cf98..7a0cef8 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 b58478a..0535706 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 e31c1b7..eb83ebf 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 19ca6ec..2988c27 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 a8888dd..0084fa7 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 db1bac8..7b15087 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 73ecde1..5fb50fe 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 116208a..e6831d9 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 cf3b867..9b8ba29 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 576f185..23e1bdf 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 72f8a69..620ecca 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 2a02a85..7113080 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 49f8ee2..9348e38 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 9553eb8..e4d2697 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 5c7a3f1..cf6fc54 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 21408a5..9881c62 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 71c37fe..16a2a35 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 f61f57f..3e7287a 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 728652c..5e2d3b1 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 701d46d..aed8c4b 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 9c7c7aa..cb14438 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 4bdd5cd..67aefd5 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 aee6406..49b497e 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 d4d2fdf..27dc62b 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 2cc3071..78d84c4 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 9e6d18b..639bfd5 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"
