[Slim-Checkins] r8868 - in /trunk/server: Plugins/Visualizer.pm Slim/Display/Transporter.pm strings.txt

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Aug  8 13:31:42 2006
New Revision: 8868

URL: http://svn.slimdevices.com?rev=8868&view=rev
Log:
Bug: N/A
Description: Move visualizer names to strings to avoid duplication 

Modified:
    trunk/server/Plugins/Visualizer.pm
    trunk/server/Slim/Display/Transporter.pm
    trunk/server/strings.txt

Modified: trunk/server/Plugins/Visualizer.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Visualizer.pm?rev=8868&r1=8867&r2=8868&view=diff
==============================================================================
--- trunk/server/Plugins/Visualizer.pm (original)
+++ trunk/server/Plugins/Visualizer.pm Tue Aug  8 13:31:42 2006
@@ -68,12 +68,12 @@
 #   4-5 - same as left channel parameters
 
 	'SCREENSAVER.visualizer_analog_vumeter' => {
-		name => 'PLUGIN_SCREENSAVER_VISUALIZER_ANALOG_VUMETER',
+		name => 'VISUALIZER_ANALOG_VUMETER',
 		params => [$VISUALIZER_VUMETER, 0, 1, 0, 160, 160, 160],
 		showtext => 0,
 	},
 	'SCREENSAVER.visualizer_digital_vumeter' => {
-		name => 'PLUGIN_SCREENSAVER_VISUALIZER_DIGITAL_VUMETER',
+		name => 'VISUALIZER_DIGITAL_VUMETER',
 		params => {
 				'transporter' =>     [$VISUALIZER_VUMETER, 0, 0, 20, 280, 340, 280],
 				'squeezebox2' => [$VISUALIZER_VUMETER, 0, 0, 20, 130, 170, 130],
@@ -107,29 +107,6 @@
 	ES	Requiere Squeezebox2
 	IT	Necessita Squeezebox2/3
 	NL	Squeezebox2/3 nodig
-
-PLUGIN_SCREENSAVER_VISUALIZER_SPECTRUM_ANALYZER
-	EN	Spectrum Analyzer
-	ES	Analizador de Espectro
-	FR	Spectromètre
-	IT	Analizzatore di spettro
-	NL	Spectrum analyser
-
-PLUGIN_SCREENSAVER_VISUALIZER_ANALOG_VUMETER
-	DE	Analoger VU Meter
-	EN	Analog VU Meter
-	ES	VUmetro análogo
-	FI	Analoginen VU-mittari
-	IT	VU meter analogico
-	NL	Analoge VU meter
-
-PLUGIN_SCREENSAVER_VISUALIZER_DIGITAL_VUMETER
-	DE	Digitaler VU Meter
-	EN	Digital VU Meter
-	ES	VUmetro digital
-	FI	Digitaalinen VU-mittari
-	IT	VU meter digitale
-	NL	Digitale VU meter
 
 PLUGIN_SCREENSAVER_VISUALIZER_PRESS_RIGHT_TO_CHOOSE
 	DE	RECHTS drücken zum Aktivieren des Bildschirmschoners
@@ -282,21 +259,21 @@
 		\%screensaverFunctions,
 		\&setVisualizerMode,
 		\&leaveVisualizerMode,
-		'PLUGIN_SCREENSAVER_VISUALIZER_SPECTRUM_ANALYZER',
+		'VISUALIZER_SPECTRUM_ANALYZER',
 	);
 	Slim::Buttons::Common::addSaver(
 		'SCREENSAVER.visualizer_analog_vumeter',
 		\%screensaverFunctions,
 		\&setVisualizerMode,
 		\&leaveVisualizerMode,
-		'PLUGIN_SCREENSAVER_VISUALIZER_ANALOG_VUMETER',
+		'VISUALIZER_ANALOG_VUMETER',
 	);
 	Slim::Buttons::Common::addSaver(
 		'SCREENSAVER.visualizer_digital_vumeter',
 		\%screensaverFunctions,
 		\&setVisualizerMode,
 		\&leaveVisualizerMode,
-		'PLUGIN_SCREENSAVER_VISUALIZER_DIGITAL_VUMETER',
+		'VISUALIZER_DIGITAL_VUMETER',
 	);
 }
 

Modified: trunk/server/Slim/Display/Transporter.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Transporter.pm?rev=8868&r1=8867&r2=8868&view=diff
==============================================================================
--- trunk/server/Slim/Display/Transporter.pm (original)
+++ trunk/server/Slim/Display/Transporter.pm Tue Aug  8 13:31:42 2006
@@ -103,10 +103,10 @@
 	  text => 1,
 	  params => [VISUALIZER_NONE],
     },
-	{ desc => ['VISUALIZER_VUMETER_AN'],
+	{ desc => ['VISUALIZER_ANALOG_VUMETER'],
 	  params => [VISUALIZER_VUMETER, 0, 1, 0 + 320, 160, 160 + 320, 160],
     },
-	{ desc => ['VISUALIZER_VUMETER_DIG'],
+	{ desc => ['VISUALIZER_DIGITAL_VUMETER'],
 	  params => [VISUALIZER_VUMETER, 0, 0, 20 + 320, 130, 170 + 320, 130],
     },
 	{ desc => ['VISUALIZER_SPECTRUM_ANALYZER'],

Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=8868&r1=8867&r2=8868&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Tue Aug  8 13:31:42 2006
@@ -9618,16 +9618,6 @@
 	NL	Kleine VU
 	ZH_CN	小音量表
 
-VISUALIZER_SPECTRUM_ANALYZER
-	CS	Frekvenční spektrum
-	EN	Spectrum
-	ES	Espectro
-	FI	Spektri
-	FR	Spectromètre
-	HE	ספקטרום
-	IT	Spettro
-	ZH_CN	音谱
-
 VISUALIZER_VUMETER
 	EN	VU Meter
 	ES	VU metro
@@ -12328,22 +12318,31 @@
 	DE	Erweiterte Textanzeige
 	EN	Extended Text Display
 
-VISUALIZER_VUMETER_AN
+VISUALIZER_SPECTRUM_ANALYZER
+	CS	Frekvenční spektrum
+	EN	Spectrum Analyzer
+	ES	Analizador de Espectro
+	FI	Spektri
+	FR	Spectromètre
+	IT	Analizzatore di spettro
+	NL	Spectrum analyser
+	ZH_CN	音谱
+
+VISUALIZER_ANALOG_VUMETER
 	DE	Analoger VU Meter
-	EN	Analogue VU Meter
+	EN	Analog VU Meter
 	ES	VUmetro análogo
 	FI	Analoginen VU-mittari
 	IT	VU meter analogico
 	NL	Analoge VU meter
 
-VISUALIZER_VUMETER_DIG
+VISUALIZER_DIGITAL_VUMETER
 	DE	Digitaler VU Meter
 	EN	Digital VU Meter
 	ES	VUmetro digital
 	FI	Digitaalinen VU-mittari
 	IT	VU meter digitale
 	NL	Digitale VU meter
-	EN	Digital VU Meter
 
 SETUP_VISUALIZERMODE
 	DE	Visualizer Bildschirm