Follow Uwe's suggestion to install ghostscript before imagemagick.

Add Jean-Pierre's translation of the installer into French.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10009 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-06-07 08:30:11 +00:00
parent 0757787316
commit 629dab57aa
2 changed files with 84 additions and 81 deletions

View File

@ -92,14 +92,14 @@ Var DoNotRequirePerl
Var PerlPath
Var DownloadPerl
Var DoNotRequireImageMagick
Var ImageMagickPath
Var DownloadImageMagick
Var DoNotRequireGhostscript
Var GhostscriptPath
Var DownloadGhostscript
Var DoNotRequireImageMagick
Var ImageMagickPath
Var DownloadImageMagick
Var DoNotInstallLyX
Var PathPrefix
@ -126,8 +126,8 @@ Page custom DownloadMinSYS DownloadMinSYS_LeaveFunction
Page custom DownloadPython DownloadPython_LeaveFunction
Page custom DownloadMiKTeX DownloadMiKTeX_LeaveFunction
Page custom DownloadPerl DownloadPerl_LeaveFunction
Page custom DownloadImageMagick DownloadImageMagick_LeaveFunction
Page custom DownloadGhostscript DownloadGhostscript_LeaveFunction
Page custom DownloadImageMagick DownloadImageMagick_LeaveFunction
Page custom SummariseDownloads SummariseDownloads_LeaveFunction
; Show the license.
@ -414,30 +414,6 @@ FunctionEnd
;--------------------------------
Function DownloadImageMagick
${DownloadEnter} \
$ImageMagickPath "Software\ImageMagick\Current" "BinPath" \
"" "" \
1 \
"$(ImageMagickDownloadLabel)" \
"$(ImageMagickFolderLabel)" \
"$(ImageMagickHeader)" \
"$(ImageMagickDescription)"
FunctionEnd
Function DownloadImageMagick_LeaveFunction
${DownloadLeave} \
$DoNotRequireImageMagick \
$DownloadImageMagick \
$ImageMagickPath \
"http://www.imagemagick.org/script/binary-releases.php" \
"$(EnterImageMagickFolder)" \
"\convert.exe" \
"$(InvalidImageMagickFolder)"
FunctionEnd
;--------------------------------
Function DownloadGhostscript
; Find which version of ghostscript, if any, is installed.
@ -471,6 +447,30 @@ FunctionEnd
;--------------------------------
Function DownloadImageMagick
${DownloadEnter} \
$ImageMagickPath "Software\ImageMagick\Current" "BinPath" \
"" "" \
1 \
"$(ImageMagickDownloadLabel)" \
"$(ImageMagickFolderLabel)" \
"$(ImageMagickHeader)" \
"$(ImageMagickDescription)"
FunctionEnd
Function DownloadImageMagick_LeaveFunction
${DownloadLeave} \
$DoNotRequireImageMagick \
$DownloadImageMagick \
$ImageMagickPath \
"http://www.imagemagick.org/script/binary-releases.php" \
"$(EnterImageMagickFolder)" \
"\convert.exe" \
"$(InvalidImageMagickFolder)"
FunctionEnd
;--------------------------------
Function SummariseDownloads
StrCpy $PathPrefix ""
@ -486,20 +486,20 @@ Function SummariseDownloads
${if} $PerlPath != ""
StrCpy $PathPrefix "$PathPrefix;$PerlPath"
${endif}
${if} $ImageMagickPath != ""
StrCpy $PathPrefix "$PathPrefix;$ImageMagickPath"
${endif}
${if} $GhostscriptPath != ""
StrCpy $PathPrefix "$PathPrefix;$GhostscriptPath"
${endif}
${if} $ImageMagickPath != ""
StrCpy $PathPrefix "$PathPrefix;$ImageMagickPath"
${endif}
; Remove the leading ';'
StrCpy $PathPrefix "$PathPrefix" "" 1
IntOp $DoNotInstallLyX $DownloadMinSYS + $DownloadPython
IntOp $DoNotInstallLyX $DoNotInstallLyX + $DownloadMiKTeX
IntOp $DoNotInstallLyX $DoNotInstallLyX + $DownloadPerl
IntOp $DoNotInstallLyX $DoNotInstallLyX + $DownloadImageMagick
IntOp $DoNotInstallLyX $DoNotInstallLyX + $DownloadGhostscript
IntOp $DoNotInstallLyX $DoNotInstallLyX + $DownloadImageMagick
${if} "$DoNotInstallLyX" == 1
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSummary.ini" "Field 1" "Text" "$(SummaryPleaseInstall)"

View File

@ -1,3 +1,4 @@
!ifndef _LYX_LANGUAGES_FRENCH_NSH_
!define _LYX_LANGUAGES_FRENCH_NSH_
@ -8,73 +9,75 @@
LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}"
LangString SecAllUsersTitle "${LYX_LANG}" "Install for all users?"
LangString SecFileAssocTitle "${LYX_LANG}" "File associations"
LangString SecDesktopTitle "${LYX_LANG}" "Desktop icon"
LangString SecAllUsersTitle "${LYX_LANG}" "Installer pour tous les utilisateurs ?"
LangString SecFileAssocTitle "${LYX_LANG}" "Associations de fichiers"
LangString SecDesktopTitle "${LYX_LANG}" "Icône du bureau"
LangString SecCoreDescription "${LYX_LANG}" "The ${PRODUCT_NAME} files."
LangString SecAllUsersDescription "${LYX_LANG}" "Install for all users or just the current user. (Requires Administrator privileges.)"
LangString SecFileAssocDescription "${LYX_LANG}" "Create associations between the executable and the .lyx extension."
LangString SecDesktopDescription "${LYX_LANG}" "A ${PRODUCT_NAME} icon on the desktop."
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 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}" "Failed attempting to set 'path_prefix' in the configure script"
LangString ModifyingConfigureFailed "${LYX_LANG}" "Échec de l'allocation 'path_prefix' dans le script de configuration."
LangString FinishPageMessage "${LYX_LANG}" "Congratulations! LyX has been installed successfully."
LangString FinishPageRun "${LYX_LANG}" "Launch LyX"
LangString FinishPageMessage "${LYX_LANG}" "Félicitations ! LyX est installé avec succès."
LangString FinishPageRun "${LYX_LANG}" "Démarrer LyX"
LangString DownloadPageField2 "${LYX_LANG}" "&Do not install"
LangString DownloadPageField2 "${LYX_LANG}" "&Ne pas installer"
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 MinSYSDownloadLabel "${LYX_LANG}" "&Download MinSYS"
LangString MinSYSFolderLabel "${LYX_LANG}" "&Folder containing sh.exe"
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 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}" "The Python scripting language (www.python.org) must be installed or ${PRODUCT_NAME} will be unable to run a number of scripts."
LangString EnterPythonFolder "${LYX_LANG}" "Please input the path to the folder containing Python.exe"
LangString InvalidPythonFolder "${LYX_LANG}" "Unable to find Python.exe"
LangString PythonDownloadLabel "${LYX_LANG}" "&Download Python"
LangString PythonFolderLabel "${LYX_LANG}" "&Folder containing Python.exe"
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 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"
LangString PythonFolderLabel "${LYX_LANG}" "&Répertoire contenant Python.exe"
LangString MiKTeXHeader "${LYX_LANG}" "MiKTeX"
LangString MiKTeXDescription "${LYX_LANG}" "MiKTeX (www.miktex.org) is an up-to-date TeX implementation for Windows."
LangString EnterMiKTeXFolder "${LYX_LANG}" "Please input the path to the folder containing latex.exe"
LangString InvalidMiKTeXFolder "${LYX_LANG}" "Unable to find latex.exe"
LangString MiKTeXDownloadLabel "${LYX_LANG}" "&Download MiKTeX"
LangString MiKTeXFolderLabel "${LYX_LANG}" "&Folder containing latex.exe"
LangString MiKTeXDescription "${LYX_LANG}" "MiKTeX (www.miktex.org) est une distribution moderne de TeX pour Windows."
LangString EnterMiKTeXFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve latex.exe"
LangString InvalidMiKTeXFolder "${LYX_LANG}" "latex.exe introuvable"
LangString MiKTeXDownloadLabel "${LYX_LANG}" "&Télécharger MiKTeX"
LangString MiKTeXFolderLabel "${LYX_LANG}" "&Répertoire contenant latex.exe"
LangString PerlHeader "${LYX_LANG}" "Perl"
LangString PerlDescription "${LYX_LANG}" "If you plan on using reLyX to convert LaTeX documents to LyX ones, then you should install Perl (www.perl.com)."
LangString EnterPerlFolder "${LYX_LANG}" "Please input the path to the folder containing Perl.exe"
LangString InvalidPerlFolder "${LYX_LANG}" "Unable to find Perl.exe"
LangString PerlDownloadLabel "${LYX_LANG}" "&Download Perl"
LangString PerlFolderLabel "${LYX_LANG}" "&Folder containing perl.exe"
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 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"
LangString PerlFolderLabel "${LYX_LANG}" "&Répertoire contenant perl.exe"
LangString ImageMagickHeader "${LYX_LANG}" "ImageMagick"
LangString ImageMagickDescription "${LYX_LANG}" "The ImageMagick tools (www.imagemagick.org/script/index.php) can be used to convert graphics files to whatever output format is needed."
LangString EnterImageMagickFolder "${LYX_LANG}" "Please input the path to the folder containing convert.exe"
LangString InvalidImageMagickFolder "${LYX_LANG}" "Unable to find convert.exe"
LangString ImageMagickDownloadLabel "${LYX_LANG}" "&Download ImageMagick"
LangString ImageMagickFolderLabel "${LYX_LANG}" "&Folder containing convert.exe"
LangString ImageMagickDescription "${LYX_LANG}" "Les outils graphiques de ImageMagick (www.imagemagick.org/script/index.php) peuvent être utilisés pour convertir les fichiers graphiques dans n'importe quel format nécessaire."
LangString EnterImageMagickFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve convert.exe"
LangString InvalidImageMagickFolder "${LYX_LANG}" "convert.exe introuvable"
LangString ImageMagickDownloadLabel "${LYX_LANG}" "&Télécharger ImageMagick"
LangString ImageMagickFolderLabel "${LYX_LANG}" "&Répertoire contenant convert.exe"
LangString GhostscriptHeader "${LYX_LANG}" "Ghostscript"
LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (http://www.cs.wisc.edu/~ghost/) is used to convert images to/from PostScript."
LangString EnterGhostscriptFolder "${LYX_LANG}" "Please input the path to the folder containing gswin32c.exe"
LangString InvalidGhostscriptFolder "${LYX_LANG}" "Unable to find gswin32c.exe"
LangString GhostscriptDownloadLabel "${LYX_LANG}" "&Download Ghostscript"
LangString GhostscriptFolderLabel "${LYX_LANG}" "&Folder containing gswin32c.exe"
LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (http://www.cs.wisc.edu/~ghost/) est utilisé pour convertir les graphiques depuis/vers PostScript."
LangString EnterGhostscriptFolder "${LYX_LANG}" "Merci de saisir le chemin conduisant au répertoire où se trouve gswin32c.exe"
LangString InvalidGhostscriptFolder "${LYX_LANG}" "gswin32c.exe introuvable"
LangString GhostscriptDownloadLabel "${LYX_LANG}" "&Télécharger Ghostscript"
LangString GhostscriptFolderLabel "${LYX_LANG}" "&Répertoire contenant gswin32c.exe"
LangString SummaryTitle "${LYX_LANG}" "Software summary"
LangString SummaryPleaseInstall "${LYX_LANG}" "Please install your downloaded files and then run LyX's installer once again."
LangString SummaryPathPrefix "${LYX_LANG}" "I shall add a 'path_prefix' string to 'lyxrc.defaults' containing:$\r$\n$PathPrefix"
LangString SummaryTitle "${LYX_LANG}" "Résumé d'installation"
LangString SummaryPleaseInstall "${LYX_LANG}" "Merci d'installer les fichiers téléchargés, puis d'exécuter de nouveau l'installation de LyX."
LangString SummaryPathPrefix "${LYX_LANG}" "Durant l'installation, une chaîne de caractères 'path_prefix' sera ajoutée à 'lyxrc.defaults', elle contiendra :$\r$\n$PathPrefix"
LangString UnNotInRegistryLabel "${LYX_LANG}" "Unable to find $(^Name) in the registry$\r$\nShortcuts on the desktop and in the Start Menu will not be removed."
LangString UnNotAdminLabel "${LYX_LANG}" "Sorry! You must have administrator privileges$\r$\nto uninstall $(^Name)."
LangString UnReallyRemoveLabel "${LYX_LANG}" "Are you sure you want to completely remove $(^Name) and all of its components?"
LangString UnRemoveSuccessLabel "${LYX_LANG}" "$(^Name) was successfully removed from your computer."
LangString UnNotInRegistryLabel "${LYX_LANG}" "$(^Name) introuvable dans le base des registres. $\r$\nLes raccourcis sur le bureau et dans le menu de démarrage ne seront pas supprimés."
LangString UnNotAdminLabel "${LYX_LANG}" "Désolé ! Vous devez avoir les droits d'administration$\r$\npour installer$(^Name)."
LangString UnReallyRemoveLabel "${LYX_LANG}" "Êtes vous sûr(e) de vouloir supprimer complètement $(^Name) et tous ses composants ?"
LangString UnRemoveSuccessLabel "${LYX_LANG}" "$(^Name) supprimé de votre ordinateur avec succès."
!undef LYX_LANG
!endif ; _LYX_LANGUAGES_FRENCH_NSH_