Index: strings.txt
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/strings.txt,v
retrieving revision 1.8
diff -u -p -B -r1.8 strings.txt
--- strings.txt	28 Jul 2004 01:59:38 -0000	1.8
+++ strings.txt	30 Jul 2004 03:04:53 -0000
@@ -1,4 +1,4 @@
-# $Id: strings.txt,v 1.8 2004/07/28 01:59:38 kdf Exp $
+# $Id: strings.txt,v 1.7 2004/07/25 22:51:05 dean Exp $
 #
 # This tab-delimited file contains all the text strings used in the SlimServer
 # The format should be self explanatory. To submit a new language, or a better
@@ -1685,6 +1685,12 @@ SETUP_ITUNESPLAYLISTSUFFIX_CHOOSE
 	NO	Suffix:
 	SE	Suffix:
 
+SETUP_SHOWYEAR
+	EN	Show Year with Albums
+
+SETUP_SHOWYEAR_DESC
+	EN	You may choose to show the album year when browsing by Albums or by Artwork.  When enabled, the album year will be shown next to the album title.
+
 SETUP_GUESSFILEFORMATS
 	DE	Tag Format erraten
 	EN	Guess Tags Formats
@@ -3546,20 +3552,6 @@ SETUP_SHOWBUFFERFULLNESS
 SETUP_SHOWBUFFERFULLNESS_CHOOSE
 	EN	Show buffer fullness in Playing Display Mode list:
 
-SETUP_SHOWBUFFERFULLNESS_ENABLED
-	DE	Aktiviert
-	EN	Enabled
-	FR	Activé
-	NO	Aktivert
-	SE	Aktiverad
-
-SETUP_SHOWBUFFERFULLNESS_DISABLED
-	DE	Desaktiviert
-	EN	Disabled
-	FR	Désactivé
-	NO	Deaktivert
-	SE	Avaktiverad
-
 SETUP_XPLSUPPORT
 	DE	xPL Support
 	EN	xPL support
@@ -3574,20 +3566,6 @@ SETUP_XPLSUPPORT_CHOOSE
 	NO	xPL støtte:
 	SE	xPL-stöd:
 
-SETUP_XPLSUPPORT_ENABLED
-	DE	Aktiviert
-	EN	Enabled
-	FR	Activé
-	NO	Aktivert
-	SE	Aktiverad
-
-SETUP_XPLSUPPORT_DISABLED
-	DE	Desaktiviert
-	EN	Disabled
-	FR	Désactivé
-	NO	Deaktivert
-	SE	Avaktiverad
-
 SETUP_XPLINTERVAL
 	DE	Heartbeat Intervall
 	EN	Heartbeat Interval
@@ -4423,6 +4401,20 @@ SHUFFLE_OFF
 	PT	Mistura de Playlist Desligada
 	SE	Blanda inte låtlista
 
+ENABLED
+	DE	Aktiviert
+	EN	Enabled
+	FR	Activé
+	NO	Aktivert
+	SE	Aktiverad
+
+DISABLED
+	DE	Desaktiviert
+	EN	Disabled
+	FR	Désactivé
+	NO	Deaktivert
+	SE	Avaktiverad
+
 CLEAR_PLAYLIST
 	DE	Playlist Löschen
 	DK	Nulstil playlisten
Index: Slim/Utils/Prefs.pm
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/Slim/Utils/Prefs.pm,v
retrieving revision 1.8
diff -u -p -B -r1.8 Prefs.pm
--- Slim/Utils/Prefs.pm	28 Jul 2004 01:59:39 -0000	1.8
+++ Slim/Utils/Prefs.pm	30 Jul 2004 03:04:54 -0000
@@ -126,6 +126,7 @@ my %DEFAULT = (
 	,'plugins-onthefly'		=> 0
 	,'longdateFormat'		=> q(%A, %B |%d, %Y)
 	,'shortdateFormat'		=> q(%m/%d/%Y)
+	,'showYear'				=> 0
 	,'timeFormat'			=> q(|%I:%M:%S %p)
 	,'titleFormatWeb'		=> 1
 	,'iTunesplaylistprefix'	=> 'iTunes: '
Index: Slim/Web/Setup.pm
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/Slim/Web/Setup.pm,v
retrieving revision 1.7
diff -u -p -B -r1.7 Setup.pm
--- Slim/Web/Setup.pm	28 Jul 2004 03:49:39 -0000	1.7
+++ Slim/Web/Setup.pm	30 Jul 2004 03:04:57 -0000
@@ -304,8 +304,8 @@ sub initSetupConfig {
 			,'showbufferfullness' => {
 						'validate' => \&validateTrueFalse
 						,'options' => {
-								'0' => string('SETUP_SHOWBUFFERFULLNESS_DISABLED')
-								,'1' => string('SETUP_SHOWBUFFERFULLNESS_ENABLED')
+								'0' => string('DISABLED')
+								,'1' => string('ENABLED')
 								}
 					}
 			,'synchronize' => {
@@ -1257,7 +1257,7 @@ sub initSetupConfig {
 		,'GroupOrder' => ['Default','TitleFormats','GuessFileFormats']
 		,'Groups' => {
 			'Default' => {
-					'PrefOrder' => ['longdateFormat','shortdateFormat','timeFormat']
+					'PrefOrder' => ['longdateFormat','shortdateFormat','timeFormat','showYear']
 				}
 			,'TitleFormats' => {
 					'PrefOrder' => ['titleFormat']
@@ -1317,6 +1317,13 @@ sub initSetupConfig {
 									$changeref->{'titleFormat'}{'Processed'} = 1;
 								}
 							}
+			,'showYear' => {
+						'validate' => \&validateTrueFalse
+						,'options' => {
+									'0' => string('DISABLED')
+									,'1' => string('ENABLED')
+								}
+							}
 			,'guessFileFormats'	=> {
 						'isArray' => 1
 						,'arrayAddExtra' => 1
@@ -1598,8 +1605,8 @@ sub initSetupConfig {
 			,'xplsupport' => {
 						'validate' => \&validateTrueFalse
 						,'options' => {
-								'0' => string('SETUP_XPLSUPPORT_DISABLED')
-								,'1' => string('SETUP_XPLSUPPORT_ENABLED')
+								'0' => string('DISABLED')
+								,'1' => string('ENABLED')
 								}
 				}
 			,'xplinterval' => {
Index: Slim/Web/Pages.pm
===================================================================
RCS file: /home/cvs/cvsroot/g2/server/Slim/Web/Pages.pm,v
retrieving revision 1.5
diff -u -p -B -r1.5 Pages.pm
--- Slim/Web/Pages.pm	27 Jul 2004 23:45:15 -0000	1.5
+++ Slim/Web/Pages.pm	30 Jul 2004 03:04:59 -0000
@@ -1,6 +1,6 @@
 package Slim::Web::Pages;
 
-# $Id: Pages.pm,v 1.5 2004/07/27 23:45:15 dean Exp $
+# $Id: Pages.pm,v 1.4 2004/07/27 07:33:06 kdf Exp $
 # SlimServer Copyright (c) 2001-2004 Sean Adams, Slim Devices Inc.
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License, 
@@ -1634,7 +1634,6 @@ sub browseid3 {
 				$list_form{'genre'}	   = $genre;
 				$list_form{'artist'}       = $artist;
 				$list_form{'album'}	   = '*';
-				$list_form{'song'}	   = $song;
 				$list_form{'title'}        = string('ALL_SONGS');
 				$list_form{'descend'}      = 1;
 				$list_form{'player'}       = $player;
@@ -1657,7 +1656,6 @@ sub browseid3 {
 				$list_form{'genre'}	   = $genre;
 				$list_form{'artist'}       = $artist;
 				$list_form{'album'}	   = $item;
-				$list_form{'song'}	   = $song;
 				$list_form{'title'}        = $item;
 				$list_form{'descend'}      = $descend;
 				$list_form{'player'}       = $player;
@@ -1674,24 +1672,33 @@ sub browseid3 {
 				if ($params->{'artwork'}) {
 
 					my $song = Slim::Music::Info::pathFromAlbum($item);
-
+					my @songs;
 					if (defined $song) {
 						$list_form{'coverthumb'}   = 1; 
 						$list_form{'thumbartpath'} = $song;
 					} else {
 						$list_form{'coverthumb'}   = 0;
+						if (Slim::Utils::Prefs::get('showYear')) {
+							@songs = Slim::Music::Info::songs([$genre], [$artist], [$item], []);
+							$song = $songs[0];
+						}
 					}
-					$list_form{'item'}	   = $item;
+					$list_form{'year'}		 = Slim::Music::Info::year($song);
+					$list_form{'item'}		 = $item;
 					$list_form{'itemnumber'} = $itemnumber;
-					$list_form{'artwork'}    = 1;
-					$list_form{'size'}       = Slim::Utils::Prefs::get('thumbSize');
+					$list_form{'artwork'}	 = 1;
+					$list_form{'size'}		 = Slim::Utils::Prefs::get('thumbSize');
 
 					$itemnumber++;
 
 					$params->{'browse_list'} .= ${Slim::Web::HTTP::filltemplatefile("browseid3_artwork.html", \%list_form)};
 
 				} else {
-
+					if (Slim::Utils::Prefs::get('showYear')) {
+						my @songs = Slim::Music::Info::songs([$genre], [$artist], [$item], []);
+						my $song = $songs[0];
+						$list_form{'year'}		 = Slim::Music::Info::year($song);
+					}
 					$itemnumber++;
 					$params->{'browse_list'} .= ${Slim::Web::HTTP::filltemplatefile("browseid3_list.html", \%list_form)};
 				}