The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit fea35ef2c61d508a9f6d19bf3e3562fc005a86aa
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Wed Jun 27 01:07:46 2012 +0200

    installer: output messages
    
    - output a message when multiple index feature or Metafile support won't be 
available

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh 
b/development/Win32/packaging/installer/include/LaTeX.nsh
index e687207..929531e 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -176,8 +176,7 @@ Function ConfigureMiKTeX
   ${andif} $MultiUser.Privileges != "Power"
    ${if} $PathLaTeX != "$LOCALAPPDATA\MiKTeX\$MiKTeXVersion\miktex\bin"
     ${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
-     # FIXME: output a translatable message in this case
-     MessageBox MB_OK "LyX's multiple index feature will not work because 
MiKTeX was installed with admin privileges but you don't have them."
+     MessageBox MB_OK|MB_ICONINFORMATION "$(MultipleIndexesNotAvailable)"
     ${endif}
    ${else}
     ${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh 
b/development/Win32/packaging/installer/lang/arabic.nsh
index 38681e7..ad9c5b7 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo '
                                     âÈä ÇÓÊÎÏÇå äêã äÃèä åÑÉ.$\r$\n\
                                     çä ÊÑÚÈ ÈÇäÊÍââ åæ ÇäÊÍÏêËÇÊ ÇäÂæ¿'
 
-${LangFileString} UpdateNotAllowed "çÐÇ ÇäÊÍÏêË ÎÇÕ áâ× Èà 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the 
configure script"
 ${LangFileString} RunConfigureFailed "äÇ êåãæ ÊæáêÐ Çäà configure script"
 ${LangFileString} NotAdmin "êÌÈ Ãæ Êãèæ ÈÕäÇÍêÉ ÇäåÏêÑ äãê ääâêÇå ÈÙåäêÉ 
ÇäÊÑãêÈ!"
 ${LangFileString} InstallRunning "Êå ÈÇäáÙä ÇäÈÏÁ ÈÙåäêÉ ÇäÊÑãêÈ!"
 ${LangFileString} StillInstalled "Êå ÈÇäáÙä ÊÑãêÈ ÈÑæÇåÌ äêã äÐÇ Ùäêã ÇèäÇë 
ÇäÚÇÁ ÊÑãêÈ ÇäæÓÎÉÇäÓÇÈâÉ."
 
+${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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "ÊçÇæêæÇ! Êå ÊÑãêÈ äêã ÈæÌÇÍ.$\r$\n\
                                            $\r$\n\
                                            (ÊÔÚêä äêã äÃèä åÑÉ âÏ êÃÎÐ ÙÏÉ 
ËèÇæê.)"
diff --git a/development/Win32/packaging/installer/lang/catalan.nsh 
b/development/Win32/packaging/installer/lang/catalan.nsh
index 7003b51..9dca374 100644
--- a/development/Win32/packaging/installer/lang/catalan.nsh
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'La distribuci
                                     abans d$\'executar el LyX per primer 
cop.$\r$\n\
                                     Voleu comprobar ara si hi ha 
actualitzacions del MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "Aquest paquet d'actualització només 
actualitza ${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "No es pot establir 'path_prefix' 
durant el programa de configuració"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Felicitats! Heu instal·lat correctament 
el LyX.$\r$\n\
                                            $\r$\n\
                                            (La primera execució del LyX pot 
trigar alguns segons.)"
diff --git a/development/Win32/packaging/installer/lang/czech.nsh 
b/development/Win32/packaging/installer/lang/czech.nsh
index b15a9af..4487919 100644
--- a/development/Win32/packaging/installer/lang/czech.nsh
+++ b/development/Win32/packaging/installer/lang/czech.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'LaTeXov
                                     pøedtím než poprvé spustíte LyX.$\r$\n\
                                     Chcete zkontrolovat dostupné aktualizace 
MiKTeXu nyní?'
                                     
-${LangFileString} UpdateNotAllowed "Tento aktualizaèní balíèek mùže být použít 
jen na ${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Nelze nastavit 'path_prefix' v 
konfiguraèním skriptu"
 ${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 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Blahopøejeme! LyX byl úspìšnì 
nainstalován.$\r$\n\
                                            $\r$\n\
                                            (První spuštìní LyXu mùže trvat 
delší dobu.)"
diff --git a/development/Win32/packaging/installer/lang/danish.nsh 
b/development/Win32/packaging/installer/lang/danish.nsh
index 83d2da9..4c20071 100644
--- a/development/Win32/packaging/installer/lang/danish.nsh
+++ b/development/Win32/packaging/installer/lang/danish.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'LaTeX-distributionen 
$\"MiKTeX$\" vil blive brugt
                                     før LyX startes for første gang.$\r$\n\
                                     Vil du tjekke om der findes MiKTeX 
opdateringer?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Forsoget på at indstille 
'path_prefix' i konfigurationen mislykkedes"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Tillykke!! LyX er installeret.$\r$\n\
                                           $\r$\n\
                                           (Når LyX startes første gang, kan 
det tage noget tid.)"
diff --git a/development/Win32/packaging/installer/lang/dutch.nsh 
b/development/Win32/packaging/installer/lang/dutch.nsh
index 4c4f395..660de6f 100644
--- a/development/Win32/packaging/installer/lang/dutch.nsh
+++ b/development/Win32/packaging/installer/lang/dutch.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'LyX gebruikt de LaTeX 
software $\"MiKTeX$\".$\r$\n
                                     voordat u LyX voor de eerste keer 
gebruikt.$\r$\n\
                                     Wilt u controleren of er updates voor 
MiKTeX beschikbaar zijn?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Mislukte poging om 'path_prefix' 
te registreren tijdens de configuratie"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Gefeliciteerd! LyX is succesvol 
geinstalleerd.$\r$\n\
                                            $\r$\n\
                                            (De eerste keer dat u LyX start kan 
dit enige seconden duren.)"
diff --git a/development/Win32/packaging/installer/lang/english.nsh 
b/development/Win32/packaging/installer/lang/english.nsh
index ca4552b..d4b3051 100644
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -84,13 +84,19 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 
'path_prefix' in the c
 ${LangFileString} InstallRunning "The installer is already running!"
 ${LangFileString} StillInstalled "LyX 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 #${LangFileString} FinishPageMessage "Congratulations! LyX has been installed 
successfully.$\r$\n\
 #                                          $\r$\n\
 #                                          (The first start of LyX might take 
some seconds.)"
 ${LangFileString} FinishPageRun "Launch LyX"
 
 ${LangFileString} UnNotInRegistryLabel "Unable to find LyX in the 
registry.$\r$\n\
-                                              Shortcuts on the desktop and in 
the Start Menu will not be removed."
+                                       Shortcuts on the desktop and in the 
Start Menu will not be removed."
 ${LangFileString} UnInstallRunning "You must close LyX at first!"
 ${LangFileString} UnNotAdminLabel "You must have administrator privileges to 
uninstall LyX!"
 ${LangFileString} UnReallyRemoveLabel "Are you sure you want to completely 
remove LyX and all of its components?"
diff --git a/development/Win32/packaging/installer/lang/french.nsh 
b/development/Win32/packaging/installer/lang/french.nsh
index 031ac72..7abbac2 100644
--- a/development/Win32/packaging/installer/lang/french.nsh
+++ b/development/Win32/packaging/installer/lang/french.nsh
@@ -77,13 +77,18 @@ ${LangFileString} MiKTeXInfo 'La distribution LaTeX 
$\"MiKTeX$\" sera utilis
                                     avant d$\'utiliser LyX pour la première 
fois.$\r$\n\
                                     Voulez-vous vérifier maintenant les mises 
à jour de MiKTeX ?'
 
-${LangFileString} UpdateNotAllowed "Ce paquetage ne peut mettre à jour que 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Échec de l'allocation 
'path_prefix' lors de la configuration."
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Félicitations ! LyX est installé avec 
succès.$\r$\n\
                                            $\r$\n\
                                            (Le premier démarrage de LyX peut 
demander quelques secondes.)"
diff --git a/development/Win32/packaging/installer/lang/galician.nsh 
b/development/Win32/packaging/installer/lang/galician.nsh
index 82ed7cb..41f85f2 100644
--- a/development/Win32/packaging/installer/lang/galician.nsh
+++ b/development/Win32/packaging/installer/lang/galician.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'Xunto co LyX vai-se empregar 
a distribuci
                                     do MiKTeX co instalador $\"MiKTeX Update 
Wizard$\"$\r$\n\
                                     Desexa comprovar agora se ha 
actualizacións do MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Non se puido engadir o 
'path_prefix' no script de configuración"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Parabéns! O LyX foi instalado con 
suceso.$\r$\n\
                                            $\r$\n\
                                            (O primeiro início do LyX pode 
levar alguns segundos.)"
diff --git a/development/Win32/packaging/installer/lang/german.nsh 
b/development/Win32/packaging/installer/lang/german.nsh
index da2d0e3..7de08fb 100644
--- a/development/Win32/packaging/installer/lang/german.nsh
+++ b/development/Win32/packaging/installer/lang/german.nsh
@@ -79,13 +79,18 @@ ${LangFileString} MiKTeXInfo 'Die LaTeX-Distribution 
$\"MiKTeX$\" wird zusammen
                                     installieren, bevor sie LyX das erste Mal 
benutzen.$\r$\n\
                                     Möchten Sie jetzt nach Updates für MiKTeX 
suchen?'
 
-${LangFileString} UpdateNotAllowed "Dieses Update-Paket kann nur 
${PRODUCT_VERSION_OLD} updaten!"
 ${LangFileString} ModifyingConfigureFailed 'Der $\"PATH_präfix$\" (Liste mit 
Programmpfaden) konnte nicht im Konfigurationsskript gesetzt werden.'
 ${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} 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."
+${LangFileString} MetafileNotAvailable "Die LyX Unterstützung für Bilder im 
Format EMF oder WMF wird nicht verfügbar$\r$\n\
+                                       sein, denn dafür müsste ein 
Software-Drucker für Windows installiert werden,$\r$\n\
+                                       was jedoch nur mit Administratorrechten 
möglich ist."
+
 ${LangFileString} FinishPageMessage "Glückwunsch! LyX wurde erfolgreich 
installiert.$\r$\n\
                                            $\r$\n\
                                            (Der erste Start von LyX kann etwas 
länger dauern.)"
diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh 
b/development/Win32/packaging/installer/lang/hungarian.nsh
index 85b9fbf..96a630e 100644
--- a/development/Win32/packaging/installer/lang/hungarian.nsh
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'A $\"MiKTeX$\" LaTeX-disztib
                                     a LyX elsõ indítása elõtt.$\r$\n\
                                     Szeretné ellenõrizni a frissítéseket most?'
 
-${LangFileString} UpdateNotAllowed "Ez a frissítõ csomag csak a 
${PRODUCT_VERSION_OLD} verziót tudja frissíteni!"
 ${LangFileString} ModifyingConfigureFailed "Nem tudom beállítani a 
'path_prefix'-et a configure parancsfájlban!"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Gratulálok! Sikeresen telepítette a 
LyX-et.$\r$\n\
                                            $\r$\n\
                                            (Az program elsõ indítása egy kis 
idõt vehet igénybe...)"
diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh 
b/development/Win32/packaging/installer/lang/indonesian.nsh
index 6bc0bcb..3264cb1 100644
--- a/development/Win32/packaging/installer/lang/indonesian.nsh
+++ b/development/Win32/packaging/installer/lang/indonesian.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'Distribusi LaTeX $\"MiKTeX$\" 
akan digunakan denga
                                     sebelum anda menggunakan LyX untuk yang 
pertama kali.$\r$\n\
                                     Apakah anda akan memeriksa perlunya 
memperbarui MikTeX?'
 
-${LangFileString} UpdateNotAllowed "Program update ini hanya hanya dapat 
memperbarui ${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 
'path_prefix' pada skrip configure"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Selamat! LyX berhasil diinstal dengan 
sukses.$\r$\n\
                                            $\r$\n\
                                            (Menjalankan LyX untuk pertama kali 
memerlukan waktu beberapa detik.)"
diff --git a/development/Win32/packaging/installer/lang/italian.nsh 
b/development/Win32/packaging/installer/lang/italian.nsh
index 54536e9..e84bb2f 100644
--- a/development/Win32/packaging/installer/lang/italian.nsh
+++ b/development/Win32/packaging/installer/lang/italian.nsh
@@ -77,13 +77,18 @@ ${LangFileString} MiKTeXInfo 'La distribuzione di LaTeX 
$\"MiKTeX$\" verr
                                     prima di usare LyX per la prima 
volta.$\r$\n\
                                     Vuoi controllare ora la presenza di 
aggiornamenti per MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Fallito tentativo di aggiornare 
'path_prefix' nello script di configurazione"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Congratulazioni! LyX è stato installato 
con successo.$\r$\n\
                                            $\r$\n\
                                            (Il primo avvio di LyX potrebbe 
richiedere qualche secondo in più.)"
diff --git a/development/Win32/packaging/installer/lang/japanese.nsh 
b/development/Win32/packaging/installer/lang/japanese.nsh
index 783f4c3..385f6c2 100644
--- a/development/Win32/packaging/installer/lang/japanese.nsh
+++ b/development/Win32/packaging/installer/lang/japanese.nsh
@@ -77,6 +77,12 @@ ${LangFileString} NotAdmin "LyX
 ${LangFileString} InstallRunning "ƒCƒ“ƒXƒg[ƒ‰[‚ÍŠù‚É“®‚¢‚Ä‚¢‚Ü‚·I"
 ${LangFileString} StillInstalled 
"LyX‚ÍŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·Iæ‚ÉLyX‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage 
"‚¨‚ß‚Å‚Æ‚¤‚²‚´‚¢‚Ü‚·ILyX‚ª³‚µ‚­‘•”õ‚³‚ê‚Ü‚µ‚½B$\r$\n\
                                            $\r$\n\
                                            
i‰‰ñ‚ÌLyX‚Ì‹N“®‚É‚ÍŽžŠÔ‚ª‚©‚©‚è‚Ü‚·Bj"
diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh 
b/development/Win32/packaging/installer/lang/norwegian.nsh
index d8cb4a3..d8c3ec3 100644
--- a/development/Win32/packaging/installer/lang/norwegian.nsh
+++ b/development/Win32/packaging/installer/lang/norwegian.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'The LaTeX-distribution 
$\"MiKTeX$\" will be used t
                                     before you use LyX for the first 
time.$\r$\n\
                                     Would you now check for MiKTeX updates?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update LyX 
${PRODUCT_VERSION_OLD}!"                                
 ${LangFileString} ModifyingConfigureFailed "Forsøket på å stille inn 
'path_prefix' i konfigurasjonsscriptet mislyktes"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Gratulerer!! LyX er installert.$\r$\n\
                                            $\r$\n\
                                            (Første gangs oppstart av LyX kan 
ta noen sekunder.)"
diff --git a/development/Win32/packaging/installer/lang/polish.nsh 
b/development/Win32/packaging/installer/lang/polish.nsh
index 224096c..fc11848 100644
--- a/development/Win32/packaging/installer/lang/polish.nsh
+++ b/development/Win32/packaging/installer/lang/polish.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'The LaTeX-distribution 
$\"MiKTeX$\" will be used t
                                     before you use LyX for the first 
time.$\r$\n\
                                     Would you now check for MiKTeX updates?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Nieudana próba ustawienia zmiennej 
'path_prefix' w pliku skryptu konfigracyjnego"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Gratulacje! LyX zosta³ pomyœlnie 
zainstalowany.$\r$\n\
                                            $\r$\n\
                                            (Pierwsze uruchomienie mo¿e potrwaæ 
kilka sekund.)"
diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh 
b/development/Win32/packaging/installer/lang/portuguese.nsh
index 8ac8e4b..085c398 100644
--- a/development/Win32/packaging/installer/lang/portuguese.nsh
+++ b/development/Win32/packaging/installer/lang/portuguese.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'Junto com o LyX vai-se 
utilizar a distribui
                                     do MiKTeX com o instalador $\"MiKTeX 
Update Wizard$\"$\r$\n\
                                     Deseja comprovar agora se há actualizações 
do MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Não conseguimos establecer o 
'path_prefix' no script de configuração"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Parabéns! O LyX foi instalado com 
sucesso.$\r$\n\
                                            $\r$\n\
                                            (O primeiro início do LyX pode 
levar alguns segundos.)"
diff --git a/development/Win32/packaging/installer/lang/romanian.nsh 
b/development/Win32/packaging/installer/lang/romanian.nsh
index 5062616..5416bb0 100644
--- a/development/Win32/packaging/installer/lang/romanian.nsh
+++ b/development/Win32/packaging/installer/lang/romanian.nsh
@@ -70,13 +70,18 @@ ${LangFileString} MiKTeXInfo 'Distribu
                                     înainte de a folosi LyX pentru prima 
oarã.$\r$\n\
                                     Doriþi sã verificaþi dacã sunt disponibile 
actualizãri pentru MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "Acest program de actualizare poate 
actualiza numai ${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Nu am putut seta 'path_prefix' în 
procesul de configurare"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Felicitãri! LyX a fost instalat cu 
succes.$\r$\n\
                                            $\r$\n\
                                            (Prima oarã cînd porniþi LyX s-ar 
putea sã dureze cîteva secunde.)"
diff --git a/development/Win32/packaging/installer/lang/slovak.nsh 
b/development/Win32/packaging/installer/lang/slovak.nsh
index b6ddcb6..ff79fda 100644
--- a/development/Win32/packaging/installer/lang/slovak.nsh
+++ b/development/Win32/packaging/installer/lang/slovak.nsh
@@ -72,13 +72,18 @@ ${LangFileString} MiKTeXInfo 'LaTeX distrib
                                     pred prvým používaním LyXu.$\r$\n\
                                     Chcete teraz testova MiKTeX aktualizácie?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Nemohol uvies v platnost 
'path_prefix' (zoznam s cestami programu) v konfiguraènom skripte"
 ${LangFileString} RunConfigureFailed "Nemohol vykona konfiguraèný skript"
 ${LangFileString} NotAdmin "Pre inštaláciu LyX potrebujete administrátorské 
práva!"
 ${LangFileString} InstallRunning "Inštalatér už behá!"
 ${LangFileString} StillInstalled "LyX je už inštalovaný! Najprv treba 
odinštalova 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Gratulácia! LyX bol úspešne 
inštalovaný.$\r$\n\
                                            $\r$\n\
                                            (Prvý LyX štart môže trva niekolko 
sekund.)"
diff --git a/development/Win32/packaging/installer/lang/spanish.nsh 
b/development/Win32/packaging/installer/lang/spanish.nsh
index a155e57..9ede731 100644
--- a/development/Win32/packaging/installer/lang/spanish.nsh
+++ b/development/Win32/packaging/installer/lang/spanish.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'Junto con LyX se va usar la 
distribuci
                                     de MiKTeX con el instalador $\"MiKTeX 
Update Wizard$\"$\r$\n\
                                     ¿Desea comprobar ahora si hay 
actualizaciones de MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Error al intentar añadir 
'path_prefix' durante la ejecución del programa de configuración"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "¡Enhorabuena! LyX ha sido instalado con 
éxito.$\r$\n\
                                            $\r$\n\
                                            (El primer arranque de LyX puede 
tardar algunos segundos.)"
diff --git a/development/Win32/packaging/installer/lang/swedish.nsh 
b/development/Win32/packaging/installer/lang/swedish.nsh
index 5cca03d..60b6c74 100644
--- a/development/Win32/packaging/installer/lang/swedish.nsh
+++ b/development/Win32/packaging/installer/lang/swedish.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'LaTeX-distributionen 
$\"MiKTeX$\" kommer att anv
                                     innan du använder LyX för första 
gången.$\r$\n\
                                     Vill du kontrollera om det finns 
uppdateringar tillgängliga för MiKTeX nu?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Misslyckades med att sätta  
'path_prefix' i konfigurationsskriptet"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Gratulerar! LyX har installerats 
framgångsrikt.$\r$\n\
                                            $\r$\n\
                                            (Första gången LyX startas tar det 
litet längre tid då programmet konfigurerar sig själv automatiskt.)"
diff --git a/development/Win32/packaging/installer/lang/turkish.nsh 
b/development/Win32/packaging/installer/lang/turkish.nsh
index 144c4c9..e5b5764 100644
--- a/development/Win32/packaging/installer/lang/turkish.nsh
+++ b/development/Win32/packaging/installer/lang/turkish.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo 'The LaTeX-distribution 
$\"MiKTeX$\" will be used t
                                     before you use LyX for the first 
time.$\r$\n\
                                     Would you now check for MiKTeX updates?'
 
-${LangFileString} UpdateNotAllowed "This update package can only update 
${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Yapýlandýrma programýnda 
'path_prefix' ayarlanamadý"
 ${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} 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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "Tebrikler! LyX baþarýyla kuruldu.$\r$\n\
                                            $\r$\n\
                                            (LyX in ilk açýlýþý birkaç saniye 
alabilir.)"
diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh 
b/development/Win32/packaging/installer/lang/ukrainian.nsh
index 61e90c1..d70af11 100644
--- a/development/Win32/packaging/installer/lang/ukrainian.nsh
+++ b/development/Win32/packaging/installer/lang/ukrainian.nsh
@@ -71,13 +71,18 @@ ${LangFileString} MiKTeXInfo '
                                     äî òîãî, ÿê âè âïåðøå ñêîðèñòàºòåñÿ 
LyX.$\r$\n\
                                     Áàæàºòå ïåðåâ³ðèòè íàÿâí³ñòü îíîâëåíü 
MiKTeX?'
 
-${LangFileString} UpdateNotAllowed "Öåé ïàêóíîê äëÿ îíîâëåííÿ ïðèçíà÷åíî ëèøå 
äëÿ ${PRODUCT_VERSION_OLD}!"
 ${LangFileString} ModifyingConfigureFailed "Íå âäàëîñÿ âñòàíîâèòè 
'path_prefix' ó ñêðèïò³ íàëàøòóâàííÿ"
 ${LangFileString} RunConfigureFailed "Íå âäàëîñÿ âèêîíàòè ñêðèïò íàëàøòóâàííÿ"
 ${LangFileString} NotAdmin "Äëÿ âñòàíîâëåííÿ LyX âàì ïîòð³áí³ ïðèâ³ëå¿ 
àäì³í³ñòðàòîðà!"
 ${LangFileString} InstallRunning "Çàñ³á äëÿ âñòàíîâëåííÿ âæå ïðàöþº!"
 ${LangFileString} StillInstalled "LyX âæå âñòàíîâëåíî! Ñïî÷àòêó âèëó÷³òü éîãî 
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."
+${LangFileString} MetafileNotAvailable "The LyX support for images in the 
format EMF or WMF will not be$\r$\n\
+                                       available because that requires to 
install a software printer to$\r$\n\
+                                       Windows which is only possible with 
administrator privileges."
+
 ${LangFileString} FinishPageMessage "³òàºìî! LyX áóëî óñï³øíî 
âñòàíîâëåíî.$\r$\n\
                                            $\r$\n\
                                            (Ïåðøèé çàïóñê LyX ìîæå òðèâàòè 
äåê³ëüêà ñåêóíä.)"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh 
b/development/Win32/packaging/installer/setup/configure.nsh
index 74c404a..2a8093b 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -168,15 +168,15 @@ SectionEnd
 
 Section -PSPrinter
 
-  ${If} $MultiUser.Privileges == "Admin"
-    ${OrIf} $MultiUser.Privileges == "Power"
-
-    # Delete printer
-    ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"'
-    # Install printer and driver
-    ExecWait '$PrinterConf /if /f "$WINDIR\inf\ntprint.inf" /b "Metafile to 
EPS Converter" /r "FILE:" /m "MS Publisher Imagesetter"'
-
-  ${EndIf}
+  ${if} $MultiUser.Privileges == "Admin"
+  ${orif} $MultiUser.Privileges == "Power"
+   # Delete printer
+   ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"'
+   # Install printer and driver
+   ExecWait '$PrinterConf /if /f "$WINDIR\inf\ntprint.inf" /b "Metafile to EPS 
Converter" /r "FILE:" /m "MS Publisher Imagesetter"'
+  ${else}
+   MessageBox MB_OK|MB_ICONINFORMATION "$(MetafileNotAvailable)"
+  ${endif}
 
 SectionEnd
 

-----------------------------------------------------------------------

Summary of changes:
 .../Win32/packaging/installer/include/LaTeX.nsh    |    3 +--
 .../Win32/packaging/installer/lang/arabic.nsh      |    7 ++++++-
 .../Win32/packaging/installer/lang/catalan.nsh     |    7 ++++++-
 .../Win32/packaging/installer/lang/czech.nsh       |    7 ++++++-
 .../Win32/packaging/installer/lang/danish.nsh      |    7 ++++++-
 .../Win32/packaging/installer/lang/dutch.nsh       |    7 ++++++-
 .../Win32/packaging/installer/lang/english.nsh     |    8 +++++++-
 .../Win32/packaging/installer/lang/french.nsh      |    7 ++++++-
 .../Win32/packaging/installer/lang/galician.nsh    |    7 ++++++-
 .../Win32/packaging/installer/lang/german.nsh      |    7 ++++++-
 .../Win32/packaging/installer/lang/hungarian.nsh   |    7 ++++++-
 .../Win32/packaging/installer/lang/indonesian.nsh  |    7 ++++++-
 .../Win32/packaging/installer/lang/italian.nsh     |    7 ++++++-
 .../Win32/packaging/installer/lang/japanese.nsh    |    6 ++++++
 .../Win32/packaging/installer/lang/norwegian.nsh   |    7 ++++++-
 .../Win32/packaging/installer/lang/polish.nsh      |    7 ++++++-
 .../Win32/packaging/installer/lang/portuguese.nsh  |    7 ++++++-
 .../Win32/packaging/installer/lang/romanian.nsh    |    7 ++++++-
 .../Win32/packaging/installer/lang/slovak.nsh      |    7 ++++++-
 .../Win32/packaging/installer/lang/spanish.nsh     |    7 ++++++-
 .../Win32/packaging/installer/lang/swedish.nsh     |    7 ++++++-
 .../Win32/packaging/installer/lang/turkish.nsh     |    7 ++++++-
 .../Win32/packaging/installer/lang/ukrainian.nsh   |    7 ++++++-
 .../Win32/packaging/installer/setup/configure.nsh  |   18 +++++++++---------
 24 files changed, 143 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to