]> git.lyx.org Git - features.git/commitdiff
installer: re-sync with master 2.3.3
authorUwe Stöhr <uwestoehr@lyx.org>
Fri, 22 Mar 2019 00:19:48 +0000 (01:19 +0100)
committerUwe Stöhr <uwestoehr@lyx.org>
Fri, 22 Mar 2019 00:19:48 +0000 (01:19 +0100)
backport all recent fixes from master

35 files changed:
development/Win32/packaging/installer/DictionaryMirrors.txt [new file with mode: 0644]
development/Win32/packaging/installer/HunspellDictionaryNames.txt
development/Win32/packaging/installer/Packages.txt
development/Win32/packaging/installer/Readme.txt
development/Win32/packaging/installer/include/LaTeX.nsh
development/Win32/packaging/installer/include/LyXUtils.nsh
development/Win32/packaging/installer/include/dictionaries.nsh
development/Win32/packaging/installer/include/init.nsh
development/Win32/packaging/installer/lang/arabic.nsh
development/Win32/packaging/installer/lang/basque.nsh
development/Win32/packaging/installer/lang/catalan.nsh
development/Win32/packaging/installer/lang/czech.nsh
development/Win32/packaging/installer/lang/danish.nsh
development/Win32/packaging/installer/lang/dutch.nsh
development/Win32/packaging/installer/lang/english.nsh
development/Win32/packaging/installer/lang/french.nsh
development/Win32/packaging/installer/lang/galician.nsh
development/Win32/packaging/installer/lang/german.nsh
development/Win32/packaging/installer/lang/hungarian.nsh
development/Win32/packaging/installer/lang/indonesian.nsh
development/Win32/packaging/installer/lang/italian.nsh
development/Win32/packaging/installer/lang/japanese.nsh
development/Win32/packaging/installer/lang/norwegian.nsh
development/Win32/packaging/installer/lang/polish.nsh
development/Win32/packaging/installer/lang/portuguese.nsh
development/Win32/packaging/installer/lang/portugueseBR.nsh
development/Win32/packaging/installer/lang/romanian.nsh
development/Win32/packaging/installer/lang/russian.nsh
development/Win32/packaging/installer/lang/slovak.nsh
development/Win32/packaging/installer/lang/spanish.nsh
development/Win32/packaging/installer/lang/swedish.nsh
development/Win32/packaging/installer/lang/turkish.nsh
development/Win32/packaging/installer/lang/ukrainian.nsh
development/Win32/packaging/installer/setup/configure.nsh
development/Win32/packaging/installer/setup/install.nsh

diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt b/development/Win32/packaging/installer/DictionaryMirrors.txt
new file mode 100644 (file)
index 0000000..95ab8e8
--- /dev/null
@@ -0,0 +1,24 @@
+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
index 817adc94723923039448e1870bf58cccddd5a306..625718dcecfbffa27ff38424854fb08d291c97e4 100644 (file)
@@ -82,6 +82,8 @@ 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
index 3ba3f1e71b20ddf4a81ad854a3d76a1585850120..91020a247e7fb92274928d585912a70019680ac2 100644 (file)
@@ -100,6 +100,7 @@ lettrine
 listings
 lithuanian
 genmisc
+georgian
 mathtools
 mhchem
 mongolian-babel
@@ -240,7 +241,6 @@ ucs
 extsizes
 frletter
 g-brief
-eurofont
 jsclasses
 platex
 fancyvrb
index 247fbbf8d366b2e381d273604bef1535d8b04d0c..f288a2d4f6c2a69c15ba1dc62c24655b565f7ccd 100644 (file)
@@ -2,12 +2,12 @@
 
 1. extract the source zip-file to e.g. the path "C:\LyX-Installer"
 2. open the file settings.nsh with a text editor
-   and adapt there the following paths to the one on your PC, e.g.:
+   and adapt there the following paths to the ones on your PC, e.g.:
  !define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX"
  !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015"
  !define FILES_QT "C:\LyX-Installer\LyXPackage\LyX"
-3. install the latest version 3.x of NSIS (http://nsis.sourceforge.net/Download)
-4. install the NSIS Large Strings build (http://nsis.sourceforge.net/Special_Builds)
+3. install the latest version 3.x of NSIS (https://nsis.sourceforge.io/Download)
+4. install the NSIS Large Strings build (https://nsis.sourceforge.io/Special_Builds)
    (extract the extension ZIP file in your NSIS installation folder and this way overwrite some files) 
 5. open the file FindProcDLL Unicode bin.zip (that is part of this bundle),
    extract from it the file FindProc.dll to the folder \Plugins\x86-unicode of
index d7e527bd72144b8acd90473fe0847dcff7ea011a..a94f269f9d065b64133f8ffefc1a53678def14a2 100644 (file)
@@ -54,10 +54,6 @@ Function LaTeXActions
     IntOp $0 $0 + 1
     Goto loop32
    done32:
-   ${if} $String == "2.8"
-    StrCpy $MiKTeXVersion "2.8"
-    StrCpy $LaTeXName "MiKTeX 2.8"
-   ${endif}
    ${if} $String == "2.9"
     StrCpy $MiKTeXVersion "2.9"
     StrCpy $LaTeXName "MiKTeX 2.9"
@@ -78,10 +74,6 @@ Function LaTeXActions
     IntOp $0 $0 + 1
     Goto loop64
    done64:
-   ${if} $String == "2.8"
-    StrCpy $MiKTeXVersion "2.8"
-    StrCpy $LaTeXName "MiKTeX 2.8"
-   ${endif}
    ${if} $String == "2.9"
     StrCpy $MiKTeXVersion "2.9"
     StrCpy $LaTeXName "MiKTeX 2.9"
@@ -110,10 +102,6 @@ Function LaTeXActions
     IntOp $0 $0 + 1
     Goto loopB
    doneB:
-   ${if} $String == "2.8"
-    StrCpy $MiKTeXVersion "2.8"
-    StrCpy $LaTeXName "MiKTeX 2.8"
-   ${endif}
    ${if} $String == "2.9"
     StrCpy $MiKTeXVersion "2.9"
     StrCpy $LaTeXName "MiKTeX 2.9"
@@ -176,19 +164,12 @@ Function LaTeXActions
   ${endif}
   # finally set the name
   ${if} $PathLaTeX != ""
-  ${andif} $LaTeXName != "MiKTeX 2.8"
   ${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 == ""
-    ReadRegStr $String HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014" "DisplayVersion"
-   ${endif}
-   ${if} $String == ""
-    ReadRegStr $String HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014" "DisplayVersion"
-   ${endif}
    ${if} $String != ""
     StrCpy $LaTeXName "TeXLive $String"
    ${else}
index ee3a4710caedda57c9367d3096b925e38cc835d3..eda1599fd65e2a76b457b1ea740e3932cf885219 100644 (file)
 #    StrPoint
 #    UnAppPreSuff
 #
-# - CheckAppPathPreferences (replaces the old install folder name with the new one in the preferences files)
-#                           (used by Update installer), uses:
-#    ReplaceLineContent
-#
-# - IsUserAdmin (checks if user is admin)
-#
 # - FileCheck (checks if a given file exists)
 #
 #--------------------------
index d540f5349a64a2729333d72a503e505738609727..4bec27ef68f1c4b9a37341ac8632f817cf814726 100644 (file)
@@ -28,8 +28,8 @@ Function FindDictionaries
   
   # read out the possible spell-checker filenames from the file        
   FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
-  ${for} $5 1 72
-   # the file has 144 lines, but we only need to check for one of the 2 dictionary files per language
+  ${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
@@ -66,20 +66,32 @@ Function DownloadHunspellDictionaries
  
  # read out the locations from the file        
  FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${For} $5 1 144 # the file has 144 lines
+ ${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
-   Push $R0
-   inetc::get /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
-   Pop $R0
+   # Download hunspell dictionaries,
+   # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
+   FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
+   
+   ${For} $4 1 24 # there are 24 mirrors in the file
+    FileRead $R4 $Search # $Search is now the mirror
+    StrCpy $Search $Search -2 # delete the linebreak characters at the end
+    Push $R0
+    inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
+    Pop $R0
+    ${if} $R0 == "OK"
+     ${ExitFor}
+    ${endif}
+   ${Next}
+   
+   FileClose $R4
    # if download failed
    ${if} $R0 != "OK"
-    MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed): $R0"
+    MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)"
     Goto abortinstall
    ${endif}
   ${endif} # end if $DictCode == $R3
@@ -107,13 +119,25 @@ Function DownloadThesaurusDictionaries
   
   ${if} $ThesCode == $R3
    StrCpy $String $String -2 # delete the linebreak characters at the end
-   # Download thesaurus files
-   Push $R0
-   inetc::get /POPUP /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
-   Pop $R0
+   # Download thesaurus files,
+   # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
+   FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
+   
+   ${For} $4 1 24 # there are 24 mirrors in the file
+    FileRead $R4 $Search # $Search is now the mirror
+    StrCpy $Search $Search -2 # delete the linebreak characters at the end
+    Push $R0
+    inetc::get /TIMEOUT=5000 "https://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
+    Pop $R0
+    ${if} $R0 == "OK"
+     ${ExitFor}
+    ${endif}
+   ${Next}
+   
+   FileClose $R4
    # if download failed
    ${if} $R0 != "OK"
-    MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed): $R0"
+    MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)"
     Goto abortinstall
    ${endif}
   ${endif} # end if $ThesCode == $R3
index 9f36dfacae566d12294a3f7ca68c78f964b712bf..59370d49b4a3b1ccd1d92235009ee6ef43df70e6 100644 (file)
@@ -151,19 +151,19 @@ SectionEnd
 
 Section /o "English (AU)" SecDEnglishAU
  StrCpy $DictCodes "en_AU,$DictCodes"
- AddSize 552
+ AddSize 557
 SectionEnd
 
 Section /o "English (CA)" SecDEnglishCA
  StrCpy $DictCodes "en_CA,$DictCodes"
- AddSize 550
+ AddSize 557
 SectionEnd
 
 Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 742
+ AddSize 1044
 SectionEnd
 
 Section /o "English (NZ)" SecDEnglishNZ
@@ -175,7 +175,7 @@ Section "English (US)" SecDEnglishUS
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 548
+ AddSize 551
 SectionEnd
 
 Section "Español (ES)" SecDSpanishES
@@ -234,6 +234,11 @@ Section /o "Galego" SecDGalician
  AddSize 3911
 SectionEnd
 
+Section /o "ქართული ენა" SecDGeorgian
+ StrCpy $DictCodes "ka_GE,$DictCodes"
+ AddSize 3952
+SectionEnd
+
 Section /o "עִברִית" SecDHebrew
  StrCpy $DictCodes "he_IL,$DictCodes"
  AddSize 3120
@@ -406,7 +411,7 @@ SectionEnd
 
 Section /o "Türkmençe" SecDTurkmen
  StrCpy $DictCodes "tk_TM,$DictCodes"
- AddSize 950
+ AddSize 2797
 SectionEnd
 
 Section /o "Türkçe" SecDTurkish
@@ -416,7 +421,7 @@ SectionEnd
 
 Section /o "Українська" SecDUkrainian
  StrCpy $DictCodes "uk_UA,$DictCodes"
- AddSize 6375
+ AddSize 6905
 SectionEnd
 
 Section /o "اردو" SecDUrdu
@@ -922,6 +927,13 @@ Function .onInit
    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"
index 19a2bb915521d7766e7e1483e0f7ffbd4226bf83..d4c4e3ebc4a7699160e3df3a90858ec3f4d8273a 100644 (file)
@@ -110,6 +110,8 @@ ${LangFileString} UnLyXPreferencesTitle 'تفضيلات مستخدم ليك'
 ${LangFileString} SecUnMiKTeXDescription "إزالة توزيعة لتيك MiKTeX."
 #${LangFileString} SecUnJabRefDescription "إزالة مدير ثبت المراجع JabRef."
 ${LangFileString} SecUnPreferencesDescription 'حذف LyX$\'s ضبط$\r$\n\
-                                               (مجلد $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               (مجلد $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                لك او لكل المستخدمين (إذا كنت المدير).'
 ${LangFileString} SecUnProgramFilesDescription "إزالة ليك مع كل مكوناته."
index 32c53b71e8d78fb781937de4df5a1bd6f846942c..db6fe5c35119a2e9f453d81b566f7f70808f7581 100644 (file)
@@ -112,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               ($\"$AppPre\erabiltzailea\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               \${APP_DIR_USERDATA}$\"$\r$\n\
                                                zuretzako edo erabiltzaile guztientzako (administratzailea bazara).'
 ${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere osagai guztiak."
 
index 3f2efb45299c8ac8a223cdc5d900efad0c6d4d26..a7449a519abdea08fe373a4b6f99af975f277bcc 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                de tots els usuaris.'
 ${LangFileString} SecUnProgramFilesDescription "Desinstal·la el LyX i tots els seus components."
 
index 0781a730e0b199c1adca556939516fdcb8098f17..bc47780fa2d5bf8a8903c64c7a53688d328e7e6d 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                pro všechny uživatele.'
 ${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a všechny jeho komponenty."
 
index 1d7f3d5942f9978eb23c1e83eef95870f6397e37..7addb2475d0a2e6efcf27da0ad3f209d3298271a 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                for alle brugere.'
 ${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter."
 
index 89123a4cbbaec6feb73746bbc3bca60f310fd8b4..402bdc94f0eeb49ac72666b57dffa075798a71b9 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                voor alle gebruikers.'
 ${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen."
 
index b7675ae4699be0b92ab6566a76561b7047114b02..f1112110b22907a21d0156f4d07a713da0d3405d 100644 (file)
@@ -85,8 +85,8 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the c
 #${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\
-                               Installing over existing installations is not recommended if the installed version \
-                               is a test release or if you have problems with your existing LyX installation. \
+                               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\
@@ -110,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               (folder $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                for you or for all users (if you are admin).'
 ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
 
index e8616bae635945286e75d0114a7b81631869c159..18b8d7f41438f9fc5c7750d16bddab44f2363ac7 100644 (file)
@@ -111,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                pour tous les utilisateurs.'
 ${LangFileString} SecUnProgramFilesDescription "Désinstaller LyX et tous ses composants."
 
index 2870bc30b58a1b1170ee932873560c9061343b83..35a0fda41d2f2ed39df10a6e8e2e4e692e6af05c 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                de todos os usuários.'
 ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes."
 
index 464cd9129e21cdc208fe105bd331fd7b06251e7a..304480d419e2413852ca2e1aaea308f134730271 100644 (file)
@@ -111,7 +111,9 @@ ${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\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\
+                                               (Ordner $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                für Sie oder für alle Benutzer (wenn Sie Admin sind).'
 ${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten."
 
index 6feaec1777b88ab48221eb3c7f127c460be27e38..5e1bc83530470d1c01f1dd0ecaf574d8cae29f03 100644 (file)
@@ -111,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                minden felhasználónál.'
 ${LangFileString} SecUnProgramFilesDescription "A LyX és minden komponensének eltávolítása."
 
index 4bcfce97eacf08658cbe468f18df84a04952f423..8f53d79b748092eec8458ecf96a31de5123453cd 100644 (file)
@@ -111,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                untuk semua pengguna.'
 ${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada."
 
index 8c7b6d3053c1b5396e4748c54c5db708ed5d658b..f51d1930fbefa7096e4c538b2d340761a661bf6b 100644 (file)
@@ -113,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                per tutti gli utenti.'
 ${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti."
 
index 9319b61e52940204f25358d8a59ae4b5e23dbee0..a72def0d19558a13c03016c5dd4597dc505dcfee 100644 (file)
@@ -111,7 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyXのユーザー設定'
 ${LangFileString} SecUnMiKTeXDescription "LaTeX頒布版MiKTeXの導入解除を行います。"
 #${LangFileString} SecUnJabRefDescription "文献管理プログラムJabRefの導入解除を行います。"
 ${LangFileString} SecUnPreferencesDescription 'ユーザー共通のLyXの設定フォルダ$\r$\n\
-                                               $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                を削除します。'
 ${LangFileString} SecUnProgramFilesDescription "LyXとすべての附属コンポーネントの導入解除を行います。"
 
index db8a91d835539fa927bf568ae06ca596c687cb4d..70eff58beff5f456b6b2afaaf6074796d7d9ed44 100644 (file)
@@ -111,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                for alle brukere.'
 ${LangFileString} SecUnProgramFilesDescription "Avinstallerer LyX og alle delkomponenter."
 
index 2dbbd77a263c54070fc149efbfd86f8054dbb6ab..00894fcceb6bac234afefbef9ac79c14109f0efa 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                wszystkim użytkownikom.'
 ${LangFileString} SecUnProgramFilesDescription "Deinstalacja LyX i wszystkich jego komponentów."
 
index bc66c901858ff2b72c26a508d7fdfff5c3253447..e01e4874bc1bc5cbcabe8a7a0a842dd7dbd97536 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                de todos os utilizadores.'
 ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes."
 
index d0eae21dd08ba658c0f25994e970203cb18f2894..8ecf95e49bce64c6d553efe768ceab9c1ca7e890 100644 (file)
@@ -113,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               (pasta $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                para você ou para todos os usuários (se você for um administrador)).'
 ${LangFileString} SecUnProgramFilesDescription "Desinstalar o LyX e todos os seus componentes."
 
index 705f6177ac3e6e5579aafc72859f245252f24771..d9de6c438cddd138c0d61f0f8494e577804ed223 100644 (file)
@@ -106,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                pentru toţi utilizatorii.'
 ${LangFileString} SecUnProgramFilesDescription "Dezinstalaţi programul LyX şi toate componentele lui."
 
index 62c895424544b16e515c7c041695baee3f23a98e..c723082afdc5592ac123ebcecc49af7f95d72cc4 100644 (file)
@@ -110,7 +110,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Пользовательские нас
 ${LangFileString} SecUnMiKTeXDescription "Удалить дистрибутив MiKTeX."
 #${LangFileString} SecUnJabRefDescription "Удалить менеджер библиографических ссылок JabRef."
 ${LangFileString} SecUnPreferencesDescription 'Удалить настройки LyX$\r$\n\
-                                               (каталог $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               (каталог $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                для вас или для всех пользователей (если вы администратор).'
 ${LangFileString} SecUnProgramFilesDescription "Удалить LyX и все его компоненты."
 
index ce146270b90aecb10ace9d36682fd134d965f6f0..de1c6bebdaf1c7adb60828f3147889d5c2df66e5 100644 (file)
@@ -112,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                pre všetkých užívateľov (keď máte administrátorské práva).'
 ${LangFileString} SecUnProgramFilesDescription "Odinštaluj LyX a všetky jeho súčiastky."
 
index e34d2b6164786440daf671d4494f57927a0f425c..5ee0998c28c3736c112d4f6d715d6cbb74cb235e 100644 (file)
@@ -111,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                de todos los usuarios.'
 ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes."
 
index fe481873ef09427551b43f336032ee2a28a9c284..4e4a5baae5d2d62a1bae27a6a09db077d9268355 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               (katalog $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                för dig eller för alla användare (om du är admin).'
 ${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter."
 
index 9fbd9322c6fc83920daa2de8d4ee3a5efb81567d..b028a0a5ef75722a4a2ec5d43bb0e93e0c4ce2f1 100644 (file)
@@ -105,7 +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\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                for all users.'
 ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components."
 
index 181b58b12b79c7c10de2afbc76a27f015ee14c83..84f6f0e27c0743374b54a33559a318d712f83d38 100644 (file)
@@ -111,7 +111,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Параметри LyX, встанов
 ${LangFileString} SecUnMiKTeXDescription "Вилучає дистрибутив LaTeX - MiKTeX."
 #${LangFileString} SecUnJabRefDescription "Вилучає засіб для роботи з бібліографічними даними JabRef."
 ${LangFileString} SecUnPreferencesDescription 'Вилучає теку з налаштуваннями LyX$\r$\n\
-                                               $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+                                               $\"$AppPre\username\$\r$\n\
+                                               $AppSuff\$\r$\n\
+                                               ${APP_DIR_USERDATA}$\")$\r$\n\
                                                для всіх користувачів.'
 ${LangFileString} SecUnProgramFilesDescription "Вилучити LyX і всі його компоненти."
 
index 80960a61fe9f6f58b00ec91484fc1ce142705d88..31a92e2b035699e2224237cab60bbf09708918af 100644 (file)
@@ -46,7 +46,7 @@ Section -InstallData
   
   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\lyx,0"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx.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"
index e5a5936805d17652652d8a36e6f9f6d36b9ea6f8..53196e3106aad1b6b54d6d456d3dc507a43e95e2 100644 (file)
@@ -145,6 +145,8 @@ Section -ProgramFiles SecProgramFiles
   ${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}"