From 475b71094fecda67c2c64b380b1beac6bac25441 Mon Sep 17 00:00:00 2001 From: Eugene Chornyi Date: Tue, 12 Jan 2021 17:33:44 +0100 Subject: [PATCH] Wininstaller: remove (old) installer, installer2 becomes (new) installer --- .../{installer => }/information/ISO_3166.html | 0 .../information/WinLangCode.htm | 0 .../{installer => }/information/iso639.htm | 0 .../packaging/installer/DictionaryMirrors.txt | 24 - .../installer/HunspellDictionaryNames.txt | 146 -- .../Win32/packaging/installer/Packages.txt | 319 ---- .../installer/ThesaurusDictionaryNames.txt | 56 - .../packaging/installer/gui/LaTeXFolder.nsh | 39 - .../packaging/installer/gui/external.nsh | 212 --- .../packaging/installer/gui/io_latex.ini | 36 - .../Win32/packaging/installer/icons/lyx.ico | Bin 37712 -> 0 bytes .../installer/include/EnvVarUpdate.nsh | 327 ---- .../packaging/installer/include/LaTeX.nsh | 250 --- .../packaging/installer/include/LyXUtils.nsh | 369 ---- .../installer/include/declarations.nsh | 94 -- .../packaging/installer/include/detection.nsh | 305 ---- .../installer/include/dictionaries.nsh | 209 --- .../packaging/installer/include/filelist.nsh | 142 -- .../Win32/packaging/installer/include/gui.nsh | 102 -- .../packaging/installer/include/init.nsh | 1480 ----------------- .../packaging/installer/include/nsis.nsh | 49 - .../packaging/installer/include/variables.nsh | 52 - .../information/InstallerStructure.odg | Bin 18284 -> 0 bytes .../information/InstallerStructure.pdf | Bin 37336 -> 0 bytes .../Win32/packaging/installer/lyx-bundle.nsi | 68 - .../packaging/installer/lyx-standard.nsi | 67 - .../lyx_standard.nsi | 0 .../Win32/packaging/installer/settings.nsh | 52 - .../packaging/installer/setup/configure.nsh | 262 --- .../packaging/installer/setup/install.nsh | 136 -- .../packaging/installer/setup/uninstall.nsh | 157 -- .../src/CustomPages/LaTeXFolder.nsddef | 0 .../src/CustomPages/LaTeXFolder.nsdinc | 0 .../src/dictionaries.nsh | 6 - .../{ => src}/lang/TranslatedLanguages.nsh | 2 +- .../installer/{ => src}/lang/arabic.nsh | 30 +- .../installer/{ => src}/lang/basque.nsh | 30 +- .../installer/{ => src}/lang/catalan.nsh | 30 +- .../installer/{ => src}/lang/czech.nsh | 30 +- .../installer/{ => src}/lang/danish.nsh | 30 +- .../installer/{ => src}/lang/dutch.nsh | 30 +- .../installer/{ => src}/lang/english.nsh | 30 +- .../installer/{ => src}/lang/french.nsh | 30 +- .../installer/{ => src}/lang/galician.nsh | 30 +- .../installer/{ => src}/lang/german.nsh | 34 +- .../installer/{ => src}/lang/hungarian.nsh | 30 +- .../installer/{ => src}/lang/indonesian.nsh | 30 +- .../installer/{ => src}/lang/italian.nsh | 30 +- .../installer/{ => src}/lang/japanese.nsh | 30 +- .../installer/{ => src}/lang/norwegian.nsh | 30 +- .../installer/{ => src}/lang/polish.nsh | 30 +- .../installer/{ => src}/lang/portuguese.nsh | 30 +- .../installer/{ => src}/lang/portugueseBR.nsh | 30 +- .../installer/{ => src}/lang/romanian.nsh | 30 +- .../installer/{ => src}/lang/russian.nsh | 30 +- .../installer/{ => src}/lang/slovak.nsh | 30 +- .../installer/{ => src}/lang/spanish.nsh | 30 +- .../installer/{ => src}/lang/swedish.nsh | 30 +- .../installer/{ => src}/lang/turkish.nsh | 30 +- .../installer/{ => src}/lang/ukrainian.nsh | 30 +- .../{installer2 => installer}/src/main.nsh | 30 +- .../src/lang/TranslatedLanguages.nsh | 33 - 62 files changed, 384 insertions(+), 5394 deletions(-) rename development/Win32/packaging/{installer => }/information/ISO_3166.html (100%) rename development/Win32/packaging/{installer => }/information/WinLangCode.htm (100%) rename development/Win32/packaging/{installer => }/information/iso639.htm (100%) delete mode 100644 development/Win32/packaging/installer/DictionaryMirrors.txt delete mode 100644 development/Win32/packaging/installer/HunspellDictionaryNames.txt delete mode 100644 development/Win32/packaging/installer/Packages.txt delete mode 100644 development/Win32/packaging/installer/ThesaurusDictionaryNames.txt delete mode 100644 development/Win32/packaging/installer/gui/LaTeXFolder.nsh delete mode 100644 development/Win32/packaging/installer/gui/external.nsh delete mode 100644 development/Win32/packaging/installer/gui/io_latex.ini delete mode 100644 development/Win32/packaging/installer/icons/lyx.ico delete mode 100644 development/Win32/packaging/installer/include/EnvVarUpdate.nsh delete mode 100644 development/Win32/packaging/installer/include/LaTeX.nsh delete mode 100644 development/Win32/packaging/installer/include/LyXUtils.nsh delete mode 100644 development/Win32/packaging/installer/include/declarations.nsh delete mode 100644 development/Win32/packaging/installer/include/detection.nsh delete mode 100644 development/Win32/packaging/installer/include/dictionaries.nsh delete mode 100644 development/Win32/packaging/installer/include/filelist.nsh delete mode 100644 development/Win32/packaging/installer/include/gui.nsh delete mode 100644 development/Win32/packaging/installer/include/init.nsh delete mode 100644 development/Win32/packaging/installer/include/nsis.nsh delete mode 100644 development/Win32/packaging/installer/include/variables.nsh delete mode 100644 development/Win32/packaging/installer/information/InstallerStructure.odg delete mode 100644 development/Win32/packaging/installer/information/InstallerStructure.pdf delete mode 100644 development/Win32/packaging/installer/lyx-bundle.nsi delete mode 100644 development/Win32/packaging/installer/lyx-standard.nsi rename development/Win32/packaging/{installer2 => installer}/lyx_standard.nsi (100%) delete mode 100644 development/Win32/packaging/installer/settings.nsh delete mode 100644 development/Win32/packaging/installer/setup/configure.nsh delete mode 100644 development/Win32/packaging/installer/setup/install.nsh delete mode 100644 development/Win32/packaging/installer/setup/uninstall.nsh rename development/Win32/packaging/{installer2 => installer}/src/CustomPages/LaTeXFolder.nsddef (100%) rename development/Win32/packaging/{installer2 => installer}/src/CustomPages/LaTeXFolder.nsdinc (100%) rename development/Win32/packaging/{installer2 => installer}/src/dictionaries.nsh (99%) rename development/Win32/packaging/installer/{ => src}/lang/TranslatedLanguages.nsh (89%) rename development/Win32/packaging/installer/{ => src}/lang/arabic.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/basque.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/catalan.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/czech.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/danish.nsh (92%) rename development/Win32/packaging/installer/{ => src}/lang/dutch.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/english.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/french.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/galician.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/german.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/hungarian.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/indonesian.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/italian.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/japanese.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/norwegian.nsh (89%) rename development/Win32/packaging/installer/{ => src}/lang/polish.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/portuguese.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/portugueseBR.nsh (92%) rename development/Win32/packaging/installer/{ => src}/lang/romanian.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/russian.nsh (92%) rename development/Win32/packaging/installer/{ => src}/lang/slovak.nsh (91%) rename development/Win32/packaging/installer/{ => src}/lang/spanish.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/swedish.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/turkish.nsh (90%) rename development/Win32/packaging/installer/{ => src}/lang/ukrainian.nsh (93%) rename development/Win32/packaging/{installer2 => installer}/src/main.nsh (97%) delete mode 100644 development/Win32/packaging/installer2/src/lang/TranslatedLanguages.nsh diff --git a/development/Win32/packaging/installer/information/ISO_3166.html b/development/Win32/packaging/information/ISO_3166.html similarity index 100% rename from development/Win32/packaging/installer/information/ISO_3166.html rename to development/Win32/packaging/information/ISO_3166.html diff --git a/development/Win32/packaging/installer/information/WinLangCode.htm b/development/Win32/packaging/information/WinLangCode.htm similarity index 100% rename from development/Win32/packaging/installer/information/WinLangCode.htm rename to development/Win32/packaging/information/WinLangCode.htm diff --git a/development/Win32/packaging/installer/information/iso639.htm b/development/Win32/packaging/information/iso639.htm similarity index 100% rename from development/Win32/packaging/installer/information/iso639.htm rename to development/Win32/packaging/information/iso639.htm diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt b/development/Win32/packaging/installer/DictionaryMirrors.txt deleted file mode 100644 index 95ab8e8ce9..0000000000 --- a/development/Win32/packaging/installer/DictionaryMirrors.txt +++ /dev/null @@ -1,24 +0,0 @@ -astuteinternet -ayera -cfhcable -cytranet -datapacket -excellmedia -freefr -iweb -jaist -kent -liquidtelecom -managedway -nchc -netcologne -netix -newcontinuum -phoenixnap -pilotfiber -razaoinfo -superb-dca2 -svwh -ufpr -versaweb -vorboss diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt deleted file mode 100644 index 625718dcec..0000000000 --- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt +++ /dev/null @@ -1,146 +0,0 @@ -af_ZA.aff -af_ZA.dic -ar_SA.aff -ar_SA.dic -be_BY.aff -be_BY.dic -bg_BG.aff -bg_BG.dic -bo_CN.aff -bo_CN.dic -br_FR.aff -br_FR.dic -ca_ES.aff -ca_ES.dic -cop_EG.aff -cop_EG.dic -cs_CZ.aff -cs_CZ.dic -cy_GB.aff -cy_GB.dic -da_DK.aff -da_DK.dic -dsb_DE.aff -dsb_DE.dic -de_AT.aff -de_AT.dic -de_CH.aff -de_CH.dic -de_DE.aff -de_DE.dic -el_GR.aff -el_GR.dic -en_AU.aff -en_AU.dic -en_CA.aff -en_CA.dic -en_GB.aff -en_GB.dic -en_NZ.aff -en_NZ.dic -en_US.aff -en_US.dic -eo_EO.aff -eo_EO.dic -es_ES.aff -es_ES.dic -es_MX.aff -es_MX.dic -et_EE.aff -et_EE.dic -eu_ES.aff -eu_ES.dic -fa_IR.aff -fa_IR.dic -fr_CA.aff -fr_CA.dic -fr_FR.aff -fr_FR.dic -ga_IE.aff -ga_IE.dic -gd_GB.aff -gd_GB.dic -gl_ES.aff -gl_ES.dic -hi_IN.aff -hi_IN.dic -hsb_DE.aff -hsb_DE.dic -he_IL.aff -he_IL.dic -hr_HR.aff -hr_HR.dic -hu_HU.aff -hu_HU.dic -hy_AM.aff -hy_AM.dic -ia_IA.aff -ia_IA.dic -id_ID.aff -id_ID.dic -is_IS.aff -is_IS.dic -it_IT.aff -it_IT.dic -ka_GE.aff -ka_GE.dic -kk_KZ.aff -kk_KZ.dic -ko_KR.aff -ko_KR.dic -la_LA.aff -la_LA.dic -lt_LT.aff -lt_LT.dic -lv_LV.aff -lv_LV.dic -mr_IN.aff -mr_IN.dic -ms_MY.aff -ms_MY.dic -nb_NO.aff -nb_NO.dic -nl_NL.aff -nl_NL.dic -nn_NO.aff -nn_NO.dic -oc_FR.aff -oc_FR.dic -pl_PL.aff -pl_PL.dic -pt_BR.aff -pt_BR.dic -pt_PT.aff -pt_PT.dic -ro_RO.aff -ro_RO.dic -ru_RU.aff -ru_RU.dic -sk_SK.aff -sk_SK.dic -sl_SI.aff -sl_SI.dic -sq_AL.aff -sq_AL.dic -sr_RS.aff -sr_RS.dic -sr_RS-Latin.aff -sr_RS-Latin.dic -sv_SE.aff -sv_SE.dic -ta_IN.aff -ta_IN.dic -te_IN.aff -te_IN.dic -th_TH.aff -th_TH.dic -tk_TM.aff -tk_TM.dic -tr_TR.aff -tr_TR.dic -uk_UA.aff -uk_UA.dic -ur_PK.aff -ur_PK.dic -vi_VN.aff -vi_VN.dic diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt deleted file mode 100644 index 91020a247e..0000000000 --- a/development/Win32/packaging/installer/Packages.txt +++ /dev/null @@ -1,319 +0,0 @@ -l3kernel -l3packages -l3experimental -ctablestack -babel-albanian -babel-azerbaijani -babel-basque -babel-belarusian -babel-bosnian -babel-breton -babel-bulgarian -babel-catalan -babel-croatian -babel-czech -babel-danish -babel-dutch -babel-english -babel-esperanto -babel-estonian -babel-finnish -babel-french -babel-friulan -babel-galician -babel-georgian -babel-german -babel-greek -babel-hebrew -babel-hungarian -babel-icelandic -babel-indonesian -babel-interlingua -babel-irish -babel-italian -babel-japanese -babel-kurmanji -babel-latin -babel-latvian -babel-macedonian -babel-malay -babel-norsk -babel-piedmontese -babel-polish -babel-portuges -babel-romanian -babel-romansh -babel-russian -babel-samin -babel-scottish -babel-serbian -babel-serbianc -babel-slovak -babel-slovenian -babel-sorbian -babel-spanish -babel-swedish -babel-thai -babel-turkish -babel-ukrainian -babel-vietnamese -babel-welsh -bezos -frankenstein -algorithms -algorithm2e -apacite -arabi -authordate -beamerposter -biblatex -bibtopic -caption -booktabs -braille -breakurl -cjk -cancel -chemgreek -chicago -covington -csquotes -endnotes -enumitem -environ -esint -eso-pic -fancybox -fancyhdr -filehook -footmisc -forest -framed -greek-fontenc -greek-inputenc -harvard -hyphenat -inlinedef -iftex -jurabib -lettrine -listings -lithuanian -genmisc -georgian -mathtools -mhchem -mongolian-babel -mslapa -natbib -units -nomencl -paralist -pdfcomment -pdfpages -pgf -prettyref -preview -refstyle -rotfloat -sectionbox -serbianc -setspace -soul -splitindex -stmaryrd -subfig -tablefootnote -tcolorbox -tex4ht -trimspaces -turkmen -ucharcat -ulem -undertilde -unicode-math -url -vntex -wallpaper -wrapfig -xargs -xcolor -arydshln -braket -colortbl -diagbox -etoolbox -fp -makecmds -marginnote -picinpar -pict2e -sidecap -was -bera -libertine -ccfonts -concrete -ecc -concmath -cmbright -cochineal -crimson -eco -eulervm -feyn -fourier -iwona -kurier -fontaxes -lm-math -lualatex-math -luxi -mathdesign -minion2newtx -newtx -noto -binhex -symbol -tex-gyre -tipa -txfonts -ascii-font -bbding -ifsym -marvosym -textgreek -tfrupee -thailatex -wasy -wasysym -ieeetran -a0poster -aastex -answers -achemso -cleveref -mciteplus -comment -lineno -aguplus -apa -apa6 -endfloat -sttools -substr -threeparttable -acmart -boondox -cmap -draftwatermark -feupphdteses -ifoddpage -inconsolata -mmap -mweights -ncctools -arabtex -sansmathaccent -beamer -lastpage -lambda-lists -lh -qtree -truncate -bxjscls -ctex -savesym -xecjk -dinbrief -epsf -dtk -filecontents -ms -elsarticle -elsevier -europasscv -mdwtools -tabu -totpages -europecv -ucs -extsizes -frletter -g-brief -jsclasses -platex -fancyvrb -upquote -kluwer -lettre -tugboat -memoir -moderncv -ebgaramond -fontawesome -mwcls -paper -powerdot -koma-script -revtex -textcase -revtex4 -sciposter -boxedminipage -seminar -multido -niceframe-type1 -pst-3d -pst-arrow -pst-fr3d -pst-math -pst-node -pst-ovl -pst-plot -pst-grad -pst-slpe -pst-tools -pstricks-add -xetex-pstricks -simplecv -spie -cite -type1cm -fpl -mathpazo -tufte-latex -changepage -hardwrap -ifmtarg -ifplatform -microtype -sauerj -placeins -titlesec -xifthen -changebar -fixme -datetime -fmtcount -shapepar -todonotes -mptopdf -pgfopts -elocalloc -datetime2 -datetime2-english -datetime2-french -datetime2-german -datetime2-spanish -tracklang -acrotex -zhmetrics -zhnumber -logreq -conv-xkv -minted -fvextra -xstring -luatex85 -pdfcrop diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt deleted file mode 100644 index 27e248f6e3..0000000000 --- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt +++ /dev/null @@ -1,56 +0,0 @@ -th_ar_SA_v2.dat -th_ar_SA_v2.idx -th_bg_BG_v2.dat -th_bg_BG_v2.idx -th_ca_ES_v2.dat -th_ca_ES_v2.idx -th_cs_CZ_v2.dat -th_cs_CZ_v2.idx -th_da_DK_v2.dat -th_da_DK_v2.idx -th_de_CH_v2.dat -th_de_CH_v2.idx -th_de_DE_v2.dat -th_de_DE_v2.idx -th_el_GR_v2.dat -th_el_GR_v2.idx -th_en_AU_v2.dat -th_en_AU_v2.idx -th_en_GB_v2.dat -th_en_GB_v2.idx -th_en_US_v2.dat -th_en_US_v2.idx -th_es_ES_v2.dat -th_es_ES_v2.idx -th_fr_FR_v2.dat -th_fr_FR_v2.idx -th_ga_IE_v2.dat -th_ga_IE_v2.idx -th_gl_ES_v2.dat -th_gl_ES_v2.idx -th_hu_HU_v2.dat -th_hu_HU_v2.idx -th_is_IS_v2.dat -th_is_IS_v2.idx -th_it_IT_v2.dat -th_it_IT_v2.idx -th_nb_NO_v2.dat -th_nb_NO_v2.idx -th_nn_NO_v2.dat -th_nn_NO_v2.idx -th_pl_PL_v2.dat -th_pl_PL_v2.idx -th_pt_PT_v2.dat -th_pt_PT_v2.idx -th_ro_RO_v2.dat -th_ro_RO_v2.idx -th_ru_RU_v2.dat -th_ru_RU_v2.idx -th_sk_SK_v2.dat -th_sk_SK_v2.idx -th_sl_SI_v2.dat -th_sl_SI_v2.idx -th_sv_SE_v2.dat -th_sv_SE_v2.idx -th_uk_UA_v2.dat -th_uk_UA_v2.idx diff --git a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh deleted file mode 100644 index 2041727d0f..0000000000 --- a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh +++ /dev/null @@ -1,39 +0,0 @@ -Function LatexFolder - - !insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini" - # generate the installer page - !insertmacro MUI_HEADER_TEXT "$(EnterLaTeXHeader1)" "$(EnterLaTeXHeader2)" - ${if} $LatexName != "" - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolder)" - ${else} - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolderNone)" - ${endif} - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 2" "Text" "$(PathName)" - ${if} $PathLaTeX == "" - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 3" "State" "C:\" - ${else} - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 3" "State" "$PathLaTeX" - ${endif} - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 4" "Text" "$(DontUseLaTeX)" - !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 4" "State" "$State" - AgainFolder: - !insertmacro INSTALLOPTIONS_DISPLAY "io_latex.ini" - !insertmacro INSTALLOPTIONS_READ "$State" "io_latex.ini" "Field 4" "State" # read checkbox if LaTeX should be used, "0" or not "1" - ${if} $State == "1" - StrCpy $PathLaTeX "" - Goto ReadyFolder - ${endif} - !insertmacro INSTALLOPTIONS_READ "$PathLaTeX" "io_latex.ini" "Field 3" "State" - # check if the latex.exe exists in the $PathLaTeX folder - !insertmacro FileCheck $5 "latex.exe" "$PathLaTeX" - ${if} $5 == "False" - MessageBox MB_RETRYCANCEL "$(InvalidLaTeXFolder)" IDRETRY AgainFolder - StrCpy $PathLaTeX "" - ${endif} - ReadyFolder: - -FunctionEnd - -Function LatexFolder_LeaveFunction - -FunctionEnd diff --git a/development/Win32/packaging/installer/gui/external.nsh b/development/Win32/packaging/installer/gui/external.nsh deleted file mode 100644 index b2aa949248..0000000000 --- a/development/Win32/packaging/installer/gui/external.nsh +++ /dev/null @@ -1,212 +0,0 @@ -/* - -external.nsh - -Installation of external components: MiKTeX, ImageMagick, Ghostscript -Either an existing installation can be used or a the components can be -downloaded or installed (depending on the type of installer) - -*/ - -#Var ExternalPage -#Var ExternalPage.Info -#Var ExternalPage.Setup -#Var ExternalPage.Existing -#Var ExternalPage.Folder -#Var ExternalPage.Folder.Text -#Var ExternalPage.Folder.Return -#Var ExternalPage.FolderBrowse -#Var ExternalPage.FolderInfo -#Var ExternalPage.NoInstall - -#Var ExternalPage.RadioButton.Click -#Var ExternalPage.FolderBrowse.Click - -#Var LaTeXState -#Var LaTeXSetup.State -#Var LaTeXExisting.State -#Var LaTeXNoInstall.State - -#Var ControlState -#Var ComponentSize - -!macro EXTERNAL_SHOWDIALOG COMPONENT - - # Build the dialog - - !insertmacro MUI_HEADER_TEXT $(TEXT_EXTERNAL_${COMPONENT}_TITLE) $(TEXT_EXTERNAL_${COMPONENT}_SUBTITLE) - -# GetFunctionAddress $ExternalPage.RadioButton.Click ExternalRadioButtonClick -# GetFunctionAddress $ExternalPage.FolderBrowse.Click ExternalFolderBrowseClick - - nsDialogs::Create /NOUNLOAD 1018 - Pop $ExternalPage - - !ifdef BUNDLESETUP_${COMPONENT} - ${NSD_CreateLabel} 0u 0u 300u 20u $(TEXT_EXTERNAL_${COMPONENT}_INFO_INSTALL) - !else - ${NSD_CreateLabel} 0u 0u 300u 20u $(TEXT_EXTERNAL_${COMPONENT}_INFO_DOWNLOAD) - !endif - Pop $ExternalPage.Info - - !ifdef BUNDLESETUP_${COMPONENT} - ${NSD_CreateRadioButton} 0u 40u 300u 10u $(TEXT_EXTERNAL_${COMPONENT}_INSTALL) - !else - ${NSD_CreateRadioButton} 0u 40u 300u 10u $(TEXT_EXTERNAL_${COMPONENT}_DOWNLOAD) - !endif - Pop $ExternalPage.Setup - nsDialogs::OnClick /NOUNLOAD $ExternalPage.Setup $ExternalPage.RadioButton.Click - - ${NSD_CreateRadioButton} 0u 60u 300u 10u $(TEXT_EXTERNAL_${COMPONENT}_FOLDER) - Pop $ExternalPage.Existing - nsDialogs::OnClick /NOUNLOAD $ExternalPage.Existing $ExternalPage.RadioButton.Click - - ${NSD_CreateText} 10u 80u 255u 12u $Path${COMPONENT} - Pop $ExternalPage.Folder - - ${NSD_CreateBrowseButton} 270u 80u 20u 12u ... - Pop $ExternalPage.FolderBrowse - nsDialogs::OnClick /NOUNLOAD $ExternalPage.FolderBrowse $ExternalPage.FolderBrowse.Click - - ${NSD_CreateLabel} 10u 100u 290u 10u $(TEXT_EXTERNAL_${COMPONENT}_FOLDER_INFO) - Pop $ExternalPage.FolderInfo - - ${NSD_CreateRadioButton} 0u 120u 300u 10u $(TEXT_EXTERNAL_${COMPONENT}_NONE) - Pop $ExternalPage.NoInstall - nsDialogs::OnClick /NOUNLOAD $ExternalPage.NoInstall $ExternalPage.RadioButton.Click - - # Set the state of the controls to the previous user selection (or the default) - - ${If} $${COMPONENT}State == "" - # Page is displayed for the first time, set the default - ${If} $Path${COMPONENT} == "" - !if ${COMPONENT} != LaTeX - # ImageMagick and Ghostscript require Administrator or - # power user privileges for installation - # Setup won't be checked because it's disabled - ${If} $MultiUser.Privileges != "User" - ${AndIf} $MultiUser.Privileges != "Guest" - !endif - - ${NSD_SetState} $ExternalPage.Setup ${BST_CHECKED} - - !if ${COMPONENT} != LaTeX - ${Else} - ${NSD_SetState} $ExternalPage.NoInstall ${BST_CHECKED} - ${EndIf} - !endif - ${Else} - ${NSD_SetState} $ExternalPage.Existing ${BST_CHECKED} - ${EndIf} - ${Else} - ${NSD_SetState} $ExternalPage.Setup $${COMPONENT}Setup.State - ${NSD_SetState} $ExternalPage.Existing $${COMPONENT}Existing.State - ${NSD_SetState} $ExternalPage.NoInstall $${COMPONENT}NoInstall.State - ${EndIf} - - #Call ExternalRadioButtonClick - - nsDialogs::Show - -!macroend - -!macro EXTERNAL_VALIDATEDIALOG COMPONENT - - # Save state of controls - StrCpy $${COMPONENT}State saved - ${NSD_GetState} $ExternalPage.Setup $${COMPONENT}Setup.State - ${NSD_GetState} $ExternalPage.Setup $${COMPONENT}Setup.State - ${NSD_GetState} $ExternalPage.Existing $${COMPONENT}Existing.State - ${NSD_GetState} $ExternalPage.NoInstall $${COMPONENT}NoInstall.State - - ${If} $${COMPONENT}Setup.State = ${BST_CHECKED} - - StrCpy $Setup${COMPONENT} ${TRUE} - - # Download or install, so we need hard drive space - - # Add size of component installer - StrCpy $ComponentSize $Size${COMPONENT} - - ${If} $Path${COMPONENT} == "" - # Not yet installed, add size of component itself - IntOp $ComponentSize $ComponentSize + ${SIZE_${COMPONENT}} - ${EndIf} - - SectionSetSize ${External${COMPONENT}} $ComponentSize - - ${Else} - - # No setup - - StrCpy $Setup${COMPONENT} ${FALSE} - SectionSetSize ${External${COMPONENT}} 0 - - ${EndIf} - - ${If} $${COMPONENT}Existing.State = ${BST_CHECKED} - - # Update location of component - - ${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder.Text - - # Verify whether the path exists - - ${IfNot} ${FileExists} "$ExternalPage.Folder.Text\${BIN_${COMPONENT}}" - MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_EXTERNAL_${COMPONENT}_NOTFOUND) - Abort # Return to allow the user to correct the location - ${EndIf} - - StrCpy $Path${COMPONENT} $ExternalPage.Folder.Text - - ${EndIf} - -!macroend - -#Function ExternalRadioButtonClick - - # Enable the folder selection controls depending - # if the option to use an existing installation is selected - -# ${NSD_GetState} $ExternalPage.Existing $ControlState - -# ${If} $ControlState = ${BST_CHECKED} -# EnableWindow $ExternalPage.Folder 1 -# EnableWindow $ExternalPage.FolderBrowse 1 -# EnableWindow $ExternalPage.FolderInfo 1 -# ${Else} -# EnableWindow $ExternalPage.Folder 0 -# EnableWindow $ExternalPage.FolderBrowse 0 -# EnableWindow $ExternalPage.FolderInfo 0 -# ${EndIf} - -#FunctionEnd - -#Function ExternalFolderBrowseClick - - # Browse button clicked - - # Get current folder to set as default -# ${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder.Text - - # Browse for new folder -# nsDialogs::SelectFolderDialog /NOUNLOAD "" $ExternalPage.Folder.Text -# Pop $ExternalPage.Folder.Return - -# ${If} $ExternalPage.Folder.Return != error -# StrCpy $ExternalPage.Folder.Text $ExternalPage.Folder.Return -# ${EndIf} - -# ${NSD_SetText} $ExternalPage.Folder $ExternalPage.Folder.Text - -#FunctionEnd - -# Page functions - -#Function PageExternalLaTeX -# !insertmacro EXTERNAL_SHOWDIALOG LaTeX -#FunctionEnd - -#Function PageExternalLaTeXValidate -# !insertmacro EXTERNAL_VALIDATEDIALOG LaTeX -#FunctionEnd diff --git a/development/Win32/packaging/installer/gui/io_latex.ini b/development/Win32/packaging/installer/gui/io_latex.ini deleted file mode 100644 index 8475b66023..0000000000 --- a/development/Win32/packaging/installer/gui/io_latex.ini +++ /dev/null @@ -1,36 +0,0 @@ -[Settings] -NumFields=4 - -[Field 1] -Type=Label -Left=20 -Right=280 -Top=3 -Bottom=60 -Text='You can optionally set here the path to the file "latex.exe" and therewith set the LaTeX-distribution that should be used by LyX.\r\nIf you don$\\'t use LaTeX, LyX cannot output documents!\r\n\r\nThe installer has detected the LaTeX-distribution "$LaTeXName" on your system. Displayed below is its path.' - -[Field 2] -Type=Groupbox -Left=5 -Right=-1 -Top=67 -Bottom=107 -Text= Path - -[Field 3] -Type=DirRequest -Left=20 -Right=270 -Top=83 -Bottom=94 -State=C:\ - -[Field 4] -Type=Checkbox -Text=Don't use LaTeX -Left=20 -Right=120 -Top=120 -Bottom=129 -State=0 - diff --git a/development/Win32/packaging/installer/icons/lyx.ico b/development/Win32/packaging/installer/icons/lyx.ico deleted file mode 100644 index 61c8117de2c745c5cac9902e7f33175981eac112..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37712 zcmeHw2|Sg}+y5N9>|10fS+hh)_7gpi6t&atIJXhU{N z${up8=RZ^N98%Bkec#{me%^oc>1yVl^*h&GbIr^($9)5U0n|WF4nUs^r0@dZ4FC`n z{P9c=06!l9%*@}Poyh@sA^|f%hXI1XMG62JY4D@GAV^sOz-9B<^6(j!(+Zj`F9@6| z0O&pifH*7fwU_|8ajf@P`9`IPix9e>m`;=Yapaal@B0|9KoZA|UyvRZaZQ zLRx_vCdDII{vXDpi~C552ZjHm&KB4DZ^JWnl5ZxIY5exizv(fF{QOJ#LktFU|E8n( z2@ic22R0v%<*UiXv(1ln3wz}e@mkgHrMmqapim*GS35s_;ZyhJ&2wN#0~0Z73$oJV zCP{~kuXJibhMymoZF~+f%=`Cqrui|GA@rm$=E5_Z<$k<>@x>oL0~!vjQW8O2f@p|pltWIcIJ=QcWl)An@Jnx z+gv>dNzSyKGzo?O&h?yETL5G3aWW7L`hZq<@WKfc@8?=%e$Bzte@)u%>YbH8nw>vV z3%Iu^w7J&j0v~QU^+jvK!6F2Jo~MY}GloEJc1z4U2u7~e+CHn`>Inis?@00SR?$m(vltXWcxe3ZJv!k)wnR?XSK61 z$LzB@u4h4`vnj|ID;}Log)+Z7`TfrOB5EfLng@R2<}*k3*}~13|BKIa zC4Zh)-{IK=H_zqyIk1S@$+Z1B8;m*p{I6|>K-tXS?+oYb98zBWX1*_!oL@`wq9A`2 z`77r9g=(>q%{TWi#B*A3v5f!aIC|BEtLNsuPyYg=Q1L4jJr=f%6w-gW;l&Er`j(M4 z4a0i-(1NwX;2CNBZ-lUlgzpm^UtvA=0Mv z_g%Ac4(Gm>WBtDf#$2`BItwLdF6loK(B1dSE9zg~>;FjC{xtfB1AjR1hXa2&@So)X z@tZr!_Al@?i9}Q{LEyLk>8bDON2ZvFm`a4k(rmGZsyw z)AGN-nc&~gox``i`sX*X57#(Xzg)#Xzkb9L(u4i~fJGCDTNf|=57e)}zjE$$x9DlJ zB_rtjQ4?9%@4ApSL~8Qm@@@HE&%*QJ?70Y~F6I`P9-v|I^9hNn_yaI6sr{ESZxZMu zdpG>2@BZVYL3(6e6g;ei^qdUCQ$gVKA!I^LaTT1$e;ko6eFUhz_};|cqsX#MdIVk6 z0Qa*+5}L4~iMHGx*q#nvP(OU6i|PAbKm1?KX1)P*G3Jn37{@NHfm!NeY+rbA6x#u= zdw<=pkTQxYa1n#lqTm-WhqV2$n@Mxv8Sv;DV0j^lE#9Vat`|Q7q=je0^DKb#&09JJ ze@$NV>ap)7=8Tfm`G1Wytbd_I&DKB9qBq}MHCGkt1*w~x5wTxLyYRDhtS z;aAi!#~kL8`SpLx$6@?Kib$IvtpSGTiT!+Y(uVS3-jYexXXAlQi(Cl#M3#_NJI^{p z(#EgAlVn*u$hF}wbC02070fg@3+AR+W0LECyM9vee<7IF5_6`Uk&~i7n)r>?_^Y)5jVA{$~de2moyfcBDEJ-dz6j zX93^xlP>+F1t)*Hw*QuW;Xa472nx?%f9EaDBtKU8tJM7b^Oo9R&=+Ue6QegTl4Si| zuyn#YN!|EW)dey0mO=>T?-c%DAip6et^DWk!X4WDe*K((A=^p%^>bzz^Irn9knQu= z{h#Zf$Km;G{5kVn%-Cu1@2KWt77Y-I>Dp7l>DmM)NaT<}y7u4?YV%FkZi8uUFc1C* z6+!<9q!37*kRrAjY+_i#y#!XyuvvG*b~M`%(NICp@?eT108*2DZC8s(~POBR>DwM1>9`&xnwfgnk zNoA%vO0!bv4W%H>IzACV!D6cmXoT@+0P_Z{5JoT@tS8fA#)MK}1zCc z_b20`>}gkt^uM0zz4P!CYr3)3(qevAQ0%!HQ-AB)&hplb&Qmwv-L+DEu6U$ABQIS$ zi~>8zs}G(yC+Azv_&)M>&7_=3#zmBUej#?TBZPn}-%*#m3Uc4)MHB0NiIZ*nR{LN+ z?etn$qPXTOc-%0;1!({xg3`*`z?dqvq&lc{!TEaZ_ zcG1_z55xz|+`_3NLdZqHu}iO84X<)~T<)SwH?oZ5JZ*Dy-^!V&QVdMWJyt(lZ0(~# zKV`k=NRDYzg~isp(c`+W2g#+VP{}MZ=BvKECmMBzE`6j`0YJX)1edJga z>h0Eb&JUA|Cwh*nuhQTx7CgS^U10**rk4A88ltxRSaTY(6=bj;GZD4v&P_fOtHf30 z1n5kbx|%VBew8ZUs>=?Pcb}1mOx&QVuWjY=lDCW?I@5CanGq^9NXD#mno@n00&8*R z4vzGt=H4BwBRcCtGC#b)n$vGzw{L19%jt?YyXw@ZJc3aMhi%yNS~?;f{<8VqudQ_V zI|KR%Z2gQE(_~nMj&We+JWmxg@C7nS;=L{&--Q$SIP=vrAiVU6`wEKQ2F0tO+i-?X zO}w8vMQTUj!3#3XVwZ{w#?;wph)eL7>up~v`n^q%bs-bveoMOpSCt%2A;=occdeD} zRgzF_VyefxSEFx?E9B@I7;sd(S#-C8rC*D!c5W=!O<5AdJ9@pVVJd2J?85UtSqvB3 zt4TxUq>S3g?58>V$ZFn}DW4Tg5xP!1y%r;P>UQ(0HYZ9Si#_f9t=Npr0QXAc6uVP9 zMV4R$csv~J3@y1B?Xr6(oGIfxcJGc`|9pMyXUc@4vO1oiyPd7&E*VAYwX~+ht6M(M zR^Md@ec>()H!b&xhowk1MN6vreU(=`nHOrqaF-@Lk370GB*^ou?>o;e&Xl|I4l=#q zx-Tr`XsdixC_Qp5hB=?$ma4&VI7~Jt#j-8z5PJz7R)WlE`m#5DM(>5wxHL&ieR>`P z$+FEU`=)Mz%T7{;_;WrrhVD}<9w>auc_Q z4~$<3U2{(s+|DDorMwH2;uq&FH_>A+6=FFHUl*UO%sou5hpDM{JdCfU zGp}Kr78a^JYt?V1NN~a(JQ=zsUVC+7`^w-OCuF;cy3(Js9$Zqe*zkaZ8gIaxuPI&nt1@5;(^6OqR$Q{H~cJ8jCch_*1WO26e+ zlt5irwB(jrKnW*b7j8K2WEemGGFLt!DIh03kFxVrZ20>FR@PyH~mhzj@Vc8S&|3V5t8Y-jRFz zrh1)2oioVW&VtpJO{-P~Hs|iX@?^7Z#icQO%iJN|9Uf_gyuO%&EWQ}O&bp0)Ooy!T zY?6<$yXq3^n)*hIw5%vt`2{2W?9Q4JIvt|-8ZwxUNhquBGb)YW-`4xs?b0jTaZqUq z(Q=>i7%{p+wI$)!7u6=S8tS)2yk}{c4`vOMd11m+zmmP}FA2G{vfNX*Ao!%%r>Qs} zQSM?B`3hsUl8m0hQhc?yJ?FWwhZ_xp(x~I#1P)vQulbf2%IXZ0U(A>ceL2M0cBd!0 z$eKc&D}^eJcHQV*tgpJk7d@GI{x*0mJ>}tFX8S(Z$26ztbHtn8QuSIJtnq>R z(>;z>6ss{cW5pOmENFfYS-c(y-a0ht$|T+PWvv!pfs6GC$ckYh5qF&PAvNm z9@i^bk#)GoRqb^@)oL2RQ>!TEdpY#%8wMJas&%c-B1sX;8x>{k_KF|NzPfYeE9=Y( z)uf~@_c+(THJD0~MaHQr~@n=Mj=jZPme3SKttFS<(+lh13 z@Mh~k{h0EQ0SJvA)ha*dD<5^Kv`N*lJZ$XBy@L7!Rz|ze+%!^4Y{|LGnc#lGqIYQQ zQcrW3d9&|c6UFC&{nCThS}%8E+J*sVn9{+aO@znXy-cR7cNrLH<( zDoxXZa8LUVbAQPx;4EMR)50?kx)hETZTymKRSmUbDn!RM3lOe>9D z8dg+Whv$ZUR>63mSIfS}cIN(8gFfDX)X~nHju)0)jI?ththOu-axik2SjEy+X~>aL z&1hLqCuJhTb#A{>fBDH_&2n>*O;fM-PMIp$99c<+b^cJNcJke{`+LR72l72{KTtF+ z>48X_u_BoIF@86hrzOiJ^}e(ucYD0mwO4UfuDH2p7fpbs$(k6~OdVh1O)mc69?@!> z)$g4i_!&K?Yje0tdpWknclcdeO`dtf^GrPhYzmK{l$fA|+3wHN&Z-HyEWKx6oN9h} zWAxEwsvb&_BfSm9&y)&x$%*Xh%`EG>o+ei+)FI2=?-}zs=8Iyb8i)CrhU2)m>DuDy z{T;WfY1=0Ap6FXE(w$Fai4|+)z4(T3SUY%mZJFDUu2u#O#dErv9vrSXw0l)A zO?;?u{Xpc$M>M4hLX$4#dE0Qu^fr~>F6PYHly4Nqoz}K`iKAOtckRBY2h`hXCsY{5 z_7wE*>AHv6xFqO9CI6bK%7)LC3~y90iDI#KN$*tZnU_4%S9oKQPiuClkk@^ARoU`a z+Gi-oF&%qr-Y610hD}$hzh||-rfMU@)xohRU#@>bc4+On$1-WFZE73bZVCui^;~Q? zD(G#W7ko!%qj;h#IZc@gCVI21zhm2#Ta*tib5y+h%1W2wiuCm!-^&Y6eM=bCx)d`? zjM6KgHX-P$zIDHi4=s@`59k{%U#|OO5MD?_H9H;6)kha6B@5THAZzm0qNjd7W?Tr&c3Q)=on?Ymh;>og0S-G z$$ z@;#t<{ehz1`)sO{{a%rk!T#wh(ma}FLq%O9Kim)6{rqeA*yQLFo8Cj?`@XtFxh&7x zq$-*F_S)f$%~L!$nh^ex{I6RrMV+U-U-^&Udo>ZH6*`t~MkW~7w#uarceZZIb+741 zqZl?@iBp<|5k`Hx>~6Svx;97DH8SAig&0>39le|ZbX#RJ*RdVBXc+14XmWJ0QiuL- zIAND`&mQF_r$biqg*K0w!Eo$-J}$Pc*{=ixSD94ZoXJSgG&nw7e{iR@ zQ5El$1n;@{CzGQa+LFtLlq>nFTAQ*<@v^Y%gT4^*Pcr&sq+uq zaaLf;EeTw9b3Cs|3R81E7TmQub^!Yzvm>?R)R}(1J4B2uht&!H_5z{M9ycwe$!YK2 z8s6UO_!B%=_xAP*8B@rc*Oy3E)x8SG(a2I_50aJUusG_SDxmM<=avi(wJqTB;4bYE zyT!q4QajL^%VGXS*UDCoeT&8y7D3OEqCDUE{B1MjO#-^q594QGM1;&oNdBY$`_BT z6GZN$D+bB-X{lhodb9X#k`lGm$`!U3(!CupNp7t%vb~AA$L*|?|BkA4IQmPfTO+Hj zF-kIeu2YU7PBx7Z*h^$*ii-IY^>FD_(>?|F$)PAUZtUjUYgnWBj%|m_8LwatB_$QM zmxJw z*|aOUy+}#gGX>rQ)||0{k+ zWx>6NEj`E*5?gWpQZ7y!SdUTbC(R$ZgG5>em!D+5Y<)z6>=x&lPf?j;lZKLtIh@p` z+L}ss;x5-S&9$ZgxY%LuLtY@*N|SQe)S@PM0&c z6bjY$Df8sp)od$a`7k3LONps@w2x0FrjRn`3}K|&fm7gilmLH&_DJ9bHo=@ok7W-S zGVSWM`-IeWCoTndRECLiPy3iPC-%7~9ZKtZ!uoOhpHtPT*fu5;&ZTCl|DznXLY_L(Rmr z-z}SnN_m;O{^*UFb&oSzO?3y~EAs@ezR=Ae;)Tg(rYP{|lkxSZQz~BDk-4&}j-lac zL_#b$?7dl+p+%ML)z$Y&xq8MP&7iTC6M#_K<+aQQ59LR_FI25w}-d~GftNm?oNMc-@s5$)Ob;Gx`W}$ zhj$M+9=JD!d3@m4QKZzyO(bhdk?HX!%n&1Xwd}*xgdACK)}Fid@G>bLi~Su%bl3~4 zZIm6Pq^}+%>+KWPW8n8!-?HZ;g$G zX1zrnrXOvYSLR_Jcn(JNGU#hu2I&(wUhGkha^x62y(Dhx?6wXXt(>M{wm_RAwym{H z5mE7d)_Fs6HyHwxpVKloJ~6vp^f9V9!o9lO)T0QmuHX^;ij4leMRc_z`LNgu z5{<|6Gl;C`&l0rkLQ+kSXlfaCR!2+M58R3c{`n%5o70?< zc6b}$kIKqTytngVILSFUDz&C3%fQFNQAH_(tR-l*+l@1id*WYz{MbCRa%|dH(!QQh zu|4*<0~5Z#=v>r_PsYNHWC`n4FmJtwHo6Q(FR9!ctTAKzuH7a#vGa|SeRSoAio!D)*mr{PeWZAW6w5-`2^XyfDM@@PVr<_wv* zWHm56{H(WnnIHm)ERFBmbpxKaM_T zn}OD6?}$`$naW-&*DIlujXC%-`QS#$Zl{ZVVp}GRY6m#q?op+RvJ5%hUeK}KmO?8G zw&lH<@f@SHI&t2 zMg?+R+r2ePg9<-G^?|~?am6t^Db=Kn<(e+C)PknFUa$SamNPma+03r^pne%`((&}x ziVq3#e4WbI2Q-yMMa&|$W68y!gy0W0<|sXteO*_ZzwB=Pft@9FK^rG;@9cBhmnL_! z{NlrePWnBL&y=Esx}C~$T=XD~5z7o32d>k*j2044;Q{D z%Z**fL%iz8gzcl+(Rti{23tf;G`nJvt!+;?VR7B+*$LG`op_7JghSrEVdNKmG1-&} zLmw$#=M%Vk`@`&yx@kqRPIKHK-V?}mI(1f0PA5mh5Nvr-vpWS$;C#HJ~ zN68#c?CGqc&GH&*wryoFZ_E`t5p&1PacO2vNML4@kaD-OJM~QFCLtLYer-;ULm4O9 z^IL8bIMS7Ejru8{E(LtST@*V8tRg037_g18*v6b(9c`)U&F-BY`A7PwO1ag*bUH1* zv)QeDuq4g|)w_H~J|t*JeIhQPfbNCHO^%tw)RwfbZL((R*p}05478H*Tq61T7baCO zNn=b}Yu1A6g9DEz?b6(|6i?6O%O))33^2>H8zeq2BBfx(w#NZ+3?9}l6M1jxKOrFgkNot!_@P+AY zrY$>V%p9ZjYIq7|z-@|Y)}|TukRU%C@ty1ei-6M_A(u`Swd-`Z0Wq1o*h)D_KNC-Yt^%G-D4j;rye9VagnRK;u?uO4uIna6fDCttUp zNx>S+LJmz)J2&On?h0OUApO1(%ZPo>rxQH)+o$^PKEwsawV#mEmTKhK+0doke?wu@ z4qEIfO;555c9+=B_}?yqLwF&#Sp-H;HQF{BcERKJCg{_KZPO=;7DbENeazmOeDTxSvZF?-re~ zLssi1=q4zLX)Rl-f>AlgT}eIdMbK9pPq2Bp>^9}}k8?xegOql$SpNrFk;!?xuYPTQ zc}s1$X-3hn^i@bh2KLp#c8m3U-rdKcK3-$nw%t55+t|R^N=xVy#q_zi!<$^RaUA}G z9SIyyB%cR#eq?j~%=6}TKiBv@GRy1F4T54s-cw@+ogi}8Jj}bhIfhI&x2P%@C#KDh z`{FD@Yn`11d;1G|b*|AGzDZl#mY~V+y0Ymuh2yyz!$EDoEEhD~6|~!^1nBkPQszkr zdDs)aX$Pk~ra>Dw{h(gWizC!STeGlsS6^XdLwWnNXrtJS=hk|DSqD+?FXIMUW5J&H z1}<6R-Q}W_4$Hg8nndYOi%o_%1$m!0xDM3(MPBq8g(vT5s5Cr(Y)TL<#%Hi5E*{OR z+aHP1YqfgEr^q-w(Z+cx4LO_(Bm`+rmS%Rna1D`P?V@cMaASI=DAkp7j7+rHZ+M%8 zHP!~Hde*^U7Y{f-G-C8_AwhcCr^UO)-o?e()IYEWExo6D7$xyG7aKB{N(EVjdbX); z7Ek+BluC(T2{(@-LNrvL$+9{d4dXt08-HLZul$sj?FGfkFWa#7ApKrBgLTJjUK7TH z6s17>@Vo0(-McI6g3K&9&u?ZjRoeVi_S?cmE2n}n$yc_YJ}M#3L!^zyeJx47v?{Tu zs5>*&0an&TubC!>lK`fwUqorJ-W$3uv_&8z;+}GX$n~v4rzo>3YW7so4TgZrAK*SG z`rT)%6oNN@w3_m=;U^h(uIv+bOZYVs9yCek>qE8R_1*ZeNhNl28p^=r>#jPUjgRlp zgjsokrKwp-&qk!z3}hU#txGs_mA_XRlMsu&#`Dq6v!UGQgQaH|Q=`nuy1S1q-%NCt zJQ_56=1hlm#kab7at@1q-W1a{iobAF&cM{pknar~ClS!4;-i9jkz3l{P4W59PL``Y?94%Ixn=6>{MA(D%vRhj*;v+C!zZ zv%-MvZi}t-Uy{J;!dS46v-OyXcUm1)ObfpL)cymhy^>R77}pfSQtDxCoQE#&V1-Dx zlLFc&sVD~3ZsVTBuIj&YggRmR&PKxa9DR!&`mA5h!@=CktAgpb3Meev#Yg4uwAro_S8M=@+?@*=D0K=4_% z9hyp6y!Bm+!X@7D62-%LgWBNoU%_dTHfhjt{p$9b}}^Reu~?alhCc+u6-xP*G0_S^7p*3njtAmpWW)qI&oK4 zopPV->KBB=;qucXA?_oIPuxGqN2=*5)Wj-hQn&0-5lPv7?o2!-zEuU&l27PmkhQGb zT}DCw+4PuEc3Pg#3ei{(a#6Wa8lgvL?;T<|FtD-Ys_?4zJ_pW`&g$OOwcg9TqOB^Q zH6QpOMCoIh6KFwk{#g3wt_aRHv+sKCXFQOvStV->g2#wx`i@lc`^p z4b-49a5p#2VPoexu2-OWkg9N(!>zb%hsLs8)sw9|S7C5)Nsj>#4l^=x8N@_udC zQ=XAu?oU3Y|4cc+sPp6gz6-;$(3Ec(%s;8+sm7ncH{R8gA9-N=A^NjPSCh;NyN*9N zmAG&9v87eZpFWS<-y|ZWpjtBw^#~{6J79nhA8_9^Oup&HbYEU1ZqFO~fUogaG(3hj z23P0#)Q>Z|$+}7gQ?y+>&gK7NzYlc;Lwr=_y#b3|gJVlI(`q+^%GP_kK1*GDQhjMf zLy0Rhm4@6)@PasBS$5uNmn zU&66Y)>tU7E8}xjFcC6^jXKqZOCJ%e)jruD^$Z+Ob!^Ag(!4kyh=~heQ*I?3PUz2{^6ORHvk{A<5|-5(dF`~k<2F^<_EECLO1qgru4kjVsjnVft1;=>&hEWG zR7Ss8+%?|p(qw`!%L;GG3upObrN{&ebr1Jm3w1udW< zOrc4Mq4Nes&n(@Z^ZZiNWFrb)d|Aponj+BJHD#t7zHS+%bygI4dIB^OHj?2FlQ*68 z%gSuX9=76_Vi`>5IU_}uV1JE`dH+kk#=63YF&%@l)ZDK^4JK@(%GbzzCAl>o-ZScd ztg!0gW{oEmN&%l-3Tk@%rsx3GU}`#;h~;}Mqe=XfTC9&)E>%atMGyse!?u_f-RI|C#&-FeTo_l*Nn=N0KUGwUtxQ7H&WjP*grZ+E&VzO^`yX+=Z1|mcpAKYfRjJE3#TRV4~;4=_*CZX3QBr?5V=2Dqu5r{uOh7bRC+ zioY3|av+qC5w7-^#@a;4dZ#bC3Gdj#QBCP8c0kaAW`ohrTCRIrI9u-)`a31MpAXQr zp&P0gz5IGV^N5gXA+eec`zlp2(eGyDr6}tiqJ>AY8Pr!2R=!Er;GK!Plhj@0aFOhq zo6Lq6v{>J+$KWh;_>;YND6nSREo2If14lvIpmXU{s`Jmw<2wbCn~s^aTZ8mlsa;FF zmqprzjSUVeay3S%?NF+BIb?Io@{?teTT}Gu`V&u_^*e7(+&Ikb|24H%?9Br|CF}5G zt8{a&$6pDJar5EzOI3`&uv-iyCL77Li|%iz%CdRdJ{hZV@45cnilg)=LHA&W1x1Ih zbnw~UJYdRT{odMl`hITezK7n7j%i$&?!e_Q;&8mGw$i|qZO6+zmcV0gvi78|_rDT* zXv6yJrepiwjWa)z1m3kfYX|8gjf+pOQIw9`HHF~f`J?k zMKmCO%3hJIjU7}fu9MNY=O6!kUw)2wo`Cx16VFZHLY;^|`E=B&Ju3Nm+2K@s=W2S( z`uq6$WoD9l(uM-6^Vn@`Z?KDDo{lEt_^z`PrLFEVpS^e^#gZN5GzoE1Zx!7lIebfL z6S!~#7*2pBna8RUl$Z5^i|cY=-S#^AB@4~cE#%g_mBZgBu8AJg!pd zy$6qEz?HW}r}zJ0PJ_R_lQzn9u$hw22F1z%-rjtP+6X9Y_@mt2$)ICyQsu4?pr&Ap8Z7mlqLe^Fg>d)&y2>3EG~jONV9 zj;SH0V1;M_<>8KOh2BsA#c7+hJ~k3gb9VldezZQ&=ZsAJ+a|4&F$g&cmZ;-N={E z<;J?0TP#=|0Q0sf@NAS4_z<#drZ+CF_RcPrAa8>9nndGWUbP#pr-?F3?BBxDO1-Vs zPd!Bfe8m=y<6W@~n*;@f_)X&1khGCegmav76O~;=Q|vGBtL9cpkhL z6ah2qMS$B|4X=BW|MjjW-x<&%MQ}4-$XWlfHDV zUHnL*zT|d`%oexD6!{Digi&G&F~0K*ATZS$H|{-u!ixuItPIzIYVR9DQy9o)X3D+| zG20(DrwE(KYTcKLieZq@1qYc~L2!rTvwM2n1+P*!Csv84=jd_o$)EdK&4swcsq7}{i3>k1N+W+T%$=OB3d^vmi zzC)|Sw>Q~s-e|BPW1a0$^ow>mNVbsBn}+|mKOFeOfj=Dh!+}2>_``ukIq>~YQ2-!= zspLNhg;D(fW{2=0yy$OeXd%%7U~p~pAnJ(B*cF;aHTT-7x=Yc`tKa#5vm{6iQ1awA>!j=ZNun! z4wXl95#i>8gm@|p-+$2o-?1_H)gRpK@&ub;9I6ksF*{atFw6r<29he+f6il3{Dsp8 zU^>D#OQd6p!U!Yc9nxX5{9}b-G;SykwTsIB%Aqubg&UG2B>9AGz!CjrBPqeRG`D~8 z1)-IW-#(;*>O^%fgR~No3J_P)TNHo(coIxUf4ztZ;UwiL;s=UngM@e?1O$Wifpqp+ zAbtNdkS{9*@=uH5s|<*cel?e7Wmy=OmxrVZUks8%ihW^tJP?#LyMukZWB~fE48o6I z`Jo94Cegd*=j))yQyoCh5giSe0imPv5Zh+3s>~k9KQn@HXxtHYAxNkmd6?Gq124i% zO13b4p+n<`c(N1{!lDdG6TX3Zcp+xeXDC-h`2G{(M=vmhw*^@~YQP1R0}qDKyL9H` zN6!~Nbu7Swa18*7o2sxJ(!tV@)_@h~jxUn$cf3dAhx9m-ds#@T4|akuQml)Gp)3*M zE5C{Go!>o;+o$;QKrVxR5L-e$s2*yNve0A?)(*sdZZbs(Ex{ZpRrW8eYP z7dpgyB*$p3h(P+L2O*}C#W0h`!SNx&SA-LxoDtz0Ziofe;Nx%f&tK!A|C&@DzK7*- z=zTpZV41!BFR%~5_{DTEnzv}~a6yuSw8mN%n33Wn4Zm>#m%F_H9?1@Tqc{=1Qk)3i zDNckh6(`2%gE;W;D|+GZUsx9l=S_~m7mWYh2Z^LOu<~y1;`pCoA-2UF(gX8!c#$o* zK#F-bjC3i?i*&u{VKuPfxdRAq@c))8JbUPxCVSw!>wyWWTWUKHcq-p4SH3J8A? zwy0d~Ye27I|GPd2!a5dnq&gqXfAto3kV}f0B#a}e0QCXsD}G3FkW@jyE&oOFCA|xQ z=}4!ofqUwdMe`WE8vRWlGGWSMj3Q0+Uz4 zJVKBpAxVSWk@|W0(0o7Jf?o6Wi!pd!1LSb1t;O6ws`CfnILzuUgdg>r1Cl5t1t6`q zVIHPgol`hd1JjXiL%JF1H*UB;S_2a6kAZ-j_F$#zMi{60Yn?OOr)LQ;-(v0`)%m3J z2hACDHbnT*e2@UwUWU)ZUpUkD?c7x`sSVT7+K6-nDnkzmwTa~J`+kpYi}|m4KZ_sv zi|S8w=0oH9Tb&PiuLbkWI)oqLL3#-FfeR$Jx`EVAS8%I&3w%a6(fmN;gdFk_&GrMy z0_wLsB(=ZiJxL$rpV`4Oqz;WK+V3cp?gr;b<|^r)vz4>}43lC(Sdn}nc|vPA!j1Ze z@+@>H9_2@Ee&ZRSTe$`9D~A{5zjSuaBJl%2z8uY`S%>y~f{<3iGm0nNi*+s1hv3=F zBtF82@XXR;cuBH<>kpdqXkRY~31LtJ5{dDPU?c+R2loJ-^d=xz^lp*#Rv0%s7ZLA} zJfc0nFr*caEP?s3FGxmbmLGi)gz^7VH_Lk@uV}oLf6IFTzilv&0^r_j1^3tJ&2bBL zQ}qu(voeX+Fw`eB9!Nfy!1D<^)TP=m{LgT+>jhfx&^oCMB;lV&{EUkT<>@6%NBl&( zSptY&-ZwuV)Tas+I7o6Z9XT}is2^y2kqnc{F?{@|I8-;9?+8EQzbrgceVC8y2ai{k zIKXtIrw}iZe&7IN*E9g17djsxy@9a)%Avl@(y#LTSL0EAi2n!^Iv?=@;V@mWsyG+O zK8gggd45pdb>W^Lt%I}k3FSw8M0gRA@)Xtg?{)|m!hqxyt(k~W80jNYZ18c;{j>Qv zSMh%%fUuxGps}AN^!&dGBZTwE{o%kL4*cQ39}fKCz`vdY#Bc7~mjGbsf8yhVzn2G^ zKYRgFe~JjcJr4>1CKNwN4w%~D7Yf>77x6!Q0KZg#o{^77K8&CBu|J-_`S1$|vp$MO zUr3nq(GE)!KBLnVil6n-i3yg2Cnqeb7p%dwp>}|p03KkVuSxvw2SXpg`iano=|k{C z3dkqIXU5>~z9#X1!Y5c0NqKPyOAwM4B+R!E4E%BbmpCxHzeN7O!;$XO(ODavDe1uV zIyPwE5&Sm*K<6}c=2`(Rlm)9+HDnu824{;dENFlB%>S#lkc`ZpqY)obcrm#_@u(e?XJI-zHzIAfdeM8>zs{GW z<+*)wjhj~bx6L@*$>(Nx#9iG{XTDC3d5*fR3{>2 zk3qHp%?14@f@`$~FrE>fcSU~Gi}E8I&UbsFOiuQKGyTFlBXrh8wh6gH8*pUSR)uUm z@NVK_=Yenc7pNaAA!+<{7v$Rbk)-}sAeA<2Baj1ZdZr|4v-TQNnMGL93L^?hb+P+3 zbSDMxGT+`Z2B*Z?f&NeTn2#nW;72KD>qfSgY*?2dq&17!!WQ-&jT1X0xnJFn!TTj5 z{8+`eyFB>0ipB51ZjYd^R{VuQDm@z3slJFEF&@T~y4ksOvya_gP?> z!|nxo0O=q>n13~#Q|C!|K6}4`(qYQL`*KZ)ffcsrz3(^oav~HnsTmxha&<9sYg;Dy#afMNT>rnp@|Izw2Yr7?_|8Fb!li?2s{&3(w!vSP9m~-gMD0od$I?|4( z0(b}w5(fL7$f1w+i%4G}Lb?a}2 zR5^k;k~QPox`lp+g?;`rHcfAX}Ifv>+{E~w7(_V97U2rWZf%{Jf_}e1XSLBd> zUIt0w{AS?3F#m6!2T)&>pai}|ShynWbWzr}%Lkp<65_ZCTuhvm^4 z@w>eiG1cVT*^XCV6ez+wY9Dw8Ed9|ZEm-!q=OdU8t=R}8Y6s;-gu=69`P=giEN=_* z{>}- y6HX7|azE06X@zZ!GIpTBd9o)1X)^LOPJ+ux(HZvDH0Khjq(GOnn6@IP3d z4~=UP+-t$PR`&xpDlhntl*b3dufM>r!{Fi9VX*MaFtY?;_#0uM5A%E@_(d212}45v E50FOnoB#j- diff --git a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh deleted file mode 100644 index 0fd1755633..0000000000 --- a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh +++ /dev/null @@ -1,327 +0,0 @@ -/** - * EnvVarUpdate.nsh - * : Environmental Variables: append, prepend, and remove entries - * - * WARNING: If you use StrFunc.nsh header then include it before this file - * with all required definitions. This is to avoid conflicts - * - * Usage: - * ${EnvVarUpdate} "ResultVar" "EnvVarName" "Action" "RegLoc" "PathString" - * - * Credits: - * Version 1.0 - * * Cal Turney (turnec2) - * * Amir Szekely (KiCHiK) and e-circ for developing the forerunners of this - * function: AddToPath, un.RemoveFromPath, AddToEnvVar, un.RemoveFromEnvVar, - * WriteEnvStr, and un.DeleteEnvStr - * * Diego Pedroso (deguix) for StrTok - * * Kevin English (kenglish_hi) for StrContains - * * Hendri Adriaens (Smile2Me), Diego Pedroso (deguix), and Dan Fuhry - * (dandaman32) for StrReplace - * - * Version 1.1 (compatibility with StrFunc.nsh) - * * techtonik - * - * http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries - * - */ - - -!ifndef ENVVARUPDATE_FUNCTION -!define ENVVARUPDATE_FUNCTION -!verbose push -!verbose 3 -!include "LogicLib.nsh" -!include "WinMessages.NSH" -!include "StrFunc.nsh" - -; ---- Fix for conflict if StrFunc.nsh is already includes in main file ----------------------- -!macro _IncludeStrFunction StrFuncName - !ifndef ${StrFuncName}_INCLUDED - ${${StrFuncName}} - !endif - !ifndef Un${StrFuncName}_INCLUDED - ${Un${StrFuncName}} - !endif - !define un.${StrFuncName} '${Un${StrFuncName}}' -!macroend - -!insertmacro _IncludeStrFunction StrTok -!insertmacro _IncludeStrFunction StrStr -!insertmacro _IncludeStrFunction StrRep - -; ---------------------------------- Macro Definitions ---------------------------------------- -!macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString - Push "${EnvVarName}" - Push "${Action}" - Push "${RegLoc}" - Push "${PathString}" - Call EnvVarUpdate - Pop "${ResultVar}" -!macroend -!define EnvVarUpdate '!insertmacro "_EnvVarUpdateConstructor"' - -!macro _unEnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString - Push "${EnvVarName}" - Push "${Action}" - Push "${RegLoc}" - Push "${PathString}" - Call un.EnvVarUpdate - Pop "${ResultVar}" -!macroend -!define un.EnvVarUpdate '!insertmacro "_unEnvVarUpdateConstructor"' -; ---------------------------------- Macro Definitions end------------------------------------- - -;----------------------------------- EnvVarUpdate start---------------------------------------- -!define hklm_all_users 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' -!define hkcu_current_user 'HKCU "Environment"' - -!macro EnvVarUpdate UN - -Function ${UN}EnvVarUpdate - - Push $0 - Exch 4 - Exch $1 - Exch 3 - Exch $2 - Exch 2 - Exch $3 - Exch - Exch $4 - Push $5 - Push $6 - Push $7 - Push $8 - Push $9 - Push $R0 - - /* After this point: - ------------------------- - $0 = ResultVar (returned) - $1 = EnvVarName (input) - $2 = Action (input) - $3 = RegLoc (input) - $4 = PathString (input) - $5 = Orig EnvVar (read from registry) - $6 = Len of $0 (temp) - $7 = tempstr1 (temp) - $8 = Entry counter (temp) - $9 = tempstr2 (temp) - $R0 = tempChar (temp) */ - - ; Step 1: Read contents of EnvVarName from RegLoc - ; - ; Check for empty EnvVarName - ${If} $1 == "" - SetErrors - DetailPrint "ERROR: EnvVarName is blank" - Goto EnvVarUpdate_Restore_Vars - ${EndIf} - - ; Check for valid Action - ${If} $2 != "A" - ${AndIf} $2 != "P" - ${AndIf} $2 != "R" - SetErrors - DetailPrint "ERROR: Invalid Action - must be A, P, or R" - Goto EnvVarUpdate_Restore_Vars - ${EndIf} - - ${If} $3 == HKLM - ReadRegStr $5 ${hklm_all_users} $1 ; Get EnvVarName from all users into $5 - ${ElseIf} $3 == HKCU - ReadRegStr $5 ${hkcu_current_user} $1 ; Read EnvVarName from current user into $5 - ${Else} - SetErrors - DetailPrint 'ERROR: Action is [$3] but must be "HKLM" or HKCU"' - Goto EnvVarUpdate_Restore_Vars - ${EndIf} - - ; Check for empty PathString - ${If} $4 == "" - SetErrors - DetailPrint "ERROR: PathString is blank" - Goto EnvVarUpdate_Restore_Vars - ${EndIf} - - ; Make sure we've got some work to do - ${If} $5 == "" - ${AndIf} $2 == "R" - SetErrors - DetailPrint "$1 is empty - Nothing to remove" - Goto EnvVarUpdate_Restore_Vars - ${EndIf} - - ; Step 2: Scrub EnvVar - ; - StrCpy $0 $5 ; Copy the contents to $0 - ; Remove spaces around semicolons (NOTE: spaces before the 1st entry or - ; after the last one are not removed here but instead in Step 3) - ${If} $0 != "" ; If EnvVar is not empty ... - ${Do} - ${${UN}StrStr} $7 $0 " ;" - ${If} $7 == "" - ${ExitDo} - ${EndIf} - ${${UN}StrRep} $0 $0 " ;" ";" ; Remove ';' - ${Loop} - ${Do} - ${${UN}StrStr} $7 $0 "; " - ${If} $7 == "" - ${ExitDo} - ${EndIf} - ${${UN}StrRep} $0 $0 "; " ";" ; Remove ';' - ${Loop} - ${Do} - ${${UN}StrStr} $7 $0 ";;" - ${If} $7 == "" - ${ExitDo} - ${EndIf} - ${${UN}StrRep} $0 $0 ";;" ";" - ${Loop} - - ; Remove a leading or trailing semicolon from EnvVar - StrCpy $7 $0 1 0 - ${If} $7 == ";" - StrCpy $0 $0 "" 1 ; Change ';' to '' - ${EndIf} - StrLen $6 $0 - IntOp $6 $6 - 1 - StrCpy $7 $0 1 $6 - ${If} $7 == ";" - StrCpy $0 $0 $6 ; Change ';' to '' - ${EndIf} - ; DetailPrint "Scrubbed $1: [$0]" ; Uncomment to debug - ${EndIf} - - /* Step 3. Remove all instances of the target path/string (even if "A" or "P") - $6 = bool flag (1 = found and removed PathString) - $7 = a string (e.g. path) delimited by semicolon(s) - $8 = entry counter starting at 0 - $9 = copy of $0 - $R0 = tempChar */ - - ${If} $5 != "" ; If EnvVar is not empty ... - StrCpy $9 $0 - StrCpy $0 "" - StrCpy $8 0 - StrCpy $6 0 - - ${Do} - ${${UN}StrTok} $7 $9 ";" $8 "0" ; $7 = next entry, $8 = entry counter - - ${If} $7 == "" ; If we've run out of entries, - ${ExitDo} ; were done - ${EndIf} ; - - ; Remove leading and trailing spaces from this entry (critical step for Action=Remove) - ${Do} - StrCpy $R0 $7 1 - ${If} $R0 != " " - ${ExitDo} - ${EndIf} - StrCpy $7 $7 "" 1 ; Remove leading space - ${Loop} - ${Do} - StrCpy $R0 $7 1 -1 - ${If} $R0 != " " - ${ExitDo} - ${EndIf} - StrCpy $7 $7 -1 ; Remove trailing space - ${Loop} - ${If} $7 == $4 ; If string matches, remove it by not appending it - StrCpy $6 1 ; Set 'found' flag - ${ElseIf} $7 != $4 ; If string does NOT match - ${AndIf} $0 == "" ; and the 1st string being added to $0, - StrCpy $0 $7 ; copy it to $0 without a prepended semicolon - ${ElseIf} $7 != $4 ; If string does NOT match - ${AndIf} $0 != "" ; and this is NOT the 1st string to be added to $0, - StrCpy $0 $0;$7 ; append path to $0 with a prepended semicolon - ${EndIf} ; - - IntOp $8 $8 + 1 ; Bump counter - ${Loop} ; Check for duplicates until we run out of paths - ${EndIf} - - ; Step 4: Perform the requested Action - ; - ${If} $2 != "R" ; If Append or Prepend - ${If} $6 == 1 ; And if we found the target - DetailPrint "Target is already present in $1. It will be removed and" - ${EndIf} - ${If} $0 == "" ; If EnvVar is (now) empty - StrCpy $0 $4 ; just copy PathString to EnvVar - ${If} $6 == 0 ; If found flag is either 0 - ${OrIf} $6 == "" ; or blank (if EnvVarName is empty) - DetailPrint "$1 was empty and has been updated with the target" - ${EndIf} - ${ElseIf} $2 == "A" ; If Append (and EnvVar is not empty), - StrCpy $0 $0;$4 ; append PathString - ${If} $6 == 1 - DetailPrint "appended to $1" - ${Else} - DetailPrint "Target was appended to $1" - ${EndIf} - ${Else} ; If Prepend (and EnvVar is not empty), - StrCpy $0 $4;$0 ; prepend PathString - ${If} $6 == 1 - DetailPrint "prepended to $1" - ${Else} - DetailPrint "Target was prepended to $1" - ${EndIf} - ${EndIf} - ${Else} ; If Action = Remove - ${If} $6 == 1 ; and we found the target - DetailPrint "Target was found and removed from $1" - ${Else} - DetailPrint "Target was NOT found in $1 (nothing to remove)" - ${EndIf} - ${If} $0 == "" - DetailPrint "$1 is now empty" - ${EndIf} - ${EndIf} - - ; Step 5: Update the registry at RegLoc with the updated EnvVar and announce the change - ; - ClearErrors - ${If} $3 == HKLM - WriteRegExpandStr ${hklm_all_users} $1 $0 ; Write it in all users section - ${ElseIf} $3 == HKCU - WriteRegExpandStr ${hkcu_current_user} $1 $0 ; Write it to current user section - ${EndIf} - - IfErrors 0 +4 - MessageBox MB_OK|MB_ICONEXCLAMATION "Could not write updated $1 to $3" - DetailPrint "Could not write updated $1 to $3" - Goto EnvVarUpdate_Restore_Vars - - ; "Export" our change - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 - - EnvVarUpdate_Restore_Vars: - ; - ; Restore the user's variables and return ResultVar - Pop $R0 - Pop $9 - Pop $8 - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Push $0 ; Push my $0 (ResultVar) - Exch - Pop $0 ; Restore his $0 - -FunctionEnd - -!macroend ; EnvVarUpdate UN -!insertmacro EnvVarUpdate "" -!insertmacro EnvVarUpdate "un." -;----------------------------------- EnvVarUpdate end---------------------------------------- - -!verbose pop -!endif diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh deleted file mode 100644 index fa6f34daf3..0000000000 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ /dev/null @@ -1,250 +0,0 @@ -/* -LaTeX.nsh - -Handling of LaTeX distributions -*/ - -# This script contains the following functions: -# -# - LaTeXActions (checks if MiKTeX or TeXLive is installed) -# -# - ConfigureMiKTeX -# (installs the LaTeX class files that are delivered with LyX, -# a Perl interpreter for splitindex and pdfcrop -# and enable MiKTeX's automatic package installation) -# -# - ConfigureTeXLive -# (installs the LaTeX class files that are delivered with LyX) - -# --------------------------------------- - -Function LaTeXActions - # checks if MiKTeX or TeXLive is installed - - StrCpy $Is64bit "false" - - ${if} ${RunningX64} - SetRegView 64 # the PATH is in the 64bit registry section - ${endif} - # test if MiKTeX is installed - # reads the PATH variable via the registry because NSIS' "$%Path%" variable is not updated when the PATH changes - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" - StrCpy $Search "miktex" - Call LaTeXCheck # sets the path to the latex.exe to $PathLaTeX # Function from LyXUtils.nsh - - StrCpy $String $PathLaTeX - StrCpy $Search "x64" # search if it is 64bit MiKTeX - Call StrPoint # Function from LyXUtils.nsh - ${if} $Pointer != "-1" # if something was found - StrCpy $Is64bit "true" - ${endif} - - # check for 32bit MiKTeX - ${if} $PathLaTeX != "" - ${andif} $Is64bit != "true" - ${if} ${RunningX64} - SetRegView 32 - ${endif} - # check if MiKTeX 2.8 or newer is installed - StrCpy $0 0 - loop32: - EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey - StrCmp $1 "" done32 - StrCpy $String $1 - IntOp $0 $0 + 1 - Goto loop32 - done32: - ${if} $String == "2.9" - StrCpy $MiKTeXVersion "2.9" - StrCpy $LaTeXName "MiKTeX 2.9" - ${endif} - ${endif} - - # check for 64bit MiKTeX - ${if} $LaTeXName == "" - ${if} ${RunningX64} - SetRegView 64 - ${endif} - # check if MiKTeX 2.8 or newer is installed - StrCpy $0 0 - loop64: - EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey - StrCmp $1 "" done64 - StrCpy $String $1 - IntOp $0 $0 + 1 - Goto loop64 - done64: - ${if} $String == "2.9" - StrCpy $MiKTeXVersion "2.9" - StrCpy $LaTeXName "MiKTeX 2.9" - ${endif} - ${endif} - - ${if} $PathLaTeX != "" - StrCpy $MiKTeXUser "HKLM" # needed later to configure MiKTeX - ${else} # check if MiKTeX is installed only for the current user - ${if} ${RunningX64} - SetRegView 64 # the PATH is in the 64bit registry section - ${endif} - ReadRegStr $String HKCU "Environment" "Path" - StrCpy $Search "miktex" - Call LaTeXCheck # function from LyXUtils.nsh - ${if} $PathLaTeX != "" - StrCpy $MiKTeXUser "HKCU" - ${endif} - ${endif} - ${if} $LaTeXName == "" # check for the MiKTeX version - StrCpy $0 0 - loopB: - EnumRegKey $1 HKCU "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey - StrCmp $1 "" doneB - StrCpy $String $1 - IntOp $0 $0 + 1 - Goto loopB - doneB: - ${if} $String == "2.9" - StrCpy $MiKTeXVersion "2.9" - StrCpy $LaTeXName "MiKTeX 2.9" - ${endif} - ${endif} - - ${if} $PathLaTeX != "" - StrCpy $String $PathLaTeX - StrCpy $Search "x64" # search if it is 64bit MiKTeX - Call StrPoint # Function from LyXUtils.nsh - ${if} $Pointer != "-1" # if something was found - StrCpy $Is64bit "true" - ${endif} - StrCpy $LaTeXInstalled "MiKTeX" - # on some installations the path ends with a "\" on some not - # therefore assure that we remove it if it exists - StrCpy $0 $PathLaTeX "" -1 - ${if} $0 == "\" - StrCpy $PathLaTeX "$PathLaTeX" -1 # delete "\" - ${endif} - ${endif} - - # test if TeXLive is installed - # TeXLive can be installed so that it appears in the PATH variable and/or only as current user. - # The safest method is to first check for the PATH because this is independent of the TeXLive version. - ${if} ${RunningX64} - SetRegView 64 # the PATH is in the 64bit registry section - ${endif} - ${if} $PathLaTeX == "" - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" - StrCpy $Search "TeXLive" - Call LaTeXCheck # function from LyXUtils.nsh - ${endif} - # check for the current user Path variable - ${if} $PathLaTeX == "" - ReadRegStr $String HKCU "Environment" "Path" - StrCpy $Search "texlive" - StrCpy $2 "TeXLive" - Call LaTeXCheck # function from LyXUtils.nsh - ${endif} - # check if it was installed to the system - ${if} ${RunningX64} - SetRegView 32 # TeXLive is a 32bit application - ${endif} - ${if} $PathLaTeX == "" - ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "UninstallString" - ${if} $String == "" - ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "UninstallString" - ${endif} - ${if} $String != "" - StrCpy $String $String -28 # remove '\tlpkg\installer\uninst.bat"' - StrCpy $String $String "" 1 # remove the leading quote - ${endif} - StrCpy $PathLaTeX "$String\bin\win32" - # check if the latex.exe exists in the $PathLaTeX folder - !insertmacro FileCheck $5 "latex.exe" "$PathLaTeX" # macro from LyXUtils.nsh - ${if} $5 == "False" - StrCpy $PathLaTeX "" - ${endif} - ${endif} - # finally set the name - ${if} $PathLaTeX != "" - ${andif} $LaTeXName != "MiKTeX 2.9" - StrCpy $LaTeXInstalled "TeXLive" - ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "DisplayVersion" - ${if} $String == "" - ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015" "DisplayVersion" - ${endif} - ${if} $String != "" - StrCpy $LaTeXName "TeXLive $String" - ${else} - StrCpy $LaTeXName "TeXLive" - ${endif} - ${endif} - -FunctionEnd - -# ------------------------------ - -Function ConfigureMiKTeX - # installs the LaTeX class files that are delivered with LyX, - # a Perl interpreter for splitindex and pdfcrop - # and enable MiKTeX's automatic package installation - - # install LyX's LaTeX class and style files and a Perl interpreter - ${if} $PathLaTeX != "" - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - ${if} $Is64bit == "true" - StrCpy $PathLaTeXLocal "$PathLaTeX" -15 # delete "\miktex\bin\x64" - ${else} - StrCpy $PathLaTeXLocal "$PathLaTeX" -11 # delete "\miktex\bin" - ${endif} - ${else} - StrCpy $PathLaTeXLocal "$APPDATA\MiKTeX\$MiKTeXVersion" - ${endif} - - # only install the LyX packages if they are not already installed - ${ifnot} ${FileExists} "$PathLaTeXLocal\tex\latex\lyx\broadway.cls" - # files in Resources\tex - SetOutPath "$PathLaTeXLocal\tex\latex\lyx" - CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\tex\latex\lyx" - - # refresh MiKTeX's file name database (do this always to assure everything is in place) - ${if} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - # call the non-admin version - nsExec::ExecToLog "$PathLaTeX\initexmf --update-fndb" - ${else} - ${if} $MiKTeXUser != "HKCU" # call the admin version - nsExec::ExecToLog "$PathLaTeX\initexmf --admin --update-fndb" - ${else} - nsExec::ExecToLog "$PathLaTeX\initexmf --update-fndb" - ${endif} - ${endif} - Pop $UpdateFNDBReturn # Return value - ${endif} - - # install a Perl interpreter for splitindex and pdfcrop - SetOutPath "$INSTDIR\Perl" - # recursively copy all files under Perl - File /r "${FILES_PERL}\" - - ${endif} # end if $PathLaTeX != "" -FunctionEnd - -# ------------------------------ - -Function ConfigureTeXLive - # installs the LaTeX class files that are delivered with LyX - # (TeXLive comes already with a Perl interpreter.) - - ${if} $PathLaTeX != "" - StrCpy $PathLaTeXLocal "$PathLaTeX" -10 # delete "\bin\win32" - - # only install the LyX packages if they are not already installed - ${ifnot} ${FileExists} "$PathLaTeXLocal\texmf-dist\tex\latex\lyx\broadway.cls" - # files in Resources\tex - SetOutPath "$PathLaTeXLocal\texmf-dist\tex\latex\lyx" - CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\texmf-dist\tex\latex\lyx" - # update TeXLive's package file list - ExecWait '$PathLaTeX\texhash' - ${endif} - ${endif} - -FunctionEnd diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh deleted file mode 100644 index eda1599fd6..0000000000 --- a/development/Win32/packaging/installer/include/LyXUtils.nsh +++ /dev/null @@ -1,369 +0,0 @@ -# This script contains the following functions: -# -# - LaTeXCheck (check installed LaTeX-system), -# (only used by Small and Complete installer), uses: -# StrPointer -# StrPoint -# RevStrPointer -# RevStrPoint -# -# - PATHCheck (checks for a path in a semicolon separated path list like the PATH variable), uses: -# StrPointer -# StrPoint -# RevStrPointer -# RevStrPoint -# -# - un.DelAppPathSub and UnAppPreSuff, -# (delete the folder ~\Documents and Settings\username\Application Data\LyX for all users), uses: -# un.GetParentA -# un.GetUsers -# un.StrPoint -# StrPointer -# StrPoint -# UnAppPreSuff -# -# - FileCheck (checks if a given file exists) -# -#-------------------------- - -!macro StrPointer FindStr SearchStr Pointer - # searches for a string/character (SearchStr) in another string (FindStr) - # and returns the number of the character in the FindStr where the SearchStr was found (Pointer) - # if nothing was found or the search is impossible the Pointer is set to -1 - - StrLen $R2 ${SearchStr} - StrLen $R4 ${FindStr} - StrCpy $R5 0 - ${if} $R2 == 0 - ${orif} $R4 == 0 - Goto NotFound - ${endif} - IntCmp $R4 $R2 loopA NotFound - loopA: - StrCpy $R3 ${FindStr} $R2 $R5 - StrCmp $R3 ${SearchStr} Found - IntOp $R5 $R5 + 1 - IntCmp $R4 $R5 loopA NotFound - Goto loopA - Found: - StrCpy ${Pointer} $R5 - Goto done - NotFound: - StrCpy ${Pointer} "-1" - done: - -!macroend - -#-------------------------------- - -Function StrPoint - !insertmacro StrPointer $String $Search $Pointer -FunctionEnd - -#-------------------------------- - -!macro RevStrPointer FindStr SearchStr Pointer - # searches for a string/character (SearchStr) in another string (FindStr) in reverse order - # and returns the number of the character in the FindStr where the SearchStr was found (Pointer) - # if nothing was found or the search is impossible the Pointer is set to +1 - - StrLen $R2 ${SearchStr} - StrLen $R4 ${FindStr} - ${if} $R2 == 0 - ${orif} $R4 == 0 - Goto NotFound - ${endif} - IntCmp $R4 $R2 loopA NotFound - StrCpy $R5 "-$R2" - loopA: - StrCpy $R3 ${FindStr} $R2 $R5 - StrCmp $R3 ${SearchStr} Found - IntOp $R5 $R5 - 1 - IntCmp "$R5" "-$R4" loopA NotFound - Goto loopA - Found: - StrCpy ${Pointer} $R5 - Goto done - NotFound: - StrCpy ${Pointer} "+1" - done: - -!macroend - -#-------------------------------- - - Function RevStrPoint - !insertmacro RevStrPointer $String $Search $Pointer - FunctionEnd - -#-------------------------------- - -!macro AppPreSuff AppPre AppSuff - # the APPDATA path for a local user has for WinXP and 2000 the following structure: - # C:\Documents and Settings\username\Application Data - # for Win Vista the structure is: - # C:\Users\username\AppData\Roaming - # this macro saves the "C:\Documents and Settings\" substring into the variable "AppPre" - # and the "Application Data" substring into the variable "AppSuff" - - # switch temporarily to local user because the all users application data path is in - # Vista only C:\ProgramData - SetShellVarContext current - StrCpy $String "$APPDATA" - Var /GLOBAL APPDATemp - StrCpy $APPDATemp "$APPDATA" - ${If} $MultiUser.Privileges == "Admin" - ${OrIf} $MultiUser.Privileges == "Power" - SetShellVarContext all # move back to all users - ${endif} - StrCpy $Search "\" - Call StrPoint # search for the first "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the first "\" - StrCpy $0 $Pointer - Call StrPoint # search for the second "\" - IntOp $0 $0 + $Pointer # $0 is now the pointer to the second "\" in the APPDATA string - StrCpy ${AppPre} $APPDATemp $0 # save the part before the second "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the second "\" - Call StrPoint # search for the third "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy ${AppSuff} $String "" $Pointer # save the part after the third "\" - -!macroend - -#-------------------------------- - -Function un.GetParentA - # deletes a subfolder of the APPDATA path for all users - # used by the function "un.getUsers" - - Exch $R0 - Push $R1 - Push $R2 - Push $R3 - StrCpy $R1 0 - StrLen $R2 $R0 - loop: - IntOp $R1 $R1 + 1 - IntCmp $R1 $R2 get 0 get - StrCpy $R3 $R0 1 -$R1 - StrCmp $R3 "\" get - Goto loop - get: - StrCpy $R0 $R0 -$R1 - Pop $R3 - Pop $R2 - Pop $R1 - Exch $R0 - -FunctionEnd - -#-------------------------------- - -Function un.GetUsers - # reads the subfolders of the "Documents and Settings" folder to get a list of the users - - StrCpy $R3 "" - Push "$PROFILE" - Call un.GetParentA - Pop $R2 - StrCpy $R2 "$R2" - FindFirst $R0 $R1 "$R2\*" - StrCmp $R1 "" findend 0 - findloop: - IfFileExists "$R2\$R1\*.*" 0 notDir - StrCmp $R1 "." notDir - StrCmp $R1 ".." notDir - StrCmp $R1 "All Users" notDir - StrCmp $R1 "Default User" notDir - StrCmp $R1 "All Users.WINNT" notDir - StrCmp $R1 "Default User.WINNT" notDir - StrCpy $R3 "$R3|$R1" - notDir: - FindNext $R0 $R1 - StrCmp $R1 "" findend 0 - Goto findloop - findend: - FindClose $R0 - -FunctionEnd - -#-------------------------------- - -Function un.StrPoint - !insertmacro StrPointer $String $Search $Pointer -FunctionEnd - -#-------------------------------- - -!macro UnAppPreSuff AppPre AppSuff - # the APPDATA path for a local user has for WinXP and 2000 the following structure: - # C:\Documents and Settings\username\Application Data - # for Win Vista the structure is: - # C:\Users\username\AppData\Roaming - # this macro saves the "C:\Documents and Settings\" substring into the variable "AppPre" - # and the "Application Data" substring into the variable "AppSuff" - - SetShellVarContext current # switch temoprarily to local user - StrCpy $String "$APPDATA" - StrCpy $APPDATemp "$APPDATA" - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - SetShellVarContext all # move back to all users - ${endif} - StrCpy $Search "\" - Call un.StrPoint # search for the first "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the first "\" - StrCpy $0 $Pointer - Call un.StrPoint # search for the second "\" - IntOp $0 $0 + $Pointer # $0 is now the pointer to the second "\" in the APPDATA string - StrCpy ${AppPre} $APPDATemp $0 # save the part before the second "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the second "\" - Call un.StrPoint # search for the third "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy ${AppSuff} $String "" $Pointer # save the part after the third "\" - -!macroend - -#-------------------------------- - -Function un.DelAppPathSub - # deletes a subfolder of the APPDATA path for all users - - # get list of all users - Push $R0 - Push $R1 - Push $R2 - Push $R3 - Call un.GetUsers - StrCpy $UserList $R3 "" 1 # cut off the "|" at the end of the list - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - # the usernames in the list of all users is separated by "|" - loop: - StrCpy $String "$UserList" - StrCpy $Search "|" - Call un.StrPoint # search for the "|" - StrCmp $Pointer "-1" ready - StrCpy $0 $UserList $Pointer # $0 contains now the username - IntOp $Pointer $Pointer + 1 # jump after the "|" - StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list - # generate the string for the current user - # AppPre and AppSuff are generated in the macro "AppPreSuff" - RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder - Goto loop - ready: - StrCpy $0 $UserList - RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder - -FunctionEnd - -#-------------------------------- - -!macro FileCheck Result FileName FilePath - # checks if a file exists, returns "True" or "False" - - Push $0 - Push $1 - StrCpy $0 "" - StrCpy $1 "" - FileOpen $0 "${FilePath}\${FileName}" r - ${if} $0 = "" - StrCpy $1 "False" - ${Else} - StrCpy $1 "True" - ${endif} - FileClose $0 - StrCpy ${Result} $1 - Pop $1 - Pop $0 - -!macroend - -#------------------------------------------ - -Function LaTeXCheck - # searches the string "$Search" in the string "$String" and extracts the path around it - # it is checked if the file "latex.exe" exists in the extracted path - - StartCheck: - StrLen $3 $String - Call StrPoint - ${if} $Pointer == "-1" # if nothing was found - StrCpy $PathLaTeX "" - Return - ${endif} - IntOp $3 $3 - $Pointer - StrCpy $4 $String $3 "-$3" # $4 is now the part behind the $Search string - StrCpy $String $String $Pointer # $String is now the part before the $Search string - StrCpy $Search ":" # search for the ":" after the first previous drive letter - Call RevStrPoint - IntOp $Pointer $Pointer - 1 # jump before the ":" to the drive letter - StrCpy $Pointer $Pointer "" 1 # cut of the "-" sign - StrCpy $PathLaTeX $String $Pointer "-$Pointer" - StrCpy $String $4 - StrCpy $Search ";" # search for the following ";" that separates the different paths - Call StrPoint - ${if} $Pointer != "-1" # if something was found - StrCpy $String $String $Pointer - ${endif} - StrCpy $PathLaTeX "$PathLaTeX$String" - # check if the latex.exe exists in the $PathLaTeX folder - !insertmacro FileCheck $5 "latex.exe" "$PathLaTeX" - ${if} $5 == "False" # delete the entry with the wrong path to the latex.exe and try again - StrCpy $PathLaTeX "" - StrLen $3 $String - StrCpy $String $4 "" $3 - ${if} $2 == "TeXLive" - StrCpy $Search "TeXLive" - ${else} - StrCpy $Search "miktex" - ${endif} - Goto StartCheck - ${endif} - -FunctionEnd - -#------------------------------------------ - -!macro PATHCheck PathResult FileName - # searches the string "$Search" in the string "$String" and extracts the path around it - # it is checked if the given filename exists - - !define ID ${__LINE__} - StrLen $3 $String - Call StrPoint - ${if} $Pointer == "-1" # if nothing was found - StrCpy ${PathResult} "False" - Goto EndPATHCheck_${ID} - ${endif} - IntOp $3 $3 - $Pointer - StrCpy $4 $String $3 "-$3" # $4 is now the part behind the $Search string - StrCpy $String $String $Pointer # $String is now the part before the $Search string - StrCpy $Search ":" # search for the ":" after the first previous drive letter - Call RevStrPoint - IntOp $Pointer $Pointer - 1 # jump before the ":" to the drive letter - StrCpy $Pointer $Pointer "" 1 # cut of the "-" sign - StrCpy ${PathResult} $String $Pointer "-$Pointer" - StrCpy $String $4 - StrCpy $Search ";" # search for the following ";" that separates the different paths - Call StrPoint - ${if} $Pointer != "-1" # if something was found - StrCpy $String $String $Pointer - ${endif} - StrCpy ${PathResult} "${PathResult}$String" - # check if the FileName exists in the ${Result} folder - !insertmacro FileCheck $Tmp ${FileName} ${PathResult} - ${if} $Tmp == "False" - StrCpy ${PathResult} "False" - ${endif} - EndPATHCheck_${ID}: - !undef ID - -!macroend diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh deleted file mode 100644 index ba9fca809f..0000000000 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ /dev/null @@ -1,94 +0,0 @@ -/* - -declaration.nsh - -Configuration of LyX installer - -*/ - -#-------------------------------- -# File locations - -!define FILES_LICENSE "${FILES_GIT}\installer\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_UNOCONV "${FILES_DEPS}\bin" -!define FILES_IMAGEMAGICK "${FILES_DEPS}\imagemagick" -!define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript" -!define FILES_NETPBM "${FILES_DEPS}\bin" -!define FILES_RSVG "${FILES_DEPS}\bin" -!define FILES_DTL "${FILES_DEPS}\bin" -!define FILES_PDFTOOLS "${FILES_DEPS}\bin" -!define FILES_METAFILE2EPS "${FILES_DEPS}\bin" - -#-------------------------------- -# Locations of components to download - -# CTAN and SourceForge select a mirror automatically - -!define DOWNLOAD_LATEX "http://mirrors.ctan.org/systems/win32/miktex/setup/${SETUPFILE_LATEX}" - -#-------------------------------- -# Names and version - -!define APP_NAME "LyX" -!define APP_NAME_SMALL "lyx" -!define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}" -# for the proposed install folder we use the scheme "LyX 2.2" while we need for the registry the scheme "LyX 2.1.4" -# to check if it is exactly this version (to support side by side installations) -!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" -!define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}" -!define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" -!define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe" -!define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}" -!define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" -!define APP_INFO "${APP_NAME} - The Document Processor" -!define APP_WEBPAGE "https://www.lyx.org/" -!define APP_WEBPAGE_INFO "${APP_NAME} Website" -!define APP_WIKI "https://wiki.lyx.org" -!define APP_WIKI_INFO "${APP_NAME} Wiki" -!define APP_COPYRIGHT "${APP_NAME} is Copyright © 1995 by Matthias Ettrich, 1995-${COPYRIGHT_YEAR} by the ${APP_NAME} Team" - -!if ${SETUPTYPE} == STANDARD - !define APP_SETUPTYPE "Standard" -!endif - -!define BIN_LYX "${APP_NAME}.exe" -!define APP_RUN "bin\${BIN_LYX}" - -!define APP_REGFOLDER "Software\${APP_NAME}" -!define APP_REGKEY "${APP_REGFOLDER}\${APP_SERIES_KEY}" # like "LyX\220" -!define APP_REGKEY_SETUP "${APP_REGKEY}\Setup" -!define APP_REGKEY_SETTINGS "${APP_REGKEY}\Settings" - -!define APP_REGNAME_DOC "${APP_NAME}.Document" - -!define APP_EXT ".${APP_NAME_SMALL}" -!define APP_MIME_TYPE "application/${APP_NAME_SMALL}" - -!define APP_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}" - -#-------------------------------- -# Setup settings - -# Output file name can be configured using command line paramaters like -# /DExeFile=/path/to/installer - -!if ${SETUPTYPE} == STANDARD - !define SETUP_EXE ${ExeFile} -!endif - -!define SETUP_ICON "${FILES_ICONS}\${APP_NAME_SMALL}.ico" -!define SETUP_HEADERIMAGE "graphics\header.bmp" -!define SETUP_WIZARDIMAGE "graphics\wizard.bmp" -!define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe" -!define SETUP_UNINSTALLER_KEY "${APP_NAME}${APP_SERIES_KEY}" - -#-------------------------------- -# Names of binaries to identify components - -!define BIN_LATEX "latex.exe" -!define BIN_BIBTEXEDITOR "JabRef.exe" diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh deleted file mode 100644 index 01c44ff616..0000000000 --- a/development/Win32/packaging/installer/include/detection.nsh +++ /dev/null @@ -1,305 +0,0 @@ -/* - -detection.nsh - -Detection of external component locations - -*/ - -# This script contains the following functions: -# -# - SearchExternal, calls the functions: -# LaTeXActions -# MissingPrograms -# FindDictionaries -# -# - MissingPrograms, (check if third-party programs are installed), uses: -# SEARCH_MIKTEX -# SEARCH_TEXLIVE -# -# - FindDictionaries (finds installed spellcheck and thesaurus dictionaries) -# -# - EditorCheck, -# (test if an editor with syntax-highlighting for LaTeX-files is installed) -# -#-------------------------- - -Function SearchExternal - Call LaTeXActions # function from LaTeX.nsh - Call MissingPrograms - SetRegView ${APP_VERSION_ACHITECHTURE} - Call FindDictionaries # function from dictionaries.nsh -FunctionEnd - -# --------------------------------------- - -Function MissingPrograms - # check if third-party programs are installed - - # test if Ghostscript is installed, check all cases: - # 1. 32bit Windows - # 2. 64bit Windows but 32bit Ghostscript - # 3. 64bit Windows and 64bit Ghostscript - StrCpy $3 0 - StrCpy $4 "0" - ${if} ${RunningX64} - SetRegView 64 - ${endif} - # case 1. and 3. - GSloop: - EnumRegKey $1 HKLM "Software\GPL Ghostscript" $3 - ${if} $1 != "" - ReadRegStr $2 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript $1" "DisplayName" - StrCpy $0 "Software\GPL Ghostscript\$1" - ${if} $2 == "" # if nothing was found in the uninstall section - ReadRegStr $2 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" # check if Ghostscript was installed together with LyX - ${endif} - ${if} $2 == "" # if nothing was found in the uninstall section - DeleteRegKey HKLM "$0" - goto GSloop - ${else} - ReadRegStr $GhostscriptPath HKLM $0 "GS_DLL" - ${if} $GhostscriptPath != "" - StrCpy $GhostscriptPath "$GhostscriptPath" -12 # remove ending "gsdll32.dll" - ${endif} - # there might be several versions installed and we want to use the newest one - IntOp $3 $3 + 1 - goto GSloop - ${endif} # if $2 - ${endif} - SetRegView 32 - # repeat for case 2. - ${if} ${RunningX64} - ${andif} $GhostscriptPath == "" - StrCpy $3 0 - # we have to assure that we only repeat once and not forever - ${if} $4 != "32" - StrCpy $4 "32" - goto GSloop - ${endif} - ${endif} - - # test if Python is installed - # only use an existing python when it is version 2.5 or newer because some - # older Compaq and Dell PCs were delivered with outdated Python interpreters - # Python 3.x was reported not to work with LyX properly, see - # http://www.lyx.org/trac/ticket/7143 - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" "" - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" "" - ${endif} - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.7\InstallPath" "" - ${endif} - ${if} $PythonPath != "" - StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end - StrCpy $DelPythonFiles "True" - ${endif} - - # No test necessary for Acrobat or Adobe Reader because pdfview does this job - # each time it is called. - - # test if a PostScript-viewer is installed, only check for GSview - # check all cases: - # 1. 32bit Windows - # 2. 64bit Windows but 32bit GSview - # 3. 64bit Windows and 64bit GSview - ${if} ${RunningX64} - SetRegView 64 - StrCpy $PSVPath "" - ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview64.exe" "Path" - SetRegView 32 - ${endif} - # repeat for case 1. and 2. - ${if} $PSVPath == "" - ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" - ${endif} - - # test if an editor with syntax-highlighting for LaTeX-files is installed - Call EditorCheck - - # test if an image editor is installed - StrCpy $ImageEditorPath "" - # first check for Gimp which is a 64bit application on x64 Windows - ${if} ${RunningX64} - SetRegView 64 - ${endif} - 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 - ${endif} - # check for Photoshop - ReadRegStr $0 HKLM "Software\Classes\Applications\Photoshop.exe\shell\open\command" "" - ${if} $0 != "" - StrCpy $0 "$0" -20 # delete '\photoshop.exe" "%1"' - StrCpy $0 $0 "" 1 # remove the leading quote - ${if} $ImageEditorPath != "" - StrCpy $ImageEditorPath "$ImageEditorPath;$0" - ${else} - StrCpy $ImageEditorPath $0 - ${endif} - StrCpy $ImageEditor "Photoshop" - ${endif} - # check for Krita - ${if} ${RunningX64} - SetRegView 64 - ${endif} - 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} - ${if} ${RunningX64} - SetRegView 32 - ${endif} - - # test if and where the BibTeX-editor JabRef is installed - ${if} ${RunningX64} - SetRegView 64 - ${endif} - ReadRegStr $PathBibTeXEditor HKLM "SOFTWARE\JabRef" "Path" - # if not installed as admin, check for user - ${if} $PathBibTeXEditor == "" - ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path" - ${endif} - ${if} ${RunningX64} - SetRegView 32 - ${endif} - - ${ifnot} ${FileExists} "$PathBibTeXEditor\${BIN_BIBTEXEDITOR}" - StrCpy $PathBibTeXEditor "" - StrCpy $JabRefInstalled == "No" - ${else} - StrCpy $JabRefInstalled == "Yes" - ${endif} - - # test if and where LilyPond is installed - ReadRegStr $LilyPondPath HKLM "Software\LilyPond" "Install_Dir" - ${if} $LilyPondPath != "" - StrCpy $LilyPondPath "$LilyPondPath\usr\bin" # add "\usr\bin" - ${endif} - - # test if Inkscape is installed - ReadRegStr $SVGPath HKLM "SOFTWARE\Classes\inkscape.svg\DefaultIcon" "" - ${if} $SVGPath != "" - StrCpy $SVGPath $SVGPath "" 1 # remove the leading quote - StrCpy $SVGPath $SVGPath -14 # # delete '\inkscape.exe"' - ${endif} - ${if} $SVGPath == "" - # this was used before Inkscape 0.91: - ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation" - ${endif} - - # test if Gnumeric is installed - ReadRegStr $0 HKLM "Software\Classes\Applications\gnumeric.exe\shell\Open\command" "" - ${if} $0 != "" - StrCpy $0 $0 -18 # remove "gnumeric.exe" "%1"" - StrCpy $0 $0 "" 1 # remove the leading quote - StrCpy $GnumericPath $0 - ${endif} - - # test if Pandoc is installed - # HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\John MacFarlane\Pandoc - ${if} ${RunningX64} - SetRegView 64 # the PATH is in the 64bit registry section - ${endif} - # check for the path to the pandoc.exe in Window's PATH variable - StrCpy $5 "" - StrCpy $Search "pandoc" - ReadRegStr $String HKCU "Environment" "PATH" - !insertmacro PATHCheck $5 "pandoc.exe" # macro from LyXUtils.nsh - # if it is not in the user-specific PATH it might be in the global PATH - ${if} $5 == "False" - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" - !insertmacro PATHCheck $5 "pandoc.exe" # macro from LyXUtils.nsh - ${endif} - SetRegView 32 - ${if} $5 != "False" - StrCpy $PandocPath $5 - ${endif} - -FunctionEnd - -# --------------------------------------- - -Function EditorCheck - # test if an editor with syntax-highlighting for LaTeX-files is installed - - # (check for jEdit, PSPad, WinShell, ConTEXT, Crimson Editor, Vim, TeXnicCenter, LaTeXEditor, WinEdt, LEd, WinTeX) - StrCpy $EditorPath "" - StrCpy $0 "" - # check for jEdit which is a 64bit application on x64 Windows - ${if} ${RunningX64} - SetRegView 64 - ${endif} - ReadRegStr $EditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jEdit_is1" "InstallLocation" - ${if} $EditorPath != "" - StrCpy $EditorPath $EditorPath -1 # remove "\" from the end of the string - ${endif} - SetRegView 32 - - # check for PSPad - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PSPad editor_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 # remove the "\" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - - # check for WinShell - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinShell_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 # remove the "\" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - - # check for Vim which is a 64bit application on x64 Windows - StrCpy $0 "" - ${if} ${RunningX64} - SetRegView 64 - ${endif} - ReadRegStr $0 HKLM "Software\Vim\Gvim" "path" - ${if} $0 != "" - StrCpy $0 $0 -9 # remove "\gvim.exe" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - SetRegView 32 - - # check for TeXnicCenter which can be a 64bit application on x64 Windows - StrCpy $0 "" - ${if} ${RunningX64} - SetRegView 64 - ${endif} - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 # remove the "\" - StrCpy $EditorPath "$EditorPath;$0" - ${else} - SetRegView 32 - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 # remove the "\" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - ${endif} - SetRegView 32 - - # check for WinEdt - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt 7" "InstallLocation" - ${if} $0 != "" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - -FunctionEnd diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh deleted file mode 100644 index 8c995d5848..0000000000 --- a/development/Win32/packaging/installer/include/dictionaries.nsh +++ /dev/null @@ -1,209 +0,0 @@ -/* -dictionaries.nsh - -Handling of hunspell / MyThes dictionaries -*/ - -# This script contains the following functions: -# -# - FindDictionaries (finds already installed dictionaries) -# -# - DownloadHunspellDictionaries and DownloadThesaurusDictionaries -# (Downloads hunspell / MyThes dictionaries from a location that is -# given in the file $INSTDIR\Resources\HunspellDictionaryNames.txt) -# -# - InstallHunspellDictionaries and InstallThesaurusDictionaries -# (installs the selected hunspell / MyThes dictionaries except of -# already existing ones), uses: -# DownloadHunspellDictionaries or DownloadThesaurusDictionaries - -# --------------------------------------- - -Function FindDictionaries - # finds already installed dictionaries - - # start with empty strings - StrCpy $FoundDict "" - StrCpy $FoundThes "" - - # read out the possible spell-checker filenames from the file - FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r - ${for} $5 1 73 - # the file has 146 lines, but we only need to check for one of the 2 dictionary files per language - # therefore check only for every second line - FileRead $R5 $String # skip the .aff file - FileRead $R5 $String # $String is now the .dic filename - StrCpy $String $String -2 # remove the linebreak characters - StrCpy $R3 $String -4 # $R3 is now the dictionary language code - ${if} ${FileExists} "$INSTDIR\Resources\dicts\$String" - StrCpy $FoundDict "$R3 $FoundDict" - ${endif} - ${next} - FileClose $R5 - - # read out the possible thesaurus filenames from the file - FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r - ${for} $5 1 28 - # the file has 56 lines, but we only need to check for one of the 2 thesaurus files per language - # therefore check only for every second line - FileRead $R5 $String # $String is now the dictionary name - FileRead $R5 $String # $String is now the dictionary name - StrCpy $String $String -2 # remove the linebreak characters - StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code - ${if} ${FileExists} "$INSTDIR\Resources\thes\$String" - StrCpy $FoundThes "$R3 $FoundThes" - ${endif} - ${next} - FileClose $R5 - -FunctionEnd - -# --------------------------------------- - -Function DownloadHunspellDictionaries - # Downloads hunspell dictionaries from a location that is given in the file - # $INSTDIR\Resources\HunspellDictionaryNames.txt - - # read out the locations from the file - FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r - ${For} $5 1 146 # the file has 146 lines - - FileRead $R5 $String # $String is now the dictionary name - StrCpy $R3 $String -6 # $R3 is now the dictionary language code - - ${if} $DictCode == $R3 - StrCpy $String $String -2 # delete the linebreak characters at the end - # Download hunspell dictionaries - inetc::get /TIMEOUT=5000 "https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/$String" "$INSTDIR\Resources\dicts\$String" /END - Pop $R0 - # if download failed - ${if} $R0 != "OK" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)" - Goto abortinstall - ${endif} - ${endif} # end if $DictCode == $R3 - - ${Next} - FileClose $R5 - - abortinstall: - Delete "$INSTDIR\$String" - -FunctionEnd - -#-------------------------------- - -Function DownloadThesaurusDictionaries - # Downloads thesaurus dictionaries from a location that is given in the file - # $INSTDIR\Resources\ThesaurusDictionaryNames.txt - - # read out the locations from the file - FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r - ${For} $5 1 56 # the file has 56 lines - - FileRead $R5 $String # $String is now the thesaurus name - StrCpy $R3 $String 5 3 # $R3 is now the thesaurus language code - - ${if} $ThesCode == $R3 - StrCpy $String $String -2 # delete the linebreak characters at the end - # Download thesaurus files - inetc::get /TIMEOUT=5000 "https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/thes/$String" "$INSTDIR\Resources\thes\$String" /END - Pop $R0 - # if download failed - ${if} $R0 != "OK" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)" - Goto abortinstall - ${endif} - ${endif} # end if $ThesCode == $R3 - - ${Next} - FileClose $R5 - - abortinstall: - Delete "$INSTDIR\$String" - -FunctionEnd - -#-------------------------------- - -Function InstallHunspellDictionaries - # installs the selected hunspell dictionaries except of already existing ones - - ${Do} - # take the first code - StrCpy $Search "," - StrCpy $String $DictCodes - Call StrPoint - # we always have a "," for each code, so in case in case something - # went wrong, empty the code list to exit the loop - ${if} $Pointer == "-1" - StrCpy $DictCodes "" - ${endif} - ${if} $Pointer != "-1" - StrCpy $DictCode $DictCodes $Pointer - # remove the taken code from the list - IntOp $Pointer $Pointer + 1 - StrCpy $DictCodes $DictCodes "" $Pointer - # don't dowload existing ones thus check if $DictCode is in $FoundDict - StrCpy $String $FoundDict - StrCpy $Search $DictCode - Call StrPoint # function from LyXUtils.nsh - ${if} $Pointer == "-1" - # download the dictionaries - Call DownloadHunspellDictionaries - ${endif} - ${endif} - ${LoopUntil} $DictCodes == "" - -FunctionEnd - -#-------------------------------- - -Function InstallThesaurusDictionaries - # installs the selected thesaurus dictionaries except of already existing ones - - ${Do} - # take the first code - StrCpy $Search "," - StrCpy $String $ThesCodes - Call StrPoint - # we always have a "," for each code, so in case in case something - # went wrong, empty the code list to exit the loop - ${if} $Pointer == "-1" - StrCpy $ThesCodes "" - ${endif} - ${if} $Pointer != "-1" - StrCpy $ThesCode $ThesCodes $Pointer - # remove the taken code from the list - IntOp $Pointer $Pointer + 1 - StrCpy $ThesCodes $ThesCodes "" $Pointer - # don't dowload existing ones thus check if $ThesCode is in $FoundThes - StrCpy $String $FoundThes - StrCpy $Search $ThesCode - Call StrPoint # function from LyXUtils.nsh - ${if} $Pointer == "-1" - # download the dictionaries - Call DownloadThesaurusDictionaries - ${endif} - ${endif} - ${LoopUntil} $ThesCodes == "" - - # some dictionaries of language variants are identic - # therefore copy and rename an existing dictionary - CreateDirectory "$INSTDIR\Resources\backup" - ${if} ${FileExists} "$INSTDIR\Resources\thes\th_de_DE_v2.dat" - CopyFiles "$INSTDIR\Resources\thes\th_de_DE_v2.*" "$INSTDIR\Resources\backup" - Rename "$INSTDIR\Resources\backup\th_de_DE_v2.dat" "$INSTDIR\Resources\backup\th_de_AT_v2.dat" - Rename "$INSTDIR\Resources\backup\th_de_DE_v2.idx" "$INSTDIR\Resources\backup\th_de_AT_v2.idx" - CopyFiles "$INSTDIR\Resources\backup\th_de_AT_v2.*" "$INSTDIR\Resources\thes" - ${endif} - ${if} ${FileExists} "$INSTDIR\Resources\thes\th_en_US_v2.dat" - CopyFiles "$INSTDIR\Resources\thes\th_en_US_v2.*" "$INSTDIR\Resources\backup" - Rename "$INSTDIR\Resources\backup\th_en_US_v2.dat" "$INSTDIR\Resources\backup\th_en_AU_v2.dat" - Rename "$INSTDIR\Resources\backup\th_en_US_v2.idx" "$INSTDIR\Resources\backup\th_en_AU_v2.idx" - CopyFiles "$INSTDIR\Resources\backup\th_en_AU_v2.*" "$INSTDIR\Resources\thes" - ${endif} - RMDir "$INSTDIR\Resources\backup" - -FunctionEnd - diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh deleted file mode 100644 index 0355c35135..0000000000 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ /dev/null @@ -1,142 +0,0 @@ -/* - -filelist.nsh - -Lists of files to include in the installer - -*/ - -!define FILE '${COMMAND} "${DIRECTORY}' - -!macro FileListLyXBin COMMAND DIRECTORY - - ${FILE}${BIN_LYX}" - ${FILE}tex2lyx.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" - -!macroend - -!macro FileListQtImageformats COMMAND DIRECTORY - - ${FILE}qgif.dll" - ${FILE}qico.dll" - ${FILE}qjpeg.dll" - ${FILE}qsvg.dll" - ${FILE}qicns.dll" - ${FILE}qtiff.dll" - ${FILE}qwbmp.dll" - ${FILE}qwebp.dll" - -!macroend - -!macro FileListQtIconengines COMMAND DIRECTORY - - ${FILE}qsvgicon.dll" - -!macroend - -!macro FileListQtPlatforms COMMAND DIRECTORY - - ${FILE}qminimal.dll" - ${FILE}qwindows.dll" - -!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 2019 - # Seem to be installed for dependencies - ${FILE}concrt140.dll" - ${FILE}msvcp140.dll" - ${FILE}vcamp140.dll" - ${FILE}vccorlib140.dll" - ${FILE}vcomp140.dll" - ${FILE}vcruntime140.dll" - !if ${APP_VERSION_ACHITECHTURE} = 64 - ${File}vcruntime140_1.dll" - !endif - -!macroend - -!macro FileListNetpbmBin COMMAND DIRECTORY - - ${FILE}libnetpbm10.dll" - ${FILE}pnmcrop.exe" - -!macroend - -!macro FileListRsvg COMMAND DIRECTORY - - ${FILE}rsvg-convert.exe" - -!macroend - -!macro FileListUnoConv COMMAND DIRECTORY - - ${FILE}unoconv.py" - -!macroend - -!macro FileListPDFViewBin COMMAND DIRECTORY - - ${FILE}pdfview.exe" - -!macroend - -!macro FileListFonts COMMAND DIRECTORY -# FIXME: simply copy the whole directory! - - ${FILE}cmex10.ttf" - ${FILE}cmmi10.ttf" - ${FILE}cmr10.ttf" - ${FILE}cmsy10.ttf" - ${FILE}esint10.ttf" - ${FILE}eufm10.ttf" - ${FILE}msam10.ttf" - ${FILE}msbm10.ttf" - ${FILE}rsfs10.ttf" - ${FILE}wasy10.ttf" - -!macroend diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh deleted file mode 100644 index 0e744636a5..0000000000 --- a/development/Win32/packaging/installer/include/gui.nsh +++ /dev/null @@ -1,102 +0,0 @@ -/* - -gui.nsh - -Installer user interface settings - -*/ - -#-------------------------------- -# General - -Name "${APP_NAME} ${APP_VERSION}" -BrandingText " " - -#-------------------------------- -# Interface settings - -!define MUI_ABORTWARNING -!define MUI_ICON "${SETUP_ICON}" -!define MUI_UNICON "${SETUP_ICON}" -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${SETUP_HEADERIMAGE}" -!define MUI_HEADERIMAGE_RIGHT -!define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}" - -#-------------------------------- -# Pages - -# Installer - -# Welcome page -!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME) -!insertmacro MUI_PAGE_WELCOME - -# Show the license. -!insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}" - -# Decision if it should be installed as admin or not -!insertmacro MULTIUSER_PAGE_INSTALLMODE - -#Page custom PageExternalLaTeX PageExternalLaTeXValidate - -# Specify the installation directory. -!insertmacro MUI_PAGE_DIRECTORY - -# Define which components to install. -!insertmacro MUI_PAGE_COMPONENTS - -# Specify where to install program shortcuts. -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APP_NAME} ${APP_SERIES_NAME}" -!insertmacro MUI_PAGE_STARTMENU ${APP_NAME} $StartmenuFolder - -# Select latex.exe manually -Page custom LatexFolder LatexFolder_LeaveFunction - -# Watch the components being installed. -!insertmacro MUI_PAGE_INSTFILES - -# The option to run LyX from the finish page is currently disabled because -# it may run with Administrator priviledges, therefore causing a different -# user directory to be used. This could be fixed by creating a separate -# process without UAC elevation. -# !define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)" -# !define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_RUN}" - -#!define MUI_FINISHPAGE_SHOWREADME -#!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED -#!define MUI_FINISHPAGE_SHOWREADME_FUNCTION StartLyX -#!define MUI_FINISHPAGE_SHOWREADME_TEXT $(FinishPageRun) -!define MUI_FINISHPAGE_LINK $(TEXT_FINISH_WEBSITE) -!define MUI_FINISHPAGE_LINK_LOCATION "https://www.lyx.org/" -#!define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckDesktopShortcut -!insertmacro MUI_PAGE_FINISH - -# Uninstaller - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_COMPONENTS -!insertmacro MUI_UNPAGE_INSTFILES - -!insertmacro MUI_UNPAGE_FINISH - -#-------------------------------- -# Installer Languages - -!include lang\TranslatedLanguages.nsh - -#-------------------------------- -# Version information - -VIProductVersion "${APP_VERSION_NUMBER}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${APP_NAME} ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION} ${APP_SETUPTYPE} installer" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${APP_NAME} Team" -# Fixme: LyX should register the name "LyX" as trademark -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "" diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh deleted file mode 100644 index bdbb49525a..0000000000 --- a/development/Win32/packaging/installer/include/init.nsh +++ /dev/null @@ -1,1480 +0,0 @@ -/* -init.nsh - -Initialization functions -*/ - -#-------------------------------- -# User initialization - -Var ComponentPath -Var LyXLangName - -# COMPONENT can be LaTeX, ImageMagick and Ghostscript -!macro EXTERNAL_INIT COMPONENT - - # APP_REGKEY_SETUP = "Software\${APP_NAME}\${APP_SERIES_KEY}\Setup" - # where ${APP_NAME}\${APP_SERIES_KEY} is something like LyX\220 - ReadRegStr $ComponentPath SHELL_CONTEXT "${APP_REGKEY_SETUP}" "${COMPONENT} Path" - - # BIN_LATEX etc are defined in settings.nsh - ${If} ${FileExists} "$ComponentPath\${BIN_${COMPONENT}}" - # set variables like PathLaTeX - StrCpy $Path${COMPONENT} $ComponentPath - ${EndIf} - -!macroend - -Function InitUser - - # Get directories of components from registry - - !insertmacro EXTERNAL_INIT LaTeX - - # Get LyX language - - ReadRegStr $LyXLangName SHELL_CONTEXT "${APP_REGKEY_SETUP}" "LyX Language" - - ${If} $LyXLangName != "" - StrCpy $LangName $LyXLangName - ${EndIf} - -FunctionEnd - -#-------------------------------- -# visible installer sections - -Section "$(SecFileAssocTitle)" SecFileAssoc - StrCpy $CreateFileAssociations "true" -SectionEnd - -Section "$(SecDesktopTitle)" SecDesktop - StrCpy $CreateDesktopIcon "true" -SectionEnd - -# Expand the list of dictionaries by default as this was requested by several -# users. For the thesaurus this is was not requested because this section -# is by default empty. -SectionGroup /e "$(SecDictionaries)" SecDictionaries - -Section /o "Afrikaans" SecDAfrikaans - StrCpy $DictCodes "af_ZA,$DictCodes" - AddSize 1440 -SectionEnd - -Section /o "العربية" SecDArabic - StrCpy $DictCodes "ar_SA,$DictCodes" - AddSize 7304 -SectionEnd - -Section /o "հայերեն" SecDArmenian - StrCpy $DictCodes "hy_AM,$DictCodes" - AddSize 2000 -SectionEnd - -Section /o "Bahasa Indonesia" SecDIndonesian - StrCpy $DictCodes "id_ID,$DictCodes" - AddSize 217 -SectionEnd - -Section /o "Bahasa Melayu" SecDMalayan - StrCpy $DictCodes "ms_MY,$DictCodes" - AddSize 227 -SectionEnd - -Section /o "беларускі" SecDBelarusian - StrCpy $DictCodes "be_BY,$DictCodes" - AddSize 1730 -SectionEnd - -Section /o "Brezhoneg" SecDBreton - StrCpy $DictCodes "br_FR,$DictCodes" - AddSize 5556 -SectionEnd - -Section /o "български" SecDBulgarian - StrCpy $DictCodes "bg_BG,$DictCodes" - AddSize 985 -SectionEnd - -Section /o "Català" SecDCatalanian - StrCpy $DictCodes "ca_ES,$DictCodes" - AddSize 1210 -SectionEnd - -Section /o "Ceština" SecDCzech - StrCpy $DictCodes "cs_CZ,$DictCodes" - AddSize 2190 -SectionEnd - -Section /o "Coptic" SecDCoptic - StrCpy $DictCodes "cop_EG,$DictCodes" - AddSize 151 -SectionEnd - -Section /o "Cymraeg" SecDWelsh - StrCpy $DictCodes "cy_GB,$DictCodes" - AddSize 1540 -SectionEnd - -Section /o "Dansk" SecDDanish - StrCpy $DictCodes "da_DK,$DictCodes" - AddSize 2470 -SectionEnd - -Section /o "Deutsch (A)" SecDGermanAT - StrCpy $DictCodes "de_AT,$DictCodes" - AddSize 3620 -SectionEnd - -Section /o "Deutsch (CH)" SecDGermanCH - StrCpy $DictCodes "de_CH,$DictCodes" - AddSize 3620 -SectionEnd - -Section "Deutsch (D)" SecDGermanD - # already installed by default - SectionIn RO - #StrCpy $DictCodes "de_DE,$DictCodes" - AddSize 3620 -SectionEnd - -Section /o "Ελληνικά" SecDGreek - StrCpy $DictCodes "el_GR,$DictCodes" - AddSize 6550 -SectionEnd - -Section /o "Eesti" SecDEstonian - StrCpy $DictCodes "et_EE,$DictCodes" - AddSize 4400 -SectionEnd - -Section /o "English (AU)" SecDEnglishAU - StrCpy $DictCodes "en_AU,$DictCodes" - AddSize 557 -SectionEnd - -Section /o "English (CA)" SecDEnglishCA - StrCpy $DictCodes "en_CA,$DictCodes" - AddSize 557 -SectionEnd - -Section "English (GB)" SecDEnglishGB - # already installed by default - SectionIn RO - #StrCpy $DictCodes "en_GB,$DictCodes" - AddSize 1044 -SectionEnd - -Section /o "English (NZ)" SecDEnglishNZ - StrCpy $DictCodes "en_NZ,$DictCodes" - AddSize 551 -SectionEnd - -Section "English (US)" SecDEnglishUS - # already installed by default - SectionIn RO - #StrCpy $DictCodes "en_US,$DictCodes" - AddSize 551 -SectionEnd - -Section "Español (ES)" SecDSpanishES - # already installed by default - SectionIn RO - #StrCpy $DictCodes "es_ES,$DictCodes" - AddSize 974 -SectionEnd - -Section "Español (MX)" SecDSpanishMX - # already installed by default - SectionIn RO - #StrCpy $DictCodes "es_MX,$DictCodes" - AddSize 924 -SectionEnd - -Section /o "Esperanto" SecDEsperanto - StrCpy $DictCodes "eo_EO,$DictCodes" - AddSize 389 -SectionEnd - -Section /o "Euskara" SecDBasque - StrCpy $DictCodes "eu_ES,$DictCodes" - AddSize 4850 -SectionEnd - -Section /o "فارسی" SecDFarsi - StrCpy $DictCodes "fa_IR,$DictCodes" - AddSize 6710 -SectionEnd - -Section "Français" SecDFrench - # already installed by default - SectionIn RO - #StrCpy $DictCodes "fr_FR,$DictCodes" - AddSize 1200 -SectionEnd - -Section /o "Français (Canada)" SecDFrenchCanada - StrCpy $DictCodes "fr_CA,$DictCodes" - AddSize 1390 -SectionEnd - -Section /o "Gaeilge" SecDGaelic - StrCpy $DictCodes "ga_IR,$DictCodes" - AddSize 1090 -SectionEnd - -Section /o "Gàidhlig" SecDScottish - StrCpy $DictCodes "gd_GB,$DictCodes" - AddSize 4161 -SectionEnd - -Section /o "Galego" SecDGalician - StrCpy $DictCodes "gl_ES,$DictCodes" - AddSize 3911 -SectionEnd - -Section /o "ქართული ენა" SecDGeorgian - StrCpy $DictCodes "ka_GE,$DictCodes" - AddSize 3952 -SectionEnd - -Section /o "עִברִית" SecDHebrew - StrCpy $DictCodes "he_IL,$DictCodes" - AddSize 3120 -SectionEnd - -Section /o "Hrvatski" SecDCroatian - StrCpy $DictCodes "hr_HR,$DictCodes" - AddSize 2240 -SectionEnd - -Section /o "Magyar" SecDHungarian - StrCpy $DictCodes "hu_HU,$DictCodes" - AddSize 3380 -SectionEnd - -Section /o "हिंदी" SecDHindi - StrCpy $DictCodes "hi_IN,$DictCodes" - AddSize 1900 -SectionEnd - -Section /o "Interlingua" SecDInterlingua - StrCpy $DictCodes "ia_IA,$DictCodes" - AddSize 613 -SectionEnd - -Section /o "Íslenska" SecDIcelandic - StrCpy $DictCodes "is_IS,$DictCodes" - AddSize 2320 -SectionEnd - -Section /o "Italiano" SecDItalian - StrCpy $DictCodes "it_IT,$DictCodes" - AddSize 1380 -SectionEnd - -Section /o "Қазақша" SecDKazakh - StrCpy $DictCodes "kk_KZ,$DictCodes" - AddSize 2120 -SectionEnd - -Section /o "한국어" SecDKorean - StrCpy $DictCodes "ko_KR,$DictCodes" - AddSize 16540 -SectionEnd - -Section /o "Latina" SecDLatin - StrCpy $DictCodes "la_LA,$DictCodes" - AddSize 2040 -SectionEnd - -Section /o "Lietuviu" SecDLithuanian - StrCpy $DictCodes "lt_LT,$DictCodes" - AddSize 1320 -SectionEnd - -Section /o "Latviešu" SecDLatvian - StrCpy $DictCodes "lv_LV,$DictCodes" - AddSize 2243 -SectionEnd - -Section /o "मराठी" SecDMarathi - StrCpy $DictCodes "mr_IN,$DictCodes" - AddSize 5290 -SectionEnd - -Section /o "Nederlands" SecDDutch - StrCpy $DictCodes "nl_NL,$DictCodes" - AddSize 1820 -SectionEnd - -Section /o "Norsk (Bokmål)" SecDNorwegianNB - StrCpy $DictCodes "nb_NO,$DictCodes" - AddSize 5291 -SectionEnd - -Section /o "Norsk (Nynorsk)" SecDNorwegianNN - StrCpy $DictCodes "nn_NO,$DictCodes" - AddSize 3292 -SectionEnd - -Section /o "Occitan" SecDOccitan - StrCpy $DictCodes "oc_FR,$DictCodes" - AddSize 31710 -SectionEnd - -Section /o "Polski" SecDPolish - StrCpy $DictCodes "pl_PL,$DictCodes" - AddSize 4540 -SectionEnd - -Section /o "Português (BR)" SecDPortugueseBR - StrCpy $DictCodes "pt_BR,$DictCodes" - AddSize 5280 -SectionEnd - -Section /o "Português (PT)" SecDPortuguesePT - StrCpy $DictCodes "pt_PT,$DictCodes" - AddSize 1568 -SectionEnd - -Section /o "Româna" SecDRomanian - StrCpy $DictCodes "ro_RO,$DictCodes" - AddSize 2255 -SectionEnd - -Section /o "Русский" SecDRussian - StrCpy $DictCodes "ru_RU,$DictCodes" - AddSize 1920 -SectionEnd - -Section /o "Serbšcina (Dolno)" SecDSorbianD - StrCpy $DictCodes "dsb_DE,$DictCodes" - AddSize 1035 -SectionEnd - -Section /o "Serbšcina (Horno)" SecDSorbianH - StrCpy $DictCodes "hsb_DE,$DictCodes" - AddSize 740 -SectionEnd - -Section /o "Shqip" SecDAlbanian - StrCpy $DictCodes "sq_AL,$DictCodes" - AddSize 2612 -SectionEnd - -Section /o "Slovenšcina" SecDSlovenian - StrCpy $DictCodes "sl_SI,$DictCodes" - AddSize 2910 -SectionEnd - -Section /o "Slovenský" SecDSlovakian - StrCpy $DictCodes "sk_SK,$DictCodes" - AddSize 3310 -SectionEnd - -Section /o "Српски (Ћирилица)" SecDSerbianC - StrCpy $DictCodes "sr_RS,$DictCodes" - AddSize 4401 -SectionEnd - -Section /o "Srpski (Latinica)" SecDSerbianL - StrCpy $DictCodes "sr_RS-Latin,$DictCodes" - AddSize 2843 -SectionEnd - -Section /o "Svenska" SecDSwedish - StrCpy $DictCodes "sv_SE,$DictCodes" - AddSize 2028 -SectionEnd - -Section /o "தமிழ்" SecDTamil - StrCpy $DictCodes "ta_IN,$DictCodes" - AddSize 5911 -SectionEnd - -Section /o "తెలుగు" SecDTelugu - StrCpy $DictCodes "te_IN,$DictCodes" - AddSize 3400 -SectionEnd - -Section /o "ไทย" SecDThai - StrCpy $DictCodes "th_TH,$DictCodes" - AddSize 351 -SectionEnd - -Section /o "Tibetan" SecDTibetan - StrCpy $DictCodes "bo_CN,$DictCodes" - AddSize 7 -SectionEnd - -Section /o "Türkmençe" SecDTurkmen - StrCpy $DictCodes "tk_TM,$DictCodes" - AddSize 2797 -SectionEnd - -Section /o "Türkçe" SecDTurkish - StrCpy $DictCodes "tr_TR,$DictCodes" - AddSize 8870 -SectionEnd - -Section /o "Українська" SecDUkrainian - StrCpy $DictCodes "uk_UA,$DictCodes" - AddSize 6905 -SectionEnd - -Section /o "اردو" SecDUrdu - StrCpy $DictCodes "ur_PK,$DictCodes" - AddSize 1401 -SectionEnd - -Section /o "Tiếng Việt" SecDVietnamese - StrCpy $DictCodes "vi_VN,$DictCodes" - AddSize 40 -SectionEnd - -SectionGroupEnd - - -SectionGroup "$(SecThesaurus)" SecThesaurus - -Section /o "العربية" SecTArabic - StrCpy $ThesCodes "ar_SA,$ThesCodes" - AddSize 799 -SectionEnd - -Section /o "български" SecTBulgarian - StrCpy $ThesCodes "bg_BG,$ThesCodes" - AddSize 3020 -SectionEnd - -Section /o "Català" SecTCatalan - StrCpy $ThesCodes "ca_ES,$ThesCodes" - AddSize 731 -SectionEnd - -Section /o "Ceština" SecTCzech - StrCpy $ThesCodes "cs_CZ,$ThesCodes" - AddSize 635 -SectionEnd - -Section /o "Dansk" SecTDanish - StrCpy $ThesCodes "da_DK,$ThesCodes" - AddSize 2360 -SectionEnd - -Section /o "Deutsch (D/A)" SecTGermanDA - StrCpy $ThesCodes "de_DE,$ThesCodes" - AddSize 14600 -SectionEnd - -Section /o "Deutsch (CH)" SecTGermanCH - StrCpy $ThesCodes "de_CH,$ThesCodes" - AddSize 14600 -SectionEnd - -Section /o "English (AU)" SecTEnglishAU - StrCpy $ThesCodes "en_AU,$ThesCodes" - AddSize 21642 -SectionEnd - -Section /o "English (GB)" SecTEnglishGB - StrCpy $ThesCodes "en_GB,$ThesCodes" - AddSize 14300 -SectionEnd - -Section /o "English (US)" SecTEnglishUS - StrCpy $ThesCodes "en_US,$ThesCodes" - AddSize 22095 -SectionEnd - -Section /o "Español" SecTSpanish - StrCpy $ThesCodes "es_ES,$ThesCodes" - AddSize 2860 -SectionEnd - -Section /o "Français" SecTFrench - StrCpy $ThesCodes "fr_FR,$ThesCodes" - AddSize 5060 -SectionEnd - -Section /o "Gaeilge" SecTGaelic - StrCpy $ThesCodes "ga_IR,$ThesCodes" - AddSize 30600 -SectionEnd - -Section /o "Galego" SecTGalician - StrCpy $ThesCodes "gl_ES,$ThesCodes" - AddSize 510 -SectionEnd - -Section /o "Ελληνικά" SecTGreek - StrCpy $ThesCodes "el_GR,$ThesCodes" - AddSize 903 -SectionEnd - -Section /o "Íslenska" SecTIcelandic - StrCpy $ThesCodes "is_IS,$ThesCodes" - AddSize 63 -SectionEnd - -Section /o "Italiano" SecTItalian - StrCpy $ThesCodes "it_IT,$ThesCodes" - AddSize 2520 -SectionEnd - -Section /o "Magyar" SecTHungarian - StrCpy $ThesCodes "hu_HU,$ThesCodes" - AddSize 632 -SectionEnd - -Section /o "Norsk (Bokmål)" SecTNorwegianNB - StrCpy $ThesCodes "nb_NO,$ThesCodes" - AddSize 2595 -SectionEnd - -Section /o "Norsk (Nynorsk)" SecTNorwegianNN - StrCpy $ThesCodes "nn_NO,$ThesCodes" - AddSize 2 -SectionEnd - -Section /o "Polski" SecTPolish - StrCpy $ThesCodes "pl_PL,$ThesCodes" - AddSize 5580 -SectionEnd - -Section /o "Português" SecTPortuguese - StrCpy $ThesCodes "pt_PT,$ThesCodes" - AddSize 3950 -SectionEnd - -Section /o "Româna" SecTRomanian - StrCpy $ThesCodes "ro_RO,$ThesCodes" - AddSize 3650 -SectionEnd - -Section /o "Русский" SecTRussian - StrCpy $ThesCodes "ru_RU,$ThesCodes" - AddSize 2080 -SectionEnd - -Section /o "Slovenšcina" SecTSlovenian - StrCpy $ThesCodes "sl_SI,$ThesCodes" - AddSize 1110 -SectionEnd - -Section /o "Slovenský" SecTSlovakian - StrCpy $ThesCodes "sk_SK,$ThesCodes" - AddSize 930 -SectionEnd - -Section /o "Svenska" SecTSwedish - StrCpy $ThesCodes "sv_SE,$ThesCodes" - AddSize 720 -SectionEnd - -Section /o "Українська" SecTUkrainian - StrCpy $ThesCodes "uk_UA,$ThesCodes" - AddSize 1339 -SectionEnd - -SectionGroupEnd - -# Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecDictionaries} "$(SecDictionariesDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecThesaurus} "$(SecThesaurusDescription)" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - -# .onInit must be here after the section definition because we have to set -# the selection states of the dictionary sections -Function .onInit - - !if ${APP_VERSION_ACHITECHTURE} = 64 - ${IfNot} ${RunningX64} - MessageBox MB_OK|MB_ICONSTOP "Cannot install a 64 bit app on 32 bit Windows, please use the 32 bit installer" /SD IDOK - Abort - ${EndIf} - !EndIf - - SetRegView ${APP_VERSION_ACHITECHTURE} - - ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - ${if} $R0 == "5.0" # 2000 - ${orif} $R0 == "5.1" # XP - ${orif} $R0 == "5.2" # 2003 - ${orif} $R0 == "6.0" # Vista - MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows 7 or newer." /SD IDOK - Quit - ${endif} - - # Check that LyX is not currently running - FindProcDLL::FindProc "${BIN_LYX}" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK - Abort - ${endif} - - !insertmacro MULTIUSER_INIT - - # check if this LyX version is already installed - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayIcon" - ${else} - ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayIcon" - # handle also the case that LyX is already installed in HKLM - ${if} $0 == "" - ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayIcon" - ${endif} - ${endif} - ${if} $0 != "" - # check if the uninstaller was acidentally deleted - # if so don't bother the user if he realy wants to install a new LyX over an existing one - # because he won't have a chance to deny this - StrCpy $4 $0 -12 # remove '\bin\lyx.exe' - # (for FileCheck the variables $0 and $1 cannot be used) - !insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from LyXUtils.nsh - ${if} $5 == "False" - Goto ForceInstallation - ${endif} - # installing over an existing installation of the same LyX release is not necessary - # if the users does this he most probably has a problem with LyX that can better be solved - # by reinstalling LyX - # for beta and other test releases over-installing can even cause errors - MessageBox MB_YESNO|MB_DEFBUTTON2|MB_ICONEXCLAMATION "$(AlreadyInstalled)" /SD IDNO IDYES ForceInstallation - Abort - ForceInstallation: - ${endif} - - # check if there is an existing LyX installation of the same LyX series - # we usually don't release more than 10 versions so with 20 we are safe to check if a newer version is installed - IntOp $4 ${APP_VERSION_REVISION} + 20 - ${for} $5 0 $4 - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion" - # also check for an emergency release - ${if} $0 == "" - ${For} $7 0 20 - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5$7" "DisplayVersion" - ${Next} - ${endif} - ${else} - ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion" - # also check for an emergency release - ${if} $0 == "" - ${For} $7 0 20 - ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5$7" "DisplayVersion" - ${Next} - ${endif} - ${endif} - ${if} $0 != "" - StrCpy $R5 $0 # store the read version number - StrCpy $OldVersionNumber "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" - # we don't stop here because we want the latest installed version - ${endif} - ${next} - - ${if} $OldVersionNumber > ${APP_SERIES_KEY} - # store the version number and reformat it temporarily for the error message - StrCpy $R0 $OldVersionNumber - StrCpy $OldVersionNumber $R5 - MessageBox MB_OK|MB_ICONSTOP "$(NewerInstalled)" /SD IDOK - StrCpy $OldVersionNumber $R0 - Abort - ${endif} - - # this can be reset to "true" in section SecDesktop - StrCpy $CreateDesktopIcon "false" - StrCpy $CreateFileAssociations "false" - - ${IfNot} ${Silent} - # Show banner while installer is intializating - Banner::show /NOUNLOAD "Checking system" - ${EndIf} - - Call SearchExternal - - # select sections of already installed spell-checker dictionaries, make them read-only - # and set the necessary size to 0 bytes - StrCpy $String $FoundDict - StrCpy $Search "af_ZA" - Call StrPoint # function from LyXUtils.nsh - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDAfrikaans} $0 - SectionSetSize ${SecDAfrikaans} 0 - ${endif} - StrCpy $Search "ar_SA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDArabic} $0 - SectionSetSize ${SecDArabic} 0 - ${endif} - StrCpy $Search "hy_AM" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDArmenian} $0 - SectionSetSize ${SecDArmenian} 0 - ${endif} - StrCpy $Search "id_ID" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDIndonesian} $0 - SectionSetSize ${SecDIndonesian} 0 - ${endif} - StrCpy $Search "ms_MY" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDMalayan} $0 - SectionSetSize ${SecDMalayan} 0 - ${endif} - StrCpy $Search "be_BY" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDBelarusian} $0 - SectionSetSize ${SecDBelarusian} 0 - ${endif} - StrCpy $Search "br_FR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDBreton} $0 - SectionSetSize ${SecDBreton} 0 - ${endif} - StrCpy $Search "bg_BG" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDBulgarian} $0 - SectionSetSize ${SecDBulgarian} 0 - ${endif} - StrCpy $Search "ca_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDCatalanian} $0 - SectionSetSize ${SecDCatalanian} 0 - ${endif} - StrCpy $Search "cs_CZ" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDCzech} $0 - SectionSetSize ${SecDCzech} 0 - ${endif} - - StrCpy $Search "cop_EG" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDCoptic} $0 - SectionSetSize ${SecDCoptic} 0 - ${endif} - StrCpy $Search "cy_GB" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDWelsh} $0 - SectionSetSize ${SecDWelsh} 0 - ${endif} - StrCpy $Search "da_DK" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDDanish} $0 - SectionSetSize ${SecDDanish} 0 - ${endif} - StrCpy $Search "de_AT" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGermanAT} $0 - SectionSetSize ${SecDGermanAT} 0 - ${endif} - StrCpy $Search "de_CH" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGermanCH} $0 - SectionSetSize ${SecDGermanCH} 0 - ${endif} - StrCpy $Search "de_DE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGermanD} $0 - SectionSetSize ${SecDGermanD} 0 - ${endif} - StrCpy $Search "el_GR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGreek} $0 - SectionSetSize ${SecDGreek} 0 - ${endif} - StrCpy $Search "et_EE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEstonian} $0 - SectionSetSize ${SecDEstonian} 0 - ${endif} - StrCpy $Search "en_AU" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEnglishAU} $0 - SectionSetSize ${SecDEnglishAU} 0 - ${endif} - StrCpy $Search "en_CA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEnglishCA} $0 - SectionSetSize ${SecDEnglishCA} 0 - ${endif} - StrCpy $Search "en_GB" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEnglishGB} $0 - SectionSetSize ${SecDEnglishGB} 0 - ${endif} - StrCpy $Search "en_NZ" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEnglishNZ} $0 - SectionSetSize ${SecDEnglishNZ} 0 - ${endif} - StrCpy $Search "en_US" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEnglishUS} $0 - SectionSetSize ${SecDEnglishUS} 0 - ${endif} - StrCpy $Search "es_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSpanishES} $0 - SectionSetSize ${SecDSpanishES} 0 - ${endif} - StrCpy $Search "es_MX" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSpanishMX} $0 - SectionSetSize ${SecDSpanishMX} 0 - ${endif} - StrCpy $Search "eo_EO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDEsperanto} $0 - SectionSetSize ${SecDEsperanto} 0 - ${endif} - StrCpy $Search "eu_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDBasque} $0 - SectionSetSize ${SecDBasque} 0 - ${endif} - StrCpy $Search "fa_IR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDFarsi} $0 - SectionSetSize ${SecDFarsi} 0 - ${endif} - StrCpy $Search "fr_CA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDFrenchCanada} $0 - SectionSetSize ${SecDFrenchCanada} 0 - ${endif} - StrCpy $Search "fr_FR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDFrench} $0 - SectionSetSize ${SecDFrench} 0 - ${endif} - StrCpy $Search "ga_IR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGaelic} $0 - SectionSetSize ${SecDGaelic} 0 - ${endif} - StrCpy $Search "gd_GB" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDScottish} $0 - SectionSetSize ${SecDScottish} 0 - ${endif} - StrCpy $Search "gl_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGalician} $0 - SectionSetSize ${SecDGalician} 0 - ${endif} - StrCpy $Search "ka_GE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDGeorgian} $0 - SectionSetSize ${SecDGeorgian} 0 - ${endif} - StrCpy $Search "he_IL" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDHebrew} $0 - SectionSetSize ${SecDHebrew} 0 - ${endif} - StrCpy $Search "hi_IN" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDHindi} $0 - SectionSetSize ${SecDHindi} 0 - ${endif} - StrCpy $Search "hr_HR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDCroatian} $0 - SectionSetSize ${SecDCroatian} 0 - ${endif} - StrCpy $Search "hu_HU" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDHungarian} $0 - SectionSetSize ${SecDHungarian} 0 - ${endif} - StrCpy $Search "ia_IA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDInterlingua} $0 - SectionSetSize ${SecDInterlingua} 0 - ${endif} - StrCpy $Search "is_IS" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDIcelandic} $0 - SectionSetSize ${SecDIcelandic} 0 - ${endif} - StrCpy $Search "it_IT" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDItalian} $0 - SectionSetSize ${SecDItalian} 0 - ${endif} - StrCpy $Search "kk_KZ" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDKazakh} $0 - SectionSetSize ${SecDKazakh} 0 - ${endif} - StrCpy $Search "ko_KR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDKorean} $0 - SectionSetSize ${SecDKorean} 0 - ${endif} - StrCpy $Search "la_LA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDLatin} $0 - SectionSetSize ${SecDLatin} 0 - ${endif} - StrCpy $Search "lt_LT" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDLithuanian} $0 - SectionSetSize ${SecDLithuanian} 0 - ${endif} - StrCpy $Search "lv_LV" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDLatvian} $0 - SectionSetSize ${SecDLatvian} 0 - ${endif} - StrCpy $Search "mr_IN" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDMarathi} $0 - SectionSetSize ${SecDMarathi} 0 - ${endif} - StrCpy $Search "nl_NL" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDDutch} $0 - SectionSetSize ${SecDDutch} 0 - ${endif} - StrCpy $Search "nb_NO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDNorwegianNB} $0 - SectionSetSize ${SecDNorwegianNB} 0 - ${endif} - StrCpy $Search "nn_NO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDNorwegianNN} $0 - SectionSetSize ${SecDNorwegianNN} 0 - ${endif} - StrCpy $Search "oc_FR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDOccitan} $0 - SectionSetSize ${SecDOccitan} 0 - ${endif} - StrCpy $Search "pl_PL" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDPolish} $0 - SectionSetSize ${SecDPolish} 0 - ${endif} - StrCpy $Search "pt_BR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDPortugueseBR} $0 - SectionSetSize ${SecDPortugueseBR} 0 - ${endif} - StrCpy $Search "pt_PT" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDPortuguesePT} $0 - SectionSetSize ${SecDPortuguesePT} 0 - ${endif} - StrCpy $Search "ro_RO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDRomanian} $0 - SectionSetSize ${SecDRomanian} 0 - ${endif} - StrCpy $Search "ru_RU" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDRussian} $0 - SectionSetSize ${SecDRussian} 0 - ${endif} - StrCpy $Search "dsb_DE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSorbianD} $0 - SectionSetSize ${SecDSorbianD} 0 - ${endif} - StrCpy $Search "hsb_DE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSorbianH} $0 - SectionSetSize ${SecDSorbianH} 0 - ${endif} - StrCpy $Search "sq_AL" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDAlbanian} $0 - SectionSetSize ${SecDAlbanian} 0 - ${endif} - StrCpy $Search "sl_SI" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSlovenian} $0 - SectionSetSize ${SecDSlovenian} 0 - ${endif} - StrCpy $Search "sk_SK" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSlovakian} $0 - SectionSetSize ${SecDSlovakian} 0 - ${endif} - StrCpy $Search "sr_RS" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSerbianC} $0 - SectionSetSize ${SecDSerbianC} 0 - ${endif} - StrCpy $Search "sr_RS-Latin" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSerbianL} $0 - SectionSetSize ${SecDSerbianL} 0 - ${endif} - StrCpy $Search "sv_SE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDSwedish} $0 - SectionSetSize ${SecDSwedish} 0 - ${endif} - StrCpy $Search "ta_IN" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDTamil} $0 - SectionSetSize ${SecDTamil} 0 - ${endif} - StrCpy $Search "te_IN" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDTelugu} $0 - SectionSetSize ${SecDTelugu} 0 - ${endif} - StrCpy $Search "th_TH" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDThai} $0 - SectionSetSize ${SecDThai} 0 - ${endif} - StrCpy $Search "bo_CN" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDTibetan} $0 - SectionSetSize ${SecDTibetan} 0 - ${endif} - StrCpy $Search "tk_TM" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDTurkmen} $0 - SectionSetSize ${SecDTurkmen} 0 - ${endif} - StrCpy $Search "tr_TR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDTurkish} $0 - SectionSetSize ${SecDTurkish} 0 - ${endif} - StrCpy $Search "uk_UA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDUkrainian} $0 - SectionSetSize ${SecDUkrainian} 0 - ${endif} - StrCpy $Search "ur_PK" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDUrdu} $0 - SectionSetSize ${SecDUrdu} 0 - ${endif} - StrCpy $Search "vi_VN" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecDVietnamese} $0 - SectionSetSize ${SecDVietnamese} 0 - ${endif} - - # select sections of already installed thesaurus dictionaries, make them read-only - # and set the necessary size to 0 bytes - StrCpy $String $FoundThes - StrCpy $Search "ar_SA" - Call StrPoint # function from LyXUtils.nsh - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTArabic} $0 - SectionSetSize ${SecTArabic} 0 - ${endif} - StrCpy $Search "bg_BG" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTBulgarian} $0 - SectionSetSize ${SecTBulgarian} 0 - ${endif} - StrCpy $Search "ca_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTCatalan} $0 - SectionSetSize ${SecTCatalan} 0 - ${endif} - StrCpy $Search "cs_CZ" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTCzech} $0 - SectionSetSize ${SecTCzech} 0 - ${endif} - StrCpy $Search "da_DK" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTDanish} $0 - SectionSetSize ${SecTDanish} 0 - ${endif} - StrCpy $Search "de_DE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTGermanDA} $0 - SectionSetSize ${SecTGermanDA} 0 - ${endif} - StrCpy $Search "de_CH" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTGermanCH} $0 - SectionSetSize ${SecTGermanCH} 0 - ${endif} - StrCpy $Search "en_AU" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTEnglishAU} $0 - SectionSetSize ${SecTEnglishAU} 0 - ${endif} - StrCpy $Search "en_GB" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTEnglishGB} $0 - SectionSetSize ${SecTEnglishGB} 0 - ${endif} - StrCpy $Search "en_US" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTEnglishUS} $0 - SectionSetSize ${SecTEnglishUS} 0 - ${endif} - StrCpy $Search "es_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTSpanish} $0 - SectionSetSize ${SecTSpanish} 0 - ${endif} - StrCpy $Search "fr_FR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTFrench} $0 - SectionSetSize ${SecTFrench} 0 - ${endif} - StrCpy $Search "ga_IR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTGaelic} $0 - SectionSetSize ${SecTGaelic} 0 - ${endif} - StrCpy $Search "gl_ES" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTGalician} $0 - SectionSetSize ${SecTGalician} 0 - ${endif} - StrCpy $Search "el_GR" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTGreek} $0 - SectionSetSize ${SecTGreek} 0 - ${endif} - StrCpy $Search "is_IS" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTIcelandic} $0 - SectionSetSize ${SecTIcelandic} 0 - ${endif} - StrCpy $Search "it_IT" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTItalian} $0 - SectionSetSize ${SecTItalian} 0 - ${endif} - StrCpy $Search "hu_HU" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTHungarian} $0 - SectionSetSize ${SecTHungarian} 0 - ${endif} - StrCpy $Search "nb_NO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTNorwegianNB} $0 - SectionSetSize ${SecTNorwegianNB} 0 - ${endif} - StrCpy $Search "nn_NO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTNorwegianNN} $0 - SectionSetSize ${SecTNorwegianNN} 0 - ${endif} - StrCpy $Search "pl_PL" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTPolish} $0 - SectionSetSize ${SecTPolish} 0 - ${endif} - StrCpy $Search "pt_PT" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTPortuguese} $0 - SectionSetSize ${SecTPortuguese} 0 - ${endif} - StrCpy $Search "ro_RO" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTRomanian} $0 - SectionSetSize ${SecTRomanian} 0 - ${endif} - StrCpy $Search "ru_RU" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTRussian} $0 - SectionSetSize ${SecTRussian} 0 - ${endif} - StrCpy $Search "sl_SI" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTSlovenian} $0 - SectionSetSize ${SecTSlovenian} 0 - ${endif} - StrCpy $Search "sk_SK" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTSlovakian} $0 - SectionSetSize ${SecTSlovakian} 0 - ${endif} - StrCpy $Search "sv_SE" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTSwedish} $0 - SectionSetSize ${SecTSwedish} 0 - ${endif} - StrCpy $Search "uk_UA" - Call StrPoint - ${if} $Pointer != "-1" - IntOp $0 ${SF_SELECTED} | ${SF_RO} - SectionSetFlags ${SecTUkrainian} $0 - SectionSetSize ${SecTUkrainian} 0 - ${endif} - - ${IfNot} ${Silent} - Banner::destroy - ${EndIf} - -FunctionEnd - -# this function is called at first after starting the uninstaller -Function un.onInit - - SetRegView ${APP_VERSION_ACHITECHTURE} - - !insertmacro MULTIUSER_UNINIT - - # Check that LyX is not currently running - FindProcDLL::FindProc "${BIN_LYX}" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK - Abort - ${endif} - - # set registry root key - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - SetShellVarContext all - ${else} - SetShellVarContext current - ${endif} - - # Ascertain whether the user has sufficient privileges to uninstall. - # abort when LyX was installed with admin permissions but the user doesn't have administrator privileges - ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayVersion" - ${if} $0 != "" - ${andif} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)" /SD IDOK - Abort - ${endif} - # warning when LyX couldn't be found in the registry - ${if} $0 == "" # check in HKCU - ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayVersion" - ${if} $0 == "" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)" /SD IDOK - ${endif} - ${endif} - - # Macro to investigate name of LyX's preferences folders to be able remove them - !insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh - - # test if MiKTeX was installed together with LyX - ReadRegStr $0 SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${if} $0 == "Yes${APP_SERIES_KEY}" - SectionSetText 2 "MiKTeX" # names the corersponding uninstaller section - StrCpy $LaTeXInstalled "MiKTeX" - ${else} - SectionSetText 2 "" # hides the corresponding uninstaller section - ${endif} - - # question message if the user really wants to uninstall LyX - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" /SD IDYES IDYES +2 # continue if yes - Abort - -FunctionEnd diff --git a/development/Win32/packaging/installer/include/nsis.nsh b/development/Win32/packaging/installer/include/nsis.nsh deleted file mode 100644 index 4a045fc352..0000000000 --- a/development/Win32/packaging/installer/include/nsis.nsh +++ /dev/null @@ -1,49 +0,0 @@ -/* - -nsis.nsh - -Configuration of standard NSIS header files - -*/ - -#-------------------------------- -# Multi-User settings - -!define MULTIUSER_EXECUTIONLEVEL Highest -!define MULTIUSER_INSTALLMODE_COMMANDLINE -!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${APP_REGKEY}" -!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "" - -!define MULTIUSER_INSTALLMODE_INSTDIR "${APP_DIR}" -!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${APP_REGKEY}" -!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" - -!define MULTIUSER_INSTALLMODE_FUNCTION InitUser -!define MULTIUSER_MUI -!if ${APP_VERSION_ACHITECHTURE} = 64 - !define MULTIUSER_USE_PROGRAMFILES64 -!endif - -#-------------------------------- -# Standard header files - -!include MUI2.nsh -!include LogicLib.nsh -!include Sections.nsh -!include WinVer.nsh -!include LangFile.nsh -!include MultiUser.nsh -!include InstallOptions.nsh -!include x64.nsh - -# Set of various macros and functions -!include include\LyXUtils.nsh - -# Functions to check and configure the LaTeX-system -!include include\LaTeX.nsh - -# Function for page to manually select LaTeX's installation folder -!include gui\LaTeXFolder.nsh - -# Functions to download spell-checker and thesaurus dictionaries -!include include\dictionaries.nsh diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh deleted file mode 100644 index 57f507c5df..0000000000 --- a/development/Win32/packaging/installer/include/variables.nsh +++ /dev/null @@ -1,52 +0,0 @@ -/* - -variables.nsh - -Variables that are shared between multiple files - -*/ - -Var PathLaTeX -Var PathLaTeXLocal -Var PathBibTeXEditor - -Var APPDATemp -Var AppPre -var AppSubfolder -Var AppSuff -Var CreateDesktopIcon -Var CreateFileAssociations -Var DictCode -Var DictCodes -Var DelPythonFiles -Var EditorPath -Var FoundDict -Var FoundThes -Var GhostscriptPath -Var GnumericPath -Var ImageEditor -Var ImageEditorPath -Var Is64bit -Var JabRefInstalled -Var LaTeXName -Var LaTeXInstalled -Var LilyPondPath -Var MiKTeXUser -Var MiKTeXVersion -Var OldVersionNumber -Var PandocPath -Var Pointer -Var PSVPath -Var PythonPath -Var Search -Var State -Var SVGPath -Var StartmenuFolder -Var String -Var Tmp -Var ThesCode -Var ThesCodes -Var UpdateFNDBReturn -Var UserList - -Var LangName diff --git a/development/Win32/packaging/installer/information/InstallerStructure.odg b/development/Win32/packaging/installer/information/InstallerStructure.odg deleted file mode 100644 index ea8f381ed4d1efa891ccd3b23a4917c564ba50fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18284 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 diff --git a/development/Win32/packaging/installer/information/InstallerStructure.pdf b/development/Win32/packaging/installer/information/InstallerStructure.pdf deleted file mode 100644 index 27c3c32efd5b369296d9d117a11ee58e05b84b96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37336 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 P1(7gfZf*k?sd|MG diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi deleted file mode 100644 index 9490f035f7..0000000000 --- a/development/Win32/packaging/installer/lyx-bundle.nsi +++ /dev/null @@ -1,68 +0,0 @@ -/* - -NSIS Script - LyX 2.3 Installer for Windows -Authors: Joost Verburg, Angus Leeming, Uwe Stöhr -Compatible with NSIS 3.0 - -*/ - -# Do a Cyclic Redundancy Check to make sure the installer -# was not corrupted by the download. -CRCCheck force -# -# Make the installer as small as possible -SetCompressor /SOLID lzma - -# make it a Unicode installer -Unicode true - -# enable support for high DPI resolution -ManifestDPIAware true - -!ifndef SETUPTYPE - !define SETUPTYPE BUNDLE -!endif - -# installer settings like version numbers -!include settings.nsh - -# declarations of LyX's registry keys and installer variant -!include include\declarations.nsh - -# definitions of global variables -!include include\variables.nsh - -# configuration of standard NSIS header files -!include include\nsis.nsh - -# list of files to be included in the installer -!include include\filelist.nsh - -# detect third-party programs like Inkscape and LaTeX -!include include\detection.nsh - -# set up the installer pages -!include include\gui.nsh - -# sets the install sections and checks the system on starting the un/installer -!include include\init.nsh - -# install LyX and needed third-party programs like Python etc. -!include setup\install.nsh - -# loads a function to modify Windows environment variables -!include include\EnvVarUpdate.nsh - -# uninstall LyX and all programs that were installed together with LyX -!include setup\uninstall.nsh - -# configure LyX (set start menu and write registry entries) -!include setup\configure.nsh - -# provides downloads of external programs -#!include gui\external.nsh - -#-------------------------------- -# Output file - -Outfile "${SETUP_EXE}" diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi deleted file mode 100644 index 5c943b2426..0000000000 --- a/development/Win32/packaging/installer/lyx-standard.nsi +++ /dev/null @@ -1,67 +0,0 @@ -/* -NSIS Script - LyX 2.3 Installer for Windows -Authors: Joost Verburg, Angus Leeming, Uwe Stöhr -Compatible with NSIS 3.0 -*/ - -# Do a Cyclic Redundancy Check to make sure the installer -# was not corrupted by the download. -CRCCheck force -# -# Make the installer as small as possible -SetCompressor /SOLID lzma - -# make it a Unicode installer -Unicode true - -# enable support for high DPI resolution -ManifestDPIAware true - -!ifndef SETUPTYPE - !define SETUPTYPE STANDARD -!endif - -# installer settings like version numbers -!include settings.nsh - -# declarations of LyX's registry keys and installer variant -!include include\declarations.nsh - -# definitions of global variables -!include include\variables.nsh - -# configuration of standard NSIS header files -!include include\nsis.nsh - -# list of files to be included in the installer -!include include\filelist.nsh - -# detect third-party programs like Inkscape and LaTeX -!include include\detection.nsh - -# set up the installer pages -!include include\gui.nsh - -# sets the install sections and checks the system on starting the un/installer -!include include\init.nsh - -# install LyX and needed third-party programs like Python etc. -!include setup\install.nsh - -# loads a function to modify Windows environment variables -!include include\EnvVarUpdate.nsh - -# uninstall LyX and all programs that were installed together with LyX -!include setup\uninstall.nsh - -# configure LyX (set start menu and write registry entries) -!include setup\configure.nsh - - -# provides downloads of external programs -#!include gui\external.nsh - -#-------------------------------- -# Output file - -Outfile "${SETUP_EXE}" diff --git a/development/Win32/packaging/installer2/lyx_standard.nsi b/development/Win32/packaging/installer/lyx_standard.nsi similarity index 100% rename from development/Win32/packaging/installer2/lyx_standard.nsi rename to development/Win32/packaging/installer/lyx_standard.nsi diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh deleted file mode 100644 index 2a79525302..0000000000 --- a/development/Win32/packaging/installer/settings.nsh +++ /dev/null @@ -1,52 +0,0 @@ -/* - -Settings for LyX installer - -These typically need to be modified for each LyX release - -*/ - -#-------------------------------- -# Version number - -!define APP_VERSION_MAJOR 2 -!define APP_VERSION_MINOR 4 -!define APP_VERSION_REVISION 0 -!define APP_VERSION_EMERGENCY "dev" # 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 - -# 32 or 64 bit, use build folder names and dependencies folder names containing "32" or "64" to use following constant in File locations declarations below -!define APP_VERSION_ACHITECHTURE 32 - -!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display - -!define COPYRIGHT_YEAR 2020 - -#-------------------------------- -# Installer file name - -# Typical names for the release are "LyX-232-Installer-1.exe" etc. - -!ifndef ExeFile - !define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}-\ - x${APP_VERSION_ACHITECHTURE}.exe" -!endif - -#-------------------------------- -# File locations -# !!! you need to adjust them to the folders in your Windows system !!! - -!define FILES_BASE "C:\lyx" -!define FILES_GIT "${FILES_BASE}\master\development\Win32\packaging" -!define FILES_LYX "${FILES_BASE}\masterbuild${APP_VERSION_ACHITECHTURE}\LYX_INSTALLED" -!define FILES_DEPS "${FILES_BASE}\lyx-windows-deps-msvc2019_${APP_VERSION_ACHITECHTURE}" -!define FILES_QT "${FILES_BASE}\masterbuild${APP_VERSION_ACHITECHTURE}\LYX_INSTALLED" -!define ClassFileDir "${FILES_LYX}\Resources\tex" - -#-------------------------------- -# MiKTeX and JabRef - -!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/" - -!define ImageMagickVersion "7.0.10" diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh deleted file mode 100644 index 59cf1b4a53..0000000000 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ /dev/null @@ -1,262 +0,0 @@ -/* - -configure.nsh - -Write registry information and configure LyX - -*/ - -Var PathPrefix - -#!define SHORTCUT '${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"' - -#-------------------------------- -# Registry information - -Section -InstallData - - # Registry information - ReadRegStr $0 SHCTX ${APP_REGFOLDER} "latestVersion" - ${If} $0 < ${APP_SERIES_KEY} - WriteRegStr SHCTX ${APP_REGFOLDER} "latestVersion" ${APP_SERIES_KEY} - ${EndIf} - WriteRegStr SHCTX ${APP_REGKEY} "" $INSTDIR - WriteRegStr SHCTX ${APP_REGKEY} "Version" "${APP_VERSION_NUMBER}" - WriteRegStr SHCTX ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX - - # Start Menu shortcut - SetOutPath "$INSTDIR\bin" # this is the folder in which the shortcut is executed - # we must assure that the folder is not empty (happens on silent install and can accidentally happen) - ${if} $StartmenuFolder == "" - StrCpy $StartmenuFolder "${APP_DIR}" - ${endif} - CreateDirectory "$SMPROGRAMS\$StartmenuFolder" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}" - # Link to www.lyx.org and to the Wiki - WriteINIStr "$SMPROGRAMS\$StartmenuFolder\${APP_WEBPAGE_INFO}.url" "InternetShortcut" "URL" "${APP_WEBPAGE}" - WriteINIStr "$SMPROGRAMS\$StartmenuFolder\${APP_WIKI_INFO}.url" "InternetShortcut" "URL" "${APP_WIKI}" - # create desktop icon - ${if} $CreateDesktopIcon == "true" - SetOutPath "$INSTDIR\bin" - CreateShortCut "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}" - ${endif} - - # Uninstaller information - ${If} $MultiUser.InstallMode == "CurrentUser" - WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayName" "${APP_NAME} ${APP_VERSION} $(TEXT_INSTALL_CURRENTUSER)" - ${Else} - WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayName" "${APP_NAME} ${APP_VERSION}" - ${EndIf} - - WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"' - WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}" - WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\${APP_NAME_SMALL}.exe" - WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}" - WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "https://www.lyx.org/AboutLyX" - WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team" - WriteRegStr SHCTX ${APP_UNINST_KEY} "HelpLink" "https://www.lyx.org/MailingLists" - WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoModify" 0x00000001 - WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoRepair" 0x00000001 - WriteRegStr SHCTX ${APP_UNINST_KEY} "StartMenu" "$SMPROGRAMS\$StartmenuFolder" - # if we install over an older existing version, remove the old uninstaller information - ${if} $OldVersionNumber != "" - ${AndIf} $OldVersionNumber < ${APP_SERIES_KEY} - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber" - DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}\$OldVersionNumber" - # also delete in the case of an emergency release - ${For} $7 0 20 - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber$7" - DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}\$OldVersionNumber$7" - ${Next} - ${endif} -SectionEnd - -#-------------------------------- -# Write LyX configuration file - -Section -Configure - - # Associate .lyx files with LyX for current user or all users - - ${if} $CreateFileAssociations == "true" - WriteRegStr SHCTX "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}" - ${endif} - - # Write information about file type - #!define REG_FILETYPE 'WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}"' - - ${if} $CreateFileAssociations == "true" - WriteRegStr SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to test if they were registered by this LyX version - WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}" "" "${APP_NAME} Document" - WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}\DefaultIcon" "" "$INSTDIR\${APP_RUN},0" - WriteRegStr SHCTX "Software\Classes\${APP_REGNAME_DOC}\Shell\open\command" "" '"$INSTDIR\${APP_RUN}" "%1"' - # we need to update also the automatically created entry about the lyx.exe - # otherwise .lyx-files will could be opened with an older LyX version - ReadRegStr $0 SHCTX "Software\Classes\Applications\${BIN_LYX}\shell\open\command" "" - ${if} $0 != "" # if something was found - WriteRegStr SHCTX "Software\Classes\Applications\${BIN_LYX}\shell\open\command" "" '"$INSTDIR\${APP_RUN}" "%1"' - ${endif} - # .lyx - WriteRegStr SHCTX "Software\Classes\${APP_EXT}" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}" "Content Type" "${APP_MIME_TYPE}" - # .lyx13 - WriteRegStr SHCTX "Software\Classes\${APP_EXT}13" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}13" "Content Type" "${APP_MIME_TYPE}" - # .lyx14 - WriteRegStr SHCTX "Software\Classes\${APP_EXT}14" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}14" "Content Type" "${APP_MIME_TYPE}" - # .lyx15 - WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}15" "Content Type" "${APP_MIME_TYPE}" - # .lyx16 - WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}16" "Content Type" "${APP_MIME_TYPE}" - # .lyx20 - WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "Content Type" "${APP_MIME_TYPE}" - # .lyx21 - WriteRegStr SHCTX "Software\Classes\${APP_EXT}21" "" "${APP_REGNAME_DOC}" - WriteRegStr SHCTX "Software\Classes\${APP_EXT}21" "Content Type" "${APP_MIME_TYPE}" - # .lyx22 don't set this, because this is designed to be opened with LyX 2.2.x - - # Refresh shell - ${RefreshShellIcons} - ${endif} - - # Install standard lyxrc.dist file - #SetOutPath "$INSTDIR\Resources" - #File "${FILES_DEPS}\Resources\lyxrc.dist" - - # create the path prefix - # $$ represents a literal $ in an NSIS string - StrCpy $PathPrefix "$$LyXDir\bin;$$LyXDir\Python;$$LyXDir\Python\Lib;$$LyXDir\Perl\bin;$$LyXDir\imagemagick" - - ${if} $PathLaTeX != "" - StrCpy $PathPrefix "$PathPrefix;$PathLaTeX" - ${EndIf} - ${if} $PSVPath != "" - StrCpy $PathPrefix "$PathPrefix;$PSVPath" - ${endif} - ${if} $EditorPath != "" - StrCpy $PathPrefix "$PathPrefix;$EditorPath" - ${endif} - ${if} $ImageEditorPath != "" - StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath" - ${endif} - ${if} $GhostscriptPath != "" - StrCpy $PathPrefix "$PathPrefix;$GhostscriptPath" - ${endif} - ${if} $SVGPath != "" - StrCpy $PathPrefix "$PathPrefix;$SVGPath" - ${endif} - ${if} $GnumericPath != "" - StrCpy $PathPrefix "$PathPrefix;$GnumericPath" - ${endif} - ${if} $PathBibTeXEditor != "" - StrCpy $PathPrefix "$PathPrefix;$PathBibTeXEditor" - ${EndIf} - ${if} $PandocPath != "" - StrCpy $PathPrefix "$PathPrefix;$PandocPath" - ${endif} - ${if} $LilyPondPath != "" - StrCpy $PathPrefix "$PathPrefix;$LilyPondPath" - ${endif} - - # Set the path prefix in lyxrc.dist - ClearErrors - FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" a - FileSeek $R1 0 END - # set some general things - FileWrite $R1 '\screen_zoom 120$\r$\n' - ${if} "$PathPrefix" != "" - FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n' - ${endif} - - # use pdfview for all types of PDF files - FileWrite $R1 '\format "pdf5" "pdf" "PDF (LuaTeX)" "u" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\ - \format "pdf4" "pdf" "PDF (XeTeX)" "X" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\ - \format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\ - \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n\ - \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector,menu=export" "application/pdf"$\r$\n' - - # 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' - ${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 - # We need to specify a resolution for the converter otherwise 1024 dpi are used and - # eps2pdf takes ages. 300 dpi are a good compromise for speed and size. - ${if} $SVGPath == "" - FileWrite $R1 '\converter "wmf" "eps" "convert -density 300 $$$$i $$$$o" ""$\r$\n\ - \converter "emf" "eps" "convert -density 300 $$$$i $$$$o" ""$\r$\n' - ${endif} - - # if LilyPondPath was found - # We need to add these entries because python scripts can only be executed - # if the full path is given. - ${if} $LilyPondPath != "" - FileWrite $R1 '\format "lilypond-book" "lytex" "LilyPond book (LaTeX)" "" "" "auto" "document,menu=export" ""$\r$\n\ - \converter "lilypond-book" "pdflatex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --pdf --latex-program=pdflatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ - \converter "lilypond-book" "xetex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --pdf --latex-program=xelatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ - \converter "lilypond-book" "luatex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --pdf --latex-program=lualatex --lily-output-dir=ly-pdf $$$$i" ""$\r$\n\ - \converter "lilypond-book" "latex" "python \"$LilyPondPath\\lilypond-book.py\" --safe --lily-output-dir=ly-eps $$$$i" ""$\r$\n' - ${endif} - FileClose $R1 - IfErrors 0 +2 - MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)" /SD IDOK - ClearErrors - - # for texindy the path to the perl.exe must unfortunately be in Windows' PATH variable - ${if} $LaTeXInstalled != "TeXLive" - ${if} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - # call the non-admin version - ${EnvVarUpdate} $0 "PATH" "A" "HKCU" "$INSTDIR\Perl\bin" - ${else} - ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\Perl\bin" - ${endif} - ${endif} - -SectionEnd - -#-------------------------------- -# Run the LyX configure.py script, so MiKTeX can download its packages - -Var ConfigureReturn - -Section -ConfigureScript - - DetailPrint $(TEXT_CONFIGURE_LYX) - SetShellVarContext current - SetOutPath "$APPDATA\${APP_DIR_USERDATA}" - nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' - # $ConfigureReturn is "0" if successful, otherwise "1" - Pop $ConfigureReturn # Return value - -SectionEnd - -#-------------------------------- -# - -#Function StartLyX - - # run LyX in a command line window to give the users feedback about - # the time consuming LaTeX package installation - -# Exec "$INSTDIR\${APP_RUN}" - -#FunctionEnd diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh deleted file mode 100644 index 178b203b73..0000000000 --- a/development/Win32/packaging/installer/setup/install.nsh +++ /dev/null @@ -1,136 +0,0 @@ -/* - -install.nsh - -Installation of program files, dictionaries and external components - -*/ - -#-------------------------------- -# Program files - -Var PythonCompileFile -Var PythonCompileReturn - -Section -ProgramFiles SecProgramFiles - - # if the $INSTDIR does not contain "LyX" we must add a subfolder to avoid that LyX will e.g. - # be installed directly to C:\programs - the uninstaller will then delete the whole - # C:\programs directory - StrCpy $String $INSTDIR - StrCpy $Search "${APP_NAME}" - Call StrPoint # function from LyXUtils.nsh - ${if} $Pointer == "-1" - StrCpy $INSTDIR "$INSTDIR\${APP_DIR}" - ${endif} - - # abort the installation if no LaTeX was found but should be used - ${if} $PathLaTeX == "" - ${andif} $State == "0" - SetOutPath $TEMP # to be able to delete the $INSTDIR - RMDir /r $INSTDIR - Abort - ${endif} - - # Install and register the core LyX files - - # The macros are defined in filelists.nsh - # the parameters are COMMAND DIRECTORY that form command '${COMMAND} "${DIRECTORY}files" - - # Initializes the plug-ins dir ($PLUGINSDIR) if not already initialized. - # $PLUGINSDIR is automatically deleted when the installer exits. - InitPluginsDir - - # Binaries - SetOutPath "$INSTDIR\bin" - !insertmacro FileListLyXBin File "${FILES_LYX}\bin\" - # The 2.3.0 and early 2.3.1 installers used a version suffix - # We need to remove the old binaries if we're installing into the same directory - Delete "$INSTDIR\bin\LyX2.3.exe" - Delete "$INSTDIR\bin\tex2lyx2.3.exe" - !insertmacro FileListQtBin File "${FILES_QT}\bin\" - !insertmacro FileListMSVC File "${FILES_LYX}\bin\" - !insertmacro FileListNetpbmBin File "${FILES_NETPBM}\" - !insertmacro FileListRsvg File "${FILES_RSVG}\" - !insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\" - - # Qt plugin DLLs - SetOutPath "$INSTDIR\bin\imageformats" - !insertmacro FileListQtImageformats File "${FILES_QT}\bin\imageformats\" - SetOutPath "$INSTDIR\bin\iconengines" - !insertmacro FileListQtIconengines File "${FILES_QT}\bin\iconengines\" - SetOutPath "$INSTDIR\bin\platforms" - !insertmacro FileListQtPlatforms File "${FILES_QT}\bin\platforms\" - SetOutPath "$INSTDIR\bin\styles" - !insertmacro FileListQtStyles File "${FILES_QT}\bin\styles\" - - # Resources - SetOutPath "$INSTDIR\Resources" - # recursively copy all files under Resources - File /r "${FILES_LYX}\Resources\" - File /r "${FILES_DEPS}\Resources\" - - # Python - SetOutPath "$INSTDIR\Python" - # recursively copy all files under Python - File /r "${FILES_PYTHON}\" -#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" %*' - WriteRegStr SHCTX "Software\Classes\Python.File\DefaultIcon" "" "$INSTDIR\Python\DLLs\py.ico" - WriteRegStr SHCTX "Software\Classes\.py" "" "Python.File" - 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 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" - FileWrite $PythonCompileFile "compileall.compile_dir('$INSTDIR\python\Lib')$\r$\n" - FileWrite $PythonCompileFile "compileall.compile_dir('$INSTDIR\Resources')$\r$\n" - FileClose $PythonCompileFile - DetailPrint $(TEXT_CONFIGURE_PYTHON) - nsExec::ExecToLog '"$INSTDIR\python\python.exe" "$INSTDIR\compilepy.py"' - Pop $PythonCompileReturn # Return value - Delete "$INSTDIR\compilepy.py" - - # Components of ImageMagick - SetOutPath "$INSTDIR\imagemagick" - File /r "${FILES_IMAGEMAGICK}\" - - # Components of Ghostscript - ${if} $GhostscriptPath == "" - SetOutPath "$INSTDIR\ghostscript" - File /r "${FILES_GHOSTSCRIPT}\" - StrCpy $GhostscriptPath "$INSTDIR\ghostscript\bin" - ${endif} - - # install unoconv - SetOutPath "$INSTDIR\Python\Lib" - !insertmacro FileListUnoConv File "${FILES_UNOCONV}\" - - # install the LaTeX class files that are delivered with LyX to MiKTeX - ${if} $LaTeXInstalled == "MiKTeX" - Call ConfigureMiKTeX # Function from LaTeX.nsh - ${endif} - # install the LaTeX class files that are delivered with LyX to TeXLive - ${if} $LaTeXInstalled == "TeXLive" - Call ConfigureTeXLive # Function from LaTeX.nsh - ${endif} - - # download dictionaries and thesaurus - ${if} $DictCodes != "" - Call InstallHunspellDictionaries # Function from dictionaries.nsh - ${endif} - ${if} $ThesCodes != "" - Call InstallThesaurusDictionaries # Function from dictionaries.nsh - ${endif} - # finally delete the list of mirrors - Delete "$INSTDIR\Resources\DictionaryMirrors.txt" - - # Create uninstaller - WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}" - -SectionEnd diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh deleted file mode 100644 index 46419a86ba..0000000000 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ /dev/null @@ -1,157 +0,0 @@ -/* - -uninstall.nsh - -Uninstall - -*/ - -Var FileAssociation - -# ---------------------------------- - -Section "un.LyX" un.SecUnProgramFiles - - SectionIn RO - # LaTeX class files that were installed together with LyX - # will not be uninstalled because other LyX versions will - # need them and these few files don't harm to stay in LaTeX - - # Binaries - RMDir /r "$INSTDIR\bin" - - # Resources - RMDir /r "$INSTDIR\Resources" - - # Python - RMDir /r "$INSTDIR\python" - ReadRegStr $0 SHCTX "Software\Classes\Python.File" "OnlyWithLyX" # test if it was registered by this LyX version - ${if} $0 == "Yes${APP_SERIES_KEY}" - DeleteRegKey SHCTX "Software\Classes\Python.File" - ${endif} - - # ImageMagick - RMDir /r "$INSTDIR\imagemagick" - - # Components of Ghostscript - RMDir /r "$INSTDIR\ghostscript" - - # delete start menu folder - ReadRegStr $0 SHCTX "${APP_UNINST_KEY}" "StartMenu" - RMDir /r "$0" - # delete desktop icon - Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" - - # remove file extension .lyx - ReadRegStr $0 SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" # test if they were registered by this LyX version - ${if} $0 == "Yes${APP_SERIES_KEY}" - ReadRegStr $R0 SHCTX "Software\Classes\${APP_EXT}" "" - ${if} $R0 == "${APP_REGNAME_DOC}" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}13" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}14" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}15" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}16" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}20" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}21" - DeleteRegKey SHCTX "Software\Classes\${APP_EXT}" - #DeleteRegKey SHCTX "Software\Classes\${APP_REGNAME_DOC}" - ${endif} - ${endif} - ${if} $MultiUser.Privileges == "Admin" - DeleteRegKey HKCR "${APP_NAME}.Document" - ${endif} - - # Uninstaller itself - Delete "$INSTDIR\${SETUP_UNINSTALLER}" - - # Application folder - SetOutPath "$TEMP" - RMDir /r "$INSTDIR" - - # Registry keys and values - DeleteRegValue SHCTX "subkey" "key_name" - DeleteRegKey SHCTX "${APP_REGKEY_SETUP}" - DeleteRegKey SHCTX "${APP_REGKEY}" - DeleteRegKey SHCTX "${APP_UNINST_KEY}" - DeleteRegKey HKCR "Applications\${BIN_LYX}" - DeleteRegValue HKCR "${APP_NAME}.Document\Shell\open\command" "" - DeleteRegValue HKCR "${APP_NAME}.Document\DefaultIcon" "" - ReadRegStr $0 SHCTX ${APP_REGFOLDER} "latestVersion" - ${If} $0 == ${APP_SERIES_KEY} - DeleteRegValue SHCTX ${APP_REGFOLDER} "latestVersion" - StrCpy $0 0 - StrCpy $R0 "" - ${Do} - StrCpy $R1 $R0 - EnumRegKey $R0 SHCTX ${APP_REGFOLDER} $0 - IntOp $0 $0 + 1 - ${LoopUntil} $R0 == "" - ${If} $R1 != "" - WriteRegStr SHCTX ${APP_REGFOLDER} "latestVersion" $R1 - ${EndIf} - ${EndIf} - DeleteRegKey /ifempty SHCTX ${APP_REGFOLDER} - - # File associations - ReadRegStr $FileAssociation SHELL_CONTEXT "Software\Classes\${APP_EXT}" "" - - ${If} $FileAssociation == "${APP_REGNAME_DOC}" - DeleteRegKey SHELL_CONTEXT "Software\Classes\${APP_EXT}" - ${EndIf} - - # clean other registry entries - DeleteRegKey SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe" - DeleteRegKey SHCTX "SOFTWARE\${APP_REGKEY}" - - # delete info that programs were installed together with LyX - DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - - # for texindy the path to the perl.exe must unfortunately be in Windows' PATH variable - # so we have to remove it now - ${if} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - # call the non-admin version - ${un.EnvVarUpdate} $0 "PATH" "R" "HKCU" "$INSTDIR\Perl\bin" - ${else} - ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\Perl\bin" - ${endif} - -SectionEnd - -#--------------------------------- -# user preferences -Section /o "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences - - # remove LyX's config files - StrCpy $AppSubfolder ${APP_DIR_USERDATA} - Call un.DelAppPathSub # function from LyXUtils.nsh - # remove registry settings - DeleteRegKey HKCU "Software\${APP_NAME}\${APP_NAME}${APP_SERIES_NAME}" - -SectionEnd - -#--------------------------------- -# MiKTeX -Section "un.MiKTeX" un.SecUnMiKTeX - - ${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was installed together with LyX - ReadRegStr $1 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString" - ExecWait $1 # run MiKTeX's uninstaller - ${endif} - -SectionEnd - -#--------------------------------- -# Section descriptions -!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnMiKTeX} "$(SecUnMiKTeXDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnPreferences} "$(SecUnPreferencesDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnProgramFiles} "$(SecUnProgramFilesDescription)" -!insertmacro MUI_UNFUNCTION_DESCRIPTION_END - -#Section "un.User Preferences and Custom Files" un.SecUserFiles -# -# SetShellVarContext current -# RMDir /r "$APPDATA\${APP_DIR_USERDATA}" -# -#SectionEnd diff --git a/development/Win32/packaging/installer2/src/CustomPages/LaTeXFolder.nsddef b/development/Win32/packaging/installer/src/CustomPages/LaTeXFolder.nsddef similarity index 100% rename from development/Win32/packaging/installer2/src/CustomPages/LaTeXFolder.nsddef rename to development/Win32/packaging/installer/src/CustomPages/LaTeXFolder.nsddef diff --git a/development/Win32/packaging/installer2/src/CustomPages/LaTeXFolder.nsdinc b/development/Win32/packaging/installer/src/CustomPages/LaTeXFolder.nsdinc similarity index 100% rename from development/Win32/packaging/installer2/src/CustomPages/LaTeXFolder.nsdinc rename to development/Win32/packaging/installer/src/CustomPages/LaTeXFolder.nsdinc diff --git a/development/Win32/packaging/installer2/src/dictionaries.nsh b/development/Win32/packaging/installer/src/dictionaries.nsh similarity index 99% rename from development/Win32/packaging/installer2/src/dictionaries.nsh rename to development/Win32/packaging/installer/src/dictionaries.nsh index 6fb02d57e9..6cd9b3901b 100644 --- a/development/Win32/packaging/installer2/src/dictionaries.nsh +++ b/development/Win32/packaging/installer/src/dictionaries.nsh @@ -52,18 +52,15 @@ Function DownloadHunspell Exch $R9 # "${langCode}.aff" / "${langCode}.dic" Push $9 - Push $R3 # FIXME remove ${IfNot} ${FileExists} "$INSTDIR\Resources\dicts\$R9" inetc::get /TIMEOUT=5000 "https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/$R9" "$INSTDIR\Resources\dicts\$R9" /END Pop $9 ${If} $9 != "OK" - StrCpy $R3 $R9 # FIXME remove MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)" # $(HunspellFailed) uses $R9 ${EndIf} ${EndIf} - Pop $R3 # FIXME remove Pop $9 Pop $R9 FunctionEnd @@ -71,18 +68,15 @@ FunctionEnd Function DownloadThesaurus Exch $R9 # "th_${langCode}_v2.dat" / "th_${langCode}_v2.idx" Push $9 - Push $R3 # FIXME remove ${IfNot} ${FileExists} "$INSTDIR\Resources\thes\$R9" inetc::get /TIMEOUT=5000 "https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/thes/$R9" "$INSTDIR\Resources\thes\$R9" /END Pop $9 ${If} $9 != "OK" - StrCpy $R3 $R9 # FIXME remove MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)" # $(ThesaurusFailed) uses $R9 ${EndIf} ${EndIf} - Push $R3 # FIXME remove Pop $9 Pop $R9 FunctionEnd diff --git a/development/Win32/packaging/installer/lang/TranslatedLanguages.nsh b/development/Win32/packaging/installer/src/lang/TranslatedLanguages.nsh similarity index 89% rename from development/Win32/packaging/installer/lang/TranslatedLanguages.nsh rename to development/Win32/packaging/installer/src/lang/TranslatedLanguages.nsh index e9b526dedd..e35b36b89c 100644 --- a/development/Win32/packaging/installer/lang/TranslatedLanguages.nsh +++ b/development/Win32/packaging/installer/src/lang/TranslatedLanguages.nsh @@ -2,7 +2,7 @@ # NSIS language file !insertmacro MUI_LANGUAGE "${LANG_NAME}" # LyX language file - !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "lang\${LANG_NAME}.nsh" "lang\english.nsh" + !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "src\lang\${LANG_NAME}.nsh" "src\lang\english.nsh" # FIXME path !macroend # list of all languages the installers are translated to diff --git a/development/Win32/packaging/installer/lang/arabic.nsh b/development/Win32/packaging/installer/src/lang/arabic.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/arabic.nsh rename to development/Win32/packaging/installer/src/lang/arabic.nsh index d4c4e3ebc4..7015c16b14 100644 --- a/development/Win32/packaging/installer/lang/arabic.nsh +++ b/development/Win32/packaging/installer/src/lang/arabic.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "هذا المساعد سوف يرشدك خلال $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "تحديث قاعدة بيانات MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "ضبط ليك ($LaTeXInstalled ربما ينزل الحزم المفقودة, وهذا سيستغرق بعض الوقت) ..." +${LangFileString} TEXT_CONFIGURE_LYX "ضبط ليك ($R9 ربما ينزل الحزم المفقودة, وهذا سيستغرق بعض الوقت) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "بناء سكربتات بايثون..." ${LangFileString} TEXT_FINISH_DESKTOP "إنشاء اختصار سطح المكتب" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "قواميس المفردات الت ${LangFileString} EnterLaTeXHeader1 'توزيعة - لتيك' ${LangFileString} EnterLaTeXHeader2 'تعيين توزيعة لتيك التي يجب على ليك استخدامها.' ${LangFileString} EnterLaTeXFolder 'تستطيع هنا تعيين مسار الملف $\"latex.exe$\" وبعد ذلك تعيين \ - توزيعة لتيك التي يجب استخدامها مع ليك.\r\n\ - إذا لم تستخدم لتيك, ليك لن يستطيع استخراج المستندات!\r\n\ - \r\n\ + توزيعة لتيك التي يجب استخدامها مع ليك.$\r$\n\ + إذا لم تستخدم لتيك, ليك لن يستطيع استخراج المستندات!$\r$\n\ + $\r$\n\ برنامج التركيب يفحص توزيعة لتيك \ - $\"$LaTeXName$\" في نظامك. ويعرض مسارها في الاسفل.' + $\"$R9$\" في نظامك. ويعرض مسارها في الاسفل.' ${LangFileString} EnterLaTeXFolderNone 'عين في الاسفل مسار الملف $\"latex.exe$\". وبعد ذلك عين \ - توزيعة لتيك التي ستستخدم مع ليك.\r\n\ - إذا لم تستخدم لتيك, ليك لن يستطيع استخراج المستندات!\r\n\ - \r\n\ + توزيعة لتيك التي ستستخدم مع ليك.$\r$\n\ + إذا لم تستخدم لتيك, ليك لن يستطيع استخراج المستندات!$\r$\n\ + $\r$\n\ برنامج التركيب لم يعثر على توزيعة لتيك في نظامك.' ${LangFileString} PathName 'مسار الملف $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "لا تستخجم لتيك" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'لم يتم العثور على توزيعة لت لا يمكن استخدام ليك بدون وجود توزيعة لتيك مثل $\"MiKTeX$\"!$\r$\n\ وسوف تلغى عملية التركيب.' -${LangFileString} HunspellFailed 'فشل تنزيل قاموس اللغة $\"$R3$\" .' -${LangFileString} ThesaurusFailed 'فشل تنزيل قاموس مفردات اللغة $\"$R3$\" .' +${LangFileString} HunspellFailed 'فشل تنزيل قاموس اللغة $\"$R9$\" .' +${LangFileString} ThesaurusFailed 'فشل تنزيل قاموس مفردات اللغة $\"$R9$\" .' #${LangFileString} JabRefInfo 'برنامج تركيب البرنامج $\"JabRef$\" سيبدأ.$\r$\n\ # يمكنك إختيار جميع الخيارات الافتراضية في JabRef-installer.' @@ -84,13 +84,13 @@ ${LangFileString} MiKTeXInfo 'توزيعة لتيك $\"MiKTeX$\" توزيعة ل ${LangFileString} ModifyingConfigureFailed "لم تعين 'path_prefix' في سكريبت الضبط" #${LangFileString} RunConfigureFailed "لم ينفذ سكريبت الضبط" ${LangFileString} InstallRunning "المركب يعمل حاليا!" -${LangFileString} AlreadyInstalled "ليك ${APP_SERIES_KEY2} تم تركيبه بالفعل!$\r$\n\ +${LangFileString} AlreadyInstalled "ليك ${APP_VERSION} تم تركيبه بالفعل!$\r$\n\ التركيب على النسخة الحالية غير مفضل إذا كانت النسخة الحالية$\r$\n\ تجريبية أو بها مشاكل.$\r$\n\ في هذه الحالة من الأفضل إعادة التركيب.$\r$\n\ هل تريد بالرغم من ذلك تركيب ليك على النسخة الحالية؟" ${LangFileString} NewerInstalled "تحاول تركيب نسخة ليك أقدم من الموجودة حاليا.$\r$\n\ - إذا كنت تريدها بالتأكيد, عليك حذف النسخة الحالية $OldVersionNumber أولا." + إذا كنت تريدها بالتأكيد, عليك حذف النسخة الحالية $R9 أولا." ${LangFileString} MultipleIndexesNotAvailable "دعم الفهارس المتعددة في المستند لن تكون متوفرة لأن $\r$\n\ MiKTeX تم تركيبه بصلاحيات المدير بينما ليك تم تركيبه بدونها." @@ -110,8 +110,8 @@ ${LangFileString} UnLyXPreferencesTitle 'تفضيلات مستخدم ليك' ${LangFileString} SecUnMiKTeXDescription "إزالة توزيعة لتيك MiKTeX." #${LangFileString} SecUnJabRefDescription "إزالة مدير ثبت المراجع JabRef." ${LangFileString} SecUnPreferencesDescription 'حذف LyX$\'s ضبط$\r$\n\ - (مجلد $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + (مجلد $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ لك او لكل المستخدمين (إذا كنت المدير).' ${LangFileString} SecUnProgramFilesDescription "إزالة ليك مع كل مكوناته." diff --git a/development/Win32/packaging/installer/lang/basque.nsh b/development/Win32/packaging/installer/src/lang/basque.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/basque.nsh rename to development/Win32/packaging/installer/src/lang/basque.nsh index db6fe5c351..a64b9c54c4 100644 --- a/development/Win32/packaging/installer/lang/basque.nsh +++ b/development/Win32/packaging/installer/src/lang/basque.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Morroi honek $(^NameDA) aplikazioaren instalazio $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "MiKTeX fitxategiaren datu-basea eguneratzen..." -${LangFileString} TEXT_CONFIGURE_LYX "LyX konfiguratzen ($LaTeXInstalled-ek falta diren paketeak deskarga ditzake, denbora piskat behar lezake) ..." +${LangFileString} TEXT_CONFIGURE_LYX "LyX konfiguratzen ($R9-ek falta diren paketeak deskarga ditzake, denbora piskat behar lezake) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Python script-ak konpilatzen..." ${LangFileString} TEXT_FINISH_DESKTOP "Sortu mahaigaineko lasterbidea" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus hiztegiak deskarga eta inst ${LangFileString} EnterLaTeXHeader1 'LaTeX-banaketa' ${LangFileString} EnterLaTeXHeader2 'Ezarri LaTeX banaketa LyX-ek erabiltzeko.' ${LangFileString} EnterLaTeXFolder 'Aukeran hemen $\"latex.exe$\" fitxategiaren bide-izena ezar dezakezu, horrekin \ - LyX-ekin erabiltzea nahi duzun LaTeX-en banaketan zehaztuko baituzu.\r\n\ - Ez baduzu LaTeX erabiltzen, LyX-ek ezin izango du irteerako dokumenturik sortu!\r\n\ - \r\n\ - Instalatzaileak LaTeX-en $\"$LaTeXName$\" banaketa aurkitu du sisteman. \ + LyX-ekin erabiltzea nahi duzun LaTeX-en banaketan zehaztuko baituzu.$\r$\n\ + Ez baduzu LaTeX erabiltzen, LyX-ek ezin izango du irteerako dokumenturik sortu!$\r$\n\ + $\r$\n\ + Instalatzaileak LaTeX-en $\"$R9$\" banaketa aurkitu du sisteman. \ Azpian dagokion bide-izena erakusten da.' ${LangFileString} EnterLaTeXFolderNone 'Azpian ezarri $\"latex.exe$\" fitxategiaren bide-izena. horrekin \ - LyX-ekin erabiltzea nahi duzun LaTeX-en banaketan zehaztuko baituzu.\r\n\ - Ez baduzu LaTeX erabiltzen, LyX-ek ezin izango du irteerako dokumenturik sortu!\r\n\ - \r\n\ + LyX-ekin erabiltzea nahi duzun LaTeX-en banaketan zehaztuko baituzu.$\r$\n\ + Ez baduzu LaTeX erabiltzen, LyX-ek ezin izango du irteerako dokumenturik sortu!$\r$\n\ + $\r$\n\ Instalatzaileak ezin izan du LaTeX banaketarik aurkitu sisteman.' ${LangFileString} PathName '$\"latex.exe$\" fitxategiaren bide-izena' ${LangFileString} DontUseLaTeX "Ez erabili LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Ezin izan da LaTeX banaketarik aurkitu!$\r$\n\ Ezin da LyX erabili $\"MiKTeX$\" bezalako LaTeX banaketarik gabe!$\r$\n\ Instalazioa bertan behera utziko da.' -${LangFileString} HunspellFailed 'Huts egin du $\"$R3$\" hizkuntzaren hiztegia deskargatzean.' -${LangFileString} ThesaurusFailed 'Huts egin du $\"$R3$\" hizkuntzaren thesaurusa deskargatzean.' +${LangFileString} HunspellFailed 'Huts egin du $\"$R9$\" hizkuntzaren hiztegia deskargatzean.' +${LangFileString} ThesaurusFailed 'Huts egin du $\"$R9$\" hizkuntzaren thesaurusa deskargatzean.' #${LangFileString} JabRefInfo 'Orain $\"JabRef$\" programaren instalatzailea abiaraziko da.$\r$\n\ # JabRef instalatzailearen aukera lehenetsi guztiak erabil ditzakezu.' @@ -85,13 +85,13 @@ ${LangFileString} MiKTeXInfo 'LaTeX-en $\"MiKTeX$\" banaketa LyX-ekin batera era ${LangFileString} ModifyingConfigureFailed "Ezin izan da 'path_prefix' ezarri konfigurazioaren script-ean" #${LangFileString} RunConfigureFailed "Ezin izan da konfigurazioaren script-a exekutatu" ${LangFileString} InstallRunning "Instalatzailea jadanik exekutatzen ari da." -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} jadanik instalatuta dago!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} jadanik instalatuta dago!$\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} NewerInstalled "Instalatuta dagoen LyX baino bertsio zaharragoa instalatzen saiatzen ari zara.$\r$\n\ - Hori egitea nahi baduzu, lehenbizi existitzen den LyX $OldVersionNumber desinstalatu beharko duzu." + Hori egitea nahi baduzu, lehenbizi existitzen den LyX $R9 desinstalatu beharko duzu." ${LangFileString} MultipleIndexesNotAvailable "Dokumentu batean hainbat indize erabiltzeko euskarria ez dago erabilgarri $\r$\n\ MiKTeX administratzailearen pribilegioekin instalatu delako baina zuk LyX $\r$\n\ @@ -112,9 +112,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX-eko erabiltzailearen hobespenak' ${LangFileString} SecUnMiKTeXDescription "LaTeX-en MiKTeX banaketa desinstalatzen du." #${LangFileString} SecUnJabRefDescription "Bibliografiaren JabRef kudeatzailea desinstalatzen du." ${LangFileString} SecUnPreferencesDescription 'LyX-en konfigurazioa ezabatzen du$\r$\n\ - ($\"$AppPre\erabiltzailea\$\r$\n\ - $AppSuff\$\r$\n\ - \${APP_DIR_USERDATA}$\"$\r$\n\ + ($\"$R9\erabiltzailea\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\"$\r$\n\ zuretzako edo erabiltzaile guztientzako (administratzailea bazara).' ${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere osagai guztiak." diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/src/lang/catalan.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/catalan.nsh rename to development/Win32/packaging/installer/src/lang/catalan.nsh index a7449a519a..12d7b24311 100644 --- a/development/Win32/packaging/installer/lang/catalan.nsh +++ b/development/Win32/packaging/installer/src/lang/catalan.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Aquest assistent us guiarà en la instal·lació $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'Distribució LaTeX' ${LangFileString} EnterLaTeXHeader2 'Establiu la distribució LaTeX que ha de fer servir el LyX.' ${LangFileString} EnterLaTeXFolder 'Opcionalment podeu establir aquí el camí al fitxer $\"latex.exe$\" i posteriorment establir la \ - distribució LaTeX que el LyX ha de fer servir.\r\n\ - Si no useu LaTeX, el LyX no podrà generar documents!\r\n\ - \r\n\ + distribució LaTeX que el LyX ha de fer servir.$\r$\n\ + Si no useu LaTeX, el LyX no podrà generar documents!$\r$\n\ + $\r$\n\ L$\'instal·lador ha detectat la distribució LaTeX \ - $\"$LaTeXName$\" al sistema, al camí que es mostra avall.' + $\"$R9$\" al sistema, al camí que es mostra avall.' ${LangFileString} EnterLaTeXFolderNone 'Indiqueu el camí al fitxer $\"latex.exe$\". Posteriorment establiu \ - quina distribució LaTeX ha de fer servir el LyX.\r\n\ - Si no useu LaTeX, el LyX no podrà generar documents!\r\n\ - \r\n\ + quina distribució LaTeX ha de fer servir el LyX.$\r$\n\ + Si no useu LaTeX, el LyX no podrà generar documents!$\r$\n\ + $\r$\n\ L$\'instal·lador no ha trobat cap distribució LaTeX al sistema.' ${LangFileString} PathName 'Camí al fitxer $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "No usis LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'No s$\'ha trobat cap distribució LaTeX!$\r$\n\ No podeu usar el LyX sense cap distribució LaTeX, com ara $\"MiKTeX$\"!$\r$\n\ Es cancel·larà la instal·lació.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Ara s$\'executarà l$\'instal·lador del programa $\"JabRef$\".$\r$\n\ # Podeu usar totes les opcions predeterminades de l$\'instal·lador del JabRef.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "No es pot establir 'path_prefix' dur #${LangFileString} RunConfigureFailed "No es pot executar el programa de configuració" ${LangFileString} NotAdmin "Necessiteu drets d'administrador per instal·lar el LyX!" ${LangFileString} InstallRunning "L'instal·lador ja s'està executant!" -${LangFileString} AlreadyInstalled "El LyX ${APP_SERIES_KEY2} ja es troba instal·lat!$\r$\n\ +${LangFileString} AlreadyInstalled "El LyX ${APP_VERSION} ja es troba instal·lat!$\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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferències d$\'usuari del LyX' ${LangFileString} SecUnMiKTeXDescription "Desintal·la la distribució de LaTeX MiKTeX." #${LangFileString} SecUnJabRefDescription "Desinstal·la el gestor de bibliografia JabRef." ${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de configuració del LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ de tots els usuaris.' ${LangFileString} SecUnProgramFilesDescription "Desinstal·la el LyX i tots els seus components." diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/src/lang/czech.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/czech.nsh rename to development/Win32/packaging/installer/src/lang/czech.nsh index bc47780fa2..bf806d61b5 100644 --- a/development/Win32/packaging/installer/lang/czech.nsh +++ b/development/Win32/packaging/installer/src/lang/czech.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Tento pomocník vás provede instalací LyXu.$\r $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'Distribuce LaTeXu' ${LangFileString} EnterLaTeXHeader2 'Nastavte distribuci LaTeXu, kterou má LyX používat.' ${LangFileString} EnterLaTeXFolder 'Můžete zde volitelně nastavit cestu k souboru $\"latex.exe$\" a tím určit \ - distribuci LaTeXu, kterou bude používat Lyx.\r\n\ - Pokud nepoužijete LaTeX, LyX nemůže vysázet výsledné dokumenty!\r\n\ - \r\n\ + distribuci LaTeXu, kterou bude používat Lyx.$\r$\n\ + Pokud nepoužijete LaTeX, LyX nemůže vysázet výsledné dokumenty!$\r$\n\ + $\r$\n\ Instalátor nalezl na vašem počítači LaTeXovou distribuci \ - $\"$LaTeXName$\". Níže je uvedena její cesta.' + $\"$R9$\". Níže je uvedena její cesta.' ${LangFileString} EnterLaTeXFolderNone 'Níže nastavte cestu k souboru $\"latex.exe$\". Určíte tím, která \ - distribuce LaTeXu bude používána LyXem.\r\n\ - Pokud nepoužijete LaTeX, LyX nemůže vysázet výsledné dokumenty!\r\n\ - \r\n\ + distribuce LaTeXu bude používána LyXem.$\r$\n\ + Pokud nepoužijete LaTeX, LyX nemůže vysázet výsledné dokumenty!$\r$\n\ + $\r$\n\ Instalátor nemohl nalézt distribuci LaTeXu na vašem počítači.' ${LangFileString} PathName 'Cesta k souboru $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nepoužívat LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Žádná LaTeXová-distribuce nebyla nalezena!$\r Nemůžete používat LyX bez distribuce LaTeXu jako je např. $\"MiKTeX$\"!$\r$\n\ Instalace bude proto přerušena.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Nyní bude spuštěn instalátor programu $\"JabRef$\".$\r$\n\ # Můžete použít všechny předvolby instalátoru JabRef.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Nelze nastavit 'path_prefix' v konfi #${LangFileString} RunConfigureFailed "Nelze spustit konfigurační skript" ${LangFileString} NotAdmin "Potřebujete administrátorská práva pro nainstalování LyXu!" ${LangFileString} InstallRunning "Instalátor je již spuštěn!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} je již nainstalován!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} je již nainstalován!$\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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Uživatelská nastavení LyXu' ${LangFileString} SecUnMiKTeXDescription "Odinstalovat LaTeXovou-distribuci MiKTeX." #${LangFileString} SecUnJabRefDescription "Odinstalovat manažer bibliografie JabRef." ${LangFileString} SecUnPreferencesDescription 'Smazat konfigurační adresář LyXu$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ pro všechny uživatele.' ${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a všechny jeho komponenty." diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/src/lang/danish.nsh similarity index 92% rename from development/Win32/packaging/installer/lang/danish.nsh rename to development/Win32/packaging/installer/src/lang/danish.nsh index 7addb2475d..0ca1207df4 100644 --- a/development/Win32/packaging/installer/lang/danish.nsh +++ b/development/Win32/packaging/installer/src/lang/danish.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Denne guide vil installere LyX på din computer. $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Vælg den LaTeX-distribution som LyX skal bruge.' ${LangFileString} EnterLaTeXFolder 'Du kan her vælge stien til filen $\"latex.exe$\" og derved vælge hvilken \ - LaTeX-distribution som bruges LyX.\r\n\ - Hvis du ikke vælger LaTeX, kan LyX ikke generere dokumenter!\r\n\ - \r\n\ + LaTeX-distribution som bruges LyX.$\r$\n\ + Hvis du ikke vælger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\ + $\r$\n\ Installationsprogrammet har detekteret LaTeX-distributionen \ - $\"$LaTeXName$\" på din computer i nedenstående sti:' + $\"$R9$\" på din computer i nedenstående sti:' ${LangFileString} EnterLaTeXFolderNone 'Vælg nedenfor stien til filen $\"latex.exe$\". Herved kan du vælge hvilken \ - LaTeX-distribution LyX skal bruge.\r\n\ - Hvis du ikke vælger LaTeX, kan LyX ikke generere dokumenter!\r\n\ - \r\n\ + LaTeX-distribution LyX skal bruge.$\r$\n\ + Hvis du ikke vælger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\ + $\r$\n\ Installationsprogrammet kunne ikke finde nogen LaTeX-distribution.' ${LangFileString} PathName 'Sti til filen $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Brug ikke LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Ingen LaTeX-distribution fundet!$\r$\n\ LyX kan ikke bruges uden en LaTeX-distribution sasom $\"MiKTeX$\"!$\r$\n\ Installationen afbrydes.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Installationen af programmet $\"JabRef$\" startes.$\r$\n\ # Du kan roligt bruge alle $\"default$\" valgmuligheder ved JabRef-installationen.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Forsoget på at indstille 'path_pref #${LangFileString} RunConfigureFailed "Mislykket forsog på at afvikle konfigurations-scriptet" ${LangFileString} NotAdmin "Du skal have administrator-rettigheder for at installere LyX!" ${LangFileString} InstallRunning "Installationsprogrammet kører allerede!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} er allerede installeret!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} er allerede installeret!$\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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription 'Afinstallerer LaTeX-distributionen $\"MiKTeX$\".' #${LangFileString} SecUnJabRefDescription 'Afinstallerer bibliografi programmet $\"JabRef$\".' ${LangFileString} SecUnPreferencesDescription 'Sletter LyX$\'s konfigurations mappe$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ for alle brugere.' ${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter." diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/src/lang/dutch.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/dutch.nsh rename to development/Win32/packaging/installer/src/lang/dutch.nsh index 402bdc94f0..4fbc4066d4 100644 --- a/development/Win32/packaging/installer/lang/dutch.nsh +++ b/development/Win32/packaging/installer/src/lang/dutch.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Dit installatie programma zal LyX op uw systeem $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'LaTeX software' ${LangFileString} EnterLaTeXHeader2 'Geef aan welke LaTeX-software LyX moet gebruiken.' ${LangFileString} EnterLaTeXFolder 'U kunt hier opgeven in welke map het programma $\"latex.exe$\" zich bevindt en op deze manier bepalen \ - welke LaTeX software gebruikt wordt door LyX.\r\n\ - Zonder LaTeX kan LyX geen documenten generen!\r\n\ - \r\n\ + welke LaTeX software gebruikt wordt door LyX.$\r$\n\ + Zonder LaTeX kan LyX geen documenten generen!$\r$\n\ + $\r$\n\ Het installatie programma heeft de LaTeX software \ - $\"$LaTeXName$\" op uw systeem gevonden in de volgende map.' + $\"$R9$\" op uw systeem gevonden in de volgende map.' ${LangFileString} EnterLaTeXFolderNone 'U kunt hier opgeven in welke map het programma $\"latex.exe$\" zich bevindt en op deze manier bepalen \ - welke LaTeX software gebruikt wordt door LyX.\r\n\ - Zonder LaTeX kan LyX geen documenten generen!\r\n\ - \r\n\ + welke LaTeX software gebruikt wordt door LyX.$\r$\n\ + Zonder LaTeX kan LyX geen documenten generen!$\r$\n\ + $\r$\n\ Het installatie programma heeft geen LaTeX software op uw systeem gevonden.' ${LangFileString} PathName 'Map met het programma $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Gebruik geen LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Er is geen LaTeX software gevonden!$\r$\n\ LyX kan niet worden gebruikt zonder LaTeX software zoals $\"MiKTeX$\"!$\r$\n\ De installatie wordt daarom afgebroken.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Het installatie programma van $\"JabRef$\" wordt nu gestart.$\r$\n\ # U kunt de standaard opties gebruiken.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Mislukte poging om 'path_prefix' te #${LangFileString} RunConfigureFailed "Mislukte configuratie poging" ${LangFileString} NotAdmin "U heeft systeem-beheerrechten nodig om LyX te installeren!" ${LangFileString} InstallRunning "Het installatieprogramma is al gestart!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is reeds geinstalleerd!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} is reeds geinstalleerd!$\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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Verwijder de LaTeX software MiKTeX." #${LangFileString} SecUnJabRefDescription "Verwijder de bibliografie manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Verwijder LyX$\'s configuratie map$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ voor alle gebruikers.' ${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen." diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/src/lang/english.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/english.nsh rename to development/Win32/packaging/installer/src/lang/english.nsh index f1112110b2..a30b37d80a 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/src/lang/english.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "This wizard will guide you through the installat $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Set the LaTeX-distribution that LyX should use.' ${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ + LaTeX-distribution that should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' + $\"$R9$\" on your system. Displayed below is its path.' ${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ + LaTeX-distribution should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ The installer couldn$\'t find a LaTeX-distribution on your system.' ${LangFileString} PathName 'Path to the file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Don$\'t use LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'No LaTeX-distribution could be found!$\r$\n\ LyX cannot be used without a LaTeX-distribution like $\"MiKTeX$\"!$\r$\n\ The installation will therefore be aborted.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ # You can use all default options of the JabRef-installer.' @@ -84,13 +84,13 @@ ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used t ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script" #${LangFileString} RunConfigureFailed "Could not execute the configure script" ${LangFileString} InstallRunning "The installer is already running!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} is already installed!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} is already installed!$\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\ 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -110,9 +110,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." #${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration$\r$\n\ - (folder $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + (folder $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ for you or for all users (if you are admin).' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/src/lang/french.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/french.nsh rename to development/Win32/packaging/installer/src/lang/french.nsh index 18b8d7f414..dca103446a 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/src/lang/french.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'i $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Mise à jour de la base de données MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX ($LaTeXInstalled peut télécharger les paquetages manquants, ceci peut prendre du temps) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX ($R9 peut télécharger les paquetages manquants, ceci peut prendre du temps) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compilation des scripts Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Créer un raccourci sur le bureau" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Les dictionnaires de synonymes qui pe ${LangFileString} EnterLaTeXHeader1 'Distribution LaTeX' ${LangFileString} EnterLaTeXHeader2 'Choisir la distribution LaTeX que LyX devra utiliser.' ${LangFileString} EnterLaTeXFolder 'Éventuellement, vous pouvez fixer ici le chemin d$\'accès au fichier $\"latex.exe$\" et de ce fait fixer \ - la distribution LaTeX utilisée par Lyx.\r\n\ - Si vous n$\'utilisez pas LaTeX, LyX ne peut créer de documents !\r\n\ - \r\n\ + la distribution LaTeX utilisée par Lyx.$\r$\n\ + Si vous n$\'utilisez pas LaTeX, LyX ne peut créer de documents !$\r$\n\ + $\r$\n\ L$\'assistant d$\'installation a détecté la distribution LaTeX \ - $\"$LaTeXName$\" sur votre système. Le chemin d$\'accès est affiché ci-dessous.' + $\"$R9$\" sur votre système. Le chemin d$\'accès est affiché ci-dessous.' ${LangFileString} EnterLaTeXFolderNone 'Fixez ci-dessous le chemin d$\'accès au fichier $\"latex.exe$\". De ce fait vous fixez la \ - distribution LaTeX utilisée par Lyx.\r\n\ - Si vous n$\'utilisez pas LaTeX, LyX ne peut créer de documents !\r\n\ - \r\n\ + distribution LaTeX utilisée par Lyx.$\r$\n\ + Si vous n$\'utilisez pas LaTeX, LyX ne peut créer de documents !$\r$\n\ + $\r$\n\ L$\'assistant d$\'installation n$\'a pas pu trouver de distribution LaTeX sur votre système.' ${LangFileString} PathName 'Chemin vers le fichier $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "N'utilisez pas LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Distribution LaTeX introuvable !$\r$\n\ LyX ne peut être utilisé sans distribution LaTeX, comme par exemple $\"MiKTeX$\" !$\r$\n\ L$\'installation de LyX va donc être abandonnée.' -${LangFileString} HunspellFailed 'Le chargement du dictionnaire pour la langue $\"$R3$\" a échoué.' -${LangFileString} ThesaurusFailed 'Le chargement du dictionnaire de synonymes pour la langue $\"$R3$\" a échoué.' +${LangFileString} HunspellFailed 'Le chargement du dictionnaire pour la langue $\"$R9$\" a échoué.' +${LangFileString} ThesaurusFailed 'Le chargement du dictionnaire de synonymes pour la langue $\"$R9$\" a échoué.' #${LangFileString} JabRefInfo 'Lancement de l$\'installation de l$\'application $\"JabRef$\".$\r$\n\ # Vous pouvez utiliser les options implicites du programme d$\'installation JabRef.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "Échec de l$\'allocation 'path_prefi #${LangFileString} RunConfigureFailed "Échec de la tentative de configuration initiale de LyX." ${LangFileString} NotAdmin "Vous devez avoir les droits d$\'administration pour installer LyX !" ${LangFileString} InstallRunning "Le programme d$\'installation est toujours en cours !" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} est déjà installé !$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} est déjà installé !$\r$\n\ L'installation par dessus les installations existantes n'est pas recommandée si la version installée$\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." + Si c$\'est ce qu vous voulez, vous devez d$\'abord désinstaller LyX $R9." ${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." @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Préférences utilisateurs de LyX' ${LangFileString} SecUnMiKTeXDescription "Désinstalle la distribution LaTeX MiKTeX." #${LangFileString} SecUnJabRefDescription "Désinstalle le gestionnaire de bibliographie JabRef." ${LangFileString} SecUnPreferencesDescription 'Supprime le répertoire de configuration de LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ pour tous les utilisateurs.' ${LangFileString} SecUnProgramFilesDescription "Désinstaller LyX et tous ses composants." diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/src/lang/galician.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/galician.nsh rename to development/Win32/packaging/installer/src/lang/galician.nsh index 35a0fda41d..4499369b5b 100644 --- a/development/Win32/packaging/installer/lang/galician.nsh +++ b/development/Win32/packaging/installer/src/lang/galician.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Este asistente vai-no guiar na instalación do L $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'Distribuición de LaTeX' ${LangFileString} EnterLaTeXHeader2 'Escolha a distribución de LaTeX que vai usar o LyX.' ${LangFileString} EnterLaTeXFolder 'Opcionalmente pode especificar o camiño do ficheiro $\"latex.exe$\" e posteriormente \ - escoller a distribuición de LaTeX que vai usar o LyX.\r\n\ - Sen LaTeX o LyX non pode (pré-)imprimir os documentos!\r\n\ - \r\n\ - O instalador detectou a distribución de LaTeX $\"$LaTeXName$\"\ + escoller a distribuición de LaTeX que vai usar o LyX.$\r$\n\ + Sen LaTeX o LyX non pode (pré-)imprimir os documentos!$\r$\n\ + $\r$\n\ + O instalador detectou a distribución de LaTeX $\"$R9$\"\ no seu sistema, no camiño que se mostra abaixo.' ${LangFileString} EnterLaTeXFolderNone 'Especifique abaixo o camiño ao ficheiro $\"latex.exe$\". Posteriormente escolla \ - a distribución de LaTeX que debe usar o LyX.\r\n\ - Sem LaTeX o LyX non pode (pré-)imprimir os documentos!\r\n\ - \r\n\ + a distribución de LaTeX que debe usar o LyX.$\r$\n\ + Sem LaTeX o LyX non pode (pré-)imprimir os documentos!$\r$\n\ + $\r$\n\ O instalador non pudo achar nengunha distribución de LaTeX no seu sistema.' ${LangFileString} PathName 'Camiño ao ficheiro $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Non usar LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Non se achou nengunha distribución de LaTeX!$\r$ Non se pode usar o LyX sen unha distribución de LaTeX como a $\"MiKTeX$\"!$\r$\n\ Por iso a instalación vai ser abortada.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Agora lanzará-se o instalador do programa $\"JabRef$\".$\r$\n\ # Pode usar todas as opcións por defeito no instalador do JabRef.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Non se puido engadir o 'path_prefix' #${LangFileString} RunConfigureFailed "Non se deu executado o script de configuración" ${LangFileString} NotAdmin "Precisa de priviléxios de administrador para instalar o LyX!" ${LangFileString} InstallRunning "O instalador xa está a correr!" -${LangFileString} AlreadyInstalled "O LyX ${APP_SERIES_KEY2} xa está instalado!$\r$\n\ +${LangFileString} AlreadyInstalled "O LyX ${APP_VERSION} xa está 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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferéncias de usuário do LyX' ${LangFileString} SecUnMiKTeXDescription "Desinstala a distribución de LaTeX MiKTeX." #${LangFileString} SecUnJabRefDescription "Desinstala o xestor de referéncias bibliográficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Elimina as pastas de configuración do LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ de todos os usuários.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes." diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/src/lang/german.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/german.nsh rename to development/Win32/packaging/installer/src/lang/german.nsh index 304480d419..65f75ab392 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/src/lang/german.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Dieser Assistent wird Sie durch die Installation $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualisiere MiKTeXs Dateinamen Datenbank..." -${LangFileString} TEXT_CONFIGURE_LYX "Konfiguriere LyX ($LaTeXInstalled kann fehlende Pakte herunterladen, was etwas Zeit braucht) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfiguriere LyX ($R9 kann fehlende Pakte herunterladen, was etwas Zeit braucht) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Kompiliere Python Skripte..." ${LangFileString} TEXT_FINISH_DESKTOP "Ein Symbol auf der Arbeitsoberfläche erzeugen" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus- Wörterbucher die herunter ${LangFileString} EnterLaTeXHeader1 'LaTeX-Distribution' ${LangFileString} EnterLaTeXHeader2 'Legen Sie die LaTeX-Distribution fest die LyX verwenden soll.' ${LangFileString} EnterLaTeXFolder 'Optional können Sie hier den Pfad zur Datei $\"latex.exe$\" angeben und damit die \ - LaTeX-Distribution festlegen, die LyX verwenden soll.\r\n\ - Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!\r\n\ - \r\n\ - Der Installer hat auf Ihrem System die LaTeX-Distribution\r\n\ - $\"$LaTeXName$\" erkannt. Unten angegeben ist ihr Pfad.' + LaTeX-Distribution festlegen, die LyX verwenden soll.$\r$\n\ + Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\ + $\r$\n\ + Der Installer hat auf Ihrem System die LaTeX-Distribution$\r$\n\ + $\"$R9$\" erkannt. Unten angegeben ist ihr Pfad.' ${LangFileString} EnterLaTeXFolderNone 'Geben Sie unten den Pfad zur Datei $\"latex.exe$\" an. Damit legen Sie fest welche \ - LaTeX-Distribution LyX verwenden soll.\r\n\ - Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!\r\n\ - \r\n\ + LaTeX-Distribution LyX verwenden soll.$\r$\n\ + Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\ + $\r$\n\ Der Installer konnte auf Ihrem System keine LaTeX-Distribution finden.' ${LangFileString} PathName 'Pfad zur Datei $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Kein LaTeX benutzen" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Es konnte keine LaTeX-Distribution gefunden werde LyX kann ohne eine LaTeX-Distribution wie z.B. $\"MiKTeX$\" nicht benutzt werden!$\r$\n\ Die Installation wird daher abgebrochen.' -${LangFileString} HunspellFailed 'Herunterladen des Wörterbuchs für Sprache $\"$R3$\" fehlgeschlagen.' -${LangFileString} ThesaurusFailed 'Herunterladen des Thesaurus für Sprache $\"$R3$\" fehlgeschlagen.' +${LangFileString} HunspellFailed 'Herunterladen des Wörterbuchs für Sprache $\"$R9$\" fehlgeschlagen.' +${LangFileString} ThesaurusFailed 'Herunterladen des Thesaurus für Sprache $\"$R9$\" fehlgeschlagen.' #${LangFileString} JabRefInfo 'Als Nächstes wird der Installer des Programms $\"JabRef$\" gestartet.$\r$\n\ # Sie können alle voreingestellten Optionen des JabRef-Installers verwenden.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed 'Der $\"PATH_präfix$\" (Liste mit Pr #${LangFileString} RunConfigureFailed "Konnte das Konfigurationsskript nicht ausführen." ${LangFileString} NotAdmin "Sie benötigen Administratorrechte um LyX zu installieren!" ${LangFileString} InstallRunning "Der Installer läuft bereits!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} ist bereits installiert!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} ist bereits installiert!$\r$\n\ Das Installieren über bestehende Installationen ist nicht empfohlen, wenn die installierte Version$\r$\n\ eine Testversion ist oder wenn es Probleme mit der bestehenden LyX-Installation gibt.$\r$\n\ Besser Sie deinstallieren in diesen Fällen LyX zuerst.$\r$\n\ Wollen Sie LyX dennoch über die bestehende Version installieren?" ${LangFileString} NewerInstalled "Sie versuchen eine Vesion von LyX zu installieren, die älter als die derzeit installierte ist.$\r$\n\ - Wenn Sie das wirklich wollen, müssen Sie erst das existierende LyX $OldVersionNumber deinstallieren." + Wenn Sie das wirklich wollen, müssen Sie erst das existierende LyX $R9 deinstallieren." ${LangFileString} MultipleIndexesNotAvailable "Die Unterstützung für mehrere Indexe in einem Dokument wird nicht verfügbar sein, denn$\r$\n\ MiKTeX wurde mit Administratorrechten installiert aber Sie installieren LyX ohne diese." @@ -105,15 +105,15 @@ ${LangFileString} UnNotInRegistryLabel "Kann LyX nicht in der Registry finden.$\ Desktopsymbole und Einträge im Startmenü können nicht entfernt werden." ${LangFileString} UnInstallRunning "Sie müssen LyX zuerst beenden!" ${LangFileString} UnNotAdminLabel "Sie benötigen Administratorrechte um LyX zu deinstallieren!" -${LangFileString} UnReallyRemoveLabel "Sind Sie sicher, dass sie LyX und all seine Komponenten deinstallieren möchten?" +${LangFileString} UnReallyRemoveLabel "Sind Sie sicher, dass Sie LyX und all seine Komponenten deinstallieren möchten?" ${LangFileString} UnLyXPreferencesTitle 'LyXs Benutzereinstellungen' ${LangFileString} SecUnMiKTeXDescription "Deinstalliert die LaTeX-Distribution MiKTeX." #${LangFileString} SecUnJabRefDescription "Deinstalliert den Bibliografiemanager JabRef." ${LangFileString} SecUnPreferencesDescription 'Löscht LyXs Benutzereinstellungen$\r$\n\ - (Ordner $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + (Ordner $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ für Sie oder für alle Benutzer (wenn Sie Admin sind).' ${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten." diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/src/lang/hungarian.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/hungarian.nsh rename to development/Win32/packaging/installer/src/lang/hungarian.nsh index 5e1bc83530..5be8bbc70a 100644 --- a/development/Win32/packaging/installer/lang/hungarian.nsh +++ b/development/Win32/packaging/installer/src/lang/hungarian.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "A varázsló segítségével tudja telepíteni a $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "MiKTeX filenév adatbázis frissítése..." -${LangFileString} TEXT_CONFIGURE_LYX "LyX beállítása ($LaTeXInstalled letöltheti a hiányzó csomagokat, ez eltarthat egy ideig) ..." +${LangFileString} TEXT_CONFIGURE_LYX "LyX beállítása ($R9 letöltheti a hiányzó csomagokat, ez eltarthat egy ideig) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Python parancsfájlok fordítása..." ${LangFileString} TEXT_FINISH_DESKTOP "Indítóikon létrehozása Asztalon" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Szinoníma-szótárak, amiket letölt ${LangFileString} EnterLaTeXHeader1 'LaTeX-disztribúció' ${LangFileString} EnterLaTeXHeader2 'Adja meg a LaTeX-disztribúciót, amit a LyX-nek használnia kell.' ${LangFileString} EnterLaTeXFolder 'Itt megadhatja az elérési útvonalat a $\"latex.exe$\" fájlhoz és ezzel meg is adja \ - melyik LaTeX disztribúciót fogja használni a LyX.\r\n\ - Amennyiben nem használ LaTeX-et, a LyX nem tud kimenetet készíteni!\r\n\ - \r\n\ + melyik LaTeX disztribúciót fogja használni a LyX.$\r$\n\ + Amennyiben nem használ LaTeX-et, a LyX nem tud kimenetet készíteni!$\r$\n\ + $\r$\n\ A telepítő megtalálta az ön számítógépén a \ - $\"$LaTeXName$\" disztribúciót. Lent láthatja az elérési útvonalát.' + $\"$R9$\" disztribúciót. Lent láthatja az elérési útvonalát.' ${LangFileString} EnterLaTeXFolderNone 'Adja meg a használandó $\"latex.exe$\" fájl elérési útvonalát. Ezzel azt is megadja \ - melyik LaTeX disztribúciót fogja használni a LyX.\r\n\ - Amennyiben nem használ LaTeX-et, a LyX nem tud kimenetet készíteni!\r\n\ - \r\n\ + melyik LaTeX disztribúciót fogja használni a LyX.$\r$\n\ + Amennyiben nem használ LaTeX-et, a LyX nem tud kimenetet készíteni!$\r$\n\ + $\r$\n\ A telepítő nem talált a számítógépén LaTeX disztribúciót!' ${LangFileString} PathName 'A $\"latex.exe$\" fájl elérési útja' ${LangFileString} DontUseLaTeX "Ne használja a LaTeX-et" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Nem találtam LaTeX-disztribúciót!$\r$\n\ A LyX nem használható egy LaTeX-disztibúció nélkül,(mint például a $\"MiKTeX$\")!$\r$\n\ Ezért a telepítés nem folytatható!' -${LangFileString} HunspellFailed 'Szótár letöltése a(z) $\"$R3$\" nyelvhez sikertelen.' -${LangFileString} ThesaurusFailed 'Szinoníma szótár letöltése a(z) $\"$R3$\" nyelvhez sikertelen.' +${LangFileString} HunspellFailed 'Szótár letöltése a(z) $\"$R9$\" nyelvhez sikertelen.' +${LangFileString} ThesaurusFailed 'Szinoníma szótár letöltése a(z) $\"$R9$\" nyelvhez sikertelen.' #${LangFileString} JabRefInfo 'A $\"JabRef$\" telepítőjének elindítása következik.$\r$\n\ # Használhatja az alapértelmezett opciókat.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "Nem tudom beállítani a 'path_prefi #${LangFileString} RunConfigureFailed "Nem tudom végrehajtani a configure parancsfájlt!" ${LangFileString} NotAdmin "A LyX telepítéséhez rendszergazdai jogok szükségesek!" ${LangFileString} InstallRunning "A telepítő már fut!" -${LangFileString} AlreadyInstalled "A LyX ${APP_SERIES_KEY2} már teleptve van!$\r$\n\ +${LangFileString} AlreadyInstalled "A LyX ${APP_VERSION} már teleptve van!$\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} NewerInstalled "A jelenleg telepítettnél régebbi LyX verziót próbál telepíteni.$\r$\n\ - Ha valóban ezt akarja, először el kell távolítania a meglévő LyX $OldVersionNumber változatot." + Ha valóban ezt akarja, először el kell távolítania a meglévő LyX $R9 változatot." ${LangFileString} MultipleIndexesNotAvailable "Bizonyos listák támogatása nem lesz elérhető a dokumentumokban,\r$\n\ mert a MiKTeX rendszergazda joggal lett telepítve, azonban a LyX-et ezen jog nélkül telepíti." @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX felhasználói beállítások' ${LangFileString} SecUnMiKTeXDescription "MikTeX LaTeX-disztibúció eltávolítása." #${LangFileString} SecUnJabRefDescription "JabRef irodalomjegyzék kezelő eltávolítása." ${LangFileString} SecUnPreferencesDescription 'A LyX beállítások mappa törlése$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ minden felhasználónál.' ${LangFileString} SecUnProgramFilesDescription "A LyX és minden komponensének eltávolítása." diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/src/lang/indonesian.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/indonesian.nsh rename to development/Win32/packaging/installer/src/lang/indonesian.nsh index 8f53d79b74..89806f42ae 100644 --- a/development/Win32/packaging/installer/lang/indonesian.nsh +++ b/development/Win32/packaging/installer/src/lang/indonesian.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Program ini akan memandu anda dalam melakukan in $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Memperbarui nama basisdata MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Konfigurasi LyX ($LaTeXInstalled mungkin mengunduh paket yang diperlukan, proses perlu waktu mohon tunggu) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurasi LyX ($R9 mungkin mengunduh paket yang diperlukan, proses perlu waktu mohon tunggu) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Proses kompilasi skrip Python ..." ${LangFileString} TEXT_FINISH_DESKTOP "Membuat pintasan ikon di destop" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Kamus padanan kata yang dapat diunduh ${LangFileString} EnterLaTeXHeader1 'Distribusi LaTeX' ${LangFileString} EnterLaTeXHeader2 'Pengaturan distribusi LaTeX yang akan digunakan dalam LyX.' ${LangFileString} EnterLaTeXFolder 'Anda dapat mengatur sendiri lokasi tempat berkas $\"latex.exe$\" berada dan mengatur lokasi \ - tempat distribusi LaTeX yang akan digunakan oleh LyX.\r\n\ - Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!\r\n\ - \r\n\ + tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\ + Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\ + $\r$\n\ Program instalasi ini mendeteksi adanya distribusi LaTeX \ - $\"$LaTeXName$\" dalam sistem anda. Dibawah ini adalah lokasi keberadaannya.' + $\"$R9$\" dalam sistem anda. Dibawah ini adalah lokasi keberadaannya.' ${LangFileString} EnterLaTeXFolderNone 'Aturlah lokasi tempat berkas $\"latex.exe$\" berada. Atur dan nyatakanlah lokasi \ - tempat distribusi LaTeX yang akan digunakan oleh LyX.\r\n\ - Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!\r\n\ - \r\n\ + tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\ + Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\ + $\r$\n\ Program instalasi ini tidak menemukan adanya distribusi LaTeX di sistem anda.' ${LangFileString} PathName 'Lokasi tempat berkas $\"latex.exe$\" berada' ${LangFileString} DontUseLaTeX "Tidak menggunakan LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Distribusi LaTeX tidak ditemukan!$\r$\n\ LyX tidak bisa digunakan tanpa menggunakan salah satu distribusi LaTeX seperti $\"MiKTeX$\"!$\r$\n\ Oleh karena itu proses instalasi dibatalkan.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Sekarang instalasi program $\"JabRef$\" akan dijalankan.$\r$\n\ # Anda boleh memilih semua pilihan default yang ada di program instalasi JabRef.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 'path_prefix' #${LangFileString} RunConfigureFailed "Tidak bisa menjalankan skrip konfigurasi" ${LangFileString} NotAdmin "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!" ${LangFileString} InstallRunning "Program instalasi sedang berjalan!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} sudah pernah diinstal!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} sudah pernah diinstal!$\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} NewerInstalled "Anda akan memasang versi LyX yang lama dari yang sudah terpasang.$\r$\n\ - Jika memang dikehendaki, anda harus menghapus dulu LyX yang ada, LyX $OldVersionNumber." + Jika memang dikehendaki, anda harus menghapus dulu LyX yang ada, LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "Tidak ada dukungan menggunakan beberapa indeks dalam dokumen karena$\r$\n\ MiKTeX dipasang oleh administrator tetapi anda akan memasang LyX bukan sebagai administrator." @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferensi pengguna LyX' ${LangFileString} SecUnMiKTeXDescription "Penghapusan distribusi LaTeX MiKTeX." #${LangFileString} SecUnJabRefDescription "Penghapusan program manajemen bibliografi JabRef." ${LangFileString} SecUnPreferencesDescription 'Menghapus berkas konfigurasi LyX pada folder$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ untuk semua pengguna.' ${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada." diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/src/lang/italian.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/italian.nsh rename to development/Win32/packaging/installer/src/lang/italian.nsh index f51d1930fb..973fe78b71 100644 --- a/development/Win32/packaging/installer/lang/italian.nsh +++ b/development/Win32/packaging/installer/src/lang/italian.nsh @@ -15,7 +15,7 @@ ${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA) $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aggiornamento dei file del database MiKTeX in corso..." -${LangFileString} TEXT_CONFIGURE_LYX "Configurazione di LyX in corso ($LaTeXInstalled potrebbe installare i pacchetti mancanti, l'azione potrebbe richiedere qualche minuto) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configurazione di LyX in corso ($R9 potrebbe installare i pacchetti mancanti, l'azione potrebbe richiedere qualche minuto) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compilazione degli script Python in corso..." ${LangFileString} TEXT_FINISH_DESKTOP "Crea icona sul desktop" @@ -41,15 +41,15 @@ ${LangFileString} SecThesaurusDescription "Dizionari dei sinonimi che possono es ${LangFileString} EnterLaTeXHeader1 'Distribuzione di LaTeX' ${LangFileString} EnterLaTeXHeader2 'Scegliere la distribuzione di LaTeX che LyX dovrà usare.' ${LangFileString} EnterLaTeXFolder 'Puoi impostare qui il percorso del file $\"latex.exe$\" e impostare di conseguenza \ - la distribuzione di LaTeX che LyX dovrà usare.\r\n\ - Senza LaTeX, LyX non può generare documenti!\r\n\ - \r\n\ + la distribuzione di LaTeX che LyX dovrà usare.$\r$\n\ + Senza LaTeX, LyX non può generare documenti!$\r$\n\ + $\r$\n\ Il programma di installazione ha rilevato la distribuzione di LaTeX \ - $\"$LaTeXName$\" sul tuo sistema. Il suo percorso è riportato sotto.' + $\"$R9$\" sul tuo sistema. Il suo percorso è riportato sotto.' ${LangFileString} EnterLaTeXFolderNone 'Imposta qui sotto il percorso del file $\"latex.exe$\". Con questo imposti quale \ - distribuzione di LaTeX dovrà essere usata da LyX.\r\n\ - Senza LaTeX, LyX non può generare documenti!\r\n\ - \r\n\ + distribuzione di LaTeX dovrà essere usata da LyX.$\r$\n\ + Senza LaTeX, LyX non può generare documenti!$\r$\n\ + $\r$\n\ Il programma di installazione non ha trovato una distribuzione di LaTeX sul tuo sistema.' ${LangFileString} PathName 'Percorso del file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Non usare LaTeX" @@ -63,8 +63,8 @@ ${LangFileString} LatexError1 'Il programma non ha rilevato la presenza di alcun LyX non può funzionare senza una distribuzione LaTeX (ad es. $\"MiKTeX$\")!$\r$\n\ Il processo di installazione verrà quindi terminato.' -${LangFileString} HunspellFailed 'Lo scaricamento del dizionario per la lingua $\"$R3$\" non e$\' andato a buon fine.' -${LangFileString} ThesaurusFailed 'Lo scaricamento dei sinonimi per la lingua $\"$R3$\" non e$\' andato a buon fine.' +${LangFileString} HunspellFailed 'Lo scaricamento del dizionario per la lingua $\"$R9$\" non e$\' andato a buon fine.' +${LangFileString} ThesaurusFailed 'Lo scaricamento dei sinonimi per la lingua $\"$R9$\" non e$\' andato a buon fine.' #${LangFileString} JabRefInfo 'Verrà adesso lanciato il programma di installazione di $\"JabRef$\".$\r$\n\ # Puoi usare tutte le opzioni predefinite per il programma di installazione di JabRef.' @@ -87,13 +87,13 @@ ${LangFileString} ModifyingConfigureFailed "Fallito tentativo di aggiornare 'pat #${LangFileString} RunConfigureFailed "Fallito tentativo di eseguire lo script di configurazione" ${LangFileString} NotAdmin "Occorrono i privilegi da amministratore per installare LyX!" ${LangFileString} InstallRunning "Il programma di installazione è già in esecuzione!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} è già installato!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} è già installato!$\r$\n\ Procedere con l'installazione su quella esistente non è raccomandabile se la versione version$\r$\n\ è una release di test o se avete problemi con la vostra installazione corrente di Lyx.$\r$\n\ In questi casi è preferibile installare nuovamente LyX.$\r$\n\ Volete procedere comunque con l'installazione di LyX su quella esistente?" ${LangFileString} NewerInstalled "Si sta procedendo ad installare una versione di LyX precedente a quella in uso.$\r$\n\ - Se si vuole procedere, è necessario prima disinstallare la versione LyX $OldVersionNumber." + Se si vuole procedere, è necessario prima disinstallare la versione LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "Il supporto di più indici per documento non sarà disponibile perche'$\r$\n\ MiKTeX è stato installato con privilegi di amministratore, ma si sta procedendo a installare LyX senza questi privilegi." @@ -113,9 +113,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Impostazioni personali di LyX' ${LangFileString} SecUnMiKTeXDescription 'Rimuove la distribuzione di LaTeX $\"MiKTeX$\".' #${LangFileString} SecUnJabRefDescription "Rimuove il gestore della bibliografia JabRef." ${LangFileString} SecUnPreferencesDescription 'Elimina la cartella con la configurazione di LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ per tutti gli utenti.' ${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti." diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/src/lang/japanese.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/japanese.nsh rename to development/Win32/packaging/installer/src/lang/japanese.nsh index a72def0d19..0f37cf024f 100644 --- a/development/Win32/packaging/installer/lang/japanese.nsh +++ b/development/Win32/packaging/installer/src/lang/japanese.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "このウィザードが、あなたのLyX導入 $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "MiKTeXのファイル名データベースを更新しています..." -${LangFileString} TEXT_CONFIGURE_LYX "LyXを構成しています ($LaTeXInstalledが不足分のパッケージをダウンロードするかもしれないので、時間のかかることがあります) ..." +${LangFileString} TEXT_CONFIGURE_LYX "LyXを構成しています ($R9が不足分のパッケージをダウンロードするかもしれないので、時間のかかることがあります) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Pythonスクリプトをコンパイルしています..." ${LangFileString} TEXT_FINISH_DESKTOP "デスクトップにショートカットを作成する" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "ダウンロード及び導入が可 ${LangFileString} EnterLaTeXHeader1 'LaTeX頒布版' ${LangFileString} EnterLaTeXHeader2 'LyXが使うべきLaTeX頒布版を指定してください。' ${LangFileString} EnterLaTeXFolder 'ここでは、$\"latex.exe$\"ファイルへのパスを指定することができます。そうすることによって、\ - LyXが使用すべきLaTeX頒布版を指定することができます。\r\n\ - もしLaTeXを使わなければ、LyXは文書を出力することができません！\r\n\ - \r\n\ + LyXが使用すべきLaTeX頒布版を指定することができます。$\r$\n\ + もしLaTeXを使わなければ、LyXは文書を出力することができません！$\r$\n\ + $\r$\n\ 導入プログラムは、システム上にLaTeX頒布版として\ - $\"$LaTeXName$\"があることを検出しました。下欄にはそのパスが表示されています。' + $\"$R9$\"があることを検出しました。下欄にはそのパスが表示されています。' ${LangFileString} EnterLaTeXFolderNone '下欄で$\"latex.exe$\"ファイルへのパスを指定してください。そうすることによって、\ - LyXがどのLaTeX頒布版を使用するべきか指定することができます。\r\n\ - もしLaTeXを使わなければ、LyXは文書を出力することができません！\r\n\ - \r\n\ + LyXがどのLaTeX頒布版を使用するべきか指定することができます。$\r$\n\ + もしLaTeXを使わなければ、LyXは文書を出力することができません！$\r$\n\ + $\r$\n\ 導入プログラムは、システム上にLaTeX頒布版を見つけることができませんでした。' ${LangFileString} PathName '$\"latex.exe$\"ファイルへのパス' ${LangFileString} DontUseLaTeX "LaTeXを使用しない" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'LaTeX頒布版を発見することができま LyXは、$\"MiKTeX$\"のようなLaTeX頒布版なしでは使うことができません！$\r$\n\ したがって導入を中止します。' -${LangFileString} HunspellFailed '言語$\"$R3$\"用辞書のダウンロードに失敗しました。' -${LangFileString} ThesaurusFailed '言語$\"$R3$\"用類義語辞典のダウンロードに失敗しました。' +${LangFileString} HunspellFailed '言語$\"$R9$\"用辞書のダウンロードに失敗しました。' +${LangFileString} ThesaurusFailed '言語$\"$R9$\"用類義語辞典のダウンロードに失敗しました。' #${LangFileString} JabRefInfo 'これからプログラム$\"JabRef$\"の導入プログラムを起動します。$\r$\n\ # JabRef導入プログラムの既定オプションをすべて受け入れてかまいません。' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "configureスクリプト中で'path_ #${LangFileString} RunConfigureFailed "configureスクリプトを実行することができませんでした" ${LangFileString} NotAdmin "LyXを導入するには、管理者権限を持っていなくてはなりません！" ${LangFileString} InstallRunning "導入プログラムは既に動作中です！" -${LangFileString} AlreadyInstalled "LyX${APP_SERIES_KEY2}は既に導入済みです！$\r$\n\ +${LangFileString} AlreadyInstalled "LyX${APP_VERSION}は既に導入済みです！$\r$\n\ 導入済みのバージョンがテスト版であったり、導入済みLyXで問題がある場合には、$\r$\n\ 上書き導入作業は推奨されません。これらの場合には、LyXを最初から再導入する$\r$\n\ ことが推奨されます。$\r$\n\ これらを承知の上で、既存のLyXを上書きしますか？" ${LangFileString} NewerInstalled "あなたは、既に導入済みのLyXよりも古い版を導入しようとしています。$\r$\n\ - 本当にそうしたいのであれば、既存の LyX $OldVersionNumber をまず導入解除してください。" + 本当にそうしたいのであれば、既存の LyX $R9 をまず導入解除してください。" ${LangFileString} MultipleIndexesNotAvailable "MiKTeXが管理者権限で導入されているのに、LyXをMiKTeXなしで導入しようとしているため、$\r$\n\ 同一文書内での複数の索引の使用はサポートされません。" @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyXのユーザー設定' ${LangFileString} SecUnMiKTeXDescription "LaTeX頒布版MiKTeXの導入解除を行います。" #${LangFileString} SecUnJabRefDescription "文献管理プログラムJabRefの導入解除を行います。" ${LangFileString} SecUnPreferencesDescription 'ユーザー共通のLyXの設定フォルダ$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ を削除します。' ${LangFileString} SecUnProgramFilesDescription "LyXとすべての附属コンポーネントの導入解除を行います。" diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/src/lang/norwegian.nsh similarity index 89% rename from development/Win32/packaging/installer/lang/norwegian.nsh rename to development/Win32/packaging/installer/src/lang/norwegian.nsh index 70eff58bef..f82183c955 100644 --- a/development/Win32/packaging/installer/lang/norwegian.nsh +++ b/development/Win32/packaging/installer/src/lang/norwegian.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Denne veiviseren installerer LyX på datamaskine $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Oppdaterer MiKTeX filenavn database..." -${LangFileString} TEXT_CONFIGURE_LYX "Konfigurerer LyX ($LaTeXInstalled kan laste ned manglende pakker, så dette kan ta litt tid) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurerer LyX ($R9 kan laste ned manglende pakker, så dette kan ta litt tid) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilerer Python script..." ${LangFileString} TEXT_FINISH_DESKTOP "Lager snarveg på skrivebordet" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Synonymordbøker som kan lastes ned o ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribusjon' ${LangFileString} EnterLaTeXHeader2 'Velg LaTeX-distribusjonen LyX skal bruke.' ${LangFileString} EnterLaTeXFolder 'Dersom du vil kan du sette stien til fila $\"latex.exe$\" og slik sette\ - LaTeX-distribusjonen som LyX bruker.\r\n\ - Om du ikke bruker LaTeX får du ikke vist dokument!\r\n\ - \r\n\ + LaTeX-distribusjonen som LyX bruker.$\r$\n\ + Om du ikke bruker LaTeX får du ikke vist dokument!$\r$\n\ + $\r$\n\ Installasjonsprosessen har funne LaTeX-distribusjonen \ - $\"$LaTeXName$\" i systemet ditt. Stien står nedenfor.' + $\"$R9$\" i systemet ditt. Stien står nedenfor.' ${LangFileString} EnterLaTeXFolderNone 'Dersom du vil kan du sette stien til fila $\"latex.exe$\" og slik sette\ - LaTeX-distribusjonen som LyX bruker.\r\n\ - Om du ikke bruker LaTeX får du ikke vist dokument!\r\n\ - \r\n\ + LaTeX-distribusjonen som LyX bruker.$\r$\n\ + Om du ikke bruker LaTeX får du ikke vist dokument!$\r$\n\ + $\r$\n\ Installasjonsprosessen har ikke funne noen LaTeX-distribusjon.' ${LangFileString} PathName 'Stien til filen $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Ikke bruk LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Fant ikke noen LaTeX-distribusjon!$\r$\n\ LyX kan ikke brukes uten en LaTeX-distribusjon slik som $\"MiKTeX$\"!$\r$\n\ Derfor avbrytes installasjonen.' -${LangFileString} HunspellFailed 'Nedlastingen av ordliste for språket $\"$R3$\" feilet.' -${LangFileString} ThesaurusFailed 'Nedlastingen av synonymordliste for språket $\"$R3$\" feilet.' +${LangFileString} HunspellFailed 'Nedlastingen av ordliste for språket $\"$R9$\" feilet.' +${LangFileString} ThesaurusFailed 'Nedlastingen av synonymordliste for språket $\"$R9$\" feilet.' #${LangFileString} JabRefInfo 'Nå vil installasjonen av programmet $\"JabRef$\" starte.$\r$\n\ # Du kan bruke alle de vanlige opsjonene i JabRef installasjonen.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "Forsøket på å stille inn 'path_pr #${LangFileString} RunConfigureFailed "Fikk ikke kjørt konfigurasjonsscriptet" ${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\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} er allerede installert!$\r$\n\ 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." + Dersom du ønsker dette må du avinstallere LyX $R9 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." @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX sine bruker innstillinger' ${LangFileString} SecUnMiKTeXDescription "Avinstallerer LaTeX-distribusjonen MiKTeX." #${LangFileString} SecUnJabRefDescription "Avinstallerer bibliografiprogrammet JabRef." ${LangFileString} SecUnPreferencesDescription 'Sletter LyX sine konfigurasjonsmapper$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ for alle brukere.' ${LangFileString} SecUnProgramFilesDescription "Avinstallerer LyX og alle delkomponenter." diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/src/lang/polish.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/polish.nsh rename to development/Win32/packaging/installer/src/lang/polish.nsh index 00894fcceb..0e529589da 100644 --- a/development/Win32/packaging/installer/lang/polish.nsh +++ b/development/Win32/packaging/installer/src/lang/polish.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Kreator przeprowadzi Ciebie przez proces instala $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualizacja bazy danych nazw plików MikTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Konfigurowanie LyX ($LaTeXInstalled może pobrać brakujące pakiety, co może zająć trochę czasu)..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurowanie LyX ($R9 może pobrać brakujące pakiety, co może zająć trochę czasu)..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilowanie skryptów Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Utwórz skrót na pulpicie" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Słowniki tezaurusa, które mogą zos ${LangFileString} EnterLaTeXHeader1 'Dystrybucja LaTeX' ${LangFileString} EnterLaTeXHeader2 'Wybierz dystrybucję LaTeX, którą chcesz używać z LyX.' ${LangFileString} EnterLaTeXFolder 'Możesz opcjonalnie określić ścieżkę do pliku $\"latex.exe$\" i w związku z tym ustawić, \ - która dystrybucja LaTeX ma być używana przez LyX.\r\n\ - Jeżeli nie użyjesz LaTeX, LyX będzie niezdolny do wyprodukowania dokumentów!\r\n\ - \r\n\ + która dystrybucja LaTeX ma być używana przez LyX.$\r$\n\ + Jeżeli nie użyjesz LaTeX, LyX będzie niezdolny do wyprodukowania dokumentów!$\r$\n\ + $\r$\n\ Instalator wykrył dystrybucję LaTeX \ - $\"$LaTeXName$\" w twoim systemie. Poniżej wyświetlono jego ścieżkę.' + $\"$R9$\" w twoim systemie. Poniżej wyświetlono jego ścieżkę.' ${LangFileString} EnterLaTeXFolderNone 'Poniżej podaj ścieżkę do pliku $\"latex.exe$\". W związku z tym od Ciebie \ - zależy, która dystrybucja LaTeX zostanie użyta przez LyX.\r\n\ - Jeżeli nie użyjesz LaTeX, LyX będzie niezdolny do wyprodukowania dokumentów!\r\n\ - \r\n\ + zależy, która dystrybucja LaTeX zostanie użyta przez LyX.$\r$\n\ + Jeżeli nie użyjesz LaTeX, LyX będzie niezdolny do wyprodukowania dokumentów!$\r$\n\ + $\r$\n\ Instalator nie może odnaleźć dystrybucji LaTeX w twoim systemie.' ${LangFileString} PathName 'Ścieżka do pliku $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nie używaj LaTeX-a" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Nie znaleziono dystrybucji LaTeX$\'a!$\r$\n\ LyX nie może być użyty bez dystrybucji LaTeX-a takiej jak $\"MiKTeX$\"!$\r$\n\ Z tego powodu instalacja zostanie przerwana.' -${LangFileString} HunspellFailed 'Pobranie słownika dla języka $\"$R3$\" nie powiodło się.' -${LangFileString} ThesaurusFailed 'Pobranie tezaurusa dla języka $\"$R3$\" nie powiodło się.' +${LangFileString} HunspellFailed 'Pobranie słownika dla języka $\"$R9$\" nie powiodło się.' +${LangFileString} ThesaurusFailed 'Pobranie tezaurusa dla języka $\"$R9$\" nie powiodło się.' #${LangFileString} JabRefInfo 'Teraz zostanie uruchomiony instalator aplikacji $\"JabRef$\".$\r$\n\ # Możesz użyć wszystkich domyślnych opcji instalatora JabRef.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Nieudana próba ustawienia zmiennej #${LangFileString} RunConfigureFailed "Niedana próba wykonania skryptu konfiguracyjnego" ${LangFileString} NotAdmin "Musisz mieć prawa administratora aby zainstalować LyX$\'a!" ${LangFileString} InstallRunning "Instalator jest już uruchomiony!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} jest już zainstalowany!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} jest już zainstalowany!$\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} NewerInstalled "Próbujesz zainstalować starszą wersję LyX, niż ta która jest już zainstalowana.$\r$\n\ - Jeżeli naprawdę chcesz tego dokonać, musisz wpierw odinstalować LyX $OldVersionNumber." + Jeżeli naprawdę chcesz tego dokonać, musisz wpierw odinstalować LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "Wsparcie dla używania wielu indeksów w dokumencie nie będzie dostępne, ponieważ$\r$\n\ MiKTeX został zainstalowany z uprawnieniami administratora, natomiast instalujesz LyX bez nich." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferencje użytkownika LyX$\'a' ${LangFileString} SecUnMiKTeXDescription "Deinstalacja MikTeX, dystrybucji LaTeX." #${LangFileString} SecUnJabRefDescription "Deinstalacja zarządcy bibliografii JabRef." ${LangFileString} SecUnPreferencesDescription 'Usuwa folder konfiguracji LyX$\'a$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ wszystkim użytkownikom.' ${LangFileString} SecUnProgramFilesDescription "Deinstalacja LyX i wszystkich jego komponentów." diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/src/lang/portuguese.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/portuguese.nsh rename to development/Win32/packaging/installer/src/lang/portuguese.nsh index e01e4874bc..ca2951acdf 100644 --- a/development/Win32/packaging/installer/lang/portuguese.nsh +++ b/development/Win32/packaging/installer/src/lang/portuguese.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Este assistente de instalação irá guiá-lo at $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Atualizar a base de dados de ficheiros do MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Configurando o LyX ($LaTeXInstalled pode descarregar pacotes em falta, isto pode demorar algum tempo) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configurando o LyX ($R9 pode descarregar pacotes em falta, isto pode demorar algum tempo) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando os scripts de Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Criar um atalho no ambiente de trabalho" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Dicionários de sinónimos (Tesauro) ${LangFileString} EnterLaTeXHeader1 'Distribuição de LaTeX' ${LangFileString} EnterLaTeXHeader2 'Escolher a distribuição de LaTeX que o LyX deverá usar.' ${LangFileString} EnterLaTeXFolder 'Opcionalmente pode especificar o caminho do ficheiro $\"latex.exe$\" e posteriormente \ - escolher a distribuição de LaTeX que vai usar o LyX.\r\n\ - Sem LaTeX o LyX não pode (pré-)imprimir os documentos!\r\n\ - \r\n\ - O instalador detectou a distribuição de LaTeX $\"$LaTeXName$\"\ + escolher a distribuição de LaTeX que vai usar o LyX.$\r$\n\ + Sem LaTeX o LyX não pode (pré-)imprimir os documentos!$\r$\n\ + $\r$\n\ + O instalador detectou a distribuição de LaTeX $\"$R9$\"\ no seu sistema, no caminho que se mostra abaixo.' ${LangFileString} EnterLaTeXFolderNone 'Especifique abaixo o caminho ao ficheiro $\"latex.exe$\". Posteriormente escolha \ - a distribuição de LaTeX que deve usar o LyX.\r\n\ - Sem LaTeX o LyX não pode (pré-)imprimir os documentos!\r\n\ - \r\n\ + a distribuição de LaTeX que deve usar o LyX.$\r$\n\ + Sem LaTeX o LyX não pode (pré-)imprimir os documentos!$\r$\n\ + $\r$\n\ O instalador não pudo achar nenhuma distribuição de LaTeX no seu sistema.' ${LangFileString} PathName 'Caminho ao ficheiro $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Não usar LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Não foi encontrada nenhuma distribuição de LaT O LyX não pode ser usado sem uma distribuição de LaTeX como o $\"MiKTeX$\"!$\r$\n\ A instalação será por isso abortada.' -${LangFileString} HunspellFailed 'Falha ao descarregar o dicionário para o idioma $\"$R3$\".' -${LangFileString} ThesaurusFailed 'Falha ao descarregar o dicionário de sinónimos (thesaurus) para o idioma $\"$R3$\".' +${LangFileString} HunspellFailed 'Falha ao descarregar o dicionário para o idioma $\"$R9$\".' +${LangFileString} ThesaurusFailed 'Falha ao descarregar o dicionário de sinónimos (thesaurus) para o idioma $\"$R9$\".' #${LangFileString} JabRefInfo 'Agora lançar-se-á o instalador do programa $\"JabRef$\".$\r$\n\ # Pode usar todas as opções por defeito no instalador do JabRef.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Não conseguimos establecer o 'path_ #${LangFileString} RunConfigureFailed "Não foi possível executar o script de configuração" ${LangFileString} NotAdmin "Precisa de privilégios de administrador para instalar o LyX!" ${LangFileString} InstallRunning "O instalador já está a correr!" -${LangFileString} AlreadyInstalled "O LyX ${APP_SERIES_KEY2} já está instalado!$\r$\n\ +${LangFileString} AlreadyInstalled "O LyX ${APP_VERSION} já está instalado!$\r$\n\ Não é recomendado instalar sobre uma instalação já existente se a versão instalada$\r$\n\ é uma versão de teste ou se tiver problemas com a instalação atual.$\r$\n\ Nestes casos é melhor reinstalar o LyX$\r$\n\ Quer continuar na mesma a instalar o LyX sobre a versão existente?" ${LangFileString} NewerInstalled "Está a tentar instalar uma versão mais antiga do que a que tem instalada.$\r$\n\ - Se realmente quer fazer isto deve antes desinstalar o LyX $OldVersionNumber." + Se realmente quer fazer isto deve antes desinstalar o LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "O suporte para usar vários indíces num documento não está disponível porque$\r$\n\ o MiKTeX foi instalado com privilégios de administrador mas está a instalar o LyX sem eles." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferências de utilizador do LyX' ${LangFileString} SecUnMiKTeXDescription "Desinstala a distribuição de LaTeX MiKTeX." #${LangFileString} SecUnJabRefDescription "Desinstala o gestor de referências bibliográficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Apaga as pastas de configuração do LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ de todos os utilizadores.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes." diff --git a/development/Win32/packaging/installer/lang/portugueseBR.nsh b/development/Win32/packaging/installer/src/lang/portugueseBR.nsh similarity index 92% rename from development/Win32/packaging/installer/lang/portugueseBR.nsh rename to development/Win32/packaging/installer/src/lang/portugueseBR.nsh index 8ecf95e49b..23d83a978b 100644 --- a/development/Win32/packaging/installer/lang/portugueseBR.nsh +++ b/development/Win32/packaging/installer/src/lang/portugueseBR.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Este assistente guiará você durante a instala $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Atualizando a base de dados de nomes de arquivo do MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Configurando o LyX (talvez o $LaTeXInstalled precise baixar pacotes, isto pode demorar algum tempo) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configurando o LyX (talvez o $R9 precise baixar pacotes, isto pode demorar algum tempo) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando scripts Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Criar atalho na área de trabalho" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Dicionários de sinônimos que podem ${LangFileString} EnterLaTeXHeader1 'Distribuição LaTeX' ${LangFileString} EnterLaTeXHeader2 'Escolha que distribuição LaTeX o LyX deverá usar.' ${LangFileString} EnterLaTeXFolder 'Você pode também optar por configurar aqui o caminho para o arquivo $\"latex.exe$\" e assim escolher \ - a distribuição LaTeX que o LyX deverá usar.\r\n\ - Sem uma distribuição LaTeX, o LyX não poderá gerar documentos de saída!\r\n\ - \r\n\ + a distribuição LaTeX que o LyX deverá usar.$\r$\n\ + Sem uma distribuição LaTeX, o LyX não poderá gerar documentos de saída!$\r$\n\ + $\r$\n\ O instalador detectou a distribuição LaTeX\ - $\"$LaTeXName$\" no seu sistema, cujo caminho é exibido abaixo.' + $\"$R9$\" no seu sistema, cujo caminho é exibido abaixo.' ${LangFileString} EnterLaTeXFolderNone 'Configure abaixo o caminho para o arquivo $\"latex.exe$\". Ao fazê-lo, \ - você escolhe a distribuição LaTeX que o LyX deverá usar.\r\n\ - Sem uma distribuição LaTeX, o LyX não poderá gerar documentos de saída!\r\n\ - \r\n\ + você escolhe a distribuição LaTeX que o LyX deverá usar.$\r$\n\ + Sem uma distribuição LaTeX, o LyX não poderá gerar documentos de saída!$\r$\n\ + $\r$\n\ O instalador não conseguiu encontrar uma distribuição LaTeX no seu sistema.' ${LangFileString} PathName 'Caminho para o arquivo $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Não usar LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Nenhuma distribuição LaTeX foi encontrada!$\r$\ Sem uma distribuição LaTeX como o $\"MiKTeX$\", o LyX não pode ser usado!$\r$\n\ Por isso, a instalação será abortada.' -${LangFileString} HunspellFailed 'Ocorreu uma falha ao baixar o dicionário ortográfico do idioma $\"$R3$\".' -${LangFileString} ThesaurusFailed 'Ocorreu uma falha ao baixar o dicionário de sinônimos do idioma $\"$R3$\".' +${LangFileString} HunspellFailed 'Ocorreu uma falha ao baixar o dicionário ortográfico do idioma $\"$R9$\".' +${LangFileString} ThesaurusFailed 'Ocorreu uma falha ao baixar o dicionário de sinônimos do idioma $\"$R9$\".' #${LangFileString} JabRefInfo 'Agora o instalador do programa $\"JabRef$\" será executado.$\r$\n\ # Você pode deixar todas as opções do instalador do JabRef em seus valores predefinidos.' @@ -84,13 +84,13 @@ ${LangFileString} MiKTeXInfo 'A distribuição LaTeX $\"MiKTeX$\" será usada pe ${LangFileString} ModifyingConfigureFailed "Não foi possível definir 'path_prefix' no script de configuração" #${LangFileString} RunConfigureFailed "Não foi possível executar o script de configuração" ${LangFileString} InstallRunning "O instalador já está em execução!" -${LangFileString} AlreadyInstalled "O LyX ${APP_SERIES_KEY2} já está instalado!$\r$\n\ +${LangFileString} AlreadyInstalled "O LyX ${APP_VERSION} já está instalado!$\r$\n\ Não é recomendado instalar sobre uma instalação existente se a versão já instalada$\r$\n\ for uma versão de teste ou se houver algum problema com a instalação existente do LyX.$\r$\n\ Nesses casos é melhor reinstalar o LyX.$\r$\n\ Deseja instalar sobre a versão existente mesmo assim?" ${LangFileString} NewerInstalled "A versão que você está tentando instalar é mais antiga que aquela que já está instalada.$\r$\n\ - Se isso for realmente o que deseja, primeiro desinstale o LyX $OldVersionNumber." + Se isso for realmente o que deseja, primeiro desinstale o LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "O suporte a documentos com múltiplos índices não estará disponível porque$\r$\n\ o MiKTeX foi instalado com privilégios de administrador mas você está instalando o LyX sem esses privilégios." @@ -113,9 +113,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferências de usuário do LyX' ${LangFileString} SecUnMiKTeXDescription "Desinstala a distribuição LaTeX MiKTeX." #${LangFileString} SecUnJabRefDescription "Desinstala o gerenciador de referências bibliográficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Exclui a configuração do LyX$\r$\n\ - (pasta $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + (pasta $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\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." diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/src/lang/romanian.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/romanian.nsh rename to development/Win32/packaging/installer/src/lang/romanian.nsh index d9de6c438c..6cfd71e867 100644 --- a/development/Win32/packaging/installer/lang/romanian.nsh +++ b/development/Win32/packaging/installer/src/lang/romanian.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Acest asistent vă va ghida în procesul de inst $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'Distribuţia LaTeX' ${LangFileString} EnterLaTeXHeader2 'Setează distribuţia LaTeX pe care să o folosească LyX.' ${LangFileString} EnterLaTeXFolder 'Opţional puteţi seta calea către fişierul $\"latex.exe$\" şi, implicit, seta distribuţia \ - LaTeX pe care să o folosească LyX.\r\n\ - Dacă nu folosiţi LaTeX, LyX nu va putea să producă fişiere!\r\n\ - \r\n\ + LaTeX pe care să o folosească LyX.$\r$\n\ + Dacă nu folosiţi LaTeX, LyX nu va putea să producă fişiere!$\r$\n\ + $\r$\n\ Programul de instalare a detectat distribuţia LaTeX \ - $\"$LaTeXName$\" instalată pe calculatorul dumneavoastră. Dedesupt este afişată calea acestei distribuţii.' + $\"$R9$\" instalată pe calculatorul dumneavoastră. Dedesupt este afişată calea acestei distribuţii.' ${LangFileString} EnterLaTeXFolderNone 'Setaţi calea către fişierul $\"latex.exe$\" şi, implicit, seta distribuţia \ - LaTeX pe care să o folosească LyX.\r\n\ - Dacă nu folosiţi LaTeX, LyX nu va putea să producă fişiere!\r\n\ - \r\n\ + LaTeX pe care să o folosească LyX.$\r$\n\ + Dacă nu folosiţi LaTeX, LyX nu va putea să producă fişiere!$\r$\n\ + $\r$\n\ Programul de instalare nu a detectat nici o distribuţia LaTeX instalată pe calculatorul dumneavoastră.' ${LangFileString} PathName 'Calea către fişierul $\"latex.exe$\"' @@ -56,8 +56,8 @@ ${LangFileString} LatexError1 'Nu am detectat nici o distribuţia LaTeX instalat LyX nu poate fi folosit fără o distribuţia LaTeX ca $\"MiKTeX$\"!$\r$\n\ Instalarea va fi abandonată.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Acum va fi lansat programul de instalare al aplicaţiei $\"JabRef$\".$\r$\n\ # Este indicat să folosiţi setările implicite ale programului de instalat JabRef.' @@ -80,13 +80,13 @@ ${LangFileString} ModifyingConfigureFailed "Nu am putut seta 'path_prefix' în p #${LangFileString} RunConfigureFailed "Nu am putut executa scriptul de configurare" ${LangFileString} NotAdmin "Trebuie să aveţi drepturi de administrator pentru instalarea programului LyX!" ${LangFileString} InstallRunning "Programul de instalare este deja pornit!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} este deja instalat!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} este deja instalat!$\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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -106,9 +106,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferinţele utilizatorului pentru LyX ${LangFileString} SecUnMiKTeXDescription 'Dezinstalează Distribuţia LaTeX $\"MiKTeX$\".' #${LangFileString} SecUnJabRefDescription "Dezinstalează gestionarul de bibliografie JabRef." ${LangFileString} SecUnPreferencesDescription 'Şterge directorul cu setările LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ pentru toţi utilizatorii.' ${LangFileString} SecUnProgramFilesDescription "Dezinstalaţi programul LyX şi toate componentele lui." diff --git a/development/Win32/packaging/installer/lang/russian.nsh b/development/Win32/packaging/installer/src/lang/russian.nsh similarity index 92% rename from development/Win32/packaging/installer/lang/russian.nsh rename to development/Win32/packaging/installer/src/lang/russian.nsh index c723082afd..741d0075dd 100644 --- a/development/Win32/packaging/installer/lang/russian.nsh +++ b/development/Win32/packaging/installer/src/lang/russian.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Этот мастер проведет вас ч $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Обновление базы имен файлов MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Конфигурирование LyX ($LaTeXInstalled может скачать недостающие пакеты, это может занять некоторое время) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Конфигурирование LyX ($R9 может скачать недостающие пакеты, это может занять некоторое время) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Компиляция скриптов Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Создать ярлык на рабочем столе" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Словари тезауруса, к ${LangFileString} EnterLaTeXHeader1 'Дистрибутив LaTeX' ${LangFileString} EnterLaTeXHeader2 'Укажите дистрибутив LaTeX, который будет использоваться LyX.' ${LangFileString} EnterLaTeXFolder 'При необходимости здесь можно задать путь к файлу $\"latex.exe$\" и тем самым \ - указать используемый дистрибутив LaTeX.\r\n\ - Если вы не используете LaTeX, то LyX не сможет выводить документы!\r\n\ - \r\n\ + указать используемый дистрибутив LaTeX.$\r$\n\ + Если вы не используете LaTeX, то LyX не сможет выводить документы!$\r$\n\ + $\r$\n\ Установщик обнаружил дистрибутив LaTeX \ - $\"$LaTeXName$\" в вашей системе. Ниже показан его путь.' + $\"$R9$\" в вашей системе. Ниже показан его путь.' ${LangFileString} EnterLaTeXFolderNone 'Задайте ниже путь к файлу $\"latex.exe$\". Этим вы укажете, какой \ - дистрибутив LaTeX будет использоваться LyX.\r\n\ - Если вы не используете LaTeX, то LyX не сможет выводить документы!\r\n\ - \r\n\ + дистрибутив LaTeX будет использоваться LyX.$\r$\n\ + Если вы не используете LaTeX, то LyX не сможет выводить документы!$\r$\n\ + $\r$\n\ Установщику не удалось найти дистрибутив LaTeX в вашей системе.' ${LangFileString} PathName 'Путь к файлу $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Не использовать LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Дистрибутив LaTeX не найден!$\ LyX не может быть использован без дистрибутива LaTeX, такого как $\"MiKTeX$\"!$\r$\n\ Поэтому установка будет прервана.' -${LangFileString} HunspellFailed 'Не удалось загрузить словарь для языка $\"$R3$\".' -${LangFileString} ThesaurusFailed 'Не удалось загрузить тезаурус для языка $\"$R3$\".' +${LangFileString} HunspellFailed 'Не удалось загрузить словарь для языка $\"$R9$\".' +${LangFileString} ThesaurusFailed 'Не удалось загрузить тезаурус для языка $\"$R9$\".' #${LangFileString} JabRefInfo 'Теперь будет запущен установщик программы $\"JabRef$\".$\r$\n\ # Вы можете использовать все параметры по умолчанию установщика JabRef.' @@ -84,13 +84,13 @@ ${LangFileString} MiKTeXInfo 'Дистрибутив LaTeX $\"MiKTeX$\" буде ${LangFileString} ModifyingConfigureFailed "Не удалось установить 'path_prefix' в сценарии настройки" #${LangFileString} RunConfigureFailed "Не удалось выполнить сценарий настройки" ${LangFileString} InstallRunning "Установщик уже запущен!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} уже установлен!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} уже установлен!$\r$\n\ Установка поверх существующих установок не рекомендуется, если установленная версия$\r$\n\ является тестовым выпуском или у вас возникли проблемы с существующей установкой LyX.$\r$\n\ В этих случаях лучше переустановить LyX.$\r$\n\ Вы все равно хотите установить LyX поверх существующей версии?" ${LangFileString} NewerInstalled "Вы пытаетесь установить более старую версию LyX, чем уже установленная.$\r$\n\ - Если вы действительно хотите этого, то сначала необходимо удалить существующий LyX $OldVersionNumber." + Если вы действительно хотите этого, то сначала необходимо удалить существующий LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "Поддержка использования нескольких индексов в документе будет недоступна, поскольку$\r$\n\ MiKTeX был установлен с правами администратора, а LyX вы устанавливаете без них." @@ -110,9 +110,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Пользовательские нас ${LangFileString} SecUnMiKTeXDescription "Удалить дистрибутив MiKTeX." #${LangFileString} SecUnJabRefDescription "Удалить менеджер библиографических ссылок JabRef." ${LangFileString} SecUnPreferencesDescription 'Удалить настройки LyX$\r$\n\ - (каталог $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + (каталог $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ для вас или для всех пользователей (если вы администратор).' ${LangFileString} SecUnProgramFilesDescription "Удалить LyX и все его компоненты." diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/src/lang/slovak.nsh similarity index 91% rename from development/Win32/packaging/installer/lang/slovak.nsh rename to development/Win32/packaging/installer/src/lang/slovak.nsh index de1c6bebda..c08d7db16a 100644 --- a/development/Win32/packaging/installer/lang/slovak.nsh +++ b/development/Win32/packaging/installer/src/lang/slovak.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Tento sprievodca Vám pomáha inštalovať LyX.$ $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualizácia MiKTeX-databázy súborových mien..." -${LangFileString} TEXT_CONFIGURE_LYX "Konfigurácia LyXu ($LaTeXInstalled môže načítať chýbajúce balíky, to môže trochu trvať) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurácia LyXu ($R9 môže načítať chýbajúce balíky, to môže trochu trvať) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilácia Python skriptov..." ${LangFileString} TEXT_FINISH_DESKTOP "Vytvoriť skratku pre pracovnú plochu" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Slovníky tezaura ktoré možno nač ${LangFileString} EnterLaTeXHeader1 'LaTeX distribúcia' ${LangFileString} EnterLaTeXHeader2 'Určite LaTeX distribúciu, ktorú má LyX používať.' ${LangFileString} EnterLaTeXFolder 'Tu môžte nastaviť cestu k $\"latex.exe$\" a tým nastaviť \ - LaTeX-distribúciu, ktorá by mala byť používaná LyXom.\r\n\ - Bez LaTeXu, LyX nedokáže produkovať dokumenty!\r\n\ - \r\n\ + 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 objavil LaTeX-distribúciu \ - $\"$LaTeXName$\" na vašom systéme. Dolu je zobrazená jeho cesta.' + $\"$R9$\" 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\ - Bez LaTeXu LyX nedokáže produkovať dokumenty!\r\n\ - \r\n\ + LaTeX-distribúcia má byť používaná LyXom.$\r$\n\ + Bez LaTeXu LyX nedokáže produkovať dokumenty!$\r$\n\ + $\r$\n\ Inštalatér nemohol nájsť LaTeX-distribúciu na vašom systéme.' ${LangFileString} PathName 'Cesta na súbor $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nepoužiť LaTeX" @@ -62,8 +62,8 @@ ${LangFileString} LatexError1 'Nenašla sa žiadna LaTeX-distribúcia!$\r$\n\ LyX sa nemôže užívať bez LaTeX distribúcie ako napríklad $\"MiKTeX$\"!$\r$\n\ Inštalácia sa preto zrušuje.' -${LangFileString} HunspellFailed 'Načítanie slovníka pre jazyk $\"$R3$\" zlyhalo.' -${LangFileString} ThesaurusFailed 'Načítanie tezaura pre jazyk $\"$R3$\" zlyhalo.' +${LangFileString} HunspellFailed 'Načítanie slovníka pre jazyk $\"$R9$\" zlyhalo.' +${LangFileString} ThesaurusFailed 'Načítanie tezaura pre jazyk $\"$R9$\" zlyhalo.' #${LangFileString} JabRefInfo 'Teraz sa štartuje inštalatér programu $\"JabRef$\".$\r$\n\ # Môžte použiť všetky štandardné možnosti inštalatéra JabRef.' @@ -86,13 +86,13 @@ ${LangFileString} ModifyingConfigureFailed "Nedal sa nastaviť 'path_prefix' v k #${LangFileString} RunConfigureFailed "Nedal sa spustiť konfiguračný skript" ${LangFileString} NotAdmin "Pre inštaláciu LyXu potrebujete administrátorské práva!" ${LangFileString} InstallRunning "Inštalačný program už beží!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} je už inštalovaný!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} je už inštalovaný!$\r$\n\ Inštalovať ponad existujúce inštalácie sa nedoporučuje keď inštalovaná verzia$\r$\n\ je testovné vydanie alebo keď máte problémy s existujúcou inštaláciou.$\r$\n\ V takýchto prípadoch je lepšie reinštalovať LyX.$\r$\n\ Napriek tomu chcete inštalovať LyX ponad existujúcu verziu?" ${LangFileString} NewerInstalled "Pokúšate sa inštalovať verziu LyXu ktorá je staršia ako tá ktorá je inštalovaná.$\r$\n\ - Keď to naozaj chcete, odinštalujte najprv existujúci LyX $OldVersionNumber." + Keď to naozaj chcete, odinštalujte najprv existujúci LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "Podpora používania viacerých indexov v dokumente nebude dostupná, lebo\r$\n\ MiKTeX bol inštalovaný pod administrátorskými právami a vy inštalujete LyX bez nich." @@ -112,9 +112,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyXove užívateľské nastavenia' ${LangFileString} SecUnMiKTeXDescription "Odinštaluje LaTeX-distribúciu MiKTeX." #${LangFileString} SecUnJabRefDescription "Odinštaluje manažéra bibliografie JabRef." ${LangFileString} SecUnPreferencesDescription 'Odstráni konfiguračný adresár LyXu $\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\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." diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/src/lang/spanish.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/spanish.nsh rename to development/Win32/packaging/installer/src/lang/spanish.nsh index 5ee0998c28..6f2828ce38 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/src/lang/spanish.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "Este programa instalará LyX en su ordenador.$\r $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Actualizando la base de datos de nombre de archivo MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Configurando LyX ($LaTeXInstalled podría descargar paquetes faltantes, lo que puede tardar un tiempo) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configurando LyX ($R9 podría descargar paquetes faltantes, lo que puede tardar un tiempo) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando guiones Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Crear acceso directo en el escritorio" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Diccionarios de sinónimos que se pue ${LangFileString} EnterLaTeXHeader1 'Distribución LaTeX' ${LangFileString} EnterLaTeXHeader2 'Elija la distribución de LaTeX que debería emplear LyX.' ${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$\" \ + 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 $\"$R9$\" \ 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\ + 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 no pudo encontrar ninguna distribución LaTeX en su sistema.' ${LangFileString} PathName 'Ruta al fichero $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "No usar LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 '¡No se ha encontrado ninguna distribución de La ¡LyX no funciona sin una distribución de LaTeX como $\"MiKTeX$\"!$\r$\n\ Por lo tanto la instalación se abortará.' -${LangFileString} HunspellFailed 'La descarga del diccionario para el idioma $\"$R3$\" ha fallado.' -${LangFileString} ThesaurusFailed 'La descarga del diccionario de sinónimos para el idioma $\"$R3$\" ha fallado.' +${LangFileString} HunspellFailed 'La descarga del diccionario para el idioma $\"$R9$\" ha fallado.' +${LangFileString} ThesaurusFailed 'La descarga del diccionario de sinónimos para el idioma $\"$R9$\" ha fallado.' #${LangFileString} JabRefInfo 'Ahora se lanzará el instalador del programa $\"JabRef$\".$\r$\n\ # Puede utilizar todas las opciones por omisión del instalador de JabRef.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "Error al intentar añadir 'path_pref #${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 está siendo ejecutado!" -${LangFileString} AlreadyInstalled "¡LyX ${APP_SERIES_KEY2} ya está instalado!$\r$\n\ +${LangFileString} AlreadyInstalled "¡LyX ${APP_VERSION} 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." + Si realmente lo desea, debe desinstalar antes la versión de LyX instalada $R9." ${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." @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferencias de usuario de LyX' ${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\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ de todos los usuarios.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes." diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/src/lang/swedish.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/swedish.nsh rename to development/Win32/packaging/installer/src/lang/swedish.nsh index 4e4a5baae5..717db44329 100644 --- a/development/Win32/packaging/installer/lang/swedish.nsh +++ b/development/Win32/packaging/installer/src/lang/swedish.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Denna guide tar dig igenom installationen av $(^ $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Uppdaterar MiKTeX filnamnsdatabas..." -${LangFileString} TEXT_CONFIGURE_LYX "Konfigurerar LyX ($LaTeXInstalled kanske laddar ned paket som saknas, detta kan ta lite tid) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurerar LyX ($R9 kanske laddar ned paket som saknas, detta kan ta lite tid) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilerar Pythonskript..." ${LangFileString} TEXT_FINISH_DESKTOP "Skapa skrivbordsgenväg" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Synonymordböcker som kan laddas ned ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Ställ in LaTeX-distributionen som LyX skall använda.' ${LangFileString} EnterLaTeXFolder 'Alternativt kan du ställa in sökvägen till filen $\"latex.exe$\" här och därmed bestämma vilken \ - LaTeX-distribution som skall användas av LyX.\r\n\ - Om du inte använder LaTeX kan LyX inte mata ut dokument!\r\n\ - \r\n\ + LaTeX-distribution som skall användas av LyX.$\r$\n\ + Om du inte använder LaTeX kan LyX inte mata ut dokument!$\r$\n\ + $\r$\n\ Installationsprogrammet har upptäckt LaTeX-distributionen \ - $\"$LaTeXName$\" i ditt system. Nedan visas dess sökväg.' + $\"$R9$\" i ditt system. Nedan visas dess sökväg.' ${LangFileString} EnterLaTeXFolderNone 'Sätt sökvägen till filen $\"latex.exe$\". Därmed väljer du vilken \ - LaTeX-distribution som skall användas av LyX.\r\n\ - Om du inte använder LaTeX kan LyX inte mata ut dokument!\r\n\ - \r\n\ + LaTeX-distribution som skall användas av LyX.$\r$\n\ + Om du inte använder LaTeX kan LyX inte mata ut dokument!$\r$\n\ + $\r$\n\ Installationsprogrammet kunde inte hitta LaTeX-distributionen i ditt system.' ${LangFileString} PathName 'Sökväg till filen $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Använd inte LaTeX" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Ingen LaTeX-distribution kunde hittas!$\r$\n\ LyX kan inte användas utan en LaTeX-distribution som $\"MiKTeX$\"!$\r$\n\ Installationen kommer därför att avbrytas.' -${LangFileString} HunspellFailed 'Nedladdning av ordbok för språk $\"$R3$\" misslyckades.' -${LangFileString} ThesaurusFailed 'Nedladdning av synonymordbok för språk $\"$R3$\" misslyckades.' +${LangFileString} HunspellFailed 'Nedladdning av ordbok för språk $\"$R9$\" misslyckades.' +${LangFileString} ThesaurusFailed 'Nedladdning av synonymordbok för språk $\"$R9$\" misslyckades.' #${LangFileString} JabRefInfo 'Nu kommer installationsprogrammet för $\"JabRef$\" att köras.$\r$\n\ # Du kan använda alla standardinställningar i installationsprogrammet för JabRef.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Kunde inte sätta 'path_prefix' i ko #${LangFileString} RunConfigureFailed "Kunde inte köra konfigurationsskriptet" ${LangFileString} NotAdmin "Du måste ha administratörsrättigheter för att installera LyX!" ${LangFileString} InstallRunning "Installationsprogrammet körs redan!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} är redan installerad!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} är redan installerad!$\r$\n\ Att installera över en nuvarande installation är inte rekommenderat om den installerade$\r$\n\ versionen är en testutgåva eller om du har problem med din nuvarande LyX-installation.$\r$\n\ I dessa fall är det bättre att ominstallera LyX.$\r$\n\ Vill du ändå installera LyX över den nuvarande versionen?" ${LangFileString} NewerInstalled "Du försöker att installera en äldre version av LyX än vad du har installerad.$\r$\n\ - Om du verkligen vill detta måste du avinstallera den befintliga LyX $OldVersionNumber innan." + Om du verkligen vill detta måste du avinstallera den befintliga LyX $R9 innan." ${LangFileString} MultipleIndexesNotAvailable "Stödet för att använda flera index i ett dokument kommer inte vara tillgängligt eftersom$\r$\n\ MiKTeX installerades med administratörrättigheter men du installerar LyX utan dem." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX-användarinställningar' ${LangFileString} SecUnMiKTeXDescription "Avinstallerar LaTeX-distributionen MiKTeX." #${LangFileString} SecUnJabRefDescription "Avinstallerar bibliografihanteraren JabRef." ${LangFileString} SecUnPreferencesDescription 'Raderar LyX-konfiguration$\r$\n\ - (katalog $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + (katalog $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ för dig eller för alla användare (om du är admin).' ${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter." diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/src/lang/turkish.nsh similarity index 90% rename from development/Win32/packaging/installer/lang/turkish.nsh rename to development/Win32/packaging/installer/src/lang/turkish.nsh index b028a0a5ef..3a1dae4361 100644 --- a/development/Win32/packaging/installer/lang/turkish.nsh +++ b/development/Win32/packaging/installer/src/lang/turkish.nsh @@ -7,7 +7,7 @@ ${LangFileString} TEXT_WELCOME "Bu sihirbaz size LyX programını kuracak.$\r$\n $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may download missing packages, this can take some time) ..." +${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($R9 may download missing packages, this can take some time) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" @@ -33,15 +33,15 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'LaTeX-dağıtımı' ${LangFileString} EnterLaTeXHeader2 'LyX in kullanacağı LaTeX dağıtımını seçin.' ${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ + LaTeX-distribution that should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' + $\"$R9$\" on your system. Displayed below is its path.' ${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ + LaTeX-distribution should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ The installer couldn$\'t find a LaTeX-distribution on your system.' ${LangFileString} PathName 'Path to the file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "LaTeX kullanma" @@ -55,8 +55,8 @@ ${LangFileString} LatexError1 'Hiç bir LaTeX dağıtımı bulunamadı!$\r$\n\ LyX $\"MiKTeX$\" gibi bir LaTeX dağıtımı olmadan kullanılamaz!$\r$\n\ Bu nedenle kurulum iptal edilecek.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R9$\" failed.' +${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R9$\" failed.' #${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ # You can use all default options of the JabRef-installer.' @@ -79,13 +79,13 @@ ${LangFileString} ModifyingConfigureFailed "Yapılandırma programında 'path_pr #${LangFileString} RunConfigureFailed "Yapılandırma programı çalıştırılamadı" ${LangFileString} NotAdmin "LyX kurabilmek için yönetici yetkileri gerekiyor!" ${LangFileString} InstallRunning "Kurulum programı zaten çalışıyor!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} kurulu zaten!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} kurulu zaten!$\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} 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." + If you really want this, you must uninstall the existing LyX $R9 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." @@ -105,9 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." #${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ for all users.' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/src/lang/ukrainian.nsh similarity index 93% rename from development/Win32/packaging/installer/lang/ukrainian.nsh rename to development/Win32/packaging/installer/src/lang/ukrainian.nsh index 84f6f0e27c..932c07d86b 100644 --- a/development/Win32/packaging/installer/lang/ukrainian.nsh +++ b/development/Win32/packaging/installer/src/lang/ukrainian.nsh @@ -13,7 +13,7 @@ ${LangFileString} TEXT_WELCOME "За допомогою цього майстр $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Оновлення бази даних назв файлів MiKTeX..." -${LangFileString} TEXT_CONFIGURE_LYX "Налаштовування LyX (може виникнути потреба у отриманні $LaTeXInstalled додаткових пакунків, зачекайте)..." +${LangFileString} TEXT_CONFIGURE_LYX "Налаштовування LyX (може виникнути потреба у отриманні $R9 додаткових пакунків, зачекайте)..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Обробка скриптів Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Створити значок на стільниці" @@ -39,15 +39,15 @@ ${LangFileString} SecThesaurusDescription "Словники синонімів, ${LangFileString} EnterLaTeXHeader1 'Дистрибутив LaTeX' ${LangFileString} EnterLaTeXHeader2 'Вкажіть дистрибутив LaTeX, який має використовувати LyX.' ${LangFileString} EnterLaTeXFolder 'Крім того, ви можете встановити тут розташування файла $\"latex.exe$\" і таким чином \ - встановити дистрибутив LaTeX, який має бути використано LyX.\r\n\ - Якщо ви не використовуватимете LaTeX, LyX не зможе створювати документів!\r\n\ - \r\n\ + встановити дистрибутив LaTeX, який має бути використано LyX.$\r$\n\ + Якщо ви не використовуватимете LaTeX, LyX не зможе створювати документів!$\r$\n\ + $\r$\n\ Засобу встановлення програми вдалося виявити дистрибутив LaTeX \ - $\"$LaTeXName$\" у вашій системі. Нижче показано його розташування.' + $\"$R9$\" у вашій системі. Нижче показано його розташування.' ${LangFileString} EnterLaTeXFolderNone 'Нижче ви маєте встановити розташування файла $\"latex.exe$\". Таким чином, ви встановите \ - дистрибутив LaTeX, який слід використовувати у LyX.\r\n\ - Якщо ви не використовуватимете LaTeX, LyX не зможе створювати документів!\r\n\ - \r\n\ + дистрибутив LaTeX, який слід використовувати у LyX.$\r$\n\ + Якщо ви не використовуватимете LaTeX, LyX не зможе створювати документів!$\r$\n\ + $\r$\n\ Засобу встановлення не вдалося виявити дистрибутива LaTeX у вашій системі.' ${LangFileString} PathName 'Розташування файла $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Не використовувати LaTeX" @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Дистрибутивів LaTeX не виявл Ви не зможете користуватися LyX без дистрибутива LaTeX на зразок $\"MiKTeX$\"!$\r$\n\ З цієї причини встановлення буде припинено.' -${LangFileString} HunspellFailed 'Спроба отримання словника для мови $\"$R3$\" зазнала невдачі.' -${LangFileString} ThesaurusFailed 'Спроба отримання словника синонімів для мови $\"$R3$\" зазнала невдачі.' +${LangFileString} HunspellFailed 'Спроба отримання словника для мови $\"$R9$\" зазнала невдачі.' +${LangFileString} ThesaurusFailed 'Спроба отримання словника синонімів для мови $\"$R9$\" зазнала невдачі.' #${LangFileString} JabRefInfo 'Тепер буде запущено засіб для встановлення програми $\"JabRef$\".$\r$\n\ # У засобі для встановлення ви можете не змінювати типових параметрів JabRef.' @@ -85,13 +85,13 @@ ${LangFileString} ModifyingConfigureFailed "Не вдалося встанови #${LangFileString} RunConfigureFailed "Не вдалося виконати скрипт налаштування" ${LangFileString} NotAdmin "Для встановлення LyX вам потрібні привілеї адміністратора!" ${LangFileString} InstallRunning "Засіб для встановлення вже працює!" -${LangFileString} AlreadyInstalled "LyX ${APP_SERIES_KEY2} вже встановлено!$\r$\n\ +${LangFileString} AlreadyInstalled "LyX ${APP_VERSION} вже встановлено!$\r$\n\ Встановлення нової версії на місце вже встановлених не рекомендоване, якщо$\r$\n\ встановлено тестову версію або у вас виникають проблеми із уже встановленим LyX.$\r$\n\ У таких випадках краще перевстановити LyX.$\r$\n\ Чи хочете ви попри ці зауваження встановити LyX на місце наявної версії?" ${LangFileString} NewerInstalled "Ви намагаєтеся встановити версію LyX, яка є застарілою порівняно з вже встановленою.$\r$\n\ - Якщо ви хочете встановити застарілу версію, вам слід спочатку вилучити вже встановлений LyX $OldVersionNumber." + Якщо ви хочете встановити застарілу версію, вам слід спочатку вилучити вже встановлений LyX $R9." ${LangFileString} MultipleIndexesNotAvailable "Ви не зможете скористатися підтримкою декількох покажчиків у документі, оскільки $\r$\n\ MiKTeX було встановлено від імені адміністратора, а LyX - від імені звичайного користувача." @@ -111,9 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Параметри LyX, встанов ${LangFileString} SecUnMiKTeXDescription "Вилучає дистрибутив LaTeX - MiKTeX." #${LangFileString} SecUnJabRefDescription "Вилучає засіб для роботи з бібліографічними даними JabRef." ${LangFileString} SecUnPreferencesDescription 'Вилучає теку з налаштуваннями LyX$\r$\n\ - $\"$AppPre\username\$\r$\n\ - $AppSuff\$\r$\n\ - ${APP_DIR_USERDATA}$\")$\r$\n\ + $\"$R9\username\$\r$\n\ + $R8\$\r$\n\ + LyX${VERSION_MAJOR}.${VERSION_MINOR}$\")$\r$\n\ для всіх користувачів.' ${LangFileString} SecUnProgramFilesDescription "Вилучити LyX і всі його компоненти." diff --git a/development/Win32/packaging/installer2/src/main.nsh b/development/Win32/packaging/installer/src/main.nsh similarity index 97% rename from development/Win32/packaging/installer2/src/main.nsh rename to development/Win32/packaging/installer/src/main.nsh index 76263cbd28..3074e359d0 100644 --- a/development/Win32/packaging/installer2/src/main.nsh +++ b/development/Win32/packaging/installer/src/main.nsh @@ -21,18 +21,6 @@ Var StartMenuFolder # Used to store the start menu folder Var pathPrefix - # FIXME Variables needed due to "old" set of language strings, delete - Var LaTeXInstalled - Var LaTeXName - Var OldVersionNumber - Var AppPre - Var AppSuff - # R3 - - # FIXME Compile time constants needed due to "old" set of language strings, delete - !define APP_SERIES_KEY2 ${APP_VERSION} - !define APP_DIR_USERDATA "LyX${VERSION_MAJOR}.${VERSION_MINOR}" - # ========= Multiuser settings ========= !define MULTIUSER_MUI # Multiuser uses modern UI 2 @@ -60,13 +48,13 @@ #!include MUI2.nsh # included in MultiUser # Header file for creating modern looking installer !define MUI_ABORTWARNING # Show a message box with a warning when the user wants to close the installer. - !define MUI_ICON "..\installer\icons\lyx.ico" # FIXME path # The icon for the installer. - !define MUI_UNICON "..\installer\icons\lyx.ico" # FIXME path # The icon for the uninstaller + !define MUI_ICON "..\icons\lyx.ico" + !define MUI_UNICON "..\icons\lyx.ico" !define MUI_HEADERIMAGE # Display an image on the header of the page. - !define MUI_HEADERIMAGE_BITMAP "..\installer\graphics\header.bmp" # FIXME path # Header image source + !define MUI_HEADERIMAGE_BITMAP "graphics\header.bmp" !define MUI_HEADERIMAGE_RIGHT # Display header image on the right and not left - !define MUI_WELCOMEFINISHPAGE_BITMAP "..\installer\graphics\wizard.bmp" # FIXME path # Source for image on welcome and finish page of the installer - !define MUI_UNWELCOMEFINISHPAGE_BITMAP "..\installer\graphics\wizard.bmp" # FIXME path # Source for image on welcome and finish page of the uninstaller + !define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\wizard.bmp" + !define MUI_UNWELCOMEFINISHPAGE_BITMAP "graphics\wizard.bmp" # ======== Pages definitions ========== @@ -75,7 +63,7 @@ !define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME) # Use custom welcome text !insertmacro MUI_PAGE_WELCOME # Welcome page - !insertmacro MUI_PAGE_LICENSE "..\installer\license.rtf" # FIXME path # License page + !insertmacro MUI_PAGE_LICENSE "license.rtf" !define MUI_PAGE_CUSTOMFUNCTION_PRE PrepareShellCTX # Prepare shell context before the multiuser page is created, so that the installer searches for default install folder in the right context (x64/x32) !insertmacro MULTIUSER_PAGE_INSTALLMODE # Multiuser page @@ -324,7 +312,6 @@ Function .onInit # Callback function, called at the very beginning, when user do StrCpy $2 0 ${DoUntil} $1 >= 4 ${SearchAllRegistry} $R9 $1 $2 "SOFTWARE\LyX" "${VERSION_MAJOR}${VERSION_MINOR}" $1 $2 # Helper Function from above - StrCpy $OldVersionNumber $R9 # FIXME remove ${If} $R9 S> ${APP_VERSION_DOTLESS} # $R9 is used in $(NewerInstalled) ReadRegStr $0 SHCTX "SOFTWARE\LYX\$0" "" ${If} ${FileExists} "$0\Uninstall-LyX.exe" @@ -408,12 +395,10 @@ Function LatexFolder_Show # Custom Function, called before showing the LaTeXFold ${Else} StrCpy $R9 "TeXLive" ${EndIf} - StrCpy $LaTeXName $R9 # FIXME remove StrCpy $1 $(EnterLaTeXFolder) # $1 is used on the page ${Else} StrCpy $1 $(EnterLaTeXFolderNone) ${EndIf} - ${StrRep} $1 $1 "\r\n" "$\r$\n" # FIXME remove Call fnc_LaTeXFolder_Show # In LaTeXFolder.nsdinc, defined by NSIS Dialog Designer FunctionEnd @@ -1008,7 +993,6 @@ Section -ConfigureScript # Runs the configure.py script ${Else} StrCpy $R9 "MiKTeX" ${EndIf} - StrCpy $LaTeXInstalled $R9 # FIXME remove DetailPrint $(TEXT_CONFIGURE_LYX) # Uses R9 to display the name of the installed latex distribution nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' @@ -1104,9 +1088,7 @@ Function un.ComponentsPre # Callback Function, called before the components page # R9 and R8 are used in $(SecUnPreferencesDescription) SetShellVarContext current ${UnStrStrAdv} $R9 $PROFILE "\" "<" "<" "0" "0" "0" # Get everything before the last "\" of $PROFILE ("C:\Users\username") -> $R9: "C:\Users" - StrCpy $AppPre $R9 # FIXME remove ${UnStrRep} $R8 $APPDATA "$PROFILE\" "" # "C:\Users\username\" gets replaced with "" in "C:\Users\username\AppData\Roaming" -> $R8: "Appdata\Roaming" - StrCpy $AppSuff $R8 # FIXME remove FunctionEnd Section "un.LyX" un.SecUnProgramFiles # Deletes files in $INSTDIR and registry entries diff --git a/development/Win32/packaging/installer2/src/lang/TranslatedLanguages.nsh b/development/Win32/packaging/installer2/src/lang/TranslatedLanguages.nsh deleted file mode 100644 index f41d5f7ca0..0000000000 --- a/development/Win32/packaging/installer2/src/lang/TranslatedLanguages.nsh +++ /dev/null @@ -1,33 +0,0 @@ -!macro LANG LANG_NAME - # NSIS language file - !insertmacro MUI_LANGUAGE "${LANG_NAME}" - # LyX language file - !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "..\installer\lang\${LANG_NAME}.nsh" "..\installer\lang\english.nsh" # FIXME path -!macroend - -# list of all languages the installers are translated to -!insertmacro LANG "english" # first language is the default -!insertmacro LANG "arabic" -!insertmacro LANG "basque" -!insertmacro LANG "catalan" -!insertmacro LANG "czech" -!insertmacro LANG "danish" -!insertmacro LANG "dutch" -!insertmacro LANG "french" -!insertmacro LANG "german" -!insertmacro LANG "galician" -!insertmacro LANG "hungarian" -!insertmacro LANG "indonesian" -!insertmacro LANG "italian" -!insertmacro LANG "japanese" -!insertmacro LANG "norwegian" -!insertmacro LANG "polish" -!insertmacro LANG "portuguese" -!insertmacro LANG "portugueseBR" -!insertmacro LANG "romanian" -!insertmacro LANG "russian" -!insertmacro LANG "slovak" -!insertmacro LANG "spanish" -!insertmacro LANG "swedish" -!insertmacro LANG "turkish" -!insertmacro LANG "ukrainian" -- 2.39.2