[LyX master] installer: implement new method to select hunspell and thesaurus dictionaries and to download the selected ones (final part 2)

Uwe Stöhr Sun, 03 Jun 2012 14:55:56 -0700

The branch, master, has been updated.

- Log -----------------------------------------------------------------


commit dc5dc850bff7c15e6d64ce760928d18d2ee701f4
Author: Uwe StÃ¶hr <uwesto...@lyx.org>
Date:   Sun Jun 3 23:55:21 2012 +0200

    installer: implement new method to select hunspell and thesaurus 
dictionaries and to download the selected ones (final part 2)

diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt 
b/development/Win32/packaging/installer/DictionaryMirrors.txt
index 04da26e..cee664d 100644
--- a/development/Win32/packaging/installer/DictionaryMirrors.txt
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -1,5 +1,8 @@
+dfn
+freefr
 garr
 heanet
 ignum
+kent
 netcologne
 switch
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt 
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index 80b8ae6..46913fd 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -1,114 +1,120 @@
-af_ZA.aff?r=&ts=
-af_ZA.dic?r=&ts=
-ar_DZ.aff?r=&ts=
-ar_DZ.dic?r=&ts=
-be_BY.aff?r=&ts=
-be_BY.dic?r=&ts=
-bg_BG.aff?r=&ts=
-bg_BG.dic?r=&ts=
-br_FR.aff?r=&ts=
-br_FR.dic?r=&ts=
-ca_ES.aff?r=&ts=
-ca_ES.dic?r=&ts=
-cs_CZ.aff?r=&ts=
-cs_CZ.dic?r=&ts=
-cy_GB.aff?r=&ts=
-cy_GB.dic?r=&ts=
-da_DK.aff?r=&ts=
-da_DK.dic?r=&ts=
-de_AT.aff?r=&ts=
-de_AT.dic?r=&ts=
-de_CH.aff?r=&ts=
-de_CH.dic?r=&ts=
-de_DE.aff?r=&ts=
-de_DE.dic?r=&ts=
-db_DE.aff?r=&ts=
-db_DE.dic?r=&ts=
-el_GR.aff?r=&ts=
-el_GR.dic?r=&ts=
-en_AU.aff?r=&ts=
-en_AU.dic?r=&ts=
-en_CA.aff?r=&ts=
-en_CA.dic?r=&ts=
-en_GB.aff?r=&ts=
-en_GB.dic?r=&ts=
-en_NZ.aff?r=&ts=
-en_NZ.dic?r=&ts=
-en_US.aff?r=&ts=
-en_US.dic?r=&ts=
-eo_EO.aff?r=&ts=
-eo_EO.dic?r=&ts=
-es_ES.aff?r=&ts=
-es_ES.dic?r=&ts=
-es_MX.aff?r=&ts=
-es_MX.dic?r=&ts=
-et_EE.aff?r=&ts=
-et_EE.dic?r=&ts=
-fa_IR.aff?r=&ts=
-fa_IR.dic?r=&ts=
-fr_FR.aff?r=&ts=
-fr_FR.dic?r=&ts=
-ga_IE.aff?r=&ts=
-ga_IE.dic?r=&ts=
-gd_GB.aff?r=&ts=
-gd_GB.dic?r=&ts=
-gl_ES.aff?r=&ts=
-gl_ES.dic?r=&ts=
-he_IL.aff?r=&ts=
-he_IL.dic?r=&ts=
-hr_HR.aff?r=&ts=
-hr_HR.dic?r=&ts=
-hu_HU.aff?r=&ts=
-hu_HU.dic?r=&ts=
-hy_AM.aff?r=&ts=
-hy_AM.dic?r=&ts=
-id_ID.aff?r=&ts=
-id_ID.dic?r=&ts=
-is_IS.aff?r=&ts=
-is_IS.dic?r=&ts=
-it_IT.aff?r=&ts=
-it_IT.dic?r=&ts=
-kk_KZ.aff?r=&ts=
-kk_KZ.dic?r=&ts=
-ko_KR.aff?r=&ts=
-ko_KR.dic?r=&ts=
-la_LA.aff?r=&ts=
-la_LA.dic?r=&ts=
-lt_LT.aff?r=&ts=
-lt_LT.dic?r=&ts=
-lv_LV.aff?r=&ts=
-lv_LV.dic?r=&ts=
-ms_MY.aff?r=&ts=
-ms_MY.dic?r=&ts=
-nb_NO.aff?r=&ts=
-nb_NO.dic?r=&ts=
-nl_NL.aff?r=&ts=
-nl_NL.dic?r=&ts=
-nn_NO.aff?r=&ts=
-nn_NO.dic?r=&ts=
-pl_PL.aff?r=&ts=
-pl_PL.dic?r=&ts=
-pt_BR.aff?r=&ts=
-pt_BR.dic?r=&ts=
-pt_PT.aff?r=&ts=
-pt_PT.dic?r=&ts=
-ro_RO.aff?r=&ts=
-ro_RO.dic?r=&ts=
-ru_RU.aff?r=&ts=
-ru_RU.dic?r=&ts=
-sk_SK.aff?r=&ts=
-sk_SK.dic?r=&ts=
-sl_SI.aff?r=&ts=
-sl_SI.dic?r=&ts=
-sq_AL.aff?r=&ts=
-sq_AL.dic?r=&ts=
-sr_RS.aff?r=&ts=
-sr_RS.dic?r=&ts=
-sv_SE.aff?r=&ts=
-sv_SE.dic?r=&ts=
-th_TH.aff?r=&ts=
-th_TH.dic?r=&ts=
-uk_UA.aff?r=&ts=
-uk_UA.dic?r=&ts=
-vi_VN.aff?r=&ts=
-vi_VN.dic?r=&ts=
+af_ZA.aff
+af_ZA.dic
+ar_DZ.aff
+ar_DZ.dic
+be_BY.aff
+be_BY.dic
+bg_BG.aff
+bg_BG.dic
+br_FR.aff
+br_FR.dic
+ca_ES.aff
+ca_ES.dic
+cs_CZ.aff
+cs_CZ.dic
+cy_GB.aff
+cy_GB.dic
+da_DK.aff
+da_DK.dic
+db_DE.aff
+db_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_FR.aff
+fr_FR.dic
+ga_IE.aff
+ga_IE.dic
+gd_GB.aff
+gd_GB.dic
+gl_ES.aff
+gl_ES.dic
+hb_DE.aff
+hb_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
+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
+ms_MY.aff
+ms_MY.dic
+nb_NO.aff
+nb_NO.dic
+nl_NL.aff
+nl_NL.dic
+nn_NO.aff
+nn_NO.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
+sv_SE.aff
+sv_SE.dic
+th_TH.aff
+th_TH.dic
+uk_UA.aff
+uk_UA.dic
+vi_VN.aff
+vi_VN.dic
diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt 
b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 8584ba6..52b154b 100644
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -1,44 +1,44 @@
-th_bg_BG_v2.dat?r=&ts=
-th_bg_BG_v2.idx?r=&ts=
-th_ca_ES_v2.dat?r=&ts=1338694206
-th_ca_ES_v2.idx?r=&ts=1338694208
-th_cs_CZ_v2.dat?r=&ts=
-th_cs_CZ_v2.idx?r=&ts=
-th_da_DK_v2.dat?r=&ts=
-th_da_DK_v2.idx?r=&ts=
-th_de_CH_v2.dat?r=&ts=1338690386
-th_de_CH_v2.idx?r=&ts=1338690545
-th_de_DE_v2.dat?r=&ts=1338686429
-th_de_DE_v2.idx?r=&ts=1338690578
-th_el_GR_v2.dat?r=&ts=
-th_el_GR_v2.idx?r=&ts=
-th_en_GB_v2.dat?r=&ts=
-th_en_GB_v2.idx?r=&ts=
-th_en_US_v2.dat?r=&ts=
-th_en_US_v2.idx?r=&ts=
-th_es_ES_v2.dat?r=&ts=
-th_es_ES_v2.idx?r=&ts=
-th_fr_FR_v2.dat?r=&ts=
-th_fr_FR_v2.idx?r=&ts=
-th_ga_IE_v2.dat?r=&ts=
-th_ga_IE_v2.idx?r=&ts=
-th_hu_HU_v2.dat?r=&ts=1338694214
-th_hu_HU_v2.idx?r=&ts=1338694321
-th_it_IT_v2.dat?r=&ts=
-th_it_IT_v2.idx?r=&ts=
-th_nb_NO_v2.dat?r=&ts=
-th_nb_NO_v2.idx?r=&ts=
-th_pl_PL_v2.dat?r=&ts=
-th_pl_PL_v2.idx?r=&ts=
-th_pt_PT_v2.dat?r=&ts=
-th_pt_PT_v2.idx?r=&ts=
-th_ro_RO_v2.dat?r=&ts=
-th_ro_RO_v2.idx?r=&ts=
-th_ru_RU_v2.dat?r=&ts=
-th_ru_RU_v2.idx?r=&ts=
-th_sk_SK_v2.dat?r=&ts=1338686412
-th_sk_SK_v2.idx?r=&ts=1338686211
-th_sl_SI_v2.dat?r=&ts=1338686213
-th_sl_SI_v2.idx?r=&ts=1338686215
-th_sv_SE_v2.dat?r=&ts=1338686216
-th_sv_SE_v2.idx?r=&ts=1338686414
+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_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_hu_HU_v2.dat
+th_hu_HU_v2.idx
+th_it_IT_v2.dat
+th_it_IT_v2.idx
+th_nb_NO_v2.dat
+th_nb_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
diff --git a/development/Win32/packaging/installer/include/init.nsh 
b/development/Win32/packaging/installer/include/init.nsh
index f430d97..4655996 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -212,6 +212,66 @@ SectionEnd
 
 SectionGroup "Dictionaries" SecDictionaries
 
+Section /o "Afrikaans" SecDAfrikaans
+ StrCpy $DictCodes "af_ZA$DictCodes"
+ AddSize 1440
+SectionEnd
+
+Section /o "Arabic" SecDArabic
+ StrCpy $DictCodes "ar_DZ$DictCodes"
+ AddSize 2500
+SectionEnd
+
+Section /o "Armenian" 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 "Belarusian" SecDBelarusian 
+ StrCpy $DictCodes "be_BY$DictCodes"
+ AddSize 1040
+SectionEnd
+
+Section /o "Brezhoneg" SecDBreton 
+ StrCpy $DictCodes "br_FR$DictCodes"
+ AddSize 11000
+SectionEnd
+
+Section /o "Bulgarian" SecDBulgarian
+ StrCpy $DictCodes "bg_BG$DictCodes"
+ AddSize 985
+SectionEnd
+
+Section /o "Català" SecDCatalanian
+ StrCpy $DictCodes "ca_ES$DictCodes"
+ AddSize 1210
+SectionEnd
+
+Section /o "Cetina" SecDCzech
+ StrCpy $DictCodes "cs_CZ$DictCodes"
+ AddSize 2190
+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 "German (A)" SecDGermanAT
  StrCpy $DictCodes "de_AT$DictCodes"
  AddSize 1000
@@ -223,20 +283,244 @@ Section /o "German (CH)" SecDGermanCH
 SectionEnd
 
 Section "German (D)" SecDGermanD
- StrCpy $DictCodes "de_DE$DictCodes"
+ # already installed by default
+ #StrCpy $DictCodes "de_DE$DictCodes"
  AddSize 2650
 SectionEnd
 
-Section "Magyar" SecDHungarian
+Section /o "Greek" SecDGreek
+ StrCpy $DictCodes "el_GR$DictCodes"
+ AddSize 6550
+SectionEnd
+
+Section /o "Eesti" SecDEstonian
+ StrCpy $DictCodes "et_EE$DictCodes"
+ AddSize 4400
+SectionEnd
+
+# enable this for LyX 2.1!
+#Section /o "English (AU)" SecDEnglishAU
+# StrCpy $DictCodes "en_AU$DictCodes"
+# AddSize 587
+#SectionEnd
+
+Section /o "English (CA)" SecDEnglishCA
+ StrCpy $DictCodes "en_CA$DictCodes"
+ AddSize 690
+SectionEnd
+
+Section "English (GB)" SecDEnglishGB
+ # already installed by default
+ #StrCpy $DictCodes "en_GB$DictCodes"
+ AddSize 757
+SectionEnd
+
+# enable this for LyX 2.1!
+#Section /o "English (NZ)" SecDEnglishNZ
+# StrCpy $DictCodes "en_NZ$DictCodes"
+# AddSize 551
+#SectionEnd
+
+Section "English (US)" SecDEnglishUS
+ # already installed by default
+ #StrCpy $DictCodes "en_US$DictCodes"
+ AddSize 688
+SectionEnd
+
+Section "Español (ES)" SecDSpanishES
+ # already installed by default
+ #StrCpy $DictCodes "es_ES$DictCodes"
+ AddSize 974
+SectionEnd
+
+Section "Español (MX)" SecDSpanishMX
+ # already installed by default
+ #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 "Farsi" SecDFarsi
+ StrCpy $DictCodes "fa_IR$DictCodes"
+ AddSize 6710
+SectionEnd
+
+Section "Français" SecDFrench
+ # already installed by default
+ #StrCpy $DictCodes "fr_FR$DictCodes"
+ AddSize 1200
+SectionEnd
+
+Section /o "Gaeilge" SecDGaelic
+ StrCpy $DictCodes "ga_IR$DictCodes"
+ AddSize 1090
+SectionEnd
+
+Section /o "Gàidhlig" SecDScottish
+ StrCpy $DictCodes "gd_GB$DictCodes"
+ AddSize 2460
+SectionEnd
+
+Section /o "Galego" SecDGalician
+ StrCpy $DictCodes "gl_ES$DictCodes"
+ AddSize 916
+SectionEnd
+
+Section /o "Hebrew" 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 "Serbcina" SecDSorbian
+Section /o "Interlingua" SecDInterlingua
+ StrCpy $DictCodes "ia_IA$DictCodes"
+ AddSize 649
+SectionEnd
+
+Section /o "Íslenska" SecDIcelandic
+ StrCpy $DictCodes "is_IS$DictCodes"
+ AddSize 2320
+SectionEnd
+
+Section /o "Italiano" SecDItalian
+ StrCpy $DictCodes "it_IT$DictCodes"
+ AddSize 1300
+SectionEnd
+
+Section /o "Kazakh" SecDKazakh
+ StrCpy $DictCodes "kk_KZ$DictCodes"
+ AddSize 2120
+SectionEnd
+
+Section /o "Korean" SecDKorean
+ StrCpy $DictCodes "ko_KR$DictCodes"
+ AddSize 15200
+SectionEnd
+
+Section /o "Latina" SecDLatin
+ StrCpy $DictCodes "la_LA$DictCodes"
+ AddSize 1250
+SectionEnd
+
+Section /o "Lietuviu" SecDLithuanian
+ StrCpy $DictCodes "lt_LT$DictCodes"
+ AddSize 1320
+SectionEnd
+
+Section /o "Latvieu" SecDLatvian
+ StrCpy $DictCodes "lv_LV$DictCodes"
+ AddSize 2140
+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 4890
+SectionEnd
+
+Section /o "Norsk (Nynorsk)" SecDNorwegianNN
+ StrCpy $DictCodes "nn_NO$DictCodes"
+ AddSize 2890
+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 1460
+SectionEnd
+
+Section /o "Româna" SecDRomanian
+ StrCpy $DictCodes "ro_RO$DictCodes"
+ AddSize 1930
+SectionEnd
+
+Section "Russian" SecDRussian
+ # already installed by default
+ #StrCpy $DictCodes "ru_RU$DictCodes"
+ AddSize 1920
+SectionEnd
+
+Section /o "Serbcina (Dolno)" SecDSorbianD
  StrCpy $DictCodes "db_DE$DictCodes"
  AddSize 904
 SectionEnd
 
+Section /o "Serbcina (Horno)" SecDSorbianH
+ StrCpy $DictCodes "hb_DE$DictCodes"
+ AddSize 740
+SectionEnd
+
+Section /o "Shqipe" SecDAlbanian
+ StrCpy $DictCodes "sq_AL$DictCodes"
+ AddSize 2400
+SectionEnd
+
+Section /o "Slovencina" SecDSlowenian
+ StrCpy $DictCodes "sl_SI$DictCodes"
+ AddSize 2840
+SectionEnd
+
+Section /o "Slovenský" SecDSlowakian
+ StrCpy $DictCodes "sk_SK$ThesCodes"
+ AddSize 4090
+SectionEnd
+
+Section /o "Srpski" SecDSerbian
+ StrCpy $DictCodes "sr_RS$DictCodes"
+ AddSize 3460
+SectionEnd
+
+Section /o "Svenska" SecDSwedish
+ StrCpy $DictCodes "sv_SE$DictCodes"
+ AddSize 1030
+SectionEnd
+ 
+Section /o "Thai" SecDThai
+ StrCpy $DictCodes "th_TH$DictCodes"
+ AddSize 351
+SectionEnd
+
+Section /o "Ukrainian" SecDUkrainian
+ StrCpy $DictCodes "uk_UA$DictCodes"
+ AddSize 2620
+SectionEnd
+
+Section /o "Vietnamese" SecDVietnamese
+ StrCpy $DictCodes "vi_VN$DictCodes"
+ AddSize 39600
+SectionEnd
+
 SectionGroupEnd
 
 SectionGroup "Thesaurus" SecThesaurus
diff --git a/development/Win32/packaging/installer/include/thesaurus.nsh 
b/development/Win32/packaging/installer/include/thesaurus.nsh
index 43cce37..fcfb007 100644
--- a/development/Win32/packaging/installer/include/thesaurus.nsh
+++ b/development/Win32/packaging/installer/include/thesaurus.nsh
@@ -8,32 +8,29 @@ Function DownloadHunspellDictionary
  FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
  ${For} $5 1 114
   FileRead $R5 $String # $String is now the dictionary name
-  StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code
-  MessageBox MB_OK|MB_ICONEXCLAMATION "$R3"
+  StrCpy $R3 $String 5 # $R3 is now the dictionary language code
   
   ${if} $DictCode == $R3
    StrCpy $String $String -2 # delete the linebreak characters at the end
-   StrCpy $FileName $String 15 # extract the real file name
    # 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 5
+   
+   ${For} $4 1 8
     FileRead $R4 $Search # $Search is now the mirror
     StrCpy $Search $Search -2 # delete the linebreak characters at the end
     Push $R0
-    MessageBox MB_OK|MB_ICONEXCLAMATION 
"http://downloads.sourceforge.net/project/lyxwininstaller/thesaurus/$String&use_mirror=$Search";
-    InetLoad::load /TIMEOUT=5000 
"http://downloads.sourceforge.net/project/lyxwininstaller/thesaurus/$String&use_mirror=$Search";
 "$INSTDIR\Resources\dicts\$FileName" /END
+    InetLoad::load /TIMEOUT=5000 
"http://$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 "(AspellDownloadFailed) $R0"
+    MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)"
     Goto abortinstall
    ${endif}
   ${endif} # end if $DictCode == $R3
@@ -42,7 +39,7 @@ Function DownloadHunspellDictionary
  FileClose $R5
 
   abortinstall:
-  Delete "$INSTDIR\$FileName"
+  Delete "$INSTDIR\$String"
 
 FunctionEnd
 
@@ -60,17 +57,15 @@ Function DownloadThesaurusDictionary
   
   ${if} $ThesCode == $R3
    StrCpy $String $String -2 # delete the linebreak characters at the end
-   StrCpy $FileName $String 15 # extract the real file name
    # Download thesaurus 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 5
+   ${For} $4 1 8
     FileRead $R4 $Search # $Search is now the mirror
     StrCpy $Search $Search -2 # delete the linebreak characters at the end
     Push $R0
-    MessageBox MB_OK|MB_ICONEXCLAMATION 
"http://downloads.sourceforge.net/project/lyxwininstaller/thesaurus/$String&use_mirror=$Search";
-    InetLoad::load /TIMEOUT=5000 
"http://downloads.sourceforge.net/project/lyxwininstaller/thesaurus/$String&use_mirror=$Search";
 "$INSTDIR\Resources\thes\$FileName" /END
+    InetLoad::load /TIMEOUT=5000 
"http://$Search.dl.sourceforge.net/project/lyxwininstaller/thesaurus/$String"; 
"$INSTDIR\Resources\thes\$String" /END
     Pop $R0
     ${if} $R0 == "OK"
      ${ExitFor}
@@ -80,7 +75,7 @@ Function DownloadThesaurusDictionary
    FileClose $R4
    # if download failed
    ${if} $R0 != "OK"
-    MessageBox MB_OK|MB_ICONEXCLAMATION "(AspellDownloadFailed) $R0"
+    MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)"
     Goto abortinstall
    ${endif}
   ${endif} # end if $ThesCode == $R3
@@ -89,7 +84,7 @@ Function DownloadThesaurusDictionary
  FileClose $R5
 
   abortinstall:
-  Delete "$INSTDIR\$FileName"
+  Delete "$INSTDIR\$String"
 
 FunctionEnd
 
@@ -104,10 +99,19 @@ Function InstallHunspellDictionary
  ${Do}
   StrCpy $DictCode $DictCodes 5
   StrCpy $DictCodes $DictCodes "" 5
-  MessageBox MB_OK|MB_ICONEXCLAMATION "$DictCode"
   Call DownloadHunspellDictionary
  ${LoopUntil} $DictCodes == ""
  
+ # some dictionaries need to be renamed
+ ${if} ${FileExists} "$INSTDIR\Resources\dicts\db_DE.aff"
+  Rename "$INSTDIR\Resources\dicts\db_DE.aff" 
"$INSTDIR\Resources\dicts\dsb_DE.aff"
+  Rename "$INSTDIR\Resources\dicts\db_DE.dic" 
"$INSTDIR\Resources\dicts\dsb_DE.dic"
+ ${endif}
+ ${if} ${FileExists} "$INSTDIR\Resources\dicts\hb_DE.aff"
+  Rename "$INSTDIR\Resources\dicts\hb_DE.aff" 
"$INSTDIR\Resources\dicts\hsb_DE.aff"
+  Rename "$INSTDIR\Resources\dicts\hb_DE.dic" 
"$INSTDIR\Resources\dicts\hsb_DE.dic"
+ ${endif}
+ 
 FunctionEnd
 
 #--------------------------------
@@ -121,7 +125,6 @@ Function InstallThesaurusDictionary
  ${Do}
   StrCpy $ThesCode $ThesCodes 5
   StrCpy $ThesCodes $ThesCodes "" 5
-  MessageBox MB_OK|MB_ICONEXCLAMATION "$ThesCode"
   Call DownloadThesaurusDictionary
  ${LoopUntil} $ThesCodes == ""
  
diff --git a/development/Win32/packaging/installer/include/variables.nsh 
b/development/Win32/packaging/installer/include/variables.nsh
index 787f5da..8e926ca 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -24,7 +24,6 @@ Var DictCode
 Var DictCodes
 Var DelPythonFiles
 Var EditorPath
-Var FileName
 Var GhostscriptPath
 Var GnumericPath
 Var ImageEditorPath
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh 
b/development/Win32/packaging/installer/lang/arabic.nsh
index 545b848..5322008 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo '
 ${LangFileString} LatexError1 'äå êÊå ÇäÙËèÑ Ùäé ÊèÒêÙÉ-äÊêã!$\r$\n\
                                      äÇ êåãæ ÇÓÊÎÏÇå äêã ÈÏèæ ÊèÒêÙÉ äÊêã åËä 
MiKTeX!$\r$\n\
                                      ÓêÊå ÇÌçÇÖ ÇäÊÑãêÈ.'
-                                     
+
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'ÓêÊå ÇäÂæ ÊÑãêÈ ÈÑæÇåÌ JabRef.$\r$\n\
                                     ÊÓÊ×êÙ ÇÎÊêÇÑ ãä ÇäÎêÇÑÇÊ ÇËæÇÁ ÊÑãêÈ 
ÈÑæÇåÌ JabRef.'
 ${LangFileString} JabRefError 'äå êæÌÍ ÊÑãêÈ ÈÑæÇåÌ JabRef!$\r$\n\
                                      ÓÊÓÊåÑ ÙåäêÉ ÇäÊÑãêÈ.$\r$\n\
                                      ÍÇèä ÊÑãêÈ JabRef äÇÍâÇë.'
-                                     
+
 ${LangFileString} LatexConfigInfo "ÇäÙåäêÉ ÇäÊÇäêÉ ÓÊÓÊÚÑâ ÈÙÖ ÇäèâÊ."
 
 ${LangFileString} MiKTeXPathInfo "äãê êãèæ ãä åÓÊÎÏå âÇÏÑÇ Ùäé ÊÎÕêÕ miktex 
äÇÍâÇë ÍÓÈ ÇÍÊêÇÌÇÊç $\r$\n\
diff --git a/development/Win32/packaging/installer/lang/catalan.nsh 
b/development/Win32/packaging/installer/lang/catalan.nsh
index 21fee8e..610f903 100644
--- a/development/Win32/packaging/installer/lang/catalan.nsh
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo 'Ara s$\'executar
 ${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} JabRefInfo 'Ara s$\'executarà l$\'instal·lador del programa 
$\"JabRef$\".$\r$\n\
                                     Podeu usar totes les opcions 
predeterminades de l$\'instal·lador del JabRef.'
 ${LangFileString} JabRefError 'El programa $\"JabRef$\" no s$\'ha instal·lat 
correctament!$\r$\n\
                                      L$\'instal·lador continuarà 
igualment.$\r$\n\
                                      Intenteu instal·lar el JabRef altre cop 
més tard.'
-                                     
+
 ${LangFileString} LatexConfigInfo "La configuració següent del LyX pot trigar 
una mica."
 
 ${LangFileString} MiKTeXPathInfo "Per a que cada usuari pugui personalitzar el 
MiKTeX segons les seves necessitats\r$\n\
diff --git a/development/Win32/packaging/installer/lang/czech.nsh 
b/development/Win32/packaging/installer/lang/czech.nsh
index 8d7d5ec..020ab62 100644
--- a/development/Win32/packaging/installer/lang/czech.nsh
+++ b/development/Win32/packaging/installer/lang/czech.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo 'Nyn
 ${LangFileString} LatexError1 'ádná LaTeXová-distribuce nebyla 
nalezena!$\r$\n\
                                      Nemùete pouívat LyX bez distribuce 
LaTeXu jako je napø. $\"MiKTeX$\"!$\r$\n\
                                      Instalace bude proto pøeruena.'
-                                     
+
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'Nyní bude sputìn instalátor programu 
$\"JabRef$\".$\r$\n\
                                     Mùete pouít vechny pøedvolby 
instalátoru JabRef.'
 ${LangFileString} JabRefError 'Program $\"JabRef$\" nebyl úspìnì 
nainstalován.$\r$\n\
                                      Instalátor bude navzdory tomu 
pokraèovat.$\r$\n\
                                      Pokuste se nainstalovat JabRef pozdìji.'
-                                     
+
 ${LangFileString} LatexConfigInfo "Následující konfigurování LyXu chvíli 
potrvá."
 
 ${LangFileString} MiKTeXPathInfo "Aby kadý uivatel mohl pozdìji pøizpùsobit 
MiKTeX pro své potøeby$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/danish.nsh 
b/development/Win32/packaging/installer/lang/danish.nsh
index 5cf88db..692d08c 100644
--- a/development/Win32/packaging/installer/lang/danish.nsh
+++ b/development/Win32/packaging/installer/lang/danish.nsh
@@ -49,6 +49,9 @@ ${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} JabRefInfo 'Installationen af programmet $\"JabRef$\" 
startes.$\r$\n\
                                     Du kan roligt bruge alle $\"default$\" 
valgmuligheder ved JabRef-installationen.'
 ${LangFileString} JabRefError 'Programmet $\"JabRef$\" kunne ikke 
installeres!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/dutch.nsh 
b/development/Win32/packaging/installer/lang/dutch.nsh
index 09d5d3b..045afbe 100644
--- a/development/Win32/packaging/installer/lang/dutch.nsh
+++ b/development/Win32/packaging/installer/lang/dutch.nsh
@@ -49,12 +49,15 @@ ${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} JabRefInfo 'Het installatie programma van $\"JabRef$\" wordt 
nu gestart.$\r$\n\
                                     U kunt de standaard opties gebruiken.'
 ${LangFileString} JabRefError 'Het programma $\"JabRef$\" kon niet worden 
geinstalleerd!$\r$\n\
                                      De LyX installatie gaat desondanks 
verder.$\r$\n\
                                      Probeer JabRef later te installeren.'
-                                     
+
 ${LangFileString} LatexConfigInfo "De volgende configuratie van LyX zal enige 
tijd duren."
 
 ${LangFileString} MiKTeXPathInfo "Opdat elke gebruiker zijn MiKTeX 
configuratie kan aanpassen$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/english.nsh 
b/development/Win32/packaging/installer/lang/english.nsh
index 948641b..175e753 100644
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -129,13 +129,16 @@ ${LangFileString} LatexInfo 'Now the installer of the 
LaTeX-distribution $\"MiKT
 ${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} JabRefInfo 'Now the installer of the program $\"JabRef$\" 
will be launched.$\r$\n\
                                     You can use all default options of the 
JabRef-installer.'
 ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully 
be installed!$\r$\n\
                                      The installer will continue anyway.$\r$\n\
                                      Try to install JabRef again later.'
-                                     
+
 ${LangFileString} LatexConfigInfo "The following configuration of LyX will 
take a while."
 
 ${LangFileString} MiKTeXPathInfo "In order that every user is later able to 
customize MiKTeX for his needs$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/french.nsh 
b/development/Win32/packaging/installer/lang/french.nsh
index a135023..57abdba 100644
--- a/development/Win32/packaging/installer/lang/french.nsh
+++ b/development/Win32/packaging/installer/lang/french.nsh
@@ -137,13 +137,16 @@ ${LangFileString} LatexInfo 'Lancement de 
l$\'installation de la distribution La
 ${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 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'Lancement de l$\'installation de l$\'application 
$\"JabRef$\".$\r$\n\
                                     Vous pouvez utiliser les options 
implicites du programme d$\'installation JabRef.'
 ${LangFileString} JabRefError 'L$\'application $\"JabRef$\" n$\'a pas pu être 
installée correctement !$\r$\n\
                                      L$\'installation de LyX va 
continuer.$\r$\n\
                                      Essayer d$\'installer JabRef de nouveau 
plus tard.'
-                                     
+
 ${LangFileString} LatexConfigInfo "La configuration de LyX qui va suivre 
prendra un moment."
 
 ${LangFileString} MiKTeXPathInfo "Pour que chaque utilisateur soit capable de 
personnaliser MiKTeX pour ses besoins$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/galician.nsh 
b/development/Win32/packaging/installer/lang/galician.nsh
index bffe7cd..71b2989 100644
--- a/development/Win32/packaging/installer/lang/galician.nsh
+++ b/development/Win32/packaging/installer/lang/galician.nsh
@@ -49,6 +49,9 @@ ${LangFileString} LatexError1 'Non se achou nengunha 
distribuci
                                      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} JabRefInfo 'Agora lanzará-se o instalador do programa 
$\"JabRef$\".$\r$\n\
                                     Pode usar todas as opcións por defeito no 
instalador do JabRef.'
 ${LangFileString} JabRefError 'Non se deu instalado o programa 
$\"JabRef$\"!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/german.nsh 
b/development/Win32/packaging/installer/lang/german.nsh
index 4630574..ead5e9a 100644
--- a/development/Win32/packaging/installer/lang/german.nsh
+++ b/development/Win32/packaging/installer/lang/german.nsh
@@ -133,7 +133,10 @@ ${LangFileString} LatexInfo 'Als N
 ${LangFileString} LatexError1 'Es konnte keine LaTeX-Distribution gefunden 
werden!$\r$\n\
                                      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} JabRefInfo 'Als Nächstes wird der Installer des Programms 
$\"JabRef$\" gestartet.$\r$\n\
                                     Sie können alle voreingestellten Optionen 
des JabRef-Installers verwenden.'
 ${LangFileString} JabRefError 'Das Programm $\"JabRef$\" konnte nicht 
erfolgreich installiert werden!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh 
b/development/Win32/packaging/installer/lang/hungarian.nsh
index c3feefc..991ccf9 100644
--- a/development/Win32/packaging/installer/lang/hungarian.nsh
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -49,6 +49,9 @@ ${LangFileString} LatexError1 'Nem tal
                                      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 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'A $\"JabRef$\" telepítõjének elindítása 
következik.$\r$\n\
                                     Használhatja az alapértelmezett opciókat.'
 ${LangFileString} JabRefError 'Nem tudom telepíteni a $\"JabRef$\" 
programot!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh 
b/development/Win32/packaging/installer/lang/indonesian.nsh
index 5a7f167..b26ab16 100644
--- a/development/Win32/packaging/installer/lang/indonesian.nsh
+++ b/development/Win32/packaging/installer/lang/indonesian.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo 'Sekarang instalasi program 
distribusi LaTeX $\"MiKT
 ${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} JabRefInfo 'Sekarang instalasi program $\"JabRef$\" akan 
dijalankan.$\r$\n\
                                     Anda boleh memilih semua pilihan default 
yang ada di program instalasi JabRef.'
 ${LangFileString} JabRefError 'Program $\"JabRef$\" tidak berhasil diinstal 
secara keseluruhan!$\r$\n\
                                      Namun proses instalasi dapat 
diteruskan.$\r$\n\
                                      Anda dapat mengulang instalasi JabRef 
nanti.'
-                                     
+
 ${LangFileString} LatexConfigInfo "Proses konfigurasi LyX selanjutnya akan 
memerlukan waktu beberapa saat."
 
 ${LangFileString} MiKTeXPathInfo "Agar memungkinkan semua pengguna dapat 
mengatur MiKTeX sesuai keinginannya$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/italian.nsh 
b/development/Win32/packaging/installer/lang/italian.nsh
index 4b78e17..9af11e7 100644
--- a/development/Win32/packaging/installer/lang/italian.nsh
+++ b/development/Win32/packaging/installer/lang/italian.nsh
@@ -131,7 +131,10 @@ ${LangFileString} LatexInfo 'Verr
 ${LangFileString} LatexError1 'Il programma non ha rilevato la presenza di 
alcuna distribuzione valida di LaTeX!$\r$\n\
                                       LyX non può funzionare senza una 
distribuzione LaTeX (ad es. $\"MiKTeX$\")!$\r$\n\
                                      Il processo di installazione verrà quindi 
terminato.'
-                
+
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${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.'
 ${LangFileString} JabRefError 'Il programma $\"JabRef$\" non è stato 
installato correttamente!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/japanese.nsh 
b/development/Win32/packaging/installer/lang/japanese.nsh
index 1ab1c52..ed140cd 100644
--- a/development/Win32/packaging/installer/lang/japanese.nsh
+++ b/development/Win32/packaging/installer/lang/japanese.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo '
 ${LangFileString} LatexError1 
'LaTeXfBXgr[Vð©·é±ÆªÅ«Ü¹ñÅµ½I$\r$\n\
                                      
LyXÍA$\"MiKTeX$\"Ìæ¤ÈLaTeXfBXgr[VÈµÅÍg¤±ÆªÅ«Ü¹ñI$\r$\n\
                                      µ½ªÁÄCXg[Í~µÜ·B'
-                                     
+
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 
'±ê©çvO$\"JabRef$\"ÌCXg[[ðN®µÜ·B$\r$\n\
                                     
JabRefCXg[[ÌftHgÌIvVð·×Äó¯üêÄ©Ü¢Ü¹ñB'
 ${LangFileString} JabRefError 
'vO$\"JabRef$\"Í³µCXg[³êÜ¹ñÅµ½I$\r$\n\
                                      
CXg[[ÍAÆè ¦¸±ÌÜÜCXg[ð±¯Ü·B$\r$\n\
                                      
ãÅJabRefÌCXg[ðÄxÝÄ¾³¢B'
-                                     
+
 ${LangFileString} LatexConfigInfo "ÈºÌLyXÌÝèÉÍXÔª©©èÜ·B"
 
 ${LangFileString} MiKTeXPathInfo 
"·×ÄÌ[U[ªãÅKvÉ¶ÄMiKTeXð$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh 
b/development/Win32/packaging/installer/lang/norwegian.nsh
index 155edd0..1a507a5 100644
--- a/development/Win32/packaging/installer/lang/norwegian.nsh
+++ b/development/Win32/packaging/installer/lang/norwegian.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo 'N
 ${LangFileString} LatexError1 'Fant ikke noen LaTeX-distribusjon!$\r$\n\
                                      LyX kan ikke brukes uten en 
LaTeX-distribusjion som $\"MiKTeX$\"!$\r$\n\
                                      Derfor avbrytes installasjonen.'
-                   
+
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" 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.'
 ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully 
be installed!$\r$\n\
                                      The installer will continue anyway.$\r$\n\
                                      Try to install JabRef again later.'
-                                     
+
 ${LangFileString} LatexConfigInfo "Konfigurasjon av LyX vil ta en stund."
 
 ${LangFileString} MiKTeXPathInfo "In order that every user is later able to 
customize MiKTeX for his needs$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/polish.nsh 
b/development/Win32/packaging/installer/lang/polish.nsh
index 9eef762..15a7c39 100644
--- a/development/Win32/packaging/installer/lang/polish.nsh
+++ b/development/Win32/packaging/installer/lang/polish.nsh
@@ -49,6 +49,9 @@ ${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 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" 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.'
 ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully 
be installed!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh 
b/development/Win32/packaging/installer/lang/portuguese.nsh
index 50f2773..82af1fd 100644
--- a/development/Win32/packaging/installer/lang/portuguese.nsh
+++ b/development/Win32/packaging/installer/lang/portuguese.nsh
@@ -49,6 +49,9 @@ ${LangFileString} LatexError1 'N
                                      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 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${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.'
 ${LangFileString} JabRefError 'Não se conseguiu instalar o programa 
$\"JabRef$\"!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/romanian.nsh 
b/development/Win32/packaging/installer/lang/romanian.nsh
index 1b5aeac..61bcbe7 100644
--- a/development/Win32/packaging/installer/lang/romanian.nsh
+++ b/development/Win32/packaging/installer/lang/romanian.nsh
@@ -48,6 +48,9 @@ ${LangFileString} LatexError1 'Nu am detectat nici o distribu
                                      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} 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.'
 ${LangFileString} JabRefError 'Programul $\"JabRef$\" nu a putut fi 
instalat!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/slovak.nsh 
b/development/Win32/packaging/installer/lang/slovak.nsh
index 4196a9a..b143c4d 100644
--- a/development/Win32/packaging/installer/lang/slovak.nsh
+++ b/development/Win32/packaging/installer/lang/slovak.nsh
@@ -50,12 +50,15 @@ ${LangFileString} LatexError1 'LaTeX distrib
                                      LyX sa nemôe uíva bez LaTeX 
distribúcie ako $\"MiKTeX$\"!$\r$\n\
                                      Preto sa intalácia zastavila.'
 
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'Teraz sa tartuje intalatér programu 
$\"JabRef$\".$\r$\n\
                                     Môzete vetký obsiahnuté nastavenia 
intalatéra JabRef.'
 ${LangFileString} JabRefError 'Program $\"JabRef$\" sa nemohol intalova 
úspene!$\r$\n\
                                      Predsa intalácia pokraèuje.$\r$\n\
                                      Skúste intalova JabRef ete raz neskôr.'
-                               
+
 ${LangFileString} LatexConfigInfo "Na nasledujúcu konfiguráciu LyXu treba 
poèka chví¾u."
 
 ${LangFileString} MiKTeXPathInfo "Aby kadý pouívatel bol neskôr schopný 
pouívat MiKTeX pre svoje potreby$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/spanish.nsh 
b/development/Win32/packaging/installer/lang/spanish.nsh
index a99b6a1..0c2a63a 100644
--- a/development/Win32/packaging/installer/lang/spanish.nsh
+++ b/development/Win32/packaging/installer/lang/spanish.nsh
@@ -49,6 +49,9 @@ ${LangFileString} LatexError1 '
                                      ¡LyX no funciona sin una distribución de 
LaTeX como $\"MiKTeX$\"!$\r$\n\
                                      Por lo tanto la instalación se abortará.'
 
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'Ahora se lanzará el instalador del programa 
$\"JabRef$\".$\r$\n\
                                     Puede utilizar todas las opciones por 
defecto del instaldor de JabRef.'
 ${LangFileString} JabRefError '¡El programa $\"JabRef$\" no pudo instalarse 
con éxito!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/swedish.nsh 
b/development/Win32/packaging/installer/lang/swedish.nsh
index cf6095f..1891afe 100644
--- a/development/Win32/packaging/installer/lang/swedish.nsh
+++ b/development/Win32/packaging/installer/lang/swedish.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo 'Nu kommer 
installationsprogrammet f
 ${LangFileString} LatexError1 'Kan inte hitta någon LaTeX-distribution!$\r$\n\
                                      LyX kan inte användas utan en 
LaTeX-distribution som tex $\"MiKTeX$\"!$\r$\n\
                                      Installation avbryts därför nu.'
-                                   
+
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'Nu kommer installationsprogrammet för 
$\"JabRef$\" att köras.$\r$\n\
                                     Du kan använda alla standardalternativ i 
installationsprogrammet för JabRef.'
 ${LangFileString} JabRefError 'Programmet $\"JabRef$\" kunde inte installeras 
ordentligt!$\r$\n\
                                      Installationen av LyX kommer att 
fortsätta ändå.$\r$\n\
                                      Försök installera GSview igen senare.'
-                                     
+
 ${LangFileString} LatexConfigInfo "Följande konfigurering av LyX kommer att ta 
ett tag."
 
 ${LangFileString} MiKTeXPathInfo "För att varje användare senare skall kunna 
anpassa MiKTeX för sina behov$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/turkish.nsh 
b/development/Win32/packaging/installer/lang/turkish.nsh
index 748d1bd..c5f33f4 100644
--- a/development/Win32/packaging/installer/lang/turkish.nsh
+++ b/development/Win32/packaging/installer/lang/turkish.nsh
@@ -49,6 +49,9 @@ ${LangFileString} LatexError1 'Hi
                                      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} JabRefInfo 'Now the installer of the program $\"JabRef$\" 
will be launched.$\r$\n\
                                     You can use all default options of the 
JabRef-installer.'
 ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully 
be installed!$\r$\n\
diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh 
b/development/Win32/packaging/installer/lang/ukrainian.nsh
index c9d5277..8b61b67 100644
--- a/development/Win32/packaging/installer/lang/ukrainian.nsh
+++ b/development/Win32/packaging/installer/lang/ukrainian.nsh
@@ -48,13 +48,16 @@ ${LangFileString} LatexInfo '
 ${LangFileString} LatexError1 'Äèñòðèáóòèâ³â LaTeX íå âèÿâëåíî!$\r$\n\
                                      Âè íå çìîæåòå êîðèñòóâàòèñÿ LyX áåç 
äèñòðèáóòèâà LaTeX íà çðàçîê $\"MiKTeX$\"!$\r$\n\
                                      Ç ö³º¿ ïðè÷èíè âñòàíîâëåííÿ áóäå 
ïðèïèíåíî.'
-                                     
+      
+${LangFileString} HunspellFailed 'Download of dictionary for language 
$\"$R3$\" failed.'
+${LangFileString} ThesaurusFailed 'Download of thesaurus for language 
$\"$R3$\" failed.'
+
 ${LangFileString} JabRefInfo 'Òåïåð áóäå çàïóùåíî çàñ³á äëÿ âñòàíîâëåííÿ 
ïðîãðàìè $\"JabRef$\".$\r$\n\
                                     Ó çàñîá³ äëÿ âñòàíîâëåííÿ âè ìîæåòå íå 
çì³íþâàòè òèïîâèõ ïàðàìåòð³â JabRef.'
 ${LangFileString} JabRefError 'Íå âäàëîñÿ âñòàíîâèòè ïðîãðàìó 
$\"JabRef$\"!$\r$\n\
                                      Ïðîöåñ âñòàíîâëåííÿ LyX áóäå 
ïðîäîâæåíî.$\r$\n\
                                      Ñïðîáóéòå âñòàíîâèòè JabRef ï³çí³øå 
ñàìîñò³éíî.'
-                                     
+
 ${LangFileString} LatexConfigInfo "Íàëàøòóâàííÿ LyX ìîæå òðèâàòè äîñèòü äîâãî."
 
 ${LangFileString} MiKTeXPathInfo "Ùîá êîæåí ç êîðèñòóâà÷³â ì³ã ï³çí³øå 
íàëàøòóâàòè MiKTeX çã³äíî äî âëàñíèõ ïîòðåá,$\r$\n\

-----------------------------------------------------------------------

Summary of changes:
 .../packaging/installer/DictionaryMirrors.txt      |    3 +
 .../installer/HunspellDictionaryNames.txt          |  234 ++++++++--------
 .../installer/ThesaurusDictionaryNames.txt         |   88 +++---
 .../Win32/packaging/installer/include/init.nsh     |  290 +++++++++++++++++++-
 .../packaging/installer/include/thesaurus.nsh      |   39 ++--
 .../packaging/installer/include/variables.nsh      |    1 -
 .../Win32/packaging/installer/lang/arabic.nsh      |    7 +-
 .../Win32/packaging/installer/lang/catalan.nsh     |    7 +-
 .../Win32/packaging/installer/lang/czech.nsh       |    7 +-
 .../Win32/packaging/installer/lang/danish.nsh      |    3 +
 .../Win32/packaging/installer/lang/dutch.nsh       |    5 +-
 .../Win32/packaging/installer/lang/english.nsh     |    7 +-
 .../Win32/packaging/installer/lang/french.nsh      |    7 +-
 .../Win32/packaging/installer/lang/galician.nsh    |    3 +
 .../Win32/packaging/installer/lang/german.nsh      |    5 +-
 .../Win32/packaging/installer/lang/hungarian.nsh   |    3 +
 .../Win32/packaging/installer/lang/indonesian.nsh  |    7 +-
 .../Win32/packaging/installer/lang/italian.nsh     |    5 +-
 .../Win32/packaging/installer/lang/japanese.nsh    |    7 +-
 .../Win32/packaging/installer/lang/norwegian.nsh   |    7 +-
 .../Win32/packaging/installer/lang/polish.nsh      |    3 +
 .../Win32/packaging/installer/lang/portuguese.nsh  |    3 +
 .../Win32/packaging/installer/lang/romanian.nsh    |    3 +
 .../Win32/packaging/installer/lang/slovak.nsh      |    5 +-
 .../Win32/packaging/installer/lang/spanish.nsh     |    3 +
 .../Win32/packaging/installer/lang/swedish.nsh     |    7 +-
 .../Win32/packaging/installer/lang/turkish.nsh     |    3 +
 .../Win32/packaging/installer/lang/ukrainian.nsh   |    7 +-
 28 files changed, 565 insertions(+), 204 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] installer: implement new method to select hunspell and thesaurus dictionaries and to download the selected ones (final part 2)

Reply via email to