[Slim-Checkins] r9549 - in /branches/6.5/server: Slim/Buttons/BrowseTree.pm strings.txt

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sat Sep  9 15:16:21 2006
New Revision: 9549

URL: http://svn.slimdevices.com?rev=9549&view=rev
Log:
Bug: N/A
Description: merge -r 9547:9548 from trunk

Modified:
    branches/6.5/server/Slim/Buttons/BrowseTree.pm
    branches/6.5/server/strings.txt

Modified: branches/6.5/server/Slim/Buttons/BrowseTree.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/BrowseTree.pm?rev=9549&r1=9548&r2=9549&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/BrowseTree.pm (original)
+++ branches/6.5/server/Slim/Buttons/BrowseTree.pm Sat Sep  9 15:16:21 2006
@@ -364,12 +364,7 @@
 
 	# Show a blocking animation
 	$client->block({
-		'line' => [ $client->string('LOADING_BROWSE_MUSIC_FOLDER') ],
-		'fonts' => {
-			'graphic-320x32' => 'light',
-			'graphic-280x16' => 'small',
-			'text'           => 2,
-		}
+		'line' => [ $client->string( $client->linesPerScreen() == 1 ? 'LOADING' : 'LOADING_BROWSE_MUSIC_FOLDER' ) ],
 	});
 
 	# Parse the hierarchy list into an array

Modified: branches/6.5/server/strings.txt
URL: http://svn.slimdevices.com/branches/6.5/server/strings.txt?rev=9549&r1=9548&r2=9549&view=diff
==============================================================================
--- branches/6.5/server/strings.txt (original)
+++ branches/6.5/server/strings.txt Sat Sep  9 15:16:21 2006
@@ -12831,3 +12831,6 @@
 
 LOADING_BROWSE_MUSIC_FOLDER
 	EN	Loading Music Folder...
+
+LOADING
+	EN	Loading...