Attachment #68489 for bug #73832

Lines 1223-1229 Link Here

(-)slimserver.old/Plugins/iTunes.pm (-1 / +1 lines)
1223	,'GroupOrder' => ['Default','iTunesPlaylistFormat']	1223	,'GroupOrder' => ['Default','iTunesPlaylistFormat']
1224	,'Groups' => {	1224	,'Groups' => {
1225	'Default' => {	1225	'Default' => {
1226	'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks','itunes_library_autolocate','itunes_library_xml_path','itunes_library_music_path']	1226	'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks']
1227	}	1227	}
1228	,'iTunesPlaylistFormat' => {	1228	,'iTunesPlaylistFormat' => {
1229	'PrefOrder' => ['iTunesplaylistprefix','iTunesplaylistsuffix']	1229	'PrefOrder' => ['iTunesplaylistprefix','iTunesplaylistsuffix']




						'PrefOrder' => ['language']
						},
				'Default' => {
						'PrefOrder' => [undef]
						},
				'Rescan' => {
					'PrefOrder' => [qw(playlistrescan wipedb rescan)]

		,'GroupOrder' => ['Default']
		,'Groups' => {
			'Default' => {
					'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb','thumbSize','includeNoArt']
					#'artfolder',
					'thumbSize','includeNoArt']
				}
			}
		,'Prefs' => {

Lines 965-972 Link Here

(-)slimserver.old/slimserver.pl (-2 lines)
965		965
966	open(STDOUT, $logfilename) \|\| die "Can't write to $logfilename: $!";	966	open(STDOUT, $logfilename) \|\| die "Can't write to $logfilename: $!";
967		967
968	$0 = "slimserver";
969
970	if (!setsid) { die "Can't start a new session: $!"; }	968	if (!setsid) { die "Can't start a new session: $!"; }
971	if (!open STDERR, '>&STDOUT') { die "Can't dup stdout: $!"; }	969	if (!open STDERR, '>&STDOUT') { die "Can't dup stdout: $!"; }
972	}	970	}

Lines 3810-3816 Link Here

(-)slimserver.old/strings.txt (-2 / +2 lines)
3810		3810
3811	SETUP_IGNOREDISABLEDITUNESTRACKS_1	3811	SETUP_IGNOREDISABLEDITUNESTRACKS_1
3812	DE Deaktivierte Musikstücke ignorieren	3812	DE Deaktivierte Musikstücke ignorieren
3813	EN Ignore songs unchecked in iTunes	3813	EN Import all songs from iTunes
3814	ES Ignorar canciones no marcadas en iTunes	3814	ES Ignorar canciones no marcadas en iTunes
3815	FR Ignorer les morceaux désactivés dans iTunes	3815	FR Ignorer les morceaux désactivés dans iTunes
3816	JP iTunesで再生しないように設定された曲を無視する	3816	JP iTunesで再生しないように設定された曲を無視する
Lines 3819-3825 Link Here
3819		3819
3820	SETUP_IGNOREDISABLEDITUNESTRACKS_0	3820	SETUP_IGNOREDISABLEDITUNESTRACKS_0
3821	DE Deaktivierte Musikstücke anzeigen	3821	DE Deaktivierte Musikstücke anzeigen
3822	EN Don't ignore songs unchecked in iTunes	3822	EN Import only checked songs from iTunes
3823	ES No ignorar canciones no marcadas en iTunes	3823	ES No ignorar canciones no marcadas en iTunes
3824	FR Ne pas ignorer les morceaux désactivés dans iTunes	3824	FR Ne pas ignorer les morceaux désactivés dans iTunes
3825	JP iTunesで再生しないように設定された曲を有効にする	3825	JP iTunesで再生しないように設定された曲を有効にする

Return to bug 73832

Lines 1209-1215 Link Here

(-)slimserver.old/Slim/Web/Setup.pm (-4 / +2 lines)
1209	'PrefOrder' => ['language']	1209	'PrefOrder' => ['language']
1210	},	1210	},
1211	'Default' => {	1211	'Default' => {
1212	'PrefOrder' => ['audiodir','playlistdir',undef]	1212	'PrefOrder' => [undef]
1213	},	1213	},
1214	'Rescan' => {	1214	'Rescan' => {
1215	'PrefOrder' => [qw(playlistrescan wipedb rescan)]	1215	'PrefOrder' => [qw(playlistrescan wipedb rescan)]
Lines 1395-1403 Link Here
1395	,'GroupOrder' => ['Default']	1395	,'GroupOrder' => ['Default']
1396	,'Groups' => {	1396	,'Groups' => {
1397	'Default' => {	1397	'Default' => {
1398	'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',	1398	'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb','thumbSize','includeNoArt']
1399	#'artfolder',
1400	'thumbSize','includeNoArt']
1401	}	1399	}
1402	}	1400	}
1403	,'Prefs' => {	1401	,'Prefs' => {