[Slim-Checkins] r10593 - in /trunk/server: HTML/EN/setupbehavior.html Slim/Web/Pages.pm Slim/Web/Setup.pm strings.txt

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sun Nov  5 13:08:21 2006
New Revision: 10593

URL: http://svn.slimdevices.com?rev=10593&view=rev
Log:
Bug: 3267
Description: refactor behaviour settings page.  remove a few strings that appear to be no longer used.  
ToDo: method for validating the numerical range settings

Added:
    trunk/server/HTML/EN/setupbehavior.html
Modified:
    trunk/server/Slim/Web/Pages.pm
    trunk/server/Slim/Web/Setup.pm
    trunk/server/strings.txt

Added: trunk/server/HTML/EN/setupbehavior.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/setupbehavior.html?rev=10593&view=auto
==============================================================================
--- trunk/server/HTML/EN/setupbehavior.html (added)
+++ trunk/server/HTML/EN/setupbehavior.html Sun Nov  5 13:08:21 2006
@@ -1,0 +1,183 @@
+[% FILTER null %]
+
+	[% pwd_list = BLOCK %]
+
+		<a href="setup.html?page=BASIC_SERVER_SETTINGS">[% "SERVER_SETTINGS" | string %]</a>
+
+		 / <a href="setupbehavior.html">[% page | string %]</a>
+
+	[% END %]
+
+	[% pageHeaderInfo = BLOCK %]
+		[%- PROCESS setting_chooser.html setting_chooser_noHome = 1 %]
+	[% END %]
+
+[% END %]
+
+[% pagetitle = pagetitle; pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %] 
+
+<div class="statusarea">
+	[% IF warning %]
+		[% warning %]
+	[% END %]
+</div>
+
+<form method="post" action="setupbehavior.html">
+
+	<input type=hidden value="[% page %]" name="page">
+
+	<div class="settingSection">
+		<div class="groupHead">[% "SETUP_COMPOSERINARTISTS" | string | upper %]</div>
+		<div class="groupDesc">[% "SETUP_COMPOSERINARTISTS_DESC" | string %]</div>
+
+		<input type=hidden name="composerInArtists" value="0" />
+		<input type=checkbox [% IF composerInArtists %]checked [% END %] class="stdedit" name="composerInArtists" id="composerInArtists" value="1" />
+		<label for="composerInArtists" class="stdlabel">[% "COMPOSER" | string %]</label><br>
+
+		<input type=hidden name="conductorInArtists" value="0" />
+		<input type=checkbox [% IF conductorInArtists %]checked [% END %] class="stdedit" name="conductorInArtists" id="conductorInArtists" value="1" />
+		<label for="conductorInArtists" class="stdlabel">[% "CONDUCTOR" | string %]</label><br>
+
+		<input type=hidden name="bandInArtists" value="0" />
+		<input type=checkbox [% IF bandInArtists %]checked [% END %] class="stdedit" name="bandInArtists" id="bandInArtists" value="1" />
+		<label for="bandInArtists" class="stdlabel">[% "BAND" | string %]</label>
+
+	</div>
+	
+	<div class="settingSection">
+	
+		<div class="groupHead">[% "SETUP_VARIOUSARTISTS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_VARIOUSARTISTAUTOIDENTIFICATION_DESC" | string %]</div>
+		<select class="stdedit" name="variousArtistAutoIdentification" id="variousArtistAutoIdentification">
+
+			<option [% IF NOT variousArtistAutoIdentification %]selected [% END %]value="0">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_0' | getstring %]</option>
+			<option [% IF variousArtistAutoIdentification %]selected [% END %]value="1">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_1' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefDesc">[% "SETUP_USEBANDASALBUMARTIST_DESC" | string %]</div>
+
+		<select class="stdedit" name="useBandAsAlbumArtist" id="useBandAsAlbumArtist">
+
+			<option [% IF NOT useBandAsAlbumArtist %]selected [% END %]value="0">[% 'SETUP_USEBANDASALBUMARTIST_0' | getstring %]</option>
+			<option [% IF useBandAsAlbumArtist %]selected [% END %]value="1">[% 'SETUP_USEBANDASALBUMARTIST_1' | getstring %]</option>
+		
+		</select>
+
+		<div class="prefDesc">[% "SETUP_VARIOUSARTISTSSTRING_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="variousArtistsString" id="variousArtistsString" value="[% variousArtistsString %]" size="40">
+
+	</div>
+	
+	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_DISPLAYTEXTTIMEOUT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_DISPLAYTEXTTIMEOUT_DESC" | string %]</div>
+
+		[% "SETUP_DISPLAYTEXTTIMEOUT_CHOOSE" | string %]<input type=text class="stdedit" name="displaytexttimeout" id="displaytexttimeout" value="[% displaytexttimeout %]" size="15">
+
+		<div class="prefHead">[% "SETUP_CHECKVERSION" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_CHECKVERSION_DESC" | string %]</div>
+
+		<select class="stdedit" name="checkVersion" id="checkVersion">
+
+			<option [% IF NOT checkVersion %]selected [% END %]value="0">[% 'SETUP_CHECKVERSION_0' | string %]</option>
+			<option [% IF checkVersion %]selected [% END %]value="1">[% 'SETUP_CHECKVERSION_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_NOGENREFILTER" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_NOGENREFILTER_DESC" | string %]</div>
+
+		<select class="stdedit" name="noGenreFilter" id="noGenreFilter">
+
+			<option [% IF NOT noGenreFilter %]selected [% END %]value="0">[% 'SETUP_NOGENREFILTER_0' | string %]</option>
+			<option [% IF noGenreFilter%]selected [% END %]value="1">[% 'SETUP_NOGENREFILTER_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_PLAYTRACKALBUM" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PLAYTRACKALBUM_DESC" | string %]</div>
+
+		<select class="stdedit" name="playtrackalbum" id="playtrackalbum">
+
+			<option [% IF NOT playtrackalbum %]selected [% END %]value="0">[% 'SETUP_PLAYTRACKALBUM_0' | string %]</option>
+			<option [% IF playtrackalbum %]selected [% END %]value="1">[% 'SETUP_PLAYTRACKALBUM_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SEARCHSUBSTRING" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SEARCHSUBSTRING_DESC" | string %]</div>
+
+		<select class="stdedit" name="searchSubString" id="searchSubString">
+
+			<option [% IF NOT searchSubString %]selected [% END %]value="0">[% 'SETUP_SEARCHSUBSTRING_0' | string %]</option>
+			<option [% IF searchSubString %]selected [% END %]value="1">[% 'SETUP_SEARCHSUBSTRING_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_IGNOREDARTICLES" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_IGNOREDARTICLES_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="ignoredarticles" id="ignoredarticles" value="[% ignoredarticles %]" size="40">
+
+		<div class="prefHead">[% "SETUP_SPLITLIST" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SPLITLIST_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="splitList" id="splitList" value="[% splitList %]" size="40">
+
+		<div class="prefHead">[% "SETUP_BROWSEAGELIMIT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_BROWSEAGELIMIT_DESC" | string %]</div>
+
+		<input type=text class="stdedit" name="browseagelimit" id="browseagelimit" value="[% browseagelimit %]" size="15">
+
+		<div class="prefHead">[% "SETUP_GROUPDISCS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_GROUPDISCS_DESC" | string %]</div>
+
+		<select class="stdedit" name="groupdiscs" id="groupdiscs">
+
+			<option [% IF NOT groupdiscs %]selected [% END %]value="0">[% 'SETUP_GROUPDISCS_0' | string %]</option>
+			<option [% IF groupdiscs %]selected [% END %]value="1">[% 'SETUP_GROUPDISCS_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_PERSISTPLAYLISTS" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_PERSISTPLAYLISTS_DESC" | string %]</div>
+
+		<select class="stdedit" name="persistPlaylists" id="persistPlaylists">
+
+			<option [% IF NOT persistPlaylists %]selected [% END %]value="0">[% 'SETUP_PERSISTPLAYLISTS_0' | string %]</option>
+			<option [% IF persistPlaylists %]selected [% END %]value="1">[% 'SETUP_PERSISTPLAYLISTS_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_RESHUFFLEONREPEAT" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_RESHUFFLEONREPEAT_DESC" | string %]</div>
+
+		<select class="stdedit" name="reshuffleOnRepeat" id="reshuffleOnRepeat">
+
+			<option [% IF NOT reshuffleOnRepeat %]selected [% END %]value="0">[% 'SETUP_RESHUFFLEONREPEAT_0' | string %]</option>
+			<option [% IF reshuffleOnRepeat %]selected [% END %]value="1">[% 'SETUP_RESHUFFLEONREPEAT_1' | string %]</option>
+		
+		</select>
+
+		<div class="prefHead">[% "SETUP_SAVESHUFFLED" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SAVESHUFFLED_DESC" | string %]</div>
+
+		<select class="stdedit" name="saveShuffled" id="saveShuffled">
+
+			<option [% IF NOT saveShuffled %]selected [% END %]value="0">[% 'SETUP_SAVESHUFFLED_0' | string %]</option>
+			<option [% IF saveShuffled %]selected [% END %]value="1">[% 'SETUP_SAVESHUFFLED_1' | string %]</option>
+		
+		</select>
+
+	</div>
+
+	<p><input name="submit" type="submit" class="stdclick" value="[% "SAVE_SETTINGS" | string %]"></p>
+</form>
+
+<p></p>
+
+[% PROCESS pagefooter.html %]
+

Modified: trunk/server/Slim/Web/Pages.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages.pm?rev=10593&r1=10592&r2=10593&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages.pm (original)
+++ trunk/server/Slim/Web/Pages.pm Sun Nov  5 13:08:21 2006
@@ -45,6 +45,7 @@
 	Slim::Web::HTTP::addPageFunction(qr/^debugging\.(?:htm|xml)/, \&Slim::Web::Setup::handleDebugSettings);
 	Slim::Web::HTTP::addPageFunction(qr/^setupfiletypes\.(?:htm|xml)/, \&Slim::Web::Setup::handleFileTypeSettings);
 	Slim::Web::HTTP::addPageFunction(qr/^setupperformance\.(?:htm|xml)/, \&Slim::Web::Setup::handlePerformanceSettings);
+	Slim::Web::HTTP::addPageFunction(qr/^setupbehavior\.(?:htm|xml)/, \&Slim::Web::Setup::handleBehaviorSettings);
 
 	# pull in the memory usage module if requested.
 	if (logger('server.memory')->is_info) {

Modified: trunk/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Setup.pm?rev=10593&r1=10592&r2=10593&view=diff
==============================================================================
--- trunk/server/Slim/Web/Setup.pm (original)
+++ trunk/server/Slim/Web/Setup.pm Sun Nov  5 13:08:21 2006
@@ -1602,191 +1602,7 @@
 
 	,'FORMATS_SETTINGS' => { }
 
-	,'BEHAVIOR_SETTINGS' => {
-		'title' => string('BEHAVIOR_SETTINGS'),
-		'parent' => 'BASIC_SERVER_SETTINGS',
-		'GroupOrder' => [qw(DisplayInArtists VariousArtists Default)],
-		'Groups' => {
-	
-			'Default' => {
-
-				'PrefOrder' => [qw(displaytexttimeout checkVersion noGenreFilter
-						playtrackalbum searchSubString ignoredarticles splitList browseagelimit
-						groupdiscs persistPlaylists reshuffleOnRepeat saveShuffled)],
-			},
-
-			'DisplayInArtists' => {
-				'PrefOrder' => [qw(composerInArtists conductorInArtists bandInArtists)],
-				'GroupHead' => 'SETUP_COMPOSERINARTISTS',
-				'Suppress_PrefHead' => 1,
-				'Suppress_PrefSub' => 1,
-				'GroupSub' => 1,
-				'GroupLine' => 1,
-				'Suppress_PrefLine' => 1,
-			},
-
-			'VariousArtists' => {
-				'PrefOrder' => [qw(variousArtistAutoIdentification useBandAsAlbumArtist variousArtistsString)],
-				'GroupHead' => 'SETUP_VARIOUSARTISTS',
-				'Suppress_PrefHead' => 1,
-				'Suppress_PrefSub' => 1,
-				'GroupSub' => 1,
-				'GroupLine' => 1,
-				'Suppress_PrefLine' => 1,
-			},
-		},
-
-		'Prefs' => {
-
-			'displaytexttimeout' => {
-				'validate'     => \&Slim::Utils::Validate::number,
-				'validateArgs' => [0.1,undef,1],
-			},
-
-			'browseagelimit' => {
-				'validate'     	=> \&Slim::Utils::Validate::number,
-				'validateArgs' => [0,undef,1,undef],
-			},
-
-			'ignoredarticles' => {
-				'validate' => \&Slim::Utils::Validate::acceptAll,
-				'PrefSize' => 'large',
-				'onChange' => sub {
-					my $client = shift;
-
-					logWarning("ignoredArticles changed - starting wipe scan");
-
-					Slim::Control::Request::executeRequest($client, ['wipecache']);
-				},
-			},
-
-			'splitList' => {
-				'validate' => \&Slim::Utils::Validate::acceptAll,
-				'PrefSize' => 'large',
-				'onChange' => sub {
-					my $client = shift;
-
-					logWarning("splitList changed - starting wipe scan");
-
-					Slim::Control::Request::executeRequest($client, ['wipecache']);
-				},
-			},
-
-			'variousArtistAutoIdentification' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options' => {
-					'1' => 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_1',
-					'0' => 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_0',
-				},
-			},
-
-			'useBandAsAlbumArtist' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options' => {
-					'1' => 'SETUP_USEBANDASALBUMARTIST_1',
-					'0' => 'SETUP_USEBANDASALBUMARTIST_0',
-				},
-			},
-
-			'variousArtistsString' => {
-				'validate' => \&Slim::Utils::Validate::acceptAll,
-				'PrefSize' => 'large',
-			},
-
-			'playtrackalbum' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options'  => {
-					'1' => 'SETUP_PLAYTRACKALBUM_1',
-					'0' => 'SETUP_PLAYTRACKALBUM_0',
-				},
-			},
-
-			'composerInArtists' => { 	 
-
-				'inputTemplate' => 'setup_input_chk.html',
-				'PrefChoose'    => 'COMPOSER',
-				'validate'      => \&Slim::Utils::Validate::trueFalse,
-			},
-
-			'conductorInArtists' => { 	 
-
-				'inputTemplate' => 'setup_input_chk.html',
-				'PrefChoose'    => 'CONDUCTOR',
-				'validate'      => \&Slim::Utils::Validate::trueFalse,
-			},
-
-			'bandInArtists' => { 	 
-
-				'inputTemplate' => 'setup_input_chk.html',
-				'PrefChoose'    => 'BAND',
-				'validate'      => \&Slim::Utils::Validate::trueFalse,
-			},
-
-			'noGenreFilter' => { 	 
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options'  => { 	 
-					'1' => 'SETUP_NOGENREFILTER_1',
-					'0' => 'SETUP_NOGENREFILTER_0',
-				},
-			},
-
-			'searchSubString' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options'  => {
-					'1' => 'SETUP_SEARCHSUBSTRING_1',
-					'0' => 'SETUP_SEARCHSUBSTRING_0',
-				},
-			},
-
-			'persistPlaylists' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options'  => {
-					'1' => 'SETUP_PERSISTPLAYLISTS_1',
-					'0' => 'SETUP_PERSISTPLAYLISTS_0',
-				},
-			},
-
-			'reshuffleOnRepeat' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options'  => {
-					'1' => 'SETUP_RESHUFFLEONREPEAT_1',
-					'0' => 'SETUP_RESHUFFLEONREPEAT_0',
-				},
-			},
-
-			'saveShuffled' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options' => {
-					'1' => 'SETUP_SAVESHUFFLED_1',
-					'0' => 'SETUP_SAVESHUFFLED_0',
-				},
-			},
-
-			'checkVersion' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options' => {
-					'1' => 'SETUP_CHECKVERSION_1',
-					'0' => 'SETUP_CHECKVERSION_0',
-				},
-			},
-
-			'groupdiscs' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'onChange' => sub {
-					my $client = shift;
-
-					logWarning("groupDiscs changed - starting wipe scan");
-
-					Slim::Control::Request::executeRequest($client, ['wipecache']);
-				},
-
-				'options' => {
-					'1' => 'SETUP_GROUPDISCS_1',
-					'0' => 'SETUP_GROUPDISCS_0',
-				},
-			 },
-		}
-	} #end of setup{'behavior'} hash
+	,'BEHAVIOR_SETTINGS' => { } #end of setup{'behavior'} hash
 
 	,'FORMATTING_SETTINGS' => {
 		'title' => string('FORMATTING_SETTINGS')
@@ -2244,6 +2060,64 @@
 	return Slim::Web::HTTP::filltemplatefile('setupperformance.html', $paramRef);
 }
 
+sub handleBehaviorSettings {
+	my ($client, $paramRef, $pageSetup) = @_;
+
+	my @prefs = qw(
+				displaytexttimeout
+				checkVersion
+				noGenreFilter
+				playtrackalbum
+				searchSubString
+				ignoredarticles
+				splitList
+				browseagelimit
+				groupdiscs
+				persistPlaylists
+				reshuffleOnRepeat
+				saveShuffled
+				composerInArtists
+				conductorInArtists
+				bandInArtists
+				variousArtistAutoIdentification
+				useBandAsAlbumArtist
+				variousArtistsString
+			);
+
+	my %scanOn = map {$_ => 1} qw(splitList ignoredarticles groupDiscs);
+
+	# If this is a settings update
+	if ($paramRef->{'submit'}) {
+
+		for my $pref (@prefs) {
+		Data::Dump::dump($pref, $scanOn{$pref},$paramRef->{$pref},Slim::Utils::Prefs::get($pref));
+			if (exists $scanOn{$pref} && $paramRef->{$pref} ne Slim::Utils::Prefs::get($pref)) {
+
+				logWarning("$pref changed - starting wipe scan");
+
+				Slim::Utils::Prefs::set($pref,    $paramRef->{$pref});
+
+				Slim::Control::Request::executeRequest($client, ['wipecache']);
+			} else {
+
+				Slim::Utils::Prefs::set($pref,    $paramRef->{$pref});
+			}
+		}
+	}
+
+	$paramRef->{'page'}       = 'BEHAVIOR_SETTINGS';
+
+	# Needed to generate the drop down settings chooser list.
+	$paramRef->{'additionalLinks'} = \%Slim::Web::Pages::additionalLinks;
+
+	for my $pref (@prefs) {
+		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
+	}
+	
+	return Slim::Web::HTTP::filltemplatefile('setupbehavior.html', $paramRef);
+}
+
+
 sub getSetupOptions {
 	my ($category, $pref) = @_;
 
@@ -2824,6 +2698,10 @@
 			} elsif ($page eq "PERFORMANCE_SETTINGS") {
 
 				Slim::Web::Pages->addPageLinks('setup', { 'PERFORMANCE_SETTINGS' => 'setupperformance.html' });
+
+			} elsif ($page eq "BEHAVIOR_SETTINGS") {
+
+				Slim::Web::Pages->addPageLinks('setup', { 'BEHAVIOR_SETTINGS' => 'setupbehavior.html' });
 
 			} else {
 

Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=10593&r1=10592&r2=10593&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Sun Nov  5 13:08:21 2006
@@ -5611,38 +5611,6 @@
 	SV	Kompositör, grupp och orkester i Artister
 	ZH_CN	有å
³è‰ºäººçš„作曲家及乐队信息
 
-SETUP_COMPOSERINARTISTS_1
-	CS	Vložit skladatele, skupinu nebo orchestr do interpreta
-	DE	Komponist, Gruppe und Orchester in Interpreten einschliessen
-	DA	Vis komponist, band og orkester som kunstner
-	EN	Include composer, band and orchestra in artists
-	ES	Incluir compositor, banda y orquesta en artistas
-	FI	Sisällytä yhtye, säveltäjä tai orkesteri artisteihin
-	FR	Inclure les compositeurs, groupes et orchestres dans les artistes
-	IT	Includi Compositore, Gruppo e Orchestra in Artisti
-	JA	「アーチスト」に、作曲家、バンド、オーケストラを含める
-	NL	Voeg componist, groep en orkest toe in artiesten
-	NO	Inkluder komponist, band og orkester i artister
-	PT	Incluir compositor, banda e orquestra nos artistas
-	SV	Inkludera kompositör, grupp och orkester i Artister
-	ZH_CN	åŒ
括有å
³è‰ºäººçš„作曲家及乐队信息
-
-SETUP_COMPOSERINARTISTS_0
-	CS	Nevkládat autora, skupinu nebo orchestr do interpreta
-	DE	Komponist, Gruppe und Orchester nicht in Interpreten einschliessen
-	DA	Vis ikke komponist, band og orkester som kunstner
-	EN	Don't include composer, band and orchestra in artists
-	ES	No incluir compositor, banda y orquesta en artistas
-	FI	Älä sisällytä säveltäjää, yhtyettä tai orkesteria artisteihin
-	FR	Ne pas inclure compositeurs, groupes et orchestres dans les artistes
-	IT	Non includere Compositore, Gruppo e Orchestra in Artisti
-	JA	「アーチスト」に、作曲家、バンド、オーケストラを含めない
-	NL	Voeg componist, groep en orkest niet toe in artiesten
-	NO	Ikke inkluder komponist, band og orkerster i artister
-	PT	Não incluir compositor, banda e orquestra nos artistas
-	SV	Inkludera INTE kompositör, grupp och orkester i Artister
-	ZH_CN	不åŒ
括有å
³è‰ºäººçš„作曲家及乐队信息
-
 SETUP_COMPOSERINARTISTS_DESC
 	CS	Informace o autorovi, skupině nebo orchestu mohou být vloženy do nabídky interpretů pro procházení nebo vyhledávání.
 	DE	Titelinformationen über Komponist, Gruppe und Orchester können in der Interpretenliste und beim Suchen eingeschlossen werden.
@@ -10222,55 +10190,6 @@
 	SV	Den mapp på din hårddisk där dina MP3-filer är lagrade:
 	ZH_CN	您的音乐文件存放在硬盘上的目录：
 
-PORT_NUMBER
-	CS	Zde můžete změnit port serveru, který je používán pro přístup k webowému rozhraní. Defaultně je nastaveno 9000.
-	DE	Sie können die Port-Nummer ändern, die für den Server-Zugriff mit Hilfe eines Web-Browsers verwendet wird (Standard ist 9000).
-	DA	Du kan ændre hvilket port-nummer der anvendes til at tilgå SlimServer via en web-browser. (Standard er 9000).
-	EN	You can change the port number that is used to access the server from a web browser. (The default is 9000.)
-	ES	El número de puerto para acceder al servidor utilizando un navegador (9000 por defecto)
-	FI	Voit vaihtaa WWW-palvelimen käyttämää porttinumeroa. (Oletusasetus on 9000.)
-	FR	Vous pouvez changer le port utilisé pour accéder au serveur à partir d'un navigateur web. Le port par défaut est 9000.
-	IT	Puoi cambiare il numero della porta che viene usata dal browser per accedere al server. (Di default e' la 9000).
-	JA	ウェブブラウザーからサーバーに接続するポート番号を変更することができます（通常は9000）。
-	NL	Je kunt het poortnummer veranderen dat gebruikt wordt om de server te raadplegen met een webbrowser. (De standaardpoort is 9000).
-	NO	Du kan endre portnummeret som brukes for å nå webserveren fra en browser. (Standard er 9000)
-	PT	A porta para acesso via navegador web. (por omissão, a 9000)
-	SV	Du kan ändra portnumret som används för att nå webservern från en webläsare. (Standardvärdet är 9000)
-	ZH_CN	您可以更改浏览器访问服务器用的端口号。（缺省为9000）。
-
-SCREENSAVER_TIMEOUT
-	CS	Přehrávač  ukazuje automaticky aktuálně přehrávanou skladbu po zadtavení dálkovým ovladačem. Můžete změnit prodlevu po které to udělá. Nastavíte li prodlevu na nulu, nebude automaticky ukazovat aktuální skladbu.
-	DE	Der Player wird automatisch das aktuelle Lied anzeigen, nachdem Sie für einige Zeit keinen Knopf mehr betätigt haben. Sie können die Wartezeit einstellen oder eine Null verwenden, um nie das aktuelle Lied anzuzeigen.
-	DA	SlimServer vil automatisk vise hvilken sang der afspilles hvis fjernbetjeningen ikke anvendes i en periode.
-	EN	The player will automatically show the currently playing song if you don't press any buttons for some amount of time. You can change the duration of this wait below. Set this duration to zero to never automatically show the current song.
-	ES	El reproductor mostrará automaticamente la canción actual si no usa el control remoto durante un tiempo determinado. Se puede cambiar este comportamiento e incluso desactivarlo introduciendo un 0 (cero).
-	FI	Kun kaukosäätimen viimeisestä napin painalluksesta on kulunut hieman aikaa, palaa soittimen näyttöön soimassa olevan kappaleen nimi. Voit vaikuttaa tähän toimintoon.
-	FR	Lorsque vous cessez d'utiliser la télécommande pendant un certain temps, la platine affichera automatiquement le morceau en cours de lecture. Vous pouvez changer la durée de ce délai. La valeur zéro désactivera cette fonctionnalité.
-	IT	Il lettore mostrera' automaticamente il brano in riproduzione dopo alcuni secondi dalla fine dell'uso del telecomando. Puoi modificare la durata dell'attesa piu' sotto. Imposta questa durata a zero per non mostrare automaticamente il brano.
-	JA	一定の時間リモートを操作しないと、プレーヤーは自動的に現在再生中の曲を表示します。以下でその時間を設定することができます。ゼロにセットすると、その機能を無効にできます。
-	NL	De speler kan automatisch het op dit moment spelende nummer tonen nadat je de afstandsbediening een bepaalde tijd niet hebt gebruikt. Je kunt deze tijd in seconden hieronder instellen. Stel deze tijd in op 0 (nul) om het huidige nummer nooit vanzelf te tonen.
-	NO	Spilleren vil etter en stund uten bruk automatisk vise hvilken sang som spilles. Du kan endre ventetiden før dette skjer nedenfor. Sett verdien til 0 for aldri å vise hva som spilles nå.
-	PT	O player irá mostrar automaticamente a música actual ao fim de algum tempo, se o parar com o controlo remoto. Pode mudar a duração da espera abaixo. Se não quiser este comportamento, coloque a 0 (zero).
-	SV	Spelaren kommer efter en fördröjning automatiskt hoppa till "Spelas nu" när du inte använder fjärrkontrollen. Nedan kan du ändra längden på denna fördröjning. Sätt fördröjningen till 0 (noll) för att aldrig automatiskt hoppa till "Spelas nu".
-	ZH_CN	播放机在您停止使用遥控后的一段时间å†
会自动地显示当前播放的歌曲。您可以更改这等å¾
的时间。以零为值则表示播放机绝对不会显示当前播放的歌曲
-
-DISPLAYTEXT_TIMEOUT
-	CS	Nastavení časové prodlevy, po které přehrávač skočí při zadávání textu na další písmeno.
-	DE	Wenn Sie Text für eine Suche eingeben, wird der Player nach einer gewissen Zeit zum nächsten Buchstaben springen. Bestimmen Sie hier die Wartezeit zwischen dem Drücken zweier Tasten.
-	DA	Når du indtaster tekst til en søgning vil SlimServer gå videre til næste bogstav efter det nedenfor angivne antal sekunder.
-	EN	When you are entering text for a search, the player will move on to the next letter after some amount of time. You can change the duration of this wait below.
-	ES	Cuando se está ingresando text para una búsqueda, el reproductor se moverá a la letra siguiente despues de un cierto intervalo. Se puede cambiar la duración de esta espera debajo.
-	FI	Syöttäessäsi tekstiä hakua varten, kursori siirtyy automaattisesti eteenpäin jonkin ajan kuluttua. Voit alla olevasta valinnasta säätää odottamiseen käytettyä aikaa.
-	FR	La platine passera à la lettre suivante après un certain délai lors de la saisie de texte. Vous pouvez choisir ce délai ci-dessous.
-	HE	פרק זמן בין מעבר לאות × ×•×¡×¤×ª בחיפוש מוזיקה
-	IT	Mentre inserisci il testo per una ricerca, il lettore si spostera' sulla lettera successiva dopo una certa quantita' di tempo. Puoi cambiare la durata dell'attesa qui sotto.
-	JA	検索にテキスト文字をå
¥åŠ›ã™ã‚‹ã¨ã€ãƒ—レーヤーは一定時間のあと、次の文字に移ります。以下でこの時間を設定することができます。
-	NL	Indien je tekst invoert om te gaan zoeken, zal de speler na een aantal seconden doorspringen naar het volgende teken. Je kunt deze wachttijd hier instellen.
-	NO	Når du skriver inn tekst for et søk, vil spilleren automatisk hoppe til neste tegnfelt etter en liten stund. Her kan du endre tiden før dette skjer.
-	PT	Ao introduzir texto para a procura, o cliente moverá para a próxima letra ao fim de algum tempo. Pode mudar esse tempo de espera abaixo.
-	SV	När du matar in text för en sökning kommer spelaren automatiskt flytta till nästa tecken efter en liten fördröjning. Här kan du ändra denna fördröjning.
-	ZH_CN	当您输å
¥æ–‡å­—进行搜查行动时，播放机会在您输å
¥çš„每一个字符后等å¾
片刻才向下一个字符移动。您可以在这里调整该等å¾
时间。
-
 SECONDS
 	CS	sekund
 	DA	sekunder