From d73d46745777e813e14464d545f97db85bb36421 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Thu, 30 Aug 2018 15:14:06 -0400 Subject: [PATCH] Packaging updates from 2.3.0. --- .../Win32/packaging/installer/ChangeLog.txt | 4 +- .../Win32/packaging/installer/icons/lyx.ico | Bin 0 -> 37712 bytes .../installer/include/EnvVarUpdate.nsh | 2 +- .../packaging/installer/include/LaTeX.nsh | 24 -------- .../installer/include/declarations.nsh | 9 ++- .../installer/include/dictionaries.nsh | 52 +++++------------ .../packaging/installer/include/filelist.nsh | 53 +++++++++++++----- .../Win32/packaging/installer/include/gui.nsh | 28 +++++++++ .../Win32/packaging/installer/lang/basque.nsh | 11 ++++ .../packaging/installer/lang/catalan.nsh | 11 ++++ .../Win32/packaging/installer/lang/czech.nsh | 10 ++++ .../Win32/packaging/installer/lang/danish.nsh | 11 ++++ .../Win32/packaging/installer/lang/dutch.nsh | 11 ++++ .../packaging/installer/lang/english.nsh | 9 +++ .../Win32/packaging/installer/lang/french.nsh | 10 ++++ .../packaging/installer/lang/galician.nsh | 11 ++++ .../Win32/packaging/installer/lang/german.nsh | 10 ++++ .../packaging/installer/lang/hungarian.nsh | 11 ++++ .../packaging/installer/lang/indonesian.nsh | 11 ++++ .../packaging/installer/lang/italian.nsh | 12 ++++ .../packaging/installer/lang/japanese.nsh | 11 ++++ .../packaging/installer/lang/norwegian.nsh | 9 +++ .../Win32/packaging/installer/lang/polish.nsh | 9 +++ .../packaging/installer/lang/portuguese.nsh | 11 ++++ .../packaging/installer/lang/portugueseBR.nsh | 12 ++++ .../packaging/installer/lang/romanian.nsh | 11 ++++ .../packaging/installer/lang/russian.nsh | 11 ++++ .../Win32/packaging/installer/lang/slovak.nsh | 16 +++++- .../packaging/installer/lang/spanish.nsh | 11 ++++ .../packaging/installer/lang/swedish.nsh | 9 +++ .../packaging/installer/lang/turkish.nsh | 11 ++++ .../packaging/installer/lang/ukrainian.nsh | 9 +++ .../Win32/packaging/installer/settings.nsh | 16 +++--- .../packaging/installer/setup/configure.nsh | 4 -- .../packaging/installer/setup/install.nsh | 24 ++++---- 35 files changed, 364 insertions(+), 110 deletions(-) create mode 100644 development/Win32/packaging/installer/icons/lyx.ico diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 61cd73d4d6..3d3ddb59c8 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,7 +1,8 @@ -Changelog for LyX-230-1: +Changelog for LyX-230: - installs LyX 2.3.0 - fix installation of Arabic spell checker - updated to MiKTeX 2.9 build 6615 +- updated to ImageMagick 7.0.7-25 - new thesaurus for Arabic - updated thesaurus for Ukrainian - updated spell checker dictionaries for Arabic, Breton and Ukrainian @@ -11,6 +12,7 @@ Changelog for LyX-230-RC2: - installs LyX 2.3.0 RC2 - updated to Qt 5.9.4 - updated to ImageMagick 7.0.7-22 +- updated to NSIS 3.0.3 Changelog for LyX-230-RC1: diff --git a/development/Win32/packaging/installer/icons/lyx.ico b/development/Win32/packaging/installer/icons/lyx.ico new file mode 100644 index 0000000000000000000000000000000000000000..61c8117de2c745c5cac9902e7f33175981eac112 GIT binary patch literal 37712 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 E50FOnoB#j- literal 0 HcmV?d00001 diff --git a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh index 12de15fdf8..e67472cf80 100644 --- a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh +++ b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh @@ -261,7 +261,7 @@ Function ${UN}EnvVarUpdate ${If} $6 == 1 DetailPrint "appended to $1" ${Else} - #DetailPrint "Target was appended to $1" + DetailPrint "Target was appended to $1" ${EndIf} ${Else} ; If Prepend (and EnvVar is not empty), StrCpy $0 $4;$0 ; prepend PathString diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index 63de0e1a49..59f9320e67 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -382,27 +382,3 @@ Function ConfigureTeXLive ExecWait '$PathLaTeX\tlmgr update --all' FunctionEnd - -# ------------------------------ - -Function UpdateMiKTeX - # asks to update MiKTeX - - MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" /SD IDNO IDYES UpdateNow IDNO UpdateLater - UpdateNow: - # the update wizard is started by the miktex-update.exe - ${if} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - # call the non-admin version - ExecWait '"$PathLaTeX\internal\miktex-update.exe"' - ${else} - ${if} $MiKTeXUser != "HKCU" # call the admin version - ExecWait '"$PathLaTeX\internal\miktex-update_admin.exe"' - ${else} - ExecWait '"$PathLaTeX\internal\miktex-update.exe"' - ${endif} - ${endif} - UpdateLater: - -FunctionEnd - diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index d3ae07fc4a..e8546b9b1b 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -9,13 +9,12 @@ Configuration of LyX installer #-------------------------------- # File locations -!define FILES_LICENSE "license.rtf" -!define FILES_ICONS "icons" +!define FILES_LICENSE "${FILES_GIT}\license.rtf" +!define FILES_ICONS "${FILES_GIT}\icons" !define FILES_PDFVIEW "${FILES_DEPS}\bin" !define FILES_MSVC "${FILES_DEPS}\bin" !define FILES_PERL "${FILES_DEPS}\Perl" !define FILES_PYTHON "${FILES_DEPS}\Python" -!define FILES_ELYXER "${FILES_DEPS}\bin" !define FILES_UNOCONV "${FILES_DEPS}\bin" !define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick" !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript" @@ -64,8 +63,8 @@ Configuration of LyX installer !define APP_SETUPTYPE "Bundle" !endif -!define APP_RUN "bin\lyx.exe" -!define BIN_LYX "lyx.exe" +!define BIN_LYX "LyX${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.exe" +!define APP_RUN "bin\${BIN_LYX}" !define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220" !define APP_REGKEY_SETUP "${APP_REGKEY}\Setup" diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh index 02471773c0..d540f5349a 100644 --- a/development/Win32/packaging/installer/include/dictionaries.nsh +++ b/development/Win32/packaging/installer/include/dictionaries.nsh @@ -73,25 +73,13 @@ Function DownloadHunspellDictionaries ${if} $DictCode == $R3 StrCpy $String $String -2 # delete the linebreak characters at the end - # Download hunspell dictionaries, - # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt" - FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r - - ${For} $4 1 22 # there are 22 mirrors in the file - FileRead $R4 $Search # $Search is now the mirror - StrCpy $Search $Search -2 # delete the linebreak characters at the end - Push $R0 - inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END - Pop $R0 - ${if} $R0 == "OK" - ${ExitFor} - ${endif} - ${Next} - - FileClose $R4 + # Download hunspell dictionaries + Push $R0 + inetc::get /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END + Pop $R0 # if download failed ${if} $R0 != "OK" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)" + MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed): $R0" Goto abortinstall ${endif} ${endif} # end if $DictCode == $R3 @@ -99,8 +87,8 @@ Function DownloadHunspellDictionaries ${Next} FileClose $R5 - abortinstall: - Delete "$INSTDIR\$String" + abortinstall: + Delete "$INSTDIR\$String" FunctionEnd @@ -119,25 +107,13 @@ Function DownloadThesaurusDictionaries ${if} $ThesCode == $R3 StrCpy $String $String -2 # delete the linebreak characters at the end - # Download thesaurus files, - # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt" - FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r - - ${For} $4 1 22 # there are 22 mirrors in the file - FileRead $R4 $Search # $Search is now the mirror - StrCpy $Search $Search -2 # delete the linebreak characters at the end - Push $R0 - inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END - Pop $R0 - ${if} $R0 == "OK" - ${ExitFor} - ${endif} - ${Next} - - FileClose $R4 + # Download thesaurus files + Push $R0 + inetc::get /POPUP /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END + Pop $R0 # if download failed ${if} $R0 != "OK" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)" + MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed): $R0" Goto abortinstall ${endif} ${endif} # end if $ThesCode == $R3 @@ -145,8 +121,8 @@ Function DownloadThesaurusDictionaries ${Next} FileClose $R5 - abortinstall: - Delete "$INSTDIR\$String" + abortinstall: + Delete "$INSTDIR\$String" FunctionEnd diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index c2c7827226..0ac3904d47 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -10,15 +10,19 @@ Lists of files to include in the installer !macro FileListLyXBin COMMAND DIRECTORY - ${FILE}lyx.exe" - ${FILE}tex2lyx.exe" + ${FILE}${BIN_LYX}" + ${FILE}tex2lyx${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.exe" !macroend !macro FileListQtBin COMMAND DIRECTORY + ${FILE}Qt5Concurrent.dll" ${FILE}Qt5Core.dll" ${FILE}Qt5Gui.dll" + ${FILE}Qt5Network.dll" + ${FILE}Qt5OpenGL.dll" + ${FILE}Qt5PrintSupport.dll" ${FILE}Qt5Svg.dll" ${FILE}Qt5Widgets.dll" ${FILE}Qt5WinExtras.dll" @@ -28,11 +32,10 @@ Lists of files to include in the installer !macro FileListQtImageformats COMMAND DIRECTORY ${FILE}qgif.dll" - ${FILE}qicns.dll" ${FILE}qico.dll" ${FILE}qjpeg.dll" ${FILE}qsvg.dll" - ${FILE}qtga.dll" + ${FILE}qicns.dll" ${FILE}qtiff.dll" ${FILE}qwbmp.dll" ${FILE}qwebp.dll" @@ -52,16 +55,46 @@ Lists of files to include in the installer !macroend +!macro FileListQtStyles COMMAND DIRECTORY + + ${FILE}qwindowsvistastyle.dll" + +!macroend + +!macro FileListMinGW COMMAND DIRECTORY + + # Files needed for MinGW + ${FILE}iconv.dll" + ${FILE}libbz2-1.dll" + ${FILE}libfreetype-6.dll" + ${FILE}libgcc_s_sjlj-1.dll" + ${FILE}libglib-2.0-0.dll" + ${FILE}libharfbuzz-0.dll" + ${FILE}libintl-8.dll" + ${FILE}libjpeg-62.dll" + ${FILE}libpcre-1.dll" + ${FILE}libpcre2-16-0.dll" + ${FILE}libpng16-16.dll" + ${FILE}libstdc++-6.dll" + ${FILE}libtiff-5.dll" + ${FILE}libwinpthread-1.dll" + ${FILE}libwebp-7.dll" + ${FILE}libwebpdemux-2.dll" + ${FILE}zlib1.dll" + +!macroend + !macro FileListMSVC COMMAND DIRECTORY # Files needed for MSVC 2015 + # Seem to be installed for dependencies ${FILE}concrt140.dll" ${FILE}msvcp140.dll" ${FILE}vcamp140.dll" ${FILE}vccorlib140.dll" ${FILE}vcomp140.dll" ${FILE}vcruntime140.dll" - + !macroend !macro FileListNetpbmBin COMMAND DIRECTORY @@ -96,16 +129,6 @@ Lists of files to include in the installer !macroend -!macro FileListeLyXer COMMAND DIRECTORY - - ${FILE}elyxer.py" - ${FILE}lyx.css" - ${FILE}math.css" - ${FILE}math2html.py" - ${FILE}toc.css" - -!macroend - !macro FileListPDFViewBin COMMAND DIRECTORY ${FILE}pdfview.exe" diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh index 04fd530415..898e3d0891 100644 --- a/development/Win32/packaging/installer/include/gui.nsh +++ b/development/Win32/packaging/installer/include/gui.nsh @@ -24,6 +24,31 @@ BrandingText " " !define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}" +Function CheckUpdateMiKTeX +${if} $LatexInstalled != "MiKTeX" + #MessageBox MB_OK "No MiKTeX?" + Return +${EndIf} +${if} ${SETUPTYPE} == BUNDLE + Return +${EndIf} + +!define MUI_PAGE_HEADER_TEXT "$(MikTeXUpdateHeader)" +!define MUI_PAGE_HEADER_SUBTEXT " " + +!include nsDialogs.nsh +nsDialogs::Create 1018 +Pop $R0 +${If} $R0 == error + Abort +${EndIf} + +${NSD_CreateLabel} 0 0 100% 60% "$(MiKTeXUpdateMsg)" +Pop $R0 +nsDialogs::Show + +FunctionEnd + #-------------------------------- # Pages @@ -32,8 +57,11 @@ BrandingText " " # Welcome page !define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME) !insertmacro MUI_PAGE_WELCOME + # Show the license. !insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}" +Page custom CheckUpdateMiKTeX + # Decision if it should be installed as admin or not !insertmacro MULTIUSER_PAGE_INSTALLMODE diff --git a/development/Win32/packaging/installer/lang/basque.nsh b/development/Win32/packaging/installer/lang/basque.nsh index 30438d1781..32c53b71e8 100644 --- a/development/Win32/packaging/installer/lang/basque.nsh +++ b/development/Win32/packaging/installer/lang/basque.nsh @@ -115,3 +115,14 @@ ${LangFileString} SecUnPreferencesDescription 'LyX-en konfigurazioa ezabatzen du ($\"$AppPre\erabiltzailea\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ zuretzako edo erabiltzaile guztientzako (administratzailea bazara).' ${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere osagai guztiak." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "MiKTeX-en aldaketak direla-eta, LyX-en bertsioen instalazioa 2.2.3 baino aurreratuagoa izan daiteke. MiKTeX-ek ezin du bertsio partziala sortu.$\r$\n\ +$\r$\n\ +Oraindik ez baduzu egin, Lyk bertsio berria instalatu aurretik, MiKTeX eguneratzeko azken bertsioa gomendatzen dizugu.$\r$\n\ +$\r$\n\ +Orain instalazioarekin jarraitu edo bertan behera utzi dezakezu MiKTeX eguneratzeko.$\r$\n\ +$\r$\n\ +(Barkatu itzulpen automatikorako.)" + +${LangFileString} MiKTeXUpdateHeader "ABISUA: MiKTeX aldaketak" diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/lang/catalan.nsh index 9635224269..3f2efb4529 100644 --- a/development/Win32/packaging/installer/lang/catalan.nsh +++ b/development/Win32/packaging/installer/lang/catalan.nsh @@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de configur $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ de tots els usuaris.' ${LangFileString} SecUnProgramFilesDescription "Desinstal·la el LyX i tots els seus components." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "A causa dels canvis en MiKTeX, la instal·lació de versions de LyX més tard de 2.2.3 pot provocar una actualització parcial que no permet fer servir MiKTeX.$\r$\n\ +$\r$\n\ +Si encara no ho heu fet, us recomanem que actualitzeu MiKTeX a la versió més recent abans d'instal·lar una nova versió de LyX.$\r$\n\ +$\r$\n\ +Ara podeu continuar amb la instal·lació o cancel·lar-lo per poder actualitzar MiKTeX.$\r$\n\ +$\r$\n\ +(Ho sento per la traducció automatitzada.)" + +${LangFileString} MiKTeXUpdateHeader "ADVERTIMENT: canvis MiKTeX" diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/lang/czech.nsh index 857604e117..0781a730e0 100644 --- a/development/Win32/packaging/installer/lang/czech.nsh +++ b/development/Win32/packaging/installer/lang/czech.nsh @@ -108,3 +108,13 @@ ${LangFileString} SecUnPreferencesDescription 'Smazat konfigurační adresář L $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ pro všechny uživatele.' ${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a všechny jeho komponenty." + + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Kvůli změnám MiKTeX-u mohly starší instalace LyX-u (2.2.3) způsobit částečnou aktualizaci, která MiKTeX-u znemožní normální fungovaní.$\r$\n\ +$\r$\n\ +Pokud jste tak již neučinili, doporučujeme abyste si sami aktualizovali poslední verzi MiKTeX-u před instalací LyX-u.$\r$\n\ +$\r$\n\ +Nyní můžete buďto pokračovat v instalaci, anebo ji stornovat za účelem aktualizace MikTeX-u." + +${LangFileString} MiKTeXUpdateHeader "Upozornění: Změny MiKTeX-u" diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/lang/danish.nsh index 990e014f0c..1d7f3d5942 100644 --- a/development/Win32/packaging/installer/lang/danish.nsh +++ b/development/Win32/packaging/installer/lang/danish.nsh @@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Sletter LyX$\'s konfigurations ma $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ for alle brugere.' ${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "På grund af ændringer i MiKTeX kan installation af versioner af LyX senere end 2.2.3 forårsage en delvis opdatering, der gør MiKTeX ubrugelig.$\r$\n\ +$\r$\n\ +Hvis du ikke allerede har gjort det, anbefaler vi, at du opdaterer MiKTeX til den nyeste version, inden du installerer en ny version af LyX.$\r$\n\ +$\r$\n\ +Du kan nu enten fortsætte med installationen eller annullere det, så du kan opdatere MiKTeX.$\r$\n\ +$\r$\n\ +(Undskyld for den automatiske oversættelse.)" + +${LangFileString} MiKTeXUpdateHeader "ADVARSEL: MiKTeX Ændringer" diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/lang/dutch.nsh index 26363da1fa..89123a4cbb 100644 --- a/development/Win32/packaging/installer/lang/dutch.nsh +++ b/development/Win32/packaging/installer/lang/dutch.nsh @@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Verwijder LyX$\'s configuratie ma $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ voor alle gebruikers.' ${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Als gevolg van wijzigingen in MiKTeX kan de installatie van versies van LyX later dan 2.2.3 een gedeeltelijke update veroorzaken waardoor MiKTeX onbruikbaar wordt.$\r$\n\ +$\r$\n\ +Als u dit nog niet hebt gedaan, raden we u aan MiKTeX bij te werken naar de nieuwste versie voordat u een nieuwe versie van LyX installeert.$\r$\n\ +$\r$\n\ +U kunt nu doorgaan met de installatie of deze annuleren, zodat u MiKTeX kunt bijwerken.$\r$\n\ +$\r$\n\ +(Sorry voor de automatische vertaling.)" + +${LangFileString} MiKTeXUpdateHeader "WAARSCHUWING: MiKTeX-wijzigingen" diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index 89e4afc95c..df44ed092f 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -113,3 +113,12 @@ ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration$\r$ (folder $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ for you or for all users (if you are admin).' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Due to changes in MiKTeX, installation of versions of LyX later than 2.2.3 can cause a partial update that makes MiKTeX unusable.$\r$\n\ +$\r$\n\ +If you have not already done so, we recommend that you update MiKTeX to the latest version prior to installing a new version of LyX.$\r$\n\ +$\r$\n\ +You may now either proceed with the installation or cancel it so you can update MiKTeX." + +${LangFileString} MiKTeXUpdateHeader "WARNING: MiKTeX Changes" diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 1d8819e87c..e8616bae63 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -114,3 +114,13 @@ ${LangFileString} SecUnPreferencesDescription 'Supprime le répertoire de config $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ pour tous les utilisateurs.' ${LangFileString} SecUnProgramFilesDescription "Désinstaller LyX et tous ses composants." + + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "À la suite de modifications de MiKTeX, l'installation de versions de LyX postérieures à 2.2.3 peut provoquer une mise à jour partielle qui rend MiKTeX inutilisable.$\r$\n\ +$\r$\n\ +Si ce n'est déjà fait, nous vous recommandons de mettre à jour MiKTeX à la dernière version disponible avant d'installer une nouvelle version de LyX.$\r$\n\ +$\r$\n\ +Vous pouvez maintenant continuer l'installation ou annuler celle-ci afin de mettre à jour MiKTeX. " + +${LangFileString} MiKTeXUpdateHeader "AVERTISSEMENT : modifications de MiKTeX" diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/lang/galician.nsh index a24dc2b451..2870bc30b5 100644 --- a/development/Win32/packaging/installer/lang/galician.nsh +++ b/development/Win32/packaging/installer/lang/galician.nsh @@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Elimina as pastas de configuraci $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ de todos os usuários.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Debido aos cambios en MiKTeX, a instalación de versións de LyX máis tarde de 2.2.3 pode causar unha actualización parcial que fai que MiKTeX non se poida usar.$\r$\n\ +$\r$\n\ +Se aínda non o fixeches, recomendamos que actualice MiKTeX á última versión antes de instalar unha nova versión de LyX.$\r$\n\ +$\r$\n\ +Agora podes continuar coa instalación ou cancelala para que poidas actualizar MiKTeX.$\r$\n\ +$\r$\n\ +(Sentímolo pola tradución automática)." + +${LangFileString} MiKTeXUpdateHeader "AVISO: Cambios MiKTeX" diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh index 817aa2965c..464cd9129e 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/lang/german.nsh @@ -114,3 +114,13 @@ ${LangFileString} SecUnPreferencesDescription 'Löscht LyXs Benutzereinstellunge (Ordner $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\ für Sie oder für alle Benutzer (wenn Sie Admin sind).' ${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten." + + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Aufgrund von Änderungen in MikTeX kann es bei Installationen von LyX in Versionen neuer als 2.2.3 zu unvollständigen Aktualisierungen kommen, aufgrund derer MikTeX nicht mehr funktioniert.$\r$\n\ +$\r$\n\ +Falls Sie es noch nicht getan haben, empfehlen wir, dass Sie MikTeX aktualisieren, bevor Sie LyX installieren.$\r$\n\ +$\r$\n\ +Sie können nun entweder mit der Installation fortfahren oder hierabbrechen, um zunächst MikTeX zu aktualisieren." + +${LangFileString} MiKTeXUpdateHeader "ACHTUNG: MikTeX-Änderungen" diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/lang/hungarian.nsh index bacbe0ecf5..6feaec1777 100644 --- a/development/Win32/packaging/installer/lang/hungarian.nsh +++ b/development/Win32/packaging/installer/lang/hungarian.nsh @@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'A LyX beállítások mappa törl $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ minden felhasználónál.' ${LangFileString} SecUnProgramFilesDescription "A LyX és minden komponensének eltávolítása." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "A MiKTeX változásai miatt a LyX későbbi verzióinak telepítése a 2.2.3-os verzión keresztül részleges frissítést eredményezhet, ami a MiKTeX-t használhatatlanná teszi.$\r$\n\ +$\r$\n\ +Ha még nem tette meg, javasoljuk, hogy frissítse a MiKTeX-et a legújabb verzióra a LyX új verziójának telepítése előtt.$\r$\n\ +$\r$\n\ +Mostantól folytathatja a telepítést, vagy törölheti azt, így frissítheti a MiKTeX-et.$\r$\n\ +$\r$\n\ +(Elnézést az automatizált fordításért.)" + +${LangFileString} MiKTeXUpdateHeader "FIGYELEM: MiKTeX változások" diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/lang/indonesian.nsh index aa260d10e9..4bcfce97ea 100644 --- a/development/Win32/packaging/installer/lang/indonesian.nsh +++ b/development/Win32/packaging/installer/lang/indonesian.nsh @@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'Menghapus berkas konfigurasi LyX $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ untuk semua pengguna.' ${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Karena perubahan pada MiKTeX, pemasangan versi LyX lebih lambat dari 2.2.3 dapat menyebabkan pembaruan parsial yang membuat MiKTeX tidak dapat digunakan.$\r$\n\ +$\r$\n\ +Jika Anda belum melakukannya, kami menyarankan Anda memperbarui MiKTeX ke versi terbaru sebelum menginstal versi baru LyX.$\r$\n\ +$\r$\n\ +Anda sekarang dapat melanjutkan instalasi atau membatalkannya sehingga Anda dapat memperbarui MiKTeX.$\r$\n\ +$\r$\n\ +(Maaf untuk terjemahan otomatis.)" + +${LangFileString} MiKTeXUpdateHeader "PERINGATAN: Perubahan MiKTeX" diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh index 27d46351bb..8c7b6d3053 100644 --- a/development/Win32/packaging/installer/lang/italian.nsh +++ b/development/Win32/packaging/installer/lang/italian.nsh @@ -116,3 +116,15 @@ ${LangFileString} SecUnPreferencesDescription 'Elimina la cartella con la config $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ per tutti gli utenti.' ${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti." + + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "A causa di cambiamenti in MiKTeX, l'installazione di versioni di LyX successive alla 2.2.3 può causare un aggiornamento parziale che rende MiKTeX inutilizzabile.$\r$\n\ +$\r$\n\ +Se non lo hai già fatto, ti consigliamo di aggiornare MiKTeX alla versione più recente prima di installare una nuova versione di LyX.$\r$\n\ +$\r$\n\ +Ora puoi procedere con l'installazione o cancellarla per poter aggiornare MiKTeX.$\r$\n\ +$\r$\n\ +(Ci scusiamo per la traduzione automatica.)" + +${LangFileString} MiKTeXUpdateHeader "ATTENZIONE: modifiche MiKTeX" diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh index 64246b1e70..9319b61e52 100644 --- a/development/Win32/packaging/installer/lang/japanese.nsh +++ b/development/Win32/packaging/installer/lang/japanese.nsh @@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'ユーザー共通のLyXの設定 $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ を削除します。' ${LangFileString} SecUnProgramFilesDescription "LyXとすべての附属コンポーネントの導入解除を行います。" + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "MiKTeXが変更されたため、2.2.3より後のバージョンのLyXをインストールすると、MiKTeXを使用できなくする部分的な更新が発生する可能性があります。$\r$\n\ +$\r$\n\ +LyXの新しいバージョンをインストールする前に、MiKTeXを最新のバージョンにアップデートすることをお勧めします。$\r$\n\ +$\r$\n\ +これで、インストールを続行するか、キャンセルしてMiKTeXを更新することができます。$\r$\n\ +$\r$\n\ +自動翻訳には申し訳ありません" + +${LangFileString} MiKTeXUpdateHeader "警告：MiKTeXの変更点" diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh index 8f5d4e8c69..db8a91d835 100644 --- a/development/Win32/packaging/installer/lang/norwegian.nsh +++ b/development/Win32/packaging/installer/lang/norwegian.nsh @@ -114,3 +114,12 @@ ${LangFileString} SecUnPreferencesDescription 'Sletter LyX sine konfigurasjonsma $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ for alle brukere.' ${LangFileString} SecUnProgramFilesDescription "Avinstallerer LyX og alle delkomponenter." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "På grunn av endringar i MiKTeX kan installasjon av LyX versjonar nyare enn 2.2.3 føre til ein delvis oppdatering som gjer MiKTeX ubrukeleg.$\r$\n\ +$\r$\n\ +Dersom du ikkje har gjort det vil vi foreslå at du oppdaterer MiKTeX til siste versjon, før du installerer siste versjon av LyX. $\r$\n\ +$\r$\n\ +Du kan no velje å fortsetje med installasjonen eller avbryte for å oppdatere MiKTeX." + +${LangFileString} MiKTeXUpdateHeader "ÅTVARING: Endringar i MiKTeX" diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh index 0777333add..2dbbd77a26 100644 --- a/development/Win32/packaging/installer/lang/polish.nsh +++ b/development/Win32/packaging/installer/lang/polish.nsh @@ -108,3 +108,12 @@ ${LangFileString} SecUnPreferencesDescription 'Usuwa folder konfiguracji LyX$\'a $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ wszystkim użytkownikom.' ${LangFileString} SecUnProgramFilesDescription "Deinstalacja LyX i wszystkich jego komponentów." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "W efekcie zmian w MiKTeX, instalacja wersji LyX starszej niż 2.2.3 może powodować częściową aktualizację, która uczyni MiKTeX niesprawnym.$\r$\n\ +$\r$\n\ +Jeżeli jeszcze tego nie uczyniłeś, zalecamy aktualizację MiKTeX do najnowszej wersji przed instalacją nowej wersji LyX.$\r$\n\ +$\r$\n\ +Teraz albo możesz kontynuować instalację lub przerwać, aby móc zaktualizować MiKTeX." + +${LangFileString} MiKTeXUpdateHeader "UWAGA: Zmiany w MiKTeX" diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/lang/portuguese.nsh index 91b2325270..bc66c90185 100644 --- a/development/Win32/packaging/installer/lang/portuguese.nsh +++ b/development/Win32/packaging/installer/lang/portuguese.nsh @@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Apaga as pastas de configuração $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ de todos os utilizadores.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Devido a alterações no MiKTeX, a instalação de versões do LyX posteriores à 2.2.3 pode causar uma atualização parcial que torna o MiKTeX inutilizável.$\r$\n\ +$\r$\n\ +Se você ainda não fez isso, recomendamos que atualize o MiKTeX para a versão mais recente antes de instalar uma nova versão do LyX.$\r$\n\ +$\r$\n\ +Agora você pode continuar com a instalação ou cancelá-la para poder atualizar o MiKTeX.$\r$\n\ +$\r$\n\ +(Desculpe pela tradução automática.)" + +${LangFileString} MiKTeXUpdateHeader "AVISO: Alterações no MiKTeX" diff --git a/development/Win32/packaging/installer/lang/portugueseBR.nsh b/development/Win32/packaging/installer/lang/portugueseBR.nsh index b11d37a410..d0eae21dd0 100644 --- a/development/Win32/packaging/installer/lang/portugueseBR.nsh +++ b/development/Win32/packaging/installer/lang/portugueseBR.nsh @@ -116,3 +116,15 @@ ${LangFileString} SecUnPreferencesDescription 'Exclui a configuração do LyX$\r (pasta $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ para você ou para todos os usuários (se você for um administrador)).' ${LangFileString} SecUnProgramFilesDescription "Desinstalar o LyX e todos os seus componentes." + + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Devido a alterações no MiKTeX, a instalação de versões do LyX posteriores à 2.2.3 pode causar uma atualização parcial que torna o MiKTeX inutilizável.$\r$\n\ +$\r$\n\ +Se você ainda não fez isso, recomendamos que atualize o MiKTeX para a versão mais recente antes de instalar uma nova versão do LyX.$\r$\n\ +$\r$\n\ +Agora você pode continuar com a instalação ou cancelá-la para poder atualizar o MiKTeX.$\r$\n\ +$\r$\n\ +(Desculpe pela tradução automática.)" + +${LangFileString} MiKTeXUpdateHeader "AVISO: Alterações no MiKTeX" diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/lang/romanian.nsh index 9b15ea2793..705f6177ac 100644 --- a/development/Win32/packaging/installer/lang/romanian.nsh +++ b/development/Win32/packaging/installer/lang/romanian.nsh @@ -109,3 +109,14 @@ ${LangFileString} SecUnPreferencesDescription 'Şterge directorul cu setările L $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ pentru toţi utilizatorii.' ${LangFileString} SecUnProgramFilesDescription "Dezinstalaţi programul LyX şi toate componentele lui." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\ +$\r$\n\ +Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\ +$\r$\n\ +Datorită schimbărilor în MiKTeX, instalarea versiunilor LyX mai târziu de 2.2.3 poate provoca o actualizare parțială care face MiKTeX inutilizabil.$\r$\n\ +$\r$\n\ +(Ne pare rău pentru traducerea automată.)" + +${LangFileString} MiKTeXUpdateHeader "AVERTISMENT: MiKTeX Modificări" diff --git a/development/Win32/packaging/installer/lang/russian.nsh b/development/Win32/packaging/installer/lang/russian.nsh index 9a355ef1ae..62c8954245 100644 --- a/development/Win32/packaging/installer/lang/russian.nsh +++ b/development/Win32/packaging/installer/lang/russian.nsh @@ -113,3 +113,14 @@ ${LangFileString} SecUnPreferencesDescription 'Удалить настройки (каталог $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ для вас или для всех пользователей (если вы администратор).' ${LangFileString} SecUnProgramFilesDescription "Удалить LyX и все его компоненты." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Из-за изменений в MiKTeX установка версий LyX позже 2.2.3 может привести к частичному обновлению, что делает MiKTeX непригодным.$\r$\n\ +$\r$\n\ +Если вы еще этого не сделали, мы рекомендуем вам обновить MiKTeX до последней версии до установки новой версии LyX.$\r$\n\ +$\r$\n\ +Вы можете либо продолжить установку, либо отменить ее, чтобы обновить MiKTeX.$\r$\n\ +$\r$\n\ +(Извините за автоматизированный перевод.)" + +${LangFileString} MiKTeXUpdateHeader "ПРЕДУПРЕЖДЕНИЕ: Изменения в MiKTeX" diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh index 53896afc83..ce146270b9 100644 --- a/development/Win32/packaging/installer/lang/slovak.nsh +++ b/development/Win32/packaging/installer/lang/slovak.nsh @@ -42,7 +42,7 @@ ${LangFileString} EnterLaTeXFolder 'Tu môžte nastaviť cestu k $\"latex.exe$\" LaTeX-distribúciu, ktorá by mala byť používaná LyXom.\r\n\ Bez LaTeXu, LyX nedokáže produkovať dokumenty!\r\n\ \r\n\ - Inštalatér detegoval LaTeX-distribúciu \ + Inštalatér objavil LaTeX-distribúciu \ $\"$LaTeXName$\" na vašom systéme. Dolu je zobrazená jeho cesta.' ${LangFileString} EnterLaTeXFolderNone 'Nastavte dolu cestu k $\"latex.exe$\". Tým nastavíte, ktorá \ LaTeX-distribúcia má byť používaná LyXom.\r\n\ @@ -54,7 +54,7 @@ ${LangFileString} DontUseLaTeX "Nepoužiť LaTeX" ${LangFileString} InvalidLaTeXFolder 'Súbor $\"latex.exe$\" nie je na špecifikovanej ceste.' ${LangFileString} LatexInfo 'Teraz štartuje inštalatér LaTeX distribúcie $\"MiKTeX$\".$\r$\n\ - Na inštalovanie programu tlačte $\"Next$\" v okne inštalátora až inštalácia začne.$\r$\n\ + Na inštalovanie programu stlačte $\"Next$\" v okne inštalátora až inštalácia začne.$\r$\n\ $\r$\n\ !!! Prosím použite všetky štandardné možnosti inštalatéra MiKTeX !!!' @@ -105,7 +105,7 @@ ${LangFileString} FinishPageRun "Spustiť LyX" ${LangFileString} UnNotInRegistryLabel "Nemôžem nájsť LyX v registre.$\r$\n\ Skratky na pracovnej ploche a v štartovacom Menu sa nedajú odstrániť." ${LangFileString} UnInstallRunning "Najprv treba zavrieť LyX!" -${LangFileString} UnNotAdminLabel "Pre odinštaláciu LyX potrebujete administrátorské práva!" +${LangFileString} UnNotAdminLabel "Pre odinštaláciu LyXu potrebujete administrátorské práva!" ${LangFileString} UnReallyRemoveLabel "Ste si istý, že chcete kompletne odinštalovať LyX a všetky jeho súčiastky?" ${LangFileString} UnLyXPreferencesTitle 'LyXove užívateľské nastavenia' @@ -115,3 +115,13 @@ ${LangFileString} SecUnPreferencesDescription 'Odstráni konfiguračný adresár $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ pre všetkých užívateľov (keď máte administrátorské práva).' ${LangFileString} SecUnProgramFilesDescription "Odinštaluj LyX a všetky jeho súčiastky." + + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Kvôli zmenám MiKTeX-u, inštalácia verzie LyX-u novšej ako 2.2.3 môže byť dôvodom parciálnej aktualizácie. To by mohlo zrobiť MiKTeX nepoužiteľným.$\r$\n\ +$\r$\n\ +Ak ste to doteraz ešte neurobili, odporúčame aktualizovať MiKTeX na jeho najnovšiu verziu pred inštaláciou novej LyX- verzie.$\r$\n\ +$\r$\n\ +Teraz môžte buď s inštaláciou pokračovať, alebo ju zrušiť aby ste mohli aktualizovať MiKTeX." + +${LangFileString} MiKTeXUpdateHeader "VAROVANIE: Zmeny MiKTeX-u" diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh index e283d50a34..e34d2b6164 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/lang/spanish.nsh @@ -114,3 +114,14 @@ ${LangFileString} SecUnPreferencesDescription 'Elimina las carpetas de configura $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ de todos los usuarios.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Debido a cambios en MiKTeX, la instalación de versiones de LyX posteriores a la 2.2.3 puede causar una actualización parcial que hace que MiKTeX no se pueda utilizar.$\r$\n\ +$\r$\n\ +Si aún no lo ha hecho, le recomendamos que actualice MiKTeX a la última versión antes de instalar una nueva versión de LyX.$\r$\n\ +$\r$\n\ +YAhora puede continuar con la instalación o cancelarla para que pueda actualizar MiKTeX.$\r$\n\ +$\r$\n\ +(Perdón por la traducción automatizada.)" + +${LangFileString} MiKTeXUpdateHeader "ADVERTENCIA: Cambios de MiKTeX" diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/lang/swedish.nsh index 905e1a1eaa..fe481873ef 100644 --- a/development/Win32/packaging/installer/lang/swedish.nsh +++ b/development/Win32/packaging/installer/lang/swedish.nsh @@ -108,3 +108,12 @@ ${LangFileString} SecUnPreferencesDescription 'Raderar LyX-konfiguration$\r$\n\ (katalog $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ för dig eller för alla användare (om du är admin).' ${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "På grund av ändringar i MiKTeX kan installering av LyX senare än version 2.2.3 orsaka en delvis uppdatering som gör MiKTeX oanvändbar.$\r$\n\ +$\r$\n\ +Om du inte redan har gjort det så rekommenderar vi att du uppdaterar MiKTeX till den senaste versionen innan installering av en ny version av LyX.$\r$\n\ +$\r$\n\ +Du kan nu antingen fortsätta med installeringen eller avbryta den så du kan uppdatera MiKTeX." + +${LangFileString} MiKTeXUpdateHeader "Varning: MiKTeX-ändringar" diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/lang/turkish.nsh index 61d327af11..9fbd9322c6 100644 --- a/development/Win32/packaging/installer/lang/turkish.nsh +++ b/development/Win32/packaging/installer/lang/turkish.nsh @@ -108,3 +108,14 @@ ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration fol $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ for all users.' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "MiKTeX'teki değişikliklerden dolayı, LyX sürümlerinin 2.2.3'den sonraki sürümleri, MiKTeX'i kullanılamaz hale getiren kısmi bir güncelleştirmeye neden olabilir.$\r$\n\ +$\r$\n\ +Henüz yapmadıysanız, yeni bir LyX sürümü yüklemeden önce MiKTeX'i en son sürüme güncellemenizi öneririz.$\r$\n\ +$\r$\n\ +Artık yükleme ile devam edebilir veya iptal edebilirsiniz, böylece MiKTeX'i güncelleyebilirsiniz.$\r$\n\ +$\r$\n\ +(Otomatik çeviri için özür dilerim.)" + +${LangFileString} MiKTeXUpdateHeader "UYARI: MiKTeX Değişiklikleri" diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh index 84e04cb739..181b58b12b 100644 --- a/development/Win32/packaging/installer/lang/ukrainian.nsh +++ b/development/Win32/packaging/installer/lang/ukrainian.nsh @@ -114,3 +114,12 @@ ${LangFileString} SecUnPreferencesDescription 'Вилучає теку з нал $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ для всіх користувачів.' ${LangFileString} SecUnProgramFilesDescription "Вилучити LyX і всі його компоненти." + +# MikTeX Update Stuff +${LangFileString} MiKTeXUpdateMsg "Через зміни у MiKTeX встановлення версій LyX, випущених після версії 2.2.3, може спричинити часткове оновлення, яке зробить MiKTeX непридатним до користування.$\r$\n\ +$\r$\n\ +Якщо ви ще цього не зробили, рекомендуємо вам оновити MiKTeX до найсвіжішої версії до встановлення нової версії LyX.$\r$\n\ +$\r$\n\ +Тепер ви можете або продовжити встановлення LyX, або скасувати його для оновлення MiKTeX." + +${LangFileString} MiKTeXUpdateHeader "УВАГА: Зміни у MiKTeX" diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index aa7ca16ff4..dfa02ed32d 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,7 +14,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 0 !define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise "" !define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise "" -!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 005 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display @@ -36,9 +36,11 @@ These typically need to be modified for each LyX release # File locations # !!! you need to adjust them to the folders in your Windows system !!! -!define FILES_LYX "D:\LyXPackage2.3\LyX" -!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015" -!define FILES_QT "C:\Qt\Qt5.9.4\5.9.4\msvc2015" +!define FILES_BASE "C:\Users\rikih\LyX" +!define FILES_GIT "${FILES_BASE}\git\development\Win32\packaging\installer" +!define FILES_LYX "${FILES_BASE}\LyX23" +!define FILES_DEPS "${FILES_BASE}\Dependencies" +!define FILES_QT "${FILES_BASE}\LyX23" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" @@ -49,9 +51,9 @@ These typically need to be modified for each LyX release !define MiKTeXDeliveredVersion "2.9" !define ImageMagickVersion "7.0.7" - + # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe" + !define MiKTeXInstall "$INSTDIR\basic-miktex-2.9.6643.exe" + !define MiKTeXInstaller "${FILES_BASE}\basic-miktex-2.9.6643.exe" !endif - diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index c61fdd33ae..f8156b6d3e 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -235,9 +235,6 @@ Section -ConfigureScript SetOutPath "$INSTDIR\Resources" - # ask to update MiKTeX - ${if} $LaTeXInstalled == "MiKTeX" - Call UpdateMiKTeX # function from latex.nsh # install all necessary packages at once because this is much faster then to install the packages one by one DetailPrint $(TEXT_CONFIGURE_LYX) ${if} $MultiUser.Privileges != "Admin" @@ -255,7 +252,6 @@ Section -ConfigureScript nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"' ${endif} ${endif} - ${endif} DetailPrint $(TEXT_CONFIGURE_LYX) nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index 15bc275854..462af2019b 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -47,7 +47,7 @@ Section -ProgramFiles SecProgramFiles SetOutPath "$INSTDIR\bin" !insertmacro FileListLyXBin File "${FILES_LYX}\bin\" !insertmacro FileListQtBin File "${FILES_QT}\bin\" - !insertmacro FileListMSVC File "${FILES_MSVC}\" + !insertmacro FileListMinGW File "${FILES_LYX}\bin\" !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\" !insertmacro FileListDTLBin File "${FILES_DTL}\" !insertmacro FileListRsvg File "${FILES_RSVG}\" @@ -56,21 +56,24 @@ Section -ProgramFiles SecProgramFiles # Qt plugin DLLs SetOutPath "$INSTDIR\bin\imageformats" - !insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\" + !insertmacro FileListQtImageformats File "${FILES_QT}\bin\imageformats\" SetOutPath "$INSTDIR\bin\iconengines" - !insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\" + !insertmacro FileListQtIconengines File "${FILES_QT}\bin\iconengines\" SetOutPath "$INSTDIR\bin\platforms" - !insertmacro FileListQtPlatforms File "${FILES_QT}\plugins\platforms\" + !insertmacro FileListQtPlatforms File "${FILES_QT}\bin\platforms\" + SetOutPath "$INSTDIR\bin\styles" + !insertmacro FileListQtStyles File "${FILES_QT}\bin\styles\" # Resources SetOutPath "$INSTDIR" # recursively copy all files under Resources File /r "${FILES_LYX}\Resources" + File /r "${FILES_DEPS}\Resources" !if ${SETUPTYPE} == BUNDLE - # extract the MiKTeX installer - File /r "${FILES_LYX}\external" + # include the MiKTeX installer + File ${MiKTeXInstaller} # install MiKTeX if not already installed Call InstallMiKTeX # function from LaTeX.nsh @@ -81,7 +84,8 @@ Section -ProgramFiles SecProgramFiles SetOutPath "$INSTDIR" # recursively copy all files under Python File /r "${FILES_PYTHON}" - # register .py files if necessary +#FIXME We probably should not do this, as dicussed on the list. + # register .py files if necessary ReadRegStr $0 SHCTX "Software\Classes\Python.File\shell\open\command" "" ${if} $0 == "" # if nothing was found WriteRegStr SHCTX "Software\Classes\Python.File\shell\open\command" "" '"$INSTDIR\Python\python.exe" "%1" %*' @@ -90,7 +94,7 @@ Section -ProgramFiles SecProgramFiles WriteRegStr SHCTX "Software\Classes\Python.File" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to test if they were registered by this LyX version ${endif} - # Compile all Pyton files to byte-code + # Compile all Python files to byte-code # The user using the scripts may not have write access FileOpen $PythonCompileFile "$INSTDIR\compilepy.py" w FileWrite $PythonCompileFile "import compileall$\r$\n" @@ -129,10 +133,6 @@ Section -ProgramFiles SecProgramFiles StrCpy $GhostscriptPath "$INSTDIR\ghostscript\bin" ${endif} - # install eLyXer - SetOutPath "$INSTDIR\Python\Lib" - !insertmacro FileListeLyXer File "${FILES_ELYXER}\" - # install unoconv SetOutPath "$INSTDIR\Python\Lib" !insertmacro FileListUnoConv File "${FILES_UNOCONV}\" -- 2.39.5