aboutsummaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorcanni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-04-12 18:56:27 +0000
committercanni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-04-12 18:56:27 +0000
commite05652b4e123eb241cb3c9b85e1b89796996b196 (patch)
treef4f4d9f773b3d4089b28355d2b23a85e0f6b5c32 /installer
parent1d9233874262457db5b454e3db9401234bea3cfe (diff)
downloadusdx-e05652b4e123eb241cb3c9b85e1b89796996b196.tar.gz
usdx-e05652b4e123eb241cb3c9b85e1b89796996b196.tar.xz
usdx-e05652b4e123eb241cb3c9b85e1b89796996b196.zip
- added uninstall option (songs, covers, highscores)
- added section sizes - changed default options git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1667 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'installer')
-rw-r--r--installer/UltraStar Deluxe.nsi164
-rw-r--r--installer/languages/English.nsh12
-rw-r--r--installer/languages/German.nsh12
-rw-r--r--installer/settings/files_main_uninstall.nsh1
4 files changed, 129 insertions, 60 deletions
diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index 4ce8c88b..2b2991e3 100644
--- a/installer/UltraStar Deluxe.nsi
+++ b/installer/UltraStar Deluxe.nsi
@@ -6,6 +6,7 @@
!include WinVer.nsh
!include LogicLib.nsh
!include InstallOptions.nsh
+!include nsDialogs.nsh
; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
; Variables
@@ -82,6 +83,7 @@ RequestExecutionLevel user
!define MUI_WELCOMEPAGE_TITLE_3LINES
!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)"
+
!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)"
; License Page:
@@ -148,6 +150,9 @@ Function Settings
; Get all the variables:
+Var /GLOBAL CHECKBOX
+Var /GLOBAL checkbox_state
+
var /GLOBAL fullscreen
var /GLOBAL language2
var /GLOBAL resolution
@@ -192,18 +197,35 @@ ${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini"
${EndIf}
-${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini"
; Animations On / Off Tasks
${If} $animations == "Off"
+${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"
+
${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini"
${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini"
${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini"
+
+${EndIf}
+
+${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini"
+
+${If} $animations != "Off"
+
+${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"
+
+${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini"
+
${EndIf}
@@ -216,8 +238,46 @@ FunctionEnd ; Settings page End
; Pages UnInstallation Routine
; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+!define MUI_WELCOMEPAGE_TITLE "$(page_un_welcome_title)"
!insertmacro MUI_UNPAGE_WELCOME
!insertmacro MUI_UNPAGE_CONFIRM
+
+UninstPage custom un.AskDelete un.DeleteAll
+
+Function un.AskDelete
+
+nsDialogs::Create /NOUNLOAD 1018
+
+ ${NSD_CreateCheckbox} 0 -150 100% 8u "$(delete_all)"
+ Pop $CHECKBOX
+
+ nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0
+
+
+nsDialogs::Show
+
+FunctionEnd
+
+Function un.DeleteAll
+
+${NSD_GetState} $CHECKBOX $checkbox_state
+
+${If} $checkbox_state == "1"
+
+ RMDir /r "$INSTDIR\Songs"
+ RMDir /r "$INSTDIR\Covers"
+ Delete "$INSTDIR\Ultrastar.db"
+
+${Else}
+
+; If checkbox_state = 0
+
+
+${EndIf}
+
+
+FunctionEnd
+
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_UNPAGE_FINISH
@@ -309,7 +369,7 @@ SectionGroup $(name_section2) Section2
Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1
-; AddSize 1400
+ AddSize 10342
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -334,7 +394,7 @@ SectionEnd
;
Section /o "Dead Smiling Pirates - I 18" g2Section2
-; AddSize 1400
+ AddSize 2816
SetOverwrite try
SetOutPath "$INSTDIR"
CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18"
@@ -363,7 +423,7 @@ SectionGroup $(name_s2_sub1) s2_sub1
Section /o "Monkey Shines" s2_sub1_Section1
-; AddSize 1400
+ AddSize 1455
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -384,7 +444,7 @@ SectionEnd
Section /o "I Crush Everything" s2_sub1_Section2
-; AddSize 1400
+ AddSize 7127
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -405,7 +465,7 @@ SectionEnd
Section /o "Not About You" s2_sub1_Section3
-; AddSize 1400
+ AddSize 3492
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -427,7 +487,7 @@ SectionEnd
Section /o "Mr. Fancy Pants" s2_sub1_Section4
-; AddSize 1400
+ AddSize 2427
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -448,7 +508,7 @@ SectionEnd
Section /o "Big Bad World One" s2_sub1_Section5
-; AddSize 1400
+ AddSize 4424
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -469,7 +529,7 @@ SectionEnd
Section /o "Flickr" s2_sub1_Section6
-; AddSize 1400
+ AddSize 21607
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -490,7 +550,7 @@ SectionEnd
Section /o "My Beige Bear" s2_sub1_Section7
-; AddSize 1400
+ AddSize 4926
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -511,7 +571,7 @@ SectionEnd
Section /o "The Future Soon" s2_sub1_Section8
-; AddSize 1400
+ AddSize 5612
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -532,7 +592,7 @@ SectionEnd
Section /o "Ikea" s2_sub1_Section9
-; AddSize 1400
+ AddSize 4608
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -553,7 +613,7 @@ SectionEnd
Section /o "Furry Old Lobster" s2_sub1_Section10
-; AddSize 1400
+ AddSize 3288
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -574,7 +634,7 @@ SectionEnd
Section /o "Code Monkey" s2_sub1_Section11
-; AddSize 1400
+ AddSize 21402
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -595,7 +655,7 @@ SectionEnd
Section /o "I´m Your Moon" s2_sub1_Section12
-; AddSize 1400
+ AddSize 4916
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -616,7 +676,7 @@ SectionEnd
Section /o "First Of May" s2_sub1_Section13
-; AddSize 1400
+ AddSize 6257
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -637,7 +697,7 @@ SectionEnd
Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14
-; AddSize 1400
+ AddSize 5929
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -656,22 +716,22 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14
SectionEnd
-Section /o "A Walk With George" s2_sub1_Section15
+Section /o "A Talk With George" s2_sub1_Section15
-; AddSize 1400
+ AddSize 4076
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
; Download song:
- NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip
+ NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\"
- Delete "$TEMP\Song-JC-AWWG.zip"
+ Delete "$TEMP\Song-JC-ATWG.zip"
SetOutPath "$INSTDIR"
@@ -679,7 +739,7 @@ SectionEnd
Section /o "Creepy Doll" s2_sub1_Section16
-; AddSize 1400
+ AddSize 66560
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -700,7 +760,7 @@ SectionEnd
Section /o "That Spells DNA" s2_sub1_Section17
-; AddSize 1400
+ AddSize 4158
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -721,7 +781,7 @@ SectionEnd
Section /o "When You Go" s2_sub1_Section18
-; AddSize 1400
+ AddSize 5755
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -742,7 +802,7 @@ SectionEnd
Section /o "Better" s2_sub1_Section19
-; AddSize 1400
+ AddSize 4199
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -763,7 +823,7 @@ SectionEnd
Section /o "Shop Vac" s2_sub1_Section20
-; AddSize 1400
+ AddSize 5448
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -784,7 +844,7 @@ SectionEnd
Section /o "I Feel Fantastic" s2_sub1_Section21
-; AddSize 1400
+ AddSize 3851
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -805,7 +865,7 @@ SectionEnd
Section /o "Re: Your Brains" s2_sub1_Section22
-; AddSize 1400
+ AddSize 7087
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -826,7 +886,7 @@ SectionEnd
Section /o "Skullcrusher Mountain" s2_sub1_Section23
-; AddSize 1400
+ AddSize 6298
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -847,7 +907,7 @@ SectionEnd
Section /o "Chiron Beta Prime" s2_sub1_Section24
-; AddSize 1400
+ AddSize 38298
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -874,7 +934,7 @@ SectionGroupEnd
;
Section /o "Joshua Morin - On The Run" g2Section3
-; AddSize 2200
+ AddSize 3881
SetOverwrite try
SetOutPath "$INSTDIR"
CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run"
@@ -896,7 +956,7 @@ Section /o "Joshua Morin - On The Run" g2Section3
SectionEnd
Section /o "Pornophonique - Space Invaders" g2Section4
-; AddSize 2200
+ AddSize 3646
SetOverwrite try
SetOutPath "$INSTDIR"
CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders"
@@ -921,7 +981,7 @@ SectionGroup $(name_s2_sub2) s2_sub2
Section /o "Shearer - 69" s2_sub2_Section1
-; AddSize 1400
+ AddSize 4557
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -942,7 +1002,7 @@ SectionEnd
Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2
-; AddSize 1400
+ AddSize 4772
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -963,7 +1023,7 @@ SectionEnd
Section /o "Shearer - Can't stop it" s2_sub2_Section3
-; AddSize 1400
+ AddSize 5510
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -984,7 +1044,7 @@ SectionEnd
Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4
-; AddSize 1400
+ AddSize 4178
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1005,7 +1065,7 @@ SectionEnd
Section /o "Shearer - In My Hand" s2_sub2_Section5
-; AddSize 1400
+ AddSize 5960
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1026,7 +1086,7 @@ SectionEnd
Section /o "Shearer - Man Song" s2_sub2_Section6
-; AddSize 1400
+ AddSize 7270
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1047,7 +1107,7 @@ SectionEnd
Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7
-; AddSize 1400
+ AddSize 5807
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1068,7 +1128,7 @@ SectionEnd
Section /o "Shearer - Stay With Me" s2_sub2_Section8
-; AddSize 1400
+ AddSize 6400
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1089,7 +1149,7 @@ SectionEnd
Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9
-; AddSize 1400
+ AddSize 5417
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1112,7 +1172,7 @@ SectionEnd
SectionGroupEnd
Section /o "Steven Dunston - Northern Star" g2Section5
-; AddSize 1500
+ AddSize 2427
SetOverwrite try
SetOutPath "$INSTDIR"
CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star"
@@ -1138,7 +1198,7 @@ SectionGroup $(name_s2_sub3) s2_sub3
Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1
-; AddSize 1400
+ AddSize 4015
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1160,7 +1220,7 @@ SectionEnd
Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2
-; AddSize 1400
+ AddSize 5335
SetOverwrite try
SetOutPath "$INSTDIR\Songs\"
@@ -1191,7 +1251,7 @@ SectionGroupEnd
SectionGroup $(name_section3) Section3
Section /o "Orange" g3Section1
-; AddSize 700
+ AddSize 1291
; Download theme orange:
NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip
@@ -1209,7 +1269,7 @@ SectionGroup $(name_section3) Section3
SectionEnd
Section /o "Streetlight" g3Section2
-; AddSize 1000
+ AddSize 1905
; Download theme Streetlight:
NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip
@@ -1227,7 +1287,7 @@ SectionEnd
SectionEnd
Section /o "Vistar" g3Section3
-; AddSize 1000
+ AddSize 1936
; Download theme Vistar:
@@ -1246,7 +1306,7 @@ SectionEnd
SectionEnd
Section /o "BlueSensation" g3Section4
-; AddSize 1000
+ AddSize 2109
; Download theme BlueSensation:
@@ -1266,7 +1326,7 @@ SectionEnd
Section /o "WhiteSensation" g3Section5
-; AddSize 1000
+ AddSize 1168
; Download theme WhiteSensation:
@@ -1285,7 +1345,7 @@ SectionEnd
SectionEnd
Section /o "WiiStar" g3Section6
-; AddSize 1000
+ AddSize 850
; Download theme WiiStar:
@@ -1304,7 +1364,7 @@ SectionEnd
SectionEnd
Section /o "iStar" g3Section7
-; AddSize 1000
+ AddSize 1588
; Download theme iStar:
diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
index 9620723e..5e1b6331 100644
--- a/installer/languages/English.nsh
+++ b/installer/languages/English.nsh
@@ -15,6 +15,8 @@ LangString button_next ${LANG_ENGLISH} "Next >"
LangString button_close ${LANG_ENGLISH} "Close"
LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards."
+LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Highscores and Covers ?"
+
LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?"
LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed."
LangString update_check_newer ${LANG_ENGLISH} "Your installed version $R0 is newer than the $\n$\rcurrent release version $1 of UltraStar Deluxe. No update needed."
@@ -28,6 +30,8 @@ LangString page_welcome_txt_update ${LANG_ENGLISH} "This wizard will guide you t
LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard"
LangString page_welcome_txt ${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.$\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 page_un_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe uninstall wizard"
+
; Components Page:
LangString page_components_info ${LANG_ENGLISH} "Hover the component to get details"
@@ -82,17 +86,17 @@ LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "This will install the song 'I
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_Section6 ${LANG_ENGLISH} "This will install the song 'Flickr [incl. video]'."
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_Section11 ${LANG_ENGLISH} "This will install the song 'Code Monkey [incl. video]'."
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_Section16 ${LANG_ENGLISH} "This will install the song 'Creepy Doll [incl. video]'."
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'."
@@ -100,7 +104,7 @@ LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "This will install the song 'S
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_s2_sub1_Section24 ${LANG_ENGLISH} "This will install the song 'Chiron Beta Prime [incl. video]'."
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)'."
diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index aeb222a7..b4f004b3 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -15,6 +15,8 @@ LangString button_next ${LANG_GERMAN} "Weiter >"
LangString button_close ${LANG_GERMAN} "Beenden"
LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden."
+LangString delete_all ${LANG_GERMAN} "Lieder, Highscores und Cover auch löschen?"
+
LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?"
LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt."
LangString update_check_newer ${LANG_GERMAN} "Deine aktuelle Version $R0 ist neuer als die zurzeit veröffentlichte$\n$\rVersion $1 von UltraStar Deluxe. Kein Update benötigt."
@@ -28,6 +30,8 @@ LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird Sie dur
LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"
LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. $\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 page_un_welcome_title ${LANG_GERMAN} "Willkommen zur Deinstallation von UltraStar Deluxe"
+
; Components Page:
LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über die Komponente um Details einzusehen"
@@ -82,17 +86,17 @@ LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "Installiert das Lied 'I Crush E
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_Section6 ${LANG_GERMAN} "Installiert das Lied 'Flickr [inkl. Video]'."
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_Section11 ${LANG_GERMAN} "Installiert das Lied 'Code Monkey [inkl. Video]'."
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_Section16 ${LANG_GERMAN} "Installiert das Lied 'Creepy Doll [inkl. Video]'."
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'."
@@ -100,7 +104,7 @@ 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_sub1_Section24 ${LANG_GERMAN} "Installiert das Lied 'Chiron Beta Prime [inkl. Video]'."
LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "Installiert das Lied '69'."
LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "Installiert das Lied '69 (Karaoke)'."
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
index b3d69da2..277eb409 100644
--- a/installer/settings/files_main_uninstall.nsh
+++ b/installer/settings/files_main_uninstall.nsh
@@ -18,6 +18,7 @@
RMDir /r "$INSTDIR\plugins"
RMDir /r "$INSTDIR\themes"
+ RMDir /r "$INSTDIR\fonts"
RMDir /r "$INSTDIR\languages"
RMDir /r "$INSTDIR\visuals"
RMDir /r "$INSTDIR\sounds"