Win installer: update thesaurus and dictionaries

- also use a better default MiKTeX repository

development/Win32/packaging/installer/ChangeLog.txt

@@ -4,9 +4,10 @@
 - updated to Imagemagick 6.9.4-1
 - updated to Ghostscript 9.19
 - updated to Python 2.7.11
-- updated thesaurus for Italian and Slovenian
-- updated spell-checker dictionaries for Italian, Portuguese (PT) and
-  English (GB and US)
+- new thesaurus for Norwegian (Nynorsk)
+- updated thesaurus for English (US), Italian, Norwegian (Bokmal) and Slovenian
+- updated spell-checker dictionaries for English (AU, GB and US), Italian,
+  Norwegian (Bokmal and Nynorsk), Portuguese (PT) and Scottish
   (To benefit from them you must uninstall an already installed LyX 2.1.x and
    then use this installer.)
 - new Brazilian translation of the installer messages

development/Win32/packaging/installer/ThesaurusDictionaryNames.txt

@@ -32,6 +32,8 @@ 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

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

@@ -43,8 +43,8 @@ Function FindDictionaries
   
   # read out the possible thesaurus filenames from the file	
   FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
-  ${for} $5 1 25
-   # the file has 50 lines, but we only need to check for one of the 2 dictionary files per language
+  ${for} $5 1 26
+   # the file has 52 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   # $String is now the dictionary name
    FileRead $R5 $String   # $String is now the dictionary name
@@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
  
  # read out the locations from the file	
  FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${For} $5 1 50          # the file has 50 lines
+ ${For} $5 1 52          # the file has 52 lines
  
   FileRead $R5 $String   # $String is now the dictionary name
   StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code

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

@@ -162,7 +162,7 @@ SectionEnd
 
 Section /o "English (AU)" SecDEnglishAU
  StrCpy $DictCodes "en_AU,$DictCodes"
- AddSize 587
+ AddSize 651
 SectionEnd
 
 Section /o "English (CA)" SecDEnglishCA
@@ -174,7 +174,7 @@ Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 652
+ AddSize 760
 SectionEnd
 
 Section /o "English (NZ)" SecDEnglishNZ
@@ -186,7 +186,7 @@ Section "English (US)" SecDEnglishUS
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 530
+ AddSize 547
 SectionEnd
 
 Section "Español (ES)" SecDSpanishES
@@ -237,7 +237,7 @@ SectionEnd
 
 Section /o "Gàidhlig" SecDScottish
  StrCpy $DictCodes "gd_GB,$DictCodes"
- AddSize 3090
+ AddSize 4161
 SectionEnd
 
 Section /o "Galego" SecDGalician
@@ -317,12 +317,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecDNorwegianNB
  StrCpy $DictCodes "nb_NO,$DictCodes"
- AddSize 3992
+ AddSize 5291
 SectionEnd
 
 Section /o "Norsk (Nynorsk)" SecDNorwegianNN
  StrCpy $DictCodes "nn_NO,$DictCodes"
- AddSize 1540
+ AddSize 3292
 SectionEnd
 
 Section /o "Occitan" SecDOccitan
@@ -477,7 +477,7 @@ SectionEnd
 
 Section /o "English (US/AU)" SecTEnglishUSAU
  StrCpy $ThesCodes "en_US,$ThesCodes"
- AddSize 21600
+ AddSize 22095
 SectionEnd
 
 Section /o "Español" SecTSpanish
@@ -522,7 +522,12 @@ SectionEnd
 
 Section /o "Norsk (Bokmål)" SecTNorwegianNB
  StrCpy $ThesCodes "nb_NO,$ThesCodes"
- AddSize 2535
+ AddSize 2595
+SectionEnd
+
+Section /o "Norsk (Nynorsk)" SecTNorwegianNN
+ StrCpy $ThesCodes "nn_NO,$ThesCodes"
+ AddSize 2
 SectionEnd
 
 Section /o "Polski" SecTPolish
@@ -1336,6 +1341,13 @@ Function .onInit
    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"

development/Win32/packaging/installer/settings.nsh

@@ -44,12 +44,10 @@ These typically need to be modified for each LyX release
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
 #--------------------------------
-# MiKTeX
+# MiKTeX and JabRef
 # Sizes in KB
 
-# it seems that some companies block ftp access by default, therefore http access is preferred here
-!define MiKTeXRepo "http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/systems/win32/miktex/tm/packages/"
-#!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
+"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
 
 !define JabRefVersion "2.11"
 !define MiKTeXDeliveredVersion "2.9"