From 5e1c92ac2908f05d09cdc6a283704f24f65d24e0 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 8 Jun 2005 08:55:09 +0000 Subject: [PATCH] Initialise variables on entry to relevant page. Jean-Pierre's french translation update. Fix error message typo. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10012 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../Win32/packaging/installer/download.nsh | 2 +- .../packaging/installer/lyx_installer.nsi | 20 +++++++++++++++++++ .../installer/lyx_languages/english.nsh | 4 ++-- .../installer/lyx_languages/french.nsh | 14 ++++++------- .../installer/lyx_languages/german.nsh | 4 ++-- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/development/Win32/packaging/installer/download.nsh b/development/Win32/packaging/installer/download.nsh index 3cd3a57623..d9641f4a8b 100644 --- a/development/Win32/packaging/installer/download.nsh +++ b/development/Win32/packaging/installer/download.nsh @@ -263,7 +263,7 @@ Abort ; Return to the page go_on: - ${ReadDownloadValues} ${DoNotRequire} ${Download} $0 ${FolderPath} + ${ReadDownloadValues} ${DoNotRequire} ${Download} $0 ${FolderPath} ${if} ${DoNotRequire} == 1 ; diff --git a/development/Win32/packaging/installer/lyx_installer.nsi b/development/Win32/packaging/installer/lyx_installer.nsi index fe60014fd8..d4cd6e485c 100644 --- a/development/Win32/packaging/installer/lyx_installer.nsi +++ b/development/Win32/packaging/installer/lyx_installer.nsi @@ -296,6 +296,8 @@ FunctionEnd ;-------------------------------- Function DownloadMinSYS + StrCpy $MinSYSPath "" + StrCpy $DownloadMinSYS "0" ; Search the registry for the MinSYS uninstaller. ; If successful, put its location in $2. @@ -343,6 +345,9 @@ FunctionEnd ;-------------------------------- Function DownloadPython + StrCpy $PythonPath "" + StrCpy $DownloadPython "0" + ${DownloadEnter} \ $PythonPath "Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe" "" \ "\Python.exe" "" \ @@ -367,6 +372,10 @@ FunctionEnd ;-------------------------------- Function DownloadMiKTeX + StrCpy $DoNotRequireMiKTeX "1" + StrCpy $MiKTeXPath "" + StrCpy $DownloadMiKTeX "0" + ${DownloadEnter} \ $MiKTeXPath "Software\MiK\MiKTeX\CurrentVersion\MiKTeX" "Install Root" \ "" "\miktex\bin" \ @@ -391,6 +400,10 @@ FunctionEnd ;-------------------------------- Function DownloadPerl + StrCpy $DoNotRequirePerl "1" + StrCpy $PerlPath "" + StrCpy $DownloadPerl "1" + ${DownloadEnter} \ $PerlPath "Software\Perl" BinDir \ "\perl.exe" "" \ @@ -415,6 +428,9 @@ FunctionEnd ;-------------------------------- Function DownloadGhostscript + StrCpy $DoNotRequireGhostscript "1" + StrCpy $GhostscriptPath "" + StrCpy $DownloadGhostscript "0" ; Find which version of ghostscript, if any, is installed. EnumRegKey $1 HKLM "Software\AFPL Ghostscript" 0 @@ -448,6 +464,10 @@ FunctionEnd ;-------------------------------- Function DownloadImageMagick + StrCpy $DoNotRequireImageMagick "1" + StrCpy $ImageMagickPath "" + StrCpy $DownloadImageMagick "0" + ${DownloadEnter} \ $ImageMagickPath "Software\ImageMagick\Current" "BinPath" \ "" "" \ diff --git a/development/Win32/packaging/installer/lyx_languages/english.nsh b/development/Win32/packaging/installer/lyx_languages/english.nsh index 75ee952507..ce02dc8cb5 100644 --- a/development/Win32/packaging/installer/lyx_languages/english.nsh +++ b/development/Win32/packaging/installer/lyx_languages/english.nsh @@ -26,8 +26,8 @@ LangString DownloadPageField2 "${LYX_LANG}" "&Do not install" LangString MinSYSHeader "${LYX_LANG}" "MinSYS" LangString MinSYSDescription "${LYX_LANG}" "MinSYS is a minimal unix scripting environment (www.mingw.org/msys.shtml) which ${PRODUCT_NAME} needs to run a number of scripts." -LangString EnterMinSYSFolder "${LYX_LANG}" "Please input the path to the folder containing MinSYS.exe" -LangString InvalidMinSYSFolder "${LYX_LANG}" "Unable to find MinSYS.exe" +LangString EnterMinSYSFolder "${LYX_LANG}" "Please input the path to the folder containing sh.exe" +LangString InvalidMinSYSFolder "${LYX_LANG}" "Unable to find sh.exe" LangString MinSYSDownloadLabel "${LYX_LANG}" "&Download MinSYS" LangString MinSYSFolderLabel "${LYX_LANG}" "&Folder containing sh.exe" diff --git a/development/Win32/packaging/installer/lyx_languages/french.nsh b/development/Win32/packaging/installer/lyx_languages/french.nsh index 4718763abe..654933312e 100644 --- a/development/Win32/packaging/installer/lyx_languages/french.nsh +++ b/development/Win32/packaging/installer/lyx_languages/french.nsh @@ -14,11 +14,11 @@ LangString SecFileAssocTitle "${LYX_LANG}" "Associations de fichiers" LangString SecDesktopTitle "${LYX_LANG}" "Icône du bureau" LangString SecCoreDescription "${LYX_LANG}" "Les fichiers ${PRODUCT_NAME}" -LangString SecAllUsersDescription "${LYX_LANG}" "Installer pour tous les utilisateurs, ou seulement pour l'utilisateur courant (nécessite les droits d'administrateur) ?." +LangString SecAllUsersDescription "${LYX_LANG}" "Installer pour tous les utilisateurs (nécessite les droits d'administrateur), ou seulement pour l'utilisateur courant ?." LangString SecFileAssocDescription "${LYX_LANG}" "Crée les associations entre l'exécutable et le suffixe .lyx." LangString SecDesktopDescription "${LYX_LANG}" "Une icône ${PRODUCT_NAME} sur le bureau." -LangString ModifyingConfigureFailed "${LYX_LANG}" "Échec de l'allocation 'path_prefix' dans le script de configuration." +LangString ModifyingConfigureFailed "${LYX_LANG}" "Échec de l'allocation 'path_prefix' lors de la configuration." LangString FinishPageMessage "${LYX_LANG}" "Félicitations ! LyX est installé avec succès." LangString FinishPageRun "${LYX_LANG}" "Démarrer LyX" @@ -26,14 +26,14 @@ LangString FinishPageRun "${LYX_LANG}" "D LangString DownloadPageField2 "${LYX_LANG}" "&Ne pas installer" LangString MinSYSHeader "${LYX_LANG}" "MinSYS" -LangString MinSYSDescription "${LYX_LANG}" "MinSYS est un environnement minimal pour gérer des fichiers de commande (www.mingw.org/msys.shtml) dont ${PRODUCT_NAME} a besoin pour exécuter un certain nombre de commandes." -LangString EnterMinSYSFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve MinSYS.exe" -LangString InvalidMinSYSFolder "${LYX_LANG}" "MinSYS.exe introuvable" +LangString MinSYSDescription "${LYX_LANG}" "MinSYS est un environnement minimal pour gérer des commandes (www.mingw.org/msys.shtml) dont ${PRODUCT_NAME} a besoin pour ses traitements." +LangString EnterMinSYSFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve sh.exe" +LangString InvalidMinSYSFolder "${LYX_LANG}" "sh.exe introuvable" LangString MinSYSDownloadLabel "${LYX_LANG}" "&Télécharger MinSYS" LangString MinSYSFolderLabel "${LYX_LANG}" "&Répertoire contenant sh.exe" LangString PythonHeader "${LYX_LANG}" "Python" -LangString PythonDescription "${LYX_LANG}" "Le language de scripting Python (www.python.org) doit être installé ou ${PRODUCT_NAME} ne pourra pas exécuter un certain nombre de commandes." +LangString PythonDescription "${LYX_LANG}" "Le langage de commandes Python (www.python.org) doit être installé ou ${PRODUCT_NAME} ne pourra pas exécuter un certain nombre de commandes." LangString EnterPythonFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve Python.exe" LangString InvalidPythonFolder "${LYX_LANG}" "Python.exe introuvable" LangString PythonDownloadLabel "${LYX_LANG}" "&Télécharger Python" @@ -47,7 +47,7 @@ LangString MiKTeXDownloadLabel "${LYX_LANG}" "&T LangString MiKTeXFolderLabel "${LYX_LANG}" "&Répertoire contenant latex.exe" LangString PerlHeader "${LYX_LANG}" "Perl" -LangString PerlDescription "${LYX_LANG}" "Si vous avez l'intention d'utilier reLyX pour convertir des documents LaTeX en LyX, vous devez installer Perl (www.perl.com)." +LangString PerlDescription "${LYX_LANG}" "Si vous avez l'intention d'utiliser reLyX pour convertir des documents LaTeX en LyX, vous devez installer Perl (www.perl.com)." LangString EnterPerlFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve Perl.exe" LangString InvalidPerlFolder "${LYX_LANG}" "Perl.exe introuvable" LangString PerlDownloadLabel "${LYX_LANG}" "&Télécharger Perl" diff --git a/development/Win32/packaging/installer/lyx_languages/german.nsh b/development/Win32/packaging/installer/lyx_languages/german.nsh index 0cb4d8cf1b..53653a55b7 100644 --- a/development/Win32/packaging/installer/lyx_languages/german.nsh +++ b/development/Win32/packaging/installer/lyx_languages/german.nsh @@ -26,8 +26,8 @@ LangString DownloadPageField2 "${LYX_LANG}" "&Do not install" LangString MinSYSHeader "${LYX_LANG}" "MinSYS" LangString MinSYSDescription "${LYX_LANG}" "MinSYS is a minimal unix scripting environment (www.mingw.org/msys.shtml) which ${PRODUCT_NAME} needs to run a number of scripts." -LangString EnterMinSYSFolder "${LYX_LANG}" "Please input the path to the folder containing MinSYS.exe" -LangString InvalidMinSYSFolder "${LYX_LANG}" "Unable to find MinSYS.exe" +LangString EnterMinSYSFolder "${LYX_LANG}" "Please input the path to the folder containing sh.exe" +LangString InvalidMinSYSFolder "${LYX_LANG}" "Unable to find sh.exe" LangString MinSYSDownloadLabel "${LYX_LANG}" "&Download MinSYS" LangString MinSYSFolderLabel "${LYX_LANG}" "&Folder containing sh.exe"