The branch, master, has been updated. - Log -----------------------------------------------------------------
commit e447cdbd6b828e796107624b3a91841fb4517782 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sat Nov 10 07:21:00 2012 +0100 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 5095ca3..d40d0b7 100644 --- 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 ad9c5b7..000c302 100644 --- 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 9dca374..d384acd 100644 --- 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 4487919..9726956 100644 --- 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 sputìn!" -${LangFileString} StillInstalled "LyX je ji nainstalován! Nejprve LyX odinstalujte." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je ji 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 4c20071..dca82d7 100644 --- 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 660de6f..c7c7775 100644 --- 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 b49653c..485e9b3 100644 --- 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 7abbac2..8329f5c 100644 --- 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 41f85f2..c46f12b 100644 --- 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 7de08fb..beb96c0 100644 --- 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 96a630e..2167b57 100644 --- 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 3264cb1..b1a553f 100644 --- 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 e84bb2f..aac3902 100644 --- 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 385f6c2..6f8a46c 100644 --- 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 "configureXNvgðÀs·é±ÆªÅ«Ü¹ñŵ½" ${LangFileString} NotAdmin "LyXðCXg[·éÉÍAÇÒ ÀðÁÄ¢ÈÄÍÈèܹñI" ${LangFileString} InstallRunning "CXg[[ÍùÉ®¢Ä¢Ü·I" -${LangFileString} StillInstalled "LyXÍùÉCXg[³êĢܷIæÉLyXðACXg[µÄ¾³¢B" +${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}ÍùÉCXg[³êĢܷIæÉLyXðACXg[µÄ¾³¢B" ${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 d8c3ec3..199a92b 100644 --- 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 fc11848..021a0a8 100644 --- 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 085c398..0693efe 100644 --- 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 5416bb0..14d1e99 100644 --- 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 ff79fda..9fad2f2 100644 --- 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 konfiguraèný skript" ${LangFileString} NotAdmin "Pre intaláciu LyX potrebujete administrátorské práva!" ${LangFileString} InstallRunning "Intalatér u behá!" -${LangFileString} StillInstalled "LyX je u intalovaný! Najprv treba odintalova LyX." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je u intalovaný! Najprv treba odintalova 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 9ede731..de857d9 100644 --- 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 60b6c74..7b3b8d7 100644 --- 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 e5b5764..63a6e64 100644 --- 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 d70af11..cbb959a 100644 --- 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." ----------------------------------------------------------------------- Summary of changes: .../packaging/installer/include/declarations.nsh | 1 + .../Win32/packaging/installer/lang/arabic.nsh | 2 +- .../Win32/packaging/installer/lang/catalan.nsh | 2 +- .../Win32/packaging/installer/lang/czech.nsh | 2 +- .../Win32/packaging/installer/lang/danish.nsh | 2 +- .../Win32/packaging/installer/lang/dutch.nsh | 2 +- .../Win32/packaging/installer/lang/english.nsh | 2 +- .../Win32/packaging/installer/lang/french.nsh | 2 +- .../Win32/packaging/installer/lang/galician.nsh | 2 +- .../Win32/packaging/installer/lang/german.nsh | 2 +- .../Win32/packaging/installer/lang/hungarian.nsh | 2 +- .../Win32/packaging/installer/lang/indonesian.nsh | 2 +- .../Win32/packaging/installer/lang/italian.nsh | 2 +- .../Win32/packaging/installer/lang/japanese.nsh | 2 +- .../Win32/packaging/installer/lang/norwegian.nsh | 2 +- .../Win32/packaging/installer/lang/polish.nsh | 2 +- .../Win32/packaging/installer/lang/portuguese.nsh | 2 +- .../Win32/packaging/installer/lang/romanian.nsh | 2 +- .../Win32/packaging/installer/lang/slovak.nsh | 2 +- .../Win32/packaging/installer/lang/spanish.nsh | 2 +- .../Win32/packaging/installer/lang/swedish.nsh | 2 +- .../Win32/packaging/installer/lang/turkish.nsh | 2 +- .../Win32/packaging/installer/lang/ukrainian.nsh | 2 +- 23 files changed, 23 insertions(+), 22 deletions(-) hooks/post-receive -- The LyX Source Repository