installer: clarify a message

It is possible to install a newer lyX over an existing older LyX installation, but we cannot allow to install over the same lyX version. Therefore output the version number if this error message is shown

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index 5095ca335f8637f84c73f6e5986051c1268988bc..d40d0b70caae1378593dc3068e8950d168b0ecad 100644 (file)
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -47,6 +47,7 @@ Configuration of LyX installer
 # to check if it is exactly this version (to support side by side installations)
 !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
 !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}"
+!define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}"
 !define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe"
 !define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}"
 !define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"

diff --git a/development/Win32/packaging/installer/lang/arabic.nsh b/development/Win32/packaging/installer/lang/arabic.nsh
index ad9c5b722356006e501ea9073ed0ef775ac456e8..000c302d80d989dc236060132bc8fb28deb85d92 100644 (file)
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the c
 ${LangFileString} RunConfigureFailed "äÇ êåãæ ÊæáêÐ Çäà configure script"
 ${LangFileString} NotAdmin "êÌÈ Ãæ Êãèæ ÈÕäÇÍêÉ ÇäåÏêÑ äãê ääâêÇå ÈÙåäêÉ ÇäÊÑãêÈ!"
 ${LangFileString} InstallRunning "Êå ÈÇäáÙä ÇäÈÏÁ ÈÙåäêÉ ÇäÊÑãêÈ!"
-${LangFileString} StillInstalled "Êå ÈÇäáÙä ÊÑãêÈ ÈÑæÇåÌ äêã äÐÇ Ùäêã ÇèäÇë ÇäÚÇÁ ÊÑãêÈ ÇäæÓÎÉÇäÓÇÈâÉ."
+${LangFileString} StillInstalled "Êå ${APP_SERIES_KEY2} ÈÇäáÙä ÊÑãêÈ ÈÑæÇåÌ äêã äÐÇ Ùäêã ÇèäÇë ÇäÚÇÁ ÊÑãêÈ ÇäæÓÎÉÇäÓÇÈâÉ."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/lang/catalan.nsh
index 9dca374eec5461cc319ff9e3d7d94ba8478dfe4c..d384acd6387ecd561aaf0c9a796b91eaf39a51cb 100644 (file)
--- a/development/Win32/packaging/installer/lang/catalan.nsh
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -75,7 +75,7 @@ ${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 ja es troba instal·lat! Desinstal·leu-lo primer."
+${LangFileString} StillInstalled "El LyX ${APP_SERIES_KEY2} ja es troba instal·lat! Desinstal·leu-lo primer."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/lang/czech.nsh
index 4487919c41fc7f8e396b702f4221519449f7b8e1..9726956c1c0f1750b68d2e53ce834e07ee7c7940 100644 (file)
--- a/development/Win32/packaging/installer/lang/czech.nsh
+++ b/development/Win32/packaging/installer/lang/czech.nsh
@@ -75,7 +75,7 @@ ${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\9e spu\9atìn!"
-${LangFileString} StillInstalled "LyX je ji\9e nainstalován! Nejprve LyX odinstalujte."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je ji\9e nainstalován! Nejprve LyX odinstalujte."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/lang/danish.nsh
index 4c20071215c607f1602afba927008a6cc44e0c9a..dca82d758cad6be95dd03fec698838017f54a907 100644 (file)
--- a/development/Win32/packaging/installer/lang/danish.nsh
+++ b/development/Win32/packaging/installer/lang/danish.nsh
@@ -75,7 +75,7 @@ ${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 er allerede installeret! Afinstaller LyX først."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installeret! Afinstaller LyX først."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/lang/dutch.nsh
index 660de6fe397456998a96b145f9579e30e9cd974e..c7c777529518e68c9eafd2630b25ca600f3fdfca 100644 (file)
--- a/development/Win32/packaging/installer/lang/dutch.nsh
+++ b/development/Win32/packaging/installer/lang/dutch.nsh
@@ -75,7 +75,7 @@ ${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 is reeds geinstalleerd! Verwijder LyX eerst."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is reeds geinstalleerd! Verwijder LyX eerst."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh
index b49653ce1d32b23490a46f61ccfdc765f576ba07..485e9b3ae8fdd57415c93f1010d14d4a7fc17872 100644 (file)
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -82,7 +82,7 @@ ${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 is already installed! Deinstall LyX first."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is already installed! Deinstall LyX first."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh
index 7abbac2c6c542096f1441cdfd415f182aba50254..8329f5c5bda33d5fdac31d55e3ac04a143ed31fc 100644 (file)
--- a/development/Win32/packaging/installer/lang/french.nsh
+++ b/development/Win32/packaging/installer/lang/french.nsh
@@ -81,7 +81,7 @@ ${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 est déjà installé ! Le désinstaller d'abord."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} est déjà installé ! Le désinstaller d'abord."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/lang/galician.nsh
index 41f85f2a7e0738d06ebf17047b34938f70f8c749..c46f12b2a0fc343c223e0018477d8864055933cc 100644 (file)
--- a/development/Win32/packaging/installer/lang/galician.nsh
+++ b/development/Win32/packaging/installer/lang/galician.nsh
@@ -75,7 +75,7 @@ ${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 xa está instalado! Desinstale o LyX primeiro."
+${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} xa está instalado! Desinstale o LyX primeiro."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh
index 7de08fb7f5f0df2d162e73d9296376569a6609f2..beb96c05ebf0ad17afbc7028c2aa093b9bf129a8 100644 (file)
--- a/development/Win32/packaging/installer/lang/german.nsh
+++ b/development/Win32/packaging/installer/lang/german.nsh
@@ -83,7 +83,7 @@ ${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 ist bereits installiert! Deinstallieren Sie LyX zuerst."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ist bereits installiert! Deinstallieren Sie LyX zuerst."
 
 ${LangFileString} MultipleIndexesNotAvailable "Die Unterstützung für mehrere Indexe in einem Dokument wird nicht verfügbar sein, denn$\r$\n\
                                               MiKTeX wurde mit Administratorrechten installiert aber Sie installieren LyX ohne diese."

diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/lang/hungarian.nsh
index 96a630ee2e5c312dc95abd223174f268f5823dde..2167b57a905219cc54d5ed11a4c5ebd375d87bb8 100644 (file)
--- a/development/Win32/packaging/installer/lang/hungarian.nsh
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -75,7 +75,7 @@ ${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 már teleptve van! Elõször távolítsa el a régit."
+${LangFileString} StillInstalled "A LyX ${APP_SERIES_KEY2} már teleptve van! Elõször távolítsa el a régit."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/lang/indonesian.nsh
index 3264cb15edf4858c76f8d7e0dd92ee5f4ae49c51..b1a553fcf3d536753da1eae9f94b26c256657bf4 100644 (file)
--- a/development/Win32/packaging/installer/lang/indonesian.nsh
+++ b/development/Win32/packaging/installer/lang/indonesian.nsh
@@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 'path_prefix'
 ${LangFileString} RunConfigureFailed "Tidak bisa menjalankan skrip configure"
 ${LangFileString} NotAdmin "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!"
 ${LangFileString} InstallRunning "Program instalasi sedang berjalan!"
-${LangFileString} StillInstalled "LyX sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh
index e84bb2f0edae859bbed58dbaf00445361cbc71fd..aac390201ff19639976d99575cd18e364111916a 100644 (file)
--- a/development/Win32/packaging/installer/lang/italian.nsh
+++ b/development/Win32/packaging/installer/lang/italian.nsh
@@ -81,7 +81,7 @@ ${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 è già installato! Occorre rimuoverlo per poter procedere."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} è già installato! Occorre rimuoverlo per poter procedere."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh
index 385f6c2ae5ad24c071d604c49b20597553fee593..6f8a46cc31fef41a440c1ada11f4816f89d2ee32 100644 (file)
--- a/development/Win32/packaging/installer/lang/japanese.nsh
+++ b/development/Win32/packaging/installer/lang/japanese.nsh
@@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "configure
 ${LangFileString} RunConfigureFailed "configure\83X\83N\83\8a\83v\83g\82ð\8eÀ\8ds\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½"
 ${LangFileString} NotAdmin "LyX\82ð\83C\83\93\83X\83g\81[\83\8b\82·\82é\82É\82Í\81A\8aÇ\97\9d\8eÒ\8c \8cÀ\82ð\8e\9d\82Á\82Ä\82¢\82È\82­\82Ä\82Í\82È\82è\82Ü\82¹\82ñ\81I"
 ${LangFileString} InstallRunning "\83C\83\93\83X\83g\81[\83\89\81[\82Í\8aù\82É\93®\82¢\82Ä\82¢\82Ü\82·\81I"
-${LangFileString} StillInstalled "LyX\82Í\8aù\82É\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82Ü\82·\81I\90æ\82ÉLyX\82ð\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82µ\82Ä\82­\82¾\82³\82¢\81B"
+${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}\82Í\8aù\82É\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82Ü\82·\81I\90æ\82ÉLyX\82ð\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh
index d8c3ec3f5af5f5a523dd76e33e11214f2dfc73de..199a92b7f00f9c2921128aea8b697587df8047e1 100644 (file)
--- a/development/Win32/packaging/installer/lang/norwegian.nsh
+++ b/development/Win32/packaging/installer/lang/norwegian.nsh
@@ -75,7 +75,7 @@ ${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 er allerede installert! Fjern LyX først."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installert! Fjern LyX først."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh
index fc118486d1c3078dc6e3e35b78d822bf0ef7a1ee..021a0a8442b8b6eb57ba2d3769d419f678c63f31 100644 (file)
--- a/development/Win32/packaging/installer/lang/polish.nsh
+++ b/development/Win32/packaging/installer/lang/polish.nsh
@@ -75,7 +75,7 @@ ${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 jest ju¿ zainstalowany! Aby kontynowaæ musisz go najpierw usun¹æ."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} jest ju¿ zainstalowany! Aby kontynowaæ musisz go najpierw usun¹æ."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/lang/portuguese.nsh
index 085c398e8b1adc4290fb39dd8c21e3536b9baaca..0693efe86b4b9d831790642a240bf2d206c0ba9c 100644 (file)
--- a/development/Win32/packaging/installer/lang/portuguese.nsh
+++ b/development/Win32/packaging/installer/lang/portuguese.nsh
@@ -75,7 +75,7 @@ ${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 já está instalado! Desinstale o LyX primeiro."
+${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} já está instalado! Desinstale o LyX primeiro."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/lang/romanian.nsh
index 5416bb0ea9495966e7009e2387eee5eefd5e83f0..14d1e9965c51bd07844260b5510a9250f9c539e2 100644 (file)
--- a/development/Win32/packaging/installer/lang/romanian.nsh
+++ b/development/Win32/packaging/installer/lang/romanian.nsh
@@ -74,7 +74,7 @@ ${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 este deja instalat! Dezinstalaþi LyX prima oarã."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} este deja instalat! Dezinstalaþi LyX prima oarã."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh
index ff79fda1b11c44d63ebe9a1bc9e2ee9d457386f2..9fad2f22e002b301c9f692fabee8901be15e4e8f 100644 (file)
--- a/development/Win32/packaging/installer/lang/slovak.nsh
+++ b/development/Win32/packaging/installer/lang/slovak.nsh
@@ -76,7 +76,7 @@ ${LangFileString} ModifyingConfigureFailed "Nemohol uvies
 ${LangFileString} RunConfigureFailed "Nemohol vykona\9d konfiguraèný skript"
 ${LangFileString} NotAdmin "Pre in\9ataláciu LyX potrebujete administrátorské práva!"
 ${LangFileString} InstallRunning "In\9atalatér u\9e behá!"
-${LangFileString} StillInstalled "LyX je u\9e in\9atalovaný! Najprv treba odin\9atalova\9d LyX."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je u\9e in\9atalovaný! Najprv treba odin\9atalova\9d LyX."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh
index 9ede731b4f63efe5321d7d640ffd5bfcf99c7c09..de857d9f878b03f2e1ab4c64665e67d281ef2234 100644 (file)
--- a/development/Win32/packaging/installer/lang/spanish.nsh
+++ b/development/Win32/packaging/installer/lang/spanish.nsh
@@ -75,7 +75,7 @@ ${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 ya esta instalado! Antes desinstale LyX."
+${LangFileString} StillInstalled "¡LyX ${APP_SERIES_KEY2} ya esta instalado! Antes desinstale LyX."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/lang/swedish.nsh
index 60b6c74ca07707d9fedb028da4ec2e0459a924c2..7b3b8d7ddb622cdb89f0a624b36b70f88c39bb60 100644 (file)
--- a/development/Win32/packaging/installer/lang/swedish.nsh
+++ b/development/Win32/packaging/installer/lang/swedish.nsh
@@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Misslyckades med att s
 ${LangFileString} RunConfigureFailed "Misslyckades med att köra konfigurationsskriptet"
 ${LangFileString} NotAdmin "Du måste ha administratörsrättigheter för att installera LyX!"
 ${LangFileString} InstallRunning "Installationsprogrammet körs readan!"
-${LangFileString} StillInstalled "LyX är redan installerat! Avinstallera LyX först."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} är redan installerat! Avinstallera LyX först."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/lang/turkish.nsh
index e5b5764081dffd86fc682fdbcf5b73e1c30131e8..63a6e6462aa85a38d913a452c3e16556dd187f60 100644 (file)
--- a/development/Win32/packaging/installer/lang/turkish.nsh
+++ b/development/Win32/packaging/installer/lang/turkish.nsh
@@ -75,7 +75,7 @@ ${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 kurulu zaten! Önce onu kaldýrýn."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} kurulu zaten! Önce onu kaldýrýn."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."

diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh
index d70af11a7f29bd5dbbe75a0cb90fd3014201e447..cbb959a6ba20cd5a247534749ce0a1930d48e6d0 100644 (file)
--- a/development/Win32/packaging/installer/lang/ukrainian.nsh
+++ b/development/Win32/packaging/installer/lang/ukrainian.nsh
@@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "
 ${LangFileString} RunConfigureFailed "Íå âäàëîñÿ âèêîíàòè ñêðèïò íàëàøòóâàííÿ"
 ${LangFileString} NotAdmin "Äëÿ âñòàíîâëåííÿ LyX âàì ïîòð³áí³ ïðèâ³ëå¿ àäì³í³ñòðàòîðà!"
 ${LangFileString} InstallRunning "Çàñ³á äëÿ âñòàíîâëåííÿ âæå ïðàöþº!"
-${LangFileString} StillInstalled "LyX âæå âñòàíîâëåíî! Ñïî÷àòêó âèëó÷³òü éîãî LyX."
+${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} âæå âñòàíîâëåíî! Ñïî÷àòêó âèëó÷³òü éîãî LyX."
 
 ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\
                                               MiKTeX was installed with administrator privileges but you are installing LyX without them."