installer: re-sync with master

backport all recent fixes from master

development/Win32/packaging/installer/DictionaryMirrors.txt

@@ -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

development/Win32/packaging/installer/HunspellDictionaryNames.txt

@@ -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

development/Win32/packaging/installer/Packages.txt

@@ -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

development/Win32/packaging/installer/Readme.txt

@@ -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)
+3. install the latest version 3.x of NSIS (https://nsis.sourceforge.io/Download)
-4. install the NSIS Large Strings build (http://nsis.sourceforge.net/Special_Builds)
+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

development/Win32/packaging/installer/include/LaTeX.nsh

@@ -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}

development/Win32/packaging/installer/include/LyXUtils.nsh

@@ -22,12 +22,6 @@
 #    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)
 #
 #--------------------------

development/Win32/packaging/installer/include/dictionaries.nsh

@@ -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
+  ${for} $5 1 73
-   # the file has 144 lines, but we only need to check for one of the 2 dictionary files per language
+   # 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
+   # Download hunspell dictionaries,
-   Push $R0
+   # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
-   inetc::get /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/hunspell/$String" "$INSTDIR\Resources\dicts\$String" /END
+   FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
-   Pop $R0
+   
+   ${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
+   # Download thesaurus files,
-   Push $R0
+   # if first download repository is not available try the other ones listed in "DictionaryMirrors.txt"
-   inetc::get /POPUP /RECEIVETIMEOUT=5000 "https://sourceforge.net/projects/lyxwininstaller/files/thesaurus/$String" "$INSTDIR\Resources\thes\$String" /END
+   FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
-   Pop $R0
+   
+   ${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

development/Win32/packaging/installer/include/init.nsh

@@ -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"

development/Win32/packaging/installer/lang/arabic.nsh

@@ -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 "إزالة ليك مع كل مكوناته."

development/Win32/packaging/installer/lang/basque.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/catalan.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/czech.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/danish.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/dutch.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/english.nsh

@@ -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 \
+				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. \
+				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."
 

development/Win32/packaging/installer/lang/french.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/galician.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/german.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/hungarian.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/indonesian.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/italian.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/japanese.nsh

@@ -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とすべての附属コンポーネントの導入解除を行います。"
 

development/Win32/packaging/installer/lang/norwegian.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/polish.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/portuguese.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/portugueseBR.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/romanian.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/russian.nsh

@@ -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 и все его компоненты."
 

development/Win32/packaging/installer/lang/slovak.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/spanish.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/swedish.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/turkish.nsh

@@ -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."
 

development/Win32/packaging/installer/lang/ukrainian.nsh

@@ -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 і всі його компоненти."
 

development/Win32/packaging/installer/setup/configure.nsh

@@ -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"

development/Win32/packaging/installer/setup/install.nsh

@@ -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}"