- added songs (wise guys, bodo wartke, shearer) and themes (whitesensation, bluesensation 5.1)

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

5 files changed, 409 insertions, 60 deletions

diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index c8df95dd..e512203c 100644
--- a/installer/UltraStar Deluxe.nsi
+++ b/installer/UltraStar Deluxe.nsi
@@ -307,11 +307,33 @@ SectionEnd
 

 SectionGroup $(name_section2) Section2

 

+Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-BodoWartke-LoveSong.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-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-BodoWartke-LoveSong.zip"

+

+  SetOutPath "$INSTDIR"

+

+

+SectionEnd

+

 ;

 ; Dead Smiling Pirates - I 18

 ; 

 

-Section /o "Dead Smiling Pirates - I 18" g2Section1

+Section /o "Dead Smiling Pirates - I 18" g2Section2

 ;  AddSize 1400

    SetOverwrite try

    SetOutPath "$INSTDIR"

@@ -851,7 +873,7 @@ SectionGroupEnd
 ; Joshua Morin - On The Run

 ; 

 

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

+Section /o "Joshua Morin - On The Run" g2Section3

 ;  AddSize 2200

    SetOverwrite try

    SetOutPath "$INSTDIR"

@@ -859,7 +881,7 @@ Section /o "Joshua Morin - On The Run" g2Section2
    SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip

+  NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-On-the-run.zip

 

   Pop $R0 ;Get the return value

     StrCmp $R0 "success" dlok

@@ -873,7 +895,7 @@ Section /o "Joshua Morin - On The Run" g2Section2
 

 SectionEnd

 

-Section /o "Pornophonique - Space Invaders" g2Section3

+Section /o "Pornophonique - Space Invaders" g2Section4

 ;  AddSize 2200

    SetOverwrite try

    SetOutPath "$INSTDIR"

@@ -895,7 +917,200 @@ Section /o "Pornophonique - Space Invaders" g2Section3
 

 SectionEnd

 

-Section /o "Steven Dunston - Northern Star" g2Section4

+SectionGroup $(name_s2_sub2) s2_sub2

+

+Section /o "Shearer - 69" s2_sub2_Section1

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song1} $TEMP\Song-Shearer-69.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-Shearer-69.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-69.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.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-Shearer-69-Kar.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-69-Kar.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - Can't stop it" s2_sub2_Section3

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.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-Shearer-CSI.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-CSI.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.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-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-CSI-Kar.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - In My Hand" s2_sub2_Section5

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.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-Shearer-IMH.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-IMH.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - Man Song" s2_sub2_Section6

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song6} $TEMP\Song-Shearer-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-Shearer-MS.zip" "$INSTDIR\Songs\"

+

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

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.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-Shearer-MS-Kar.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-MS-Kar.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - Stay With Me" s2_sub2_Section8

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.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-Shearer-SWM.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-SWM.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.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-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-Shearer-SWM-Kar.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+SectionGroupEnd

+

+Section /o "Steven Dunston - Northern Star" g2Section5

 ;  AddSize 1500

    SetOverwrite try

    SetOutPath "$INSTDIR"

@@ -903,7 +1118,7 @@ Section /o "Steven Dunston - Northern Star" g2Section4
    SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\"

 

 ; Download song:

-  NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-Northern-Star.zip

+  NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Northern-Star.zip

 

   Pop $R0 ;Get the return value

     StrCmp $R0 "success" dlok

@@ -917,6 +1132,52 @@ Section /o "Steven Dunston - Northern Star" g2Section4
 

 SectionEnd

 

+SectionGroup $(name_s2_sub3) s2_sub3

+

+Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.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-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-WiseGuys-LUKUS.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2

+

+;  AddSize 1400

+   SetOverwrite try

+   SetOutPath "$INSTDIR\Songs\"

+

+; Download song:

+  NSISdl::download /TIMEOUT=30000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.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-WiseGuys-MWBD.zip" "$INSTDIR\Songs\"

+

+  Delete "$TEMP\Song-WiseGuys-MWBD.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+SectionGroupEnd

+

 SectionGroupEnd

 

 ;------------------------------------

@@ -999,7 +1260,27 @@ SectionEnd
 

 SectionEnd

 

- Section /o "WiiStar" g3Section5

+

+ Section /o "WhiteSensation" g3Section5

+;   AddSize 1000

+

+; Download theme WhiteSensation:

+

+  NSISdl::download /TIMEOUT=30000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip

+

+  Pop $R0 ;Get the return value

+   StrCmp $R0 "success" dlok

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

+  dlok:

+  nsisunz::Unzip "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\"

+

+  Delete "$TEMP\Theme-WhiteSensation.zip"

+

+  SetOutPath "$INSTDIR"

+

+SectionEnd

+

+ Section /o "WiiStar" g3Section6

 ;   AddSize 1000

 

 ; Download theme WiiStar:

@@ -1018,7 +1299,7 @@ SectionEnd
 

 SectionEnd

 

- Section /o "iStar" g3Section6

+ Section /o "iStar" g3Section7

 ;   AddSize 1000

 

 ; Download theme iStar:

@@ -1073,12 +1354,15 @@ 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 ${s2_sub2} $(DESC_Section2_sub2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3)

   !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)

 

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)

   !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5)

 

   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2)

@@ -1105,12 +1389,26 @@ SectionEnd
   !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 ${s2_sub2_Section1} $(DESC_s2_sub2_Section1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9)

+

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1)

+  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2)

+

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5)

   !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6)

+  !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7)

 

 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 

diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
index e5d8dccf..9620723e 100644
--- a/installer/languages/English.nsh
+++ b/installer/languages/English.nsh
@@ -60,17 +60,22 @@ 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_s2_sub2 ${LANG_ENGLISH} "Shearer"

+LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys"

 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_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed."

+LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed."

+LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs 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)."

-LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)."

-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_g2Section2 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

+LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)."

+LangString DESC_g2Section4 ${LANG_ENGLISH} "This will install the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

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

+LangString DESC_g2Section1 ${LANG_ENGLISH} "This will install the song 'Bodo Wartke - Liebeslied (Love Song)'."

 

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

@@ -97,11 +102,23 @@ LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "This will install the song 'R
 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_s2_sub2_Section1 ${LANG_ENGLISH} "This will install the song '69'."

+LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "This will install the song '69 (Karaoke)'."

+LangString DESC_s2_sub2_Section3 ${LANG_ENGLISH} "This will install the song 'Can't stop it'."

+LangString DESC_s2_sub2_Section4 ${LANG_ENGLISH} "This will install the song 'Can't stop it (Karaoke)'."

+LangString DESC_s2_sub2_Section5 ${LANG_ENGLISH} "This will install the song 'In My Hand'."

+LangString DESC_s2_sub2_Section6 ${LANG_ENGLISH} "This will install the song 'Man Song'."

+LangString DESC_s2_sub2_Section7 ${LANG_ENGLISH} "This will install the song 'Man Song (Karaoke)'."

+LangString DESC_s2_sub2_Section8 ${LANG_ENGLISH} "This will install the song 'Stay with me'."

+LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "This will install the song 'Stay with me (Karaoke)'."

+

+LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "This will install the song 'Lebendig und kräftig und schärfer'."

+LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du?'."

+

 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"

-LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5' by Charis"

-LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW"

-LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX"

-

-

+LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5.1' by Charis"

+LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW"

+LangString DESC_g3Section7 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX"

+LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WhiteSensation' by Charis"
\ No newline at end of file
diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index 642257ee..aeb222a7 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -60,47 +60,65 @@ 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_s2_sub2 ${LANG_GERMAN} "Shearer"

+LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys"

 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_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden."

+LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs 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)."

-LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Beispiellied 'Joshua Morin - On The Run' (CC by-sa 2.5)."

-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_g2Section2 ${LANG_GERMAN} "Installiert das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."

+LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5)."

+LangString DESC_g2Section4 ${LANG_GERMAN} "Installiert das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."

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

+LangString DESC_g2Section1 ${LANG_GERMAN} "Installiert das Lied 'Bodo Wartke - Liebeslied (Love Song)'."

+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Installiert das Lied '69'."

+LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Installiert das Lied '69 (Karaoke)'."

+LangString DESC_s2_sub2_Section3 ${LANG_GERMAN} "Installiert das Lied 'Can't stop it'."

+LangString DESC_s2_sub2_Section4 ${LANG_GERMAN} "Installiert das Lied 'Can't stop it (Karaoke)'."

+LangString DESC_s2_sub2_Section5 ${LANG_GERMAN} "Installiert das Lied 'In My Hand'."

+LangString DESC_s2_sub2_Section6 ${LANG_GERMAN} "Installiert das Lied 'Man Song'."

+LangString DESC_s2_sub2_Section7 ${LANG_GERMAN} "Installiert das Lied 'Man Song (Karaoke)'."

+LangString DESC_s2_sub2_Section8 ${LANG_GERMAN} "Installiert das Lied 'Stay with me'."

+LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Installiert das Lied 'Stay with me (Karaoke)'."

+

+LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Installiert das Lied 'Lebendig und kräftig und schärfer'."

+LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du?'."

 

 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"

-LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5' von Charis"

-LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW"

-LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX"

-

+LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5.1' von Charis"

+LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW"

+LangString DESC_g3Section7 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX"

+LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WhiteSensation' von Charis"
\ No newline at end of file
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index 605725aa..6a270257 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -11,11 +11,12 @@ CreateDirectory $INSTDIR\playlists
 

 SetOutPath "$INSTDIR"

 

-; themes, languages, sounds, visuals dir

+; themes, languages, sounds, fonts, visuals dir

 

 File /r ..\game\themes

 File /r ..\game\languages

 File /r ..\game\sounds

+File /r ..\game\fonts

 File /r ..\installerdependencies\visuals

 

 ; Root dir:

diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh
index bf5668d7..db98d89f 100644
--- a/installer/settings/variables.nsh
+++ b/installer/settings/variables.nsh
@@ -14,7 +14,7 @@
 

 !define exe "USdx"

 

-!define license "license.txt"

+!define license "..\installerdependencies\documents\license.txt"

 

 ; Icons

 

@@ -38,10 +38,11 @@
 

 ; Download URLs for Songs and Themes:

 

-!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip"

-!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip"

-!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_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip"

+!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip"

+!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip"

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

+!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.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"

@@ -68,9 +69,23 @@
 !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_sub2_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69.zip"

+!define download_sub2_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69_kar.zip"

+!define download_sub2_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it.zip"

+!define download_sub2_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it_kar.zip"

+!define download_sub2_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_in_my_hand.zip"

+!define download_sub2_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song.zip"

+!define download_sub2_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song_kar.zip"

+!define download_sub2_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me.zip"

+!define download_sub2_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me_kar.zip"

+

+!define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip"

+!define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.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"

-!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5_by_Charis.zip"

-!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip"

-!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip"
\ No newline at end of file
+!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5.1_by_Charis.zip"

+!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip"

+!define download_theme7 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip"

+!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-whitesensationV101_by_Charis.zip"   
\ No newline at end of file