- Fixed Welcome Page

- Added Sections and LangStrings
- Exported and merged language files
for easier multi language support

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

2 files changed, 39 insertions, 4 deletions

diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
index e50410e8..f0b9d1dd 100644
--- a/installer/languages/English.nsh
+++ b/installer/languages/English.nsh
@@ -8,7 +8,7 @@ LangString abort_uninstall ${LANG_ENGLISH} "Are you sure to abort UnInstallation
 ; Welcome Page:

 

 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_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"

 

 ; Components Page:

 

@@ -16,7 +16,7 @@ LangString page_components_info ${LANG_ENGLISH} "Hover the component to get deta
 

 ; Finish Page:

 

-LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates."

+LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.$\n$\r$\n$\rVisit out project website to get latest news and updates."

 LangString page_finish_linktxt ${LANG_ENGLISH} "Project website"

 

 ; Start Menu and Shortcuts

@@ -36,3 +36,21 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
 LangString name_section1 ${LANG_ENGLISH} "Main components"

 LangString name_section2 ${LANG_ENGLISH} "Optional songs"

 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_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_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"

+

+

diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index 20beeef5..7ed7b422 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -8,7 +8,7 @@ LangString abort_uninstall ${LANG_GERMAN} "Wollen Sie die Deinstallation wirklic
 ; Welcome Page:

 

 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_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"

 

 ; Components Page:

 

@@ -16,7 +16,7 @@ LangString page_components_info ${LANG_GERMAN} "Schieben Sie den Mauszeiger über
 

 ; Finish Page:

 

-LangString page_finish_txt ${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 page_finish_txt ${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 page_finish_linktxt ${LANG_GERMAN} "Projektwebseite"

 

 ; Start Menu and Shortcuts

@@ -36,3 +36,20 @@ 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_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_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_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"

+