aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--game/languages/German.ini8
-rw-r--r--installer/languages/English.nsh4
-rw-r--r--installer/languages/German.nsh4
-rw-r--r--installer/settings/settings-1031.ini5
-rw-r--r--installer/settings/settings-1033.ini5
5 files changed, 18 insertions, 8 deletions
diff --git a/game/languages/German.ini b/game/languages/German.ini
index 088e7519..4ea0bf89 100644
--- a/game/languages/German.ini
+++ b/game/languages/German.ini
@@ -33,7 +33,7 @@ SING_OPTIONS_LYRICS=Lyrics
SING_OPTIONS_THEMES=Design
SING_OPTIONS_RECORD=Aufnahme
SING_OPTIONS_ADVANCED=Erweitert
-SING_OPTIONS_EXIT=Zurück
+SING_OPTIONS_EXIT=zurück
SING_OPTIONS_GAME_WHEREAMI=Spieloptionen
SING_OPTIONS_GAME_DESC=Allgemeine Spieleinstellungen
@@ -100,9 +100,9 @@ SING_EDIT=Editor
SING_EDIT_MENU_DESCRIPTION=Erstelle deinen eigenen Song
SING_EDIT_BUTTON_DESCRIPTION_CONVERT=Midi/Kar-Datei in Text exportieren
-SING_EDIT_BUTTON_DESCRIPTION_EXIT=Zurück
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=zurück
SING_EDIT_BUTTON_CONVERT=Importieren
-SING_EDIT_BUTTON_EXIT=Zurück
+SING_EDIT_BUTTON_EXIT=zurück
SING_EDIT_NAVIGATE=Navigieren
SING_EDIT_SELECT=Auswählen
@@ -111,7 +111,7 @@ SING_EDIT_EXIT=zurück
SING_LEGEND_SELECT=Auswählen
SING_LEGEND_NAVIGATE=Navigieren
SING_LEGEND_CONTINUE=Weiter
-SING_LEGEND_ESC=Zurück
+SING_LEGEND_ESC=zurück
SING_PLAYER_DESC=Spielernamen eingeben.
SING_PLAYER_WHEREAMI=Spielernamen
diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
index 5e1b6331..63901b87 100644
--- a/installer/languages/English.nsh
+++ b/installer/languages/English.nsh
@@ -62,11 +62,11 @@ LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
; Sections and SectionGroups
LangString name_section1 ${LANG_ENGLISH} "Main components"
-LangString name_section2 ${LANG_ENGLISH} "Optional songs"
+LangString name_section2 ${LANG_ENGLISH} "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 name_section3 ${LANG_ENGLISH} "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."
diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index b4f004b3..7f438e9d 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -62,11 +62,11 @@ LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?"
; Sections and SectionGroups
LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten"
-LangString name_section2 ${LANG_GERMAN} "Optionale Songs"
+LangString name_section2 ${LANG_GERMAN} "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 name_section3 ${LANG_GERMAN} "Designs"
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."
diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini
index 642f577e..9e588fcb 100644
--- a/installer/settings/settings-1031.ini
+++ b/installer/settings/settings-1031.ini
@@ -44,6 +44,7 @@ Bottom=132
[Field 6]
Type=Droplist
ListItems=On|Off
+State=On
Left=71
Right=161
Top=25
@@ -52,6 +53,7 @@ Bottom=38
[Field 7]
Type=Droplist
ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish
+State=German
Left=71
Right=161
Top=48
@@ -60,6 +62,7 @@ Bottom=62
[Field 8]
Type=Droplist
ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200
+State=800x600
Left=71
Right=161
Top=72
@@ -68,6 +71,7 @@ Bottom=86
[Field 9]
Type=Droplist
ListItems=On|Off
+State=Off
Left=71
Right=161
Top=96
@@ -76,6 +80,7 @@ Bottom=110
[Field 10]
Type=Droplist
ListItems=On|Off
+State=On
Left=71
Right=161
Top=121
diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini
index 2a3dfdba..17a08a8c 100644
--- a/installer/settings/settings-1033.ini
+++ b/installer/settings/settings-1033.ini
@@ -44,6 +44,7 @@ Bottom=132
[Field 6]
Type=Droplist
ListItems=On|Off
+State=On
Left=70
Right=160
Top=24
@@ -52,6 +53,7 @@ Bottom=36
[Field 7]
Type=Droplist
ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish
+State=English
Left=70
Right=160
Top=48
@@ -60,6 +62,7 @@ Bottom=60
[Field 8]
Type=Droplist
ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200
+State=800x600
Left=70
Right=160
Top=72
@@ -68,6 +71,7 @@ Bottom=86
[Field 9]
Type=Droplist
ListItems=On|Off
+State=Off
Left=70
Right=160
Top=99
@@ -76,6 +80,7 @@ Bottom=113
[Field 10]
Type=Droplist
ListItems=On|Off
+State=On
Left=70
Right=160
Top=123