From 53d911b35d8ce723e096385f482987333c96b9a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 11 Feb 2016 01:33:34 +0100 Subject: [PATCH] Win installer: some fixes and improvements - fixed typos and updated translation - support for Krita - updated support for Gimp - updated backup detection for TeXLive (generic detection always works independently) - safeguard for a variable issue --- .../Win32/packaging/installer/ChangeLog.txt | 8 +++- .../packaging/installer/include/LaTeX.nsh | 14 +++++-- .../packaging/installer/include/LyXUtils.nsh | 4 +- .../packaging/installer/include/detection.nsh | 16 +++++++- .../packaging/installer/include/variables.nsh | 2 + .../packaging/installer/lang/english.nsh | 5 +-- .../Win32/packaging/installer/lang/french.nsh | 11 ++---- .../packaging/installer/lang/norwegian.nsh | 11 ++---- .../packaging/installer/lang/spanish.nsh | 38 +++++++++---------- .../packaging/installer/lang/ukrainian.nsh | 11 ++---- .../packaging/installer/setup/configure.nsh | 14 ++++++- 11 files changed, 79 insertions(+), 55 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 2630bf41c5..0a82b88b43 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,7 +1,11 @@ Changelog for LyX.220-beta-1-1: - installs lyX 2.2.0 beta1 -- support for the document converter program Pandoc, see http://wiki.lyx.org/LyX/NewInLyX22#converters -- support for JabRef 3.x +- new support for the document converter program Pandoc (http://pandoc.org/), + see http://wiki.lyx.org/LyX/NewInLyX22#converters +- new support to use Krita (https://krita.org/) as image editor from within LyX +- updated support to use Gimp (http://www.gimp.org/) as image editor from within LyX +- support to use JabRef 3.x as editor for BibTeX files from within LyX +- updated detection of TeXLive 2015 as LaTeX distribution for LyX - updated thesaurus for Slovenian - updated spell-checker dictionaries for Portuguese (PT) and English (GB and US) - new Brazilian translation of the installer messages diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index cb3d80a80f..045b2715bb 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -165,9 +165,9 @@ Function LaTeXActions SetRegView 32 # TeXLive is a 32bit application ${endif} ${if} $PathLaTeX == "" - ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2012" "UninstallString" + ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "UninstallString" ${if} $String == "" - ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2012" "UninstallString" + ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "UninstallString" ${endif} ${if} $String != "" StrCpy $String $String -28 # remove '\tlpkg\installer\uninst.bat"' @@ -185,9 +185,15 @@ Function LaTeXActions ${andif} $LaTeXName != "MiKTeX 2.8" ${andif} $LaTeXName != "MiKTeX 2.9" StrCpy $LaTeXInstalled "TeXLive" - ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2012" "DisplayVersion" + ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "DisplayVersion" ${if} $String == "" - ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2012" "DisplayVersion" + ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "DisplayVersion" + ${endif} + ${if} $String == "" + ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014" "DisplayVersion" + ${endif} + ${if} $String == "" + ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014" "DisplayVersion" ${endif} ${if} $String != "" StrCpy $LaTeXName "TeXLive $String" diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh index f76c9c4572..c513b3ba05 100644 --- a/development/Win32/packaging/installer/include/LyXUtils.nsh +++ b/development/Win32/packaging/installer/include/LyXUtils.nsh @@ -365,8 +365,8 @@ FunctionEnd ${endif} StrCpy ${PathResult} "${PathResult}$String" # check if the FileName exists in the ${Result} folder - !insertmacro FileCheck $R5 ${FileName} ${PathResult} - ${if} $R5 == "False" + !insertmacro FileCheck $Tmp ${FileName} ${PathResult} + ${if} $Tmp == "False" StrCpy ${PathResult} "False" ${endif} EndPATHCheck_${ID}: diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 5599dc4807..0d02308b83 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -126,6 +126,7 @@ Function MissingPrograms ReadRegStr $ImageEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1" "InstallLocation" ${if} $ImageEditorPath != "" StrCpy $ImageEditorPath "$ImageEditorPathbin" # add the bin folder + StrCpy $ImageEditor "Gimp" ${endif} ${if} ${RunningX64} SetRegView 32 @@ -140,6 +141,19 @@ Function MissingPrograms ${else} StrCpy $ImageEditorPath $0 ${endif} + StrCpy $ImageEditor "Photoshop" + ${endif} + # check for Krita + ReadRegStr $0 HKLM "SOFTWARE\Classes\Krita.Document\shell\open\command" "" + ${if} $0 != "" + StrCpy $0 "$0" -16 # delete '\krita.exe" "%1"' + StrCpy $0 $0 "" 1 # remove the leading quote + ${if} $ImageEditorPath != "" + StrCpy $ImageEditorPath "$ImageEditorPath;$0" + ${else} + StrCpy $ImageEditorPath $0 + ${endif} + StrCpy $ImageEditor "Krita" ${endif} # test if and where the BibTeX-editor JabRef is installed @@ -151,7 +165,7 @@ Function MissingPrograms # there is currently a bug in the Jabref installer that prevents to install it without admin permissions # therefore only check the admin installation ${if} $PathBibTeXEditor == "" - ReadRegStr $PathBibTeXEditor HKCR "JabRef\shell\open\command" "" + ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\Classes\JabRef\shell\open\command" "" StrCpy $PathBibTeXEditor $PathBibTeXEditor -17 # remove '\JabRef.exe" "%1"' StrCpy $PathBibTeXEditor $PathBibTeXEditor "" 1 # remove the leading quote ${endif} diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index 8fe77d2dd9..4a263c3957 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -25,6 +25,7 @@ Var FoundDict Var FoundThes Var GhostscriptPath Var GnumericPath +Var ImageEditor Var ImageEditorPath Var Is64bit !if ${SETUPTYPE} == BUNDLE @@ -48,6 +49,7 @@ Var Search Var SVGPath Var StartmenuFolder Var String +Var Tmp Var ThesCode Var ThesCodes Var UpdateFNDBReturn diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index 9b8ba29780..64961e0875 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -86,15 +86,12 @@ ${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is already installed! Installing over existing installations is not recommended if the installed version$\r$\n\ is a test release or if you have problems with your existing LyX installation.$\r$\n\ In these cases better reinstall LyX.$\r$\n\ - Dou you nevertheles want to install LyX over the existing version?" + Do you nevertheless want to install LyX over the existing version?" ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${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\ diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 23e1bdfaeb..21e05982c8 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -84,18 +84,15 @@ ${LangFileString} RunConfigureFailed " ${LangFileString} NotAdmin "Vous devez avoir les droits d$\'administration pour installer LyX !" ${LangFileString} InstallRunning "Le programme d$\'installation est toujours en cours !" ${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} est déjà installé !$\r$\n\ - Installing over existing installations is not recommended if the installed version$\r$\n\ - is a test release or if you have problems with your existing LyX installation.$\r$\n\ - In these cases better reinstall LyX.$\r$\n\ - Dou you nevertheles want to install LyX over the existing version ?" + L'installation par dessus les installations existantes n'est pas recommandée si la version à installer$\r$\n\ + est une version de test ou si vous avez des problèmes avec votre installation LyX existante.$\r$\n\ + Dans ces situations il vaut mieux réinstaller LyX.$\r$\n\ + Voulez-vous néanmoins installer LyX par dessus la version existante ?" ${LangFileString} NewerInstalled "Vous essayez d$\'installer une version de LyX plus ancienne que celle qui est déjà installée.$\r$\n\ Si c$\'est ce qu vous voulez, vous devez d$\'abord désinstaller LyX $OldVersionNumber." ${LangFileString} MultipleIndexesNotAvailable "La possibilité d$\'utiliser plusieurs indexes dans un même document ne sera pas disponible car$\r$\n\ MiKTeX a été installé avec des privilèges d$\'administrateur et LyX a été istallé sans." -${LangFileString} MetafileNotAvailable "La prise en compte par LyX d$\'images au format EMF ou WMF ne sera pas disponible$\r$\n\ - car elle necessite l$\'installation dans Windows d$\'une imprimante logicielle, $\r$\n\ - ce qui n$\'est possible qu$\'avec des privilèges d$\'administrateur." ${LangFileString} FinishPageMessage "Félicitations ! LyX est installé avec succès.$\r$\n\ $\r$\n\ diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh index 16a2a35987..5135b03a8b 100644 --- a/development/Win32/packaging/installer/lang/norwegian.nsh +++ b/development/Win32/packaging/installer/lang/norwegian.nsh @@ -84,18 +84,15 @@ ${LangFileString} RunConfigureFailed "Fikk ikke kj ${LangFileString} NotAdmin "Du trenger administratorrettigheter for å installere LyX!" ${LangFileString} InstallRunning "Installasjonsprogrammet er allerede i gang!" ${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} er allerede installert!$\r$\n\ - Installing over existing installations is not recommended if the installed version$\r$\n\ - is a test release or if you have problems with your existing LyX installation.$\r$\n\ - In these cases better reinstall LyX.$\r$\n\ - Dou you nevertheles want to install LyX over the existing version?" + Vi anbefaler ikke å installere over en eksisterende installasjon hvis den installere versjonen$\r$\n\ + er en testversjon eller om du har problemer med den eksisterende installasjonen.$\r$\n\ + I slike tilfeller er det bedre å reinstallere LyX.$\r$\n\ + Vil du likevel installere LyX over den eksisterende versjonen?" ${LangFileString} NewerInstalled "Du prøver å installere en eldre versjon av Lyx enn den du har installert fra før.$\r$\n\ Dersom du ønsker dette må du avinstallere LyX $OldVersionNumber først." ${LangFileString} MultipleIndexesNotAvailable "Støtte for flere indekser vil ikke være tilgjengelig fordi$\r$\n\ MiKTeX er installert med administratorrettigheter og du installerer LyX uten." -${LangFileString} MetafileNotAvailable "Støtte i LyX for bilder i formatene EMF eller WMF vil ikke være$\r$\n\ - tilgjengelig fordi man da må installere programvareskriver i $\r$\n\ - Windows som bare er mulig med administratorrettigheter." ${LangFileString} FinishPageMessage "Gratulerer!! LyX er installert.$\r$\n\ $\r$\n\ diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh index 67aefd5efd..911443b6ee 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/lang/spanish.nsh @@ -27,7 +27,7 @@ ${LangFileString} SecFileAssocTitle "Asociar ficheros" ${LangFileString} SecDesktopTitle "Icono de escritorio" ${LangFileString} SecCoreDescription "Los ficheros de LyX." -${LangFileString} SecInstJabRefDescription "Administrador de referencias bibliograficas e editor de ficheros BibTeX." +${LangFileString} SecInstJabRefDescription "Administrador de referencias bibliográficas y editor de ficheros BibTeX." ${LangFileString} SecAllUsersDescription "Instalar LyX para todos los usuarios o sólo para el usuario actual." ${LangFileString} SecFileAssocDescription "Asociar la extensión .lyx con LyX." ${LangFileString} SecDesktopDescription "Crear un icono de LyX en el escritorio." @@ -36,25 +36,25 @@ ${LangFileString} SecThesaurusDescription "Diccionarios de sin ${LangFileString} EnterLaTeXHeader1 'Distribución LaTeX' ${LangFileString} EnterLaTeXHeader2 'Elija la distribución de LaTeX que debería emplear LyX.' -${LangFileString} EnterLaTeXFolder 'Opcionalmente puede especificar el camino del fichero $\"latex.exe$\" y posteriormente \ +${LangFileString} EnterLaTeXFolder 'Opcionalmente puede especificar la ruta del fichero $\"latex.exe$\" y posteriormente \ elegir la distribución de LaTeX que va usar LyX.\r\n\ ¡Sin LaTeX LyX no puede (pre)imprimir documentos!\r\n\ \r\n\ El instalador ha detectado la distribución de LaTeX $\"$LaTeXName$\" \ - en su sistema, en el camino que se muestra abajo.' -${LangFileString} EnterLaTeXFolderNone 'Especifique abajo el camino al fichero $\"latex.exe$\". Posteriormente elija \ + en su sistema, en la ruta que se muestra abajo.' +${LangFileString} EnterLaTeXFolderNone 'Especifique abajo la ruta al fichero $\"latex.exe$\". Posteriormente elija \ la distribución de LaTeX que debe usar LyX.\r\n\ ¡Sin LaTeX LyX no puede (pre)imprimir documentos!\r\n\ \r\n\ - El instalador non pudo encontrar ninguna distribución LaTeX en su sistema.' -${LangFileString} PathName 'Camino al fichero $\"latex.exe$\"' + El instalador no pudo encontrar ninguna distribución LaTeX en su sistema.' +${LangFileString} PathName 'Ruta al fichero $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "No usar LaTeX" ${LangFileString} InvalidLaTeXFolder 'Imposible encontrar $\"latex.exe$\".' ${LangFileString} LatexInfo 'Ahora se lanzará el instalador de $\"MiKTeX$\", la distribución de LaTeX.$\r$\n\ Para instalar el programa presione el botón $\"Next$\" en la ventana del instalador hasta que la aplicación arranque.$\r$\n\ $\r$\n\ - ¡¡¡ Por favor use todas las opciones por defecto del instalador de MiKTeX !!!' + ¡¡¡ Por favor use todas las opciones por omisión del instalador de MiKTeX !!!' ${LangFileString} LatexError1 '¡No se ha encontrado ninguna distribución de LaTeX!$\r$\n\ ¡LyX no funciona sin una distribución de LaTeX como $\"MiKTeX$\"!$\r$\n\ Por lo tanto la instalación se abortará.' @@ -63,14 +63,14 @@ ${LangFileString} HunspellFailed 'La descarga del diccionario para el idioma $\" ${LangFileString} ThesaurusFailed 'La descarga del diccionario de sinónimos para el idioma $\"$R3$\" ha fallado.' ${LangFileString} JabRefInfo 'Ahora se lanzará el instalador del programa $\"JabRef$\".$\r$\n\ - Puede utilizar todas las opciones por defecto del instaldor de JabRef.' + Puede utilizar todas las opciones por omisión del instalador de JabRef.' ${LangFileString} JabRefError '¡El programa $\"JabRef$\" no pudo instalarse con éxito!$\r$\n\ - La instalación se continuará de toda forma.$\r$\n\ + La instalación continuará de todas formas.$\r$\n\ Intente instalar otra vez JabRef más tarde.' ${LangFileString} LatexConfigInfo "La siguiente configuración de LyX va a tardar un poco." -${LangFileString} MiKTeXPathInfo "Para que cada usuario pueda personalizar posteriormente MiKTeX acorde sus$\r$\n\ +${LangFileString} MiKTeXPathInfo "Para que cada usuario pueda personalizar posteriormente MiKTeX acorde a sus$\r$\n\ necesidades, es necesario que la carpeta donde fue instalado MiKTeX's $\r$\n\ $MiKTeXPath $\r$\n\ y sus subcarpetas tengan permiso de escritura para todos los usuarios." @@ -82,19 +82,17 @@ ${LangFileString} MiKTeXInfo 'Junto con LyX se va usar la distribuci ${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} AlreadyInstalled "¡LyX ${APP_SERIES_KEY2} ya esta instalado!$\r$\n\ - Installing over existing installations is not recommended if the installed version$\r$\n\ - is a test release or if you have problems with your existing LyX installation.$\r$\n\ - In these cases better reinstall LyX.$\r$\n\ - Dou you nevertheles want to install LyX over the existing version?" +${LangFileString} InstallRunning "El instalador ya está siendo ejecutado!" +${LangFileString} AlreadyInstalled "¡LyX ${APP_SERIES_KEY2} ya está instalado!$\r$\n\ + Se recomienda no instalar sobre una instalación existente$\r$\n\ + si la versión instalada es de prueba o da problemas.$\r$\n\ + En estos casos es mejor reinstalar LyX.$\r$\n\ + Aún así, ¿quiere instalar LyX sobre la versión existente?" ${LangFileString} NewerInstalled "Está tratando de instalar una versión de LyX más antigua que la que tiene instalada.$\r$\n\ Si realmente lo desea, debe desinstalar antes la versión de LyX instalada $OldVersionNumber." ${LangFileString} MultipleIndexesNotAvailable "El soporte para el uso de varios índices en un documento no estará disponible porque$\r$\n\ MiKTeX se instaló con privilegios de administrador pero LyX se está instalando ahora sin ellos." -${LangFileString} MetafileNotAvailable "El soporte de LyX para imágenes en formato EMF o WMF no estará$\r$\n\ - disponible, ya que requiere la instalación de un software de impresora$\r$\n\ para Windows que sólo es posible con privilegios de administrador." ${LangFileString} FinishPageMessage "¡Enhorabuena! LyX ha sido instalado con éxito.$\r$\n\ $\r$\n\ @@ -108,8 +106,8 @@ ${LangFileString} UnNotAdminLabel "Necesita privilegios de administrador para de ${LangFileString} UnReallyRemoveLabel "¿Está seguro de que desea eliminar completamente LyX y todos sus componentes?" ${LangFileString} UnLyXPreferencesTitle 'Preferencias de usuario de LyX' -${LangFileString} SecUnMiKTeXDescription "Desinstala a distribución de LaTeX MiKTeX." -${LangFileString} SecUnJabRefDescription "Desinstala el administrador de referencias bibliograficas JabRef." +${LangFileString} SecUnMiKTeXDescription "Desinstala la distribución de LaTeX MiKTeX." +${LangFileString} SecUnJabRefDescription "Desinstala el administrador de referencias bibliográficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Elimina las carpetas de configuración de LyX$\r$\n\ $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ de todos los usuarios.' diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh index 78d84c42cc..641d4b1182 100644 --- a/development/Win32/packaging/installer/lang/ukrainian.nsh +++ b/development/Win32/packaging/installer/lang/ukrainian.nsh @@ -84,18 +84,15 @@ ${LangFileString} RunConfigureFailed " ${LangFileString} NotAdmin "Äëÿ âñòàíîâëåííÿ LyX âàì ïîòð³áí³ ïðèâ³ëå¿ àäì³í³ñòðàòîðà!" ${LangFileString} InstallRunning "Çàñ³á äëÿ âñòàíîâëåííÿ âæå ïðàöþº!" ${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} âæå âñòàíîâëåíî!$\r$\n\ - Installing over existing installations is not recommended if the installed version$\r$\n\ - is a test release or if you have problems with your existing LyX installation.$\r$\n\ - In these cases better reinstall LyX.$\r$\n\ - Dou you nevertheles want to install LyX over the existing version?" + Âñòàíîâëåííÿ íîâî¿ âåðñ³¿ íà ì³ñöå âæå âñòàíîâëåíèõ íå ðåêîìåíäîâàíå, ÿêùî$\r$\n\ + âñòàíîâëåíî òåñòîâó âåðñ³þ àáî ó âàñ âèíèêàþòü ïðîáëåìè ³ç óæå âñòàíîâëåíèì LyX.$\r$\n\ + Ó òàêèõ âèïàäêàõ êðàùå ïåðåâñòàíîâèòè LyX.$\r$\n\ + ×è õî÷åòå âè ïîïðè ö³ çàóâàæåííÿ âñòàíîâèòè LyX íà ì³ñöå íàÿâíî¿ âåðñ³¿?" ${LangFileString} NewerInstalled "Âè íàìàãàºòåñÿ âñòàíîâèòè âåðñ³þ LyX, ÿêà º çàñòàð³ëîþ ïîð³âíÿíî ç âæå âñòàíîâëåíîþ.$\r$\n\ ßêùî âè õî÷åòå âñòàíîâèòè çàñòàð³ëó âåðñ³þ, âàì ñë³ä ñïî÷àòêó âèëó÷èòè âæå âñòàíîâëåíèé LyX $OldVersionNumber." ${LangFileString} MultipleIndexesNotAvailable "Âè íå çìîæåòå ñêîðèñòàòèñÿ ï³äòðèìêîþ äåê³ëüêîõ ïîêàæ÷èê³â ó äîêóìåíò³, îñê³ëüêè $\r$\n\ MiKTeX áóëî âñòàíîâëåíî â³ä ³ìåí³ àäì³í³ñòðàòîðà, à LyX - â³ä ³ìåí³ çâè÷àéíîãî êîðèñòóâà÷à." -${LangFileString} MetafileNotAvailable "Âè íå çìîæåòå ñêîðèñòàòèñÿ ï³äòðèìêîþ ðîáîòè ç çîáðàæåííÿìè ó ôîðìàòàõ EMF ³ WMF,$\r$\n\ - îñê³ëüêè äëÿ ðîáîòè ç òàêèìè çîáðàæåííÿìè ïîòð³áåí ïðîãðàìíèé ïðèíòåð äëÿ$\r$\n\ - Windows, âñòàíîâèòè ÿêèé ìîæíà ëèøå â³ä ³ìåí³ àäì³í³ñòðàòîðà ñèñòåìè." ${LangFileString} FinishPageMessage "³òàºìî! LyX áóëî óñï³øíî âñòàíîâëåíî.$\r$\n\ $\r$\n\ diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 3974364fe0..ccf8b3a049 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -174,7 +174,19 @@ Section -Configure # use Inkscape to edit PDF and EPS images ${if} $SVGPath != "" FileWrite $R1 '\format "pdf6" "pdf" "PDF (graphics)" "" "auto" "inkscape" "vector" "application/pdf"$\r$\n\ - \format "eps" "eps" "EPS" "" "auto" "inkscape" "vector" "image/x-eps"$\r$\n' + \format "eps" "eps" "EPS" "" "auto" "inkscape" "vector" "image/x-eps"$\r$\n' + ${endif} + + # set image editors + ${if} $ImageEditor == "Gimp" + FileWrite $R1 '\format "gif" "gif" "GIF" "" "auto" "gimp-2.8" "" "image/gif"$\r$\n\ + \format "jpg" "jpg, jpeg" "JPEG" "" "auto" "gimp-2.8" "" "image/jpeg"$\r$\n\ + \format "png" "png" "PNG" "" "auto" "gimp-2.8" "" "image/x-png"' + ${endif} + ${if} $ImageEditor == "Krita" + FileWrite $R1 '\format "gif" "gif" "GIF" "" "auto" "krita" "" "image/gif"$\r$\n\ + \format "jpg" "jpg, jpeg" "JPEG" "" "auto" "krita" "" "image/jpeg"$\r$\n\ + \format "png" "png" "PNG" "" "auto" "krita" "" "image/x-png"' ${endif} # if Inkscape is not available Imagemagick will be used to convert WMF/EMF files -- 2.39.2