5 files changed, 49 insertions, 31 deletions
diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh
index e391d240..d94291df 100644
--- a/Installer/settings/files_in.nsh
+++ b/Installer/settings/files_in.nsh
@@ -1,7 +1,7 @@
 ; This list contains the files that will be installed
 
 ; Create required directories:
-
+  
   CreateDirectory "$INSTDIR\Covers"
   CreateDirectory "$INSTDIR\Languages"
   CreateDirectory "$INSTDIR\Plugins"
@@ -17,10 +17,10 @@
   SetOutPath "$INSTDIR"
   File "..\InstallerDependencies\dll\bass.dll"
   File "..\InstallerDependencies\dll\SDL.dll"
-  File "..\InstallerDependencies\dll\avutil-49.dll"
+  File "..\InstallerDependencies\dll\sqlite3.dll"
   File "..\InstallerDependencies\dll\avcodec-51.dll"
   File "..\InstallerDependencies\dll\avformat-50.dll"
-  File "..\InstallerDependencies\dll\sqlite3.dll"
+  File "..\InstallerDependencies\dll\avutil-49.dll"
 
   File "..\InstallerDependencies\documents\Changelog.german.txt"
   File "..\InstallerDependencies\documents\Changelog.txt"
@@ -62,8 +62,8 @@ ${EndIf}
   File "..\Plugins\Blind.dll"
   File "..\Plugins\Duell.dll"
   File "..\Plugins\Hold_The_Line.dll"
-  File "..\Plugins\Until5000.dll"
   File "..\Plugins\TeamDuell.dll"
+  File "..\Plugins\Until5000.dll"
 
   SetOutPath "$INSTDIR\Skins\Classic\"
   File "..\Skins\Classic\[button]13.jpg"
@@ -258,7 +258,7 @@ ${EndIf}
   File "..\Sounds\select music change music 50.mp3"
   File "..\Sounds\select music change music.mp3"
   File "..\Sounds\wome-credits-tune.mp3"
-
+  
   SetOutPath "$INSTDIR\Themes\"
   File "..\Themes\Classic.ini"
   File "..\Themes\Deluxe.ini"
diff --git a/Installer/settings/langstrings.nsh b/Installer/settings/langstrings.nsh
index dec444d8..fa3acf19 100644
--- a/Installer/settings/langstrings.nsh
+++ b/Installer/settings/langstrings.nsh
@@ -9,8 +9,8 @@ LangString str_abort ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrec
 LangString uninst_begin ${LANG_ENGLISH} "This will uninstall UltraStar Deluxe completely (with Songs!). Continue ?"
 LangString uninst_begin ${LANG_GERMAN} "Dies wird UltraStar Deluxe vollständig deinstallieren (inkl. Songs!). Fortfahren?"
 
-LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_ENGLISH} "We hope you enjoyed UltraStar Deluxe. Please leave us a comment why you uninstalled UltraStar Deluxe in our forum:\n\n${forum}\n\nWe would also be pleased to recieve your feedback on UltraStar Deluxe there."
-LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_GERMAN} "Wir hoffen du hast UltraStar Deluxe genossen. Bitte hinterlasse uns einen Kommentar im Forum, warum du UltraStar Deluxe deinstalliert hast:\n\n${forum}\n\nWir würden uns dort ebenso über eine Rückmeldung für UltraStar Deluxe freuen."
+LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_ENGLISH} "We hope you enjoyed UltraStar Deluxe. Please leave us a comment why you uninstalled UltraStar Deluxe in our forum: ${forum}. We would also be pleased to recieve your feedback on UltraStar Deluxe there."
+LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_GERMAN} "Wir hoffen du hast UltraStar Deluxe genossen. Bitte hinterlasse uns einen Kommentar im Forum, warum du UltraStar Deluxe deinstalliert hast: ${forum}. Wir würden uns dort ebenso über eine Rückmeldung für UltraStar Deluxe freuen."
 
 LangString MUI_UNTEXT_FINISH_INFO_TITLE ${LANG_ENGLISH} "The uninstallation finished successfully!"
 LangString MUI_UNTEXT_FINISH_INFO_TITLE ${LANG_GERMAN} "Die Deinstallation wurde erfolgreich abgeschlossen."
@@ -30,22 +30,19 @@ LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar Deluxe"
 LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?" ; Finish Page: Readme = Create Desktop Shortcut
 LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
 
-LangString sc_play ${LANG_GERMAN} "Spielen"                            ; Shortcut name play or spielen (used for MCE)
+LangString sc_play ${LANG_GERMAN} "Spielen"  			  ; Shortcut name play or spielen (used for MCE)
 LangString sc_play ${LANG_ENGLISH} "Play"
 
-LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren"                  ; Name for uninstall icon in startmenu
+LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren"		  ; Name for uninstall icon in startmenu
 LangString sm_uninstall ${LANG_ENGLISH} "Uninstall"
 
-LangString sm_website ${LANG_GERMAN} "Webseite"                  ; Name for website icon in startmenu
+LangString sm_website ${LANG_GERMAN} "Internetseite"		  ; Name for website icon in startmenu
 LangString sm_website ${LANG_ENGLISH} "Website"
 
-LangString sm_documentation ${LANG_GERMAN} "Dokumentation"                  ; Name for documentation icon in startmenu
-LangString sm_documentation ${LANG_ENGLISH} "Documentation"
-
-LangString sm_license ${LANG_GERMAN} "Lizenz"                          ; Name for license.txt icon in startmenu
+LangString sm_license ${LANG_GERMAN} "Lizenz"			  ; Name for license.txt icon in startmenu
 LangString sm_license ${LANG_ENGLISH} "License"
 
-LangString sm_readme ${LANG_GERMAN} "Lies mich"                          ; Name for readme.txt icon in startmenu
+LangString sm_readme ${LANG_GERMAN} "Lies mich"			  ; Name for readme.txt icon in startmenu
 LangString sm_readme ${LANG_ENGLISH} "Readme"
 
 LangString Settings_TITLE ${LANG_ENGLISH} " "
@@ -53,20 +50,20 @@ LangString Settings_TITLE ${LANG_GERMAN} " "
 LangString Settings_SUBTITLE ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe"
 LangString Settings_SUBTITLE ${LANG_GERMAN} "Lege deine favorisierten Einstellungen für UltraStar Deluxe fest."
 
-LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"        ; Title String in Welcome Page
+LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"	; Title String in Welcome Page
 LangString wp_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard"
 
 LangString wp_text ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. Diese Installationsroutine enthält den Bonus Song 'Dead Smiling Pirates - I 18' aus der CreativeCommons Datenbank, der optional heruntergeladen werden kann (benötigt aktive Internetverbindung).\n\r\n\rDas UltraStar Deluxe Team wünscht viel Spaß.\n\rProjekthomepage: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org"
 LangString wp_text ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar. These Installation Wizard includes the bonus track 'Dead Smiling Pirates - I 18' from the CreativeCommons database and which can be downloaded seperatly (requires active internet connection).\n\r\n\rThe UltraStar Deluxe Team wishes you fun.\n\rProject website: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org"
 
-LangString fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)"        ; "Show Readme" String in Finish Page
+LangString fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)"	; "Show Readme" String in Finish Page
 LangString fp_showreadme ${LANG_ENGLISH} "See documentation (PDF)"
 
-LangString fp_text ${LANG_GERMAN}  "UltraStar wurde erfolgreich auf Ihrem System installiert.\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten."
-LangString fp_text ${LANG_ENGLISH}  "UltraStar was installed successfully on you system.\n\rVisit out project website to get latest news and updates."
+LangString fp_text ${LANG_GERMAN}  "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.\n\r\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten."
+LangString fp_text ${LANG_ENGLISH}  "UltraStar Deluxe was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates."
 
-LangString fp_link ${LANG_GERMAN} "Projektwebseite"        ; Link to developers website - String in Finish Page
+LangString fp_link ${LANG_GERMAN} "Projektwebseite"	; Link to developers website - String in Finish Page
 LangString fp_link ${LANG_ENGLISH} "Project website"
 
-LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent für UltraStar Deluxe"
+LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent für UltraStar Deluxe" 
 LangString uncp_text ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Uninstall Wizard"
 \ No newline at end of file
diff --git a/Installer/settings/optional/in_song1.nsh b/Installer/settings/optional/in_song1.nsh
new file mode 100644
index 00000000..50c1e20a
--- /dev/null
+++ b/Installer/settings/optional/in_song1.nsh
@@ -0,0 +1,10 @@
+
+  SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"
+
+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18 [BG].jpg"
+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18 [CO].jpg"
+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18.ogg"
+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18.txt"
+  File "..\Songs\Dead Smiling Pirates - I 18 [DEMO]\License.txt"
+
+  SetOutPath "$INSTDIR"
+\ No newline at end of file
diff --git a/Installer/settings/optional/in_song2.nsh b/Installer/settings/optional/in_song2.nsh
new file mode 100644
index 00000000..a9929b17
--- /dev/null
+++ b/Installer/settings/optional/in_song2.nsh
@@ -0,0 +1,11 @@
+
+  SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\"
+
+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\License.txt"
+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star v1.4.txt"
+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [BG].jpg"
+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [CO].jpg"
+  File "..\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.mp3"
+
+
+  SetOutPath "$INSTDIR"
+\ No newline at end of file
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index 1bb3a7b6..3a022ecd 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -27,11 +27,11 @@
 !define eng_sec3_desc "You can choose which optional themes should also be installed."  ; English Description of "Optional Themes"-Section
 !define ger_sec3_desc "Hier können optionale Motive zum Installieren gewählt werden."   ; German Description of "Optional Themes"-Section
 
-!define eng_g2Section1_desc "Downloads the demo song 'Dead Smiling Pirates - I 18'. Requires: Active Internet connection!"	; English Description of the Example Song "I 18"
-!define ger_g2Section1_desc "Lädt das freie Beispiellied 'Dead Smiling Pirates - I 18' herunter. Benötigt: Aktive Internetverbindung!"   	; German Description of the Example Song "I 18"
+!define eng_g2Section1_desc "Install the demo song 'Dead Smiling Pirates - I 18'."	; English Description of the Example Song "I 18"
+!define ger_g2Section1_desc "Installiert das freie Beispiellied 'Dead Smiling Pirates - I 18'"   	; German Description of the Example Song "I 18"
 
-!define eng_g2Section2_desc "Downloads the demo song 'Steven Dunston - Northern Star'. Requires: Active Internet connection!"		; English Description of the Example Song "Northern Star"
-!define ger_g2Section2_desc "Lädt das freie Beispiellied 'Steven Dunston - Northern Star' herunter. Benötigt: Aktive Internetverbindung!"	; German Description of the Example Song "Northern Star"
+!define eng_g2Section2_desc "Install the demo song 'Steven Dunston - Northern Star'."		; English Description of the Example Song "Northern Star"
+!define ger_g2Section2_desc "Installiert das freie Beispiellied 'Steven Dunston - Northern Star'"	; German Description of the Example Song "Northern Star"
 
 !define eng_sec1 "Base components" 							; English Name of the component section1
 !define ger_sec1 "Basiskomponenten" 							; German Name of the component section1
@@ -44,14 +44,14 @@
 
 ; Group Section Descriptions:
 
-!define eng_g1Sec1_desc "This will download the optional theme 'Orange' by Skar."
-!define ger_g1Sec1_desc "Dies lädt das optionale Motiv 'Orange' von Skar herunter."
+!define eng_g1Sec1_desc "This will install the optional theme 'Orange' by Skar."
+!define ger_g1Sec1_desc "Dies installiert das optionale Motiv 'Orange' von Skar."
 
-!define eng_g1Sec2_desc "This will download the optional theme 'Streetlight' by Skar."
-!define ger_g1Sec2_desc "Dies lädt das optionale Motiv 'Streetlight' von Skar herunter."
+!define eng_g1Sec2_desc "This will install the optional theme 'Streetlight' by Skar."
+!define ger_g1Sec2_desc "Dies installiert das optionale Motiv 'Streetlight' von Skar."
 
-!define eng_g1Sec3_desc "This will download the optional theme 'Vistar' by Skar."
-!define ger_g1Sec3_desc "Dies lädt das optionale Motiv 'Vistar' von Skar herunter."
+!define eng_g1Sec3_desc "This will install the optional theme 'Vistar' by Skar."
+!define ger_g1Sec3_desc "Dies installiert das optionale Motiv 'Vistar' von Skar."
 
 ; Skin: