- added jonathan coulton songs

- small installer fixes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1542 b956fd51-792f-4845-bead-9b4dfca2ff2c

5 files changed, 621 insertions, 6 deletions

diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index 1e71e28c..c8df95dd 100644
--- a/installer/UltraStar Deluxe.nsi
+++ b/installer/UltraStar Deluxe.nsi
@@ -334,7 +334,521 @@ Section /o "Dead Smiling Pirates - I 18" g2Section1
 SectionEnd

 

 ;

-; Steven Dunston - Northern Star

+; Jonathan Coulton Songs

+; 

+

+SectionGroup $(name_s2_sub1) s2_sub1

+

+Section /o "Monkey Shines" s2_sub1_Section1

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-MS.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "I Crush Everything" s2_sub1_Section2

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-ICE.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Not About You" s2_sub1_Section3

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-NAY.zip"

+

+  SetOutPath "$INSTDIR"

+

+

+SectionEnd

+

+Section /o "Mr. Fancy Pants" s2_sub1_Section4

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-MFP.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Big Bad World One" s2_sub1_Section5

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-BBWO.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Flickr" s2_sub1_Section6

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-Flickr.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "My Beige Bear" s2_sub1_Section7

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-MBB.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "The Future Soon" s2_sub1_Section8

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-TFS.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Ikea" s2_sub1_Section9

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-Ikea.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Furry Old Lobster" s2_sub1_Section10

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-FOL.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Code Monkey" s2_sub1_Section11

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-CM.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "I´m Your Moon" s2_sub1_Section12

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-IYM.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "First Of May" s2_sub1_Section13

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-FOM.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-DSJD.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "A Walk With George" s2_sub1_Section15

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-AWWG.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Creepy Doll" s2_sub1_Section16

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-CD.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "That Spells DNA" s2_sub1_Section17

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-TSDNA.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "When You Go" s2_sub1_Section18

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-WYG.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Better" s2_sub1_Section19

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-Better.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shop Vac" s2_sub1_Section20

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-SV.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "I Feel Fantastic" s2_sub1_Section21

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-IFF.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Re: Your Brains" s2_sub1_Section22

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-ReYB.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Skullcrusher Mountain" s2_sub1_Section23

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-SCM.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Chiron Beta Prime" s2_sub1_Section24

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip

+ 

+  Pop $R0

+    StrCmp $R0 "success" dlok

+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK

+  dlok:

+  nsisunz::Unzip "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-JC-CBP.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+

+SectionGroupEnd

+

+;

+; Joshua Morin - On The Run

 ; 

 

 Section /o "Joshua Morin - On The Run" g2Section2

@@ -558,6 +1072,7 @@ SectionEnd
 

   !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1)

   !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)

 

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

@@ -565,6 +1080,31 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4)

 

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24)

+

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3)

diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
index f74e5c75..b539a0e2 100644
--- a/installer/languages/English.nsh
+++ b/installer/languages/English.nsh
@@ -46,10 +46,12 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
 

 LangString name_section1 ${LANG_ENGLISH} "Main components"

 LangString name_section2 ${LANG_ENGLISH} "Optional songs"

+LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton"

 LangString name_section3 ${LANG_ENGLISH} "Optional themes"

 

 LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe"

 LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed."

+LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton Songs (CC by-nc 3.0) should be installed."

 LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed."

 

 LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

@@ -57,6 +59,31 @@ LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Joshua M
 LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

 LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."

 

+LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "This will install the song 'Monkey Shines'."

+LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I Crush Everything'."

+LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "This will install the song 'Not About You'."

+LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "This will install the song 'Mr. Fancy Pants'."

+LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "This will install the song 'Big Bad World One'."

+LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr'."

+LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "This will install the song 'My Beige Bear'."

+LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "This will install the song 'The Future Soon'."

+LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "This will install the song 'Ikea'."

+LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "This will install the song 'Furry Old Lobster'."

+LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey'."

+LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "This will install the song 'I´m Your Moon'."

+LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "This will install the song 'First Of May'."

+LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "This will install the song 'Dance, Soterios Johnson, Dance'."

+LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "This will install the song 'A Talk With George'."

+LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll'."

+LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "This will install the song 'That Spells DNA'."

+LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "This will install the song 'When You Go'."

+LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "This will install the song 'Better'."

+LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "This will install the song 'Shop Vac'."

+LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "This will install the song 'I Feel Fantastic'."

+LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'Re: Your Brains'."

+LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "This will install the song 'Skullcrusher Mountain'."

+LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime'."

+

 LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar"

 LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar"

 LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar"

diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index 1027b8e0..0939b236 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -46,10 +46,12 @@ LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?"
 

 LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten"

 LangString name_section2 ${LANG_GERMAN} "Optionale Songs"

+LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton"

 LangString name_section3 ${LANG_GERMAN} "Optionale Themen"

 

 LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien"

 LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden."

+LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden."

 LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden."

 

 LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

@@ -57,6 +59,31 @@ LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'Joshua
 LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

 LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."

 

+LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "Installiert das Beispiellied 'Monkey Shines'."

+LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'I Crush Everything'."

+LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "Installiert das Beispiellied 'Not About You'."

+LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "Installiert das Beispiellied 'Mr. Fancy Pants'."

+LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "Installiert das Beispiellied 'Big Bad World One'."

+LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "Installiert das Beispiellied 'Flickr'."

+LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "Installiert das Beispiellied 'My Beige Bear'."

+LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "Installiert das Beispiellied 'The Future Soon'."

+LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "Installiert das Beispiellied 'Ikea'."

+LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "Installiert das Beispiellied 'Furry Old Lobster'."

+LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "Installiert das Beispiellied 'Code Monkey'."

+LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "Installiert das Beispiellied 'I´m Your Moon'."

+LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "Installiert das Beispiellied 'First Of May'."

+LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "Installiert das Beispiellied 'Dance, Soterios Johnson, Dance'."

+LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "Installiert das Beispiellied 'A Talk With George'."

+LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "Installiert das Beispiellied 'Creepy Doll'."

+LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "Installiert das Beispiellied 'That Spells DNA'."

+LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "Installiert das Beispiellied 'When You Go'."

+LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "Installiert das Beispiellied 'Better'."

+LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "Installiert das Beispiellied 'Shop Vac'."

+LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "Installiert das Beispiellied 'I Feel Fantastic'."

+LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "Installiert das Beispiellied 'Re: Your Brains'."

+LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "Installiert das Beispiellied 'Skullcrusher Mountain'."

+LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "Installiert das Beispiellied 'Chiron Beta Prime'."

+

 LangString DESC_g3Section1 ${LANG_GERMAN} "Installiert das Motiv 'Orange' von Skar"

 LangString DESC_g3Section2 ${LANG_GERMAN} "Installiert das Motiv 'Streetlight' von Skar"

 LangString DESC_g3Section3 ${LANG_GERMAN} "Installiert das Motiv 'Vistar' von Skar"

diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index 00fd3f8e..605725aa 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -43,11 +43,7 @@ File ..\game\covers\NoCover.jpg
 ; Plugins dir:

 

 SetOutPath "$INSTDIR\Plugins\"

-  File "..\Plugins\Blind.dll"

-  File "..\Plugins\Duell.dll"

-  File "..\Plugins\Hold_The_Line.dll"

-  File "..\Plugins\TeamDuell.dll"

-  File "..\Plugins\Until5000.dll"

+  File "..\Plugins\*.dll"

 

 ${If} ${AtLeastWinVista}

 

diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh
index b6ffc022..bf5668d7 100644
--- a/installer/settings/variables.nsh
+++ b/installer/settings/variables.nsh
@@ -43,6 +43,31 @@
 !define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip"

 !define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip"

 

+!define download_sub1_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_monkey_shines.zip"

+!define download_sub1_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_crush_everything.zip"

+!define download_sub1_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_not_about_you.zip"

+!define download_sub1_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_mr_fancy_pants.zip"

+!define download_sub1_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_big_bad_world_one.zip"

+!define download_sub1_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_flickr.zip"

+!define download_sub1_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_my_beige_bear.zip"

+!define download_sub1_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_the_future_soon.zip"

+!define download_sub1_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_ikea.zip"

+!define download_sub1_song10 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_furry_old_lobster.zip"

+!define download_sub1_song11 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_code_monkey.zip"

+!define download_sub1_song12 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_im_your_moon.zip"

+!define download_sub1_song13 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_first_of_may.zip"

+!define download_sub1_song14 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_dance_soterios_johnson_dance.zip"

+!define download_sub1_song15 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_a_talk_with_george.zip"

+!define download_sub1_song16 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_creepy_doll.zip"

+!define download_sub1_song17 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_that_spells_dna.zip"

+!define download_sub1_song18 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_when_you_go.zip"

+!define download_sub1_song19 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_better.zip"

+!define download_sub1_song20 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_shop_vac.zip"

+!define download_sub1_song21 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_feel_fantastic.zip"

+!define download_sub1_song22 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_re-_your_brains.zip"

+!define download_sub1_song23 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_skullcrusher_mountain.zip"

+!define download_sub1_song24 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_chiron_beta_prime.zip"

+

 !define download_theme1 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-orange_by_Skar.zip"

 !define download_theme2 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Streetlight_by_Skar.zip"

 !define download_theme3 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Vistar_by_Skar.zip"