From 3e918cc3e09fefbb045f41a1f1e06fa6b550e080 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 10 Oct 2010 13:36:48 +0000
Subject: - removed solmization option from theme - added hint in singscreen
 when webcam is starting

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2655 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Output/Languages/Dutch.ini       |   1 -
 Game/Output/Languages/English.ini     |   7 +------
 Game/Output/Languages/German.ini      |   9 ++-------
 Game/Output/Languages/Italian.ini     |   1 -
 Game/Output/Languages/Languages.xls   | Bin 212480 -> 211968 bytes
 Game/Output/Themes/Blue Sensation.ini |  22 +---------------------
 Game/Output/Themes/Deluxe.ini         |  22 +---------------------
 Game/Output/Themes/iStar.ini          |  22 +---------------------
 8 files changed, 6 insertions(+), 78 deletions(-)

(limited to 'Game/Output')

diff --git a/Game/Output/Languages/Dutch.ini b/Game/Output/Languages/Dutch.ini
index 83f229a4..4d492b1b 100644
--- a/Game/Output/Languages/Dutch.ini
+++ b/Game/Output/Languages/Dutch.ini
@@ -226,7 +226,6 @@ SING_OPTIONS_LYRICS = Teksten
 SING_OPTIONS_LYRICS_DESC = Tekstinstellingen
 SING_OPTIONS_LYRICS_EFFECT = Effect
 SING_OPTIONS_LYRICS_FONT = Lettertype
-SING_OPTIONS_LYRICS_SOLMIZATION = Solmisatie
 SING_OPTIONS_LYRICS_WHEREAMI = Opties Teksten
 SING_OPTIONS_RECORD = Opnamen
 SING_OPTIONS_RECORD_CARD = Geluidskaart
diff --git a/Game/Output/Languages/English.ini b/Game/Output/Languages/English.ini
index d6c1aa19..d2ad6a4b 100644
--- a/Game/Output/Languages/English.ini
+++ b/Game/Output/Languages/English.ini
@@ -226,7 +226,6 @@ SING_OPTIONS_LYRICS = lyrics
 SING_OPTIONS_LYRICS_DESC = change lyrics settings
 SING_OPTIONS_LYRICS_EFFECT = Animation
 SING_OPTIONS_LYRICS_FONT = Font
-SING_OPTIONS_LYRICS_SOLMIZATION = Solmization
 SING_OPTIONS_LYRICS_WHEREAMI = Lyrics Options
 SING_OPTIONS_RECORD = mics
 SING_OPTIONS_RECORD_CARD = Soundcard
@@ -690,7 +689,7 @@ SUB_030 = Sound
 ENT_031 =     Mic boost, note clicks, beat clicks, noise threshold, preview volume and fading
 #-------------------------------------------------------#
 SUB_040 = Lyrics
-ENT_041 =     Lyric font, lyric animation and solmization
+ENT_041 =     Lyric font and lyric animation
 #-------------------------------------------------------#
 SUB_050 = Themes
 ENT_051 =     Theme, theme skin and theme skin colour
@@ -847,8 +846,6 @@ ENT_011 = 
 SUB_020 = Animation
 ENT_021 =     Determine the lyrics animation effect
 #-------------------------------------------------------#
-SUB_030 = Solmization
-ENT_031 =     Decide whether and which solmization to display in place of a song's lyrics
 #-------------------------------------------------------#
 SEC_001 = General
 RETURN = Confirm current selection
@@ -1477,5 +1474,3 @@ PAGEDOWN = Decrease song volume
 #-------------------------------------------------------#
 # ID_034: ScreenSongMenu Medley #
 #-------------------------------------------------------#
-
-
diff --git a/Game/Output/Languages/German.ini b/Game/Output/Languages/German.ini
index 8e10236f..8f9d090f 100644
--- a/Game/Output/Languages/German.ini
+++ b/Game/Output/Languages/German.ini
@@ -226,7 +226,6 @@ SING_OPTIONS_LYRICS = Lyrics
 SING_OPTIONS_LYRICS_DESC = Einstellungen für die Lyrics
 SING_OPTIONS_LYRICS_EFFECT = Effekt
 SING_OPTIONS_LYRICS_FONT = Schriftart
-SING_OPTIONS_LYRICS_SOLMIZATION = Solmisation
 SING_OPTIONS_LYRICS_WHEREAMI = Optionen Lyrics
 SING_OPTIONS_RECORD = Aufnahme
 SING_OPTIONS_RECORD_CARD = Soundkarte
@@ -690,7 +689,7 @@ SUB_030 = Sound
 ENT_031 = Einstellungen zur Mikrofonverstärkung, zum Click-Assistenten, zu den Beat-Clicks, zur Rauschunterdrückung, zur Vorschau-Lautstärke und zum Vorschau-Fading.
 #-------------------------------------------------------#
 SUB_040 = Lyrics
-ENT_041 = Einstellungen zur Schriftart, zum Animationseffekt und zur Solmisation des Liedtextes
+ENT_041 = Einstellungen zur Schriftart und zum Animationseffekt des Liedtextes
 #-------------------------------------------------------#
 SUB_050 = Themes
 ENT_051 = Einstellungen zum Theme, zum Skin und zur Farbe
@@ -847,8 +846,6 @@ ENT_011 = Legt die Schriftart des Liedtextes fest.
 SUB_020 = Effekt
 ENT_021 = Legt den Animationseffekt für die zu singende Silbe fest.
 #-------------------------------------------------------#
-SUB_030 = Solmisation
-ENT_031 = Legt fest, ob und wenn ja, welche Solmisation verwendet werden soll. Dabei wird der Liedtext durch die entsprechenden Tonsilben ersetzt.
 #-------------------------------------------------------#
 SEC_001 = Allgemein
 RETURN = Wenn aktuelle Auswahl auf "zurück": Zum Optionsmenü zurückkehren
@@ -1476,6 +1473,4 @@ PAGEUP = MP3-Lautst
 PAGEDOWN = MP3-Lautstärke reduzieren
 #-------------------------------------------------------#
 # ID_034: ScreenSongMenu Medley #
-#-------------------------------------------------------#
-
-
+#-------------------------------------------------------#
\ No newline at end of file
diff --git a/Game/Output/Languages/Italian.ini b/Game/Output/Languages/Italian.ini
index a258e299..af8d5d72 100644
--- a/Game/Output/Languages/Italian.ini
+++ b/Game/Output/Languages/Italian.ini
@@ -226,7 +226,6 @@ SING_OPTIONS_LYRICS = Testi
 SING_OPTIONS_LYRICS_DESC = Opzioni testi
 SING_OPTIONS_LYRICS_EFFECT = Effetto
 SING_OPTIONS_LYRICS_FONT = Carattere
-SING_OPTIONS_LYRICS_SOLMIZATION = Solfeggio
 SING_OPTIONS_LYRICS_WHEREAMI = Opzioni testi
 SING_OPTIONS_RECORD = Input sonoro
 SING_OPTIONS_RECORD_CARD = Scheda audio
diff --git a/Game/Output/Languages/Languages.xls b/Game/Output/Languages/Languages.xls
index 8ae520ac..a8ab8d1c 100644
Binary files a/Game/Output/Languages/Languages.xls and b/Game/Output/Languages/Languages.xls differ
diff --git a/Game/Output/Themes/Blue Sensation.ini b/Game/Output/Themes/Blue Sensation.ini
index 0e845c14..bdb012dc 100644
--- a/Game/Output/Themes/Blue Sensation.ini	
+++ b/Game/Output/Themes/Blue Sensation.ini	
@@ -5698,29 +5698,9 @@ SBGDColor = ColorLight
 STColor = White
 STDColor = GrayDark
 
-[OptionsLyricsSelectSolmization]
-Tex =MainBar
-TexSBG =SelectBG
-Text =SING_OPTIONS_LYRICS_SOLMIZATION
-X = 40
-Y = 195
-W = 230
-H = 70
-SkipX = 50
-
-Color =ColorDark
-DColor = ColorLight
-TColor = White
-TDColor = White
-SBGTex =MainBar
-SBGColor = ColorDark
-SBGDColor = ColorLight
-STColor = White
-STDColor = GrayDark
-
 [OptionsLyricsButtonExit]
 X = 40
-Y = 250
+Y = 195
 W = 230
 H = 70
 Tex =MainBar
diff --git a/Game/Output/Themes/Deluxe.ini b/Game/Output/Themes/Deluxe.ini
index 16a419fb..fe799b79 100644
--- a/Game/Output/Themes/Deluxe.ini
+++ b/Game/Output/Themes/Deluxe.ini
@@ -5053,29 +5053,9 @@ SBGDColor = Gray
 STColor = White
 STDColor = GrayDark
 
-[OptionsLyricsSelectSolmization]
-Tex =MainBar
-TexSBG =SelectBG
-Text =SING_OPTIONS_LYRICS_SOLMIZATION
-X = 40
-Y = 195
-W = 230
-H = 70
-SkipX = 50
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex =MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
 [OptionsLyricsButtonExit]
 X = 40
-Y = 250
+Y = 195
 W = 230
 H = 70
 Tex =MainBar
diff --git a/Game/Output/Themes/iStar.ini b/Game/Output/Themes/iStar.ini
index a2ff0f7d..0524c081 100644
--- a/Game/Output/Themes/iStar.ini
+++ b/Game/Output/Themes/iStar.ini
@@ -5676,29 +5676,9 @@ SBGDColor = Gray
 STColor = White
 STDColor = GrayDark
 
-[OptionsLyricsSelectSolmization]
-Tex =MainBar
-TexSBG =SelectBG
-Text =SING_OPTIONS_LYRICS_SOLMIZATION
-X = 40
-Y = 195
-W = 230
-H = 70
-SkipX = 50
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex =MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
 [OptionsLyricsButtonExit]
 X = 40
-Y = 250
+Y = 195
 W = 230
 H = 70
 Tex =MainBar
-- 
cgit v1.2.3