Index: server/HTML/EN/galleryselect.html
===================================================================
--- server/HTML/EN/galleryselect.html	(revision 12142)
+++ server/HTML/EN/galleryselect.html	(working copy)
@@ -1,40 +1,41 @@
-[% IF levelName == 'album' || levelName == 'age' %]
-
-<div class="viewSelect">
-
-[% IF levelName == 'album' %]
-
-	[% orderByList = {
-		'album.titlesort'                                     => 'ALBUM',
-		'album.year,album.titlesort'                          => 'SORT_YEARALBUM',
-		'album.year,contributor.namesort,album.titlesort'     => 'SORT_YEARARTISTALBUM',
-		'contributor.namesort,album.titlesort'                => 'SORT_ARTISTALBUM',
-		'contributor.namesort,album.year,album.titlesort'     => 'SORT_ARTISTYEARALBUM',
-		'genre.namesort,album.titlesort'                      => 'SORT_GENREALBUM',
-		'genre.namesort,contributor.namesort,album.titlesort' => 'SORT_GENREARTISTALBUM',
-	} %]
-
-	[% IF NOT noLabel %]<label for="orderBy" class="stdlabel">[% "SORT_BY" | string %]</label>[% END %]
-
-	<select class="stdedit" name="orderBy" onChange="chooseAlbumOrderBy(selectedIndex,options[selectedIndex].value)">
-
-	[% FOREACH orderType = orderByList.keys.sort %]
-		<option [% IF orderType == orderBy %]selected[% END %] value="[% orderType %]">[% orderByList.$orderType | string %]</option>
-	[% END %]
-
-	</select>
-
-[% END %]
-
-	[% IF controlGraphics %]
-		[% IF artwork %]<a href="javascript:toggleGalleryView(0);"><img src="html/images/list.png" alt='[% "SWITCH_TO_LIST" | string %]' title='[% "SWITCH_TO_LIST" | string %]'></a>
-		[% ELSE %]<a href="javascript:toggleGalleryView(1);"><img src="html/images/gallery.png" alt='[% "SWITCH_TO_GALLERY" | string %]' title='[% "SWITCH_TO_GALLERY" | string %]'></a>
-		[% END %]
-	[% ELSE %]
-		([% IF artwork -%]<a href="javascript:toggleGalleryView(0);">[% "SWITCH_TO_LIST" | string %]</a>
-		[%- ELSE -%]<a href="javascript:toggleGalleryView(1);">[% "SWITCH_TO_GALLERY" | string %]</a>
-		[%- END %])
-	[% END %]
-</div>
-
-[% END %]
+[% IF levelName == 'album' || levelName == 'age' %]
+
+<div class="viewSelect">
+
+[% IF levelName == 'album' %]
+
+	[% orderByList = {
+		'album.titlesort'                                                => 'ALBUM',
+		'album.year,album.titlesort'                                     => 'SORT_YEARALBUM',
+		'album.year,contributor.namesort,album.titlesort'                => 'SORT_YEARARTISTALBUM',
+		'contributor.namesort,album.titlesort'                           => 'SORT_ARTISTALBUM',
+		'contributor.namesort,album.year,album.titlesort'                => 'SORT_ARTISTYEARALBUM',
+		'genre.namesort,album.titlesort'                                 => 'SORT_GENREALBUM',
+		'genre.namesort,contributor.namesort,album.titlesort'            => 'SORT_GENREARTISTALBUM',
+		'genre.namesort,contributor.namesort,album.year,album.titlesort' => 'SORT_GENREARTISTYEARALBUM',
+	} %]
+
+	[% IF NOT noLabel %]<label for="orderBy" class="stdlabel">[% "SORT_BY" | string %]</label>[% END %]
+
+	<select class="stdedit" name="orderBy" onChange="chooseAlbumOrderBy(selectedIndex,options[selectedIndex].value)">
+
+	[% FOREACH orderType = orderByList.keys.sort %]
+		<option [% IF orderType == orderBy %]selected[% END %] value="[% orderType %]">[% orderByList.$orderType | string %]</option>
+	[% END %]
+
+	</select>
+
+[% END %]
+
+	[% IF controlGraphics %]
+		[% IF artwork %]<a href="javascript:toggleGalleryView(0);"><img src="html/images/list.png" alt='[% "SWITCH_TO_LIST" | string %]' title='[% "SWITCH_TO_LIST" | string %]'></a>
+		[% ELSE %]<a href="javascript:toggleGalleryView(1);"><img src="html/images/gallery.png" alt='[% "SWITCH_TO_GALLERY" | string %]' title='[% "SWITCH_TO_GALLERY" | string %]'></a>
+		[% END %]
+	[% ELSE %]
+		([% IF artwork -%]<a href="javascript:toggleGalleryView(0);">[% "SWITCH_TO_LIST" | string %]</a>
+		[%- ELSE -%]<a href="javascript:toggleGalleryView(1);">[% "SWITCH_TO_GALLERY" | string %]</a>
+		[%- END %])
+	[% END %]
+</div>
+
+[% END %]
Index: server/HTML/Nokia770/galleryselect.html
===================================================================
--- server/HTML/Nokia770/galleryselect.html	(revision 12142)
+++ server/HTML/Nokia770/galleryselect.html	(working copy)
@@ -8,13 +8,14 @@
 
 <div id = 'gallerySelect'>
 	[% orderByList = {
-		'album.titlesort'                                     => 'ALBUM',
-		'album.year,album.titlesort'                          => 'SORT_YEARALBUM',
-		'album.year,contributor.namesort,album.titlesort'     => 'SORT_YEARARTISTALBUM',
-		'contributor.namesort,album.titlesort'                => 'SORT_ARTISTALBUM',
-		'contributor.namesort,album.year,album.titlesort'     => 'SORT_ARTISTYEARALBUM',
-		'genre.namesort,album.titlesort'                      => 'SORT_GENREALBUM',
-		'genre.namesort,contributor.namesort,album.titlesort' => 'SORT_GENREARTISTALBUM',
+		'album.titlesort'                                                => 'ALBUM',
+		'album.year,album.titlesort'                                     => 'SORT_YEARALBUM',
+		'album.year,contributor.namesort,album.titlesort'                => 'SORT_YEARARTISTALBUM',
+		'contributor.namesort,album.titlesort'                           => 'SORT_ARTISTALBUM',
+		'contributor.namesort,album.year,album.titlesort'                => 'SORT_ARTISTYEARALBUM',
+		'genre.namesort,album.titlesort'                                 => 'SORT_GENREALBUM',
+		'genre.namesort,contributor.namesort,album.titlesort'            => 'SORT_GENREARTISTALBUM',
+		'genre.namesort,contributor.namesort,album.year,album.titlesort' => 'SORT_GENREARTISTYEARALBUM',
 	} %]
 
 	[% IF NOT noLabel %]<label for="orderBy" class="stdlabel">[% "SORT_BY" | string %]</label>[% END %]
Index: server/strings.txt
===================================================================
--- server/strings.txt	(revision 12142)
+++ server/strings.txt	(working copy)
@@ -13632,6 +13632,16 @@
 	SV	Genre, Artist, Album
 	ZH_CN	风格，艺人，专辑
 
+SORT_GENREARTISTYEARALBUM
+	DE	Stilrichtung, Interpret, Jahr, Album
+	EN	Genre, Artist, Year, Album
+	ES	Género, Artista, año, álbum
+	FR	Genre, Artiste, Année, Album
+	HE	סגנון, מבצע, שנה, אלבום
+	IT	Genere, Artista, anno, album
+	NL	Genre, Artiest, jaar, album
+	SV	Genre, Artist, År, Album
+
 SETUP_CLOCKSOURCE
 	DE	Taktgeberquelle
 	EN	Clock Source